Full revert to tag 2.6.2

Due to a countless number of changes made to the core that were not
fully understood, tested, or documented, it was decided to roll
everything back to the last known stable version (2.6.2).

Changes dropped include:
 - Witness needed
 - Shake
 - Frame SFX
 - Multiple custom objections
 - Multithreaded thumbnail generation
 - Looping
 - Various translation additions
 - "Mirror IC"
 - Color in IC log
 - An invocation of clang-format

Next time, work together and split your big fork into independently
testable feature branches.
This commit is contained in:
oldmud0 2020-05-22 17:02:32 -05:00
parent d89a4370a7
commit 156a760eba
223 changed files with 9459 additions and 18191 deletions

8
.github/labeler.yml vendored
View File

@ -1,8 +0,0 @@
translation:
- resource/translations/*
content:
- base/**/*
good_luck:
- src/courtroom.cpp

4
.gitignore vendored
View File

@ -4,7 +4,6 @@
*.dll *.dll
*.so *.so
*.pro.autosave *.pro.autosave
*.pro.user
base_override.h base_override.h
.DS_Store .DS_Store
@ -22,7 +21,6 @@ debug/
Makefile* Makefile*
object_script* object_script*
/android/gradle*
/Attorney_Online_remake_resource.rc /Attorney_Online_remake_resource.rc
/attorney_online_remake_plugin_import.cpp /attorney_online_remake_plugin_import.cpp
@ -33,5 +31,3 @@ discord/
moc* moc*
/Attorney_Online_CC_resource.rc /Attorney_Online_CC_resource.rc
/attorney_online_cc_plugin_import.cpp /attorney_online_cc_plugin_import.cpp
*.autosave

View File

@ -8,9 +8,6 @@ cache:
paths: paths:
- lib/ - lib/
variables:
DEBIAN_FRONTEND: noninteractive
before_script: before_script:
- echo Current working directory is $(pwd) - echo Current working directory is $(pwd)
@ -25,24 +22,22 @@ build linux x86_64:
- apt-get update - apt-get update
- > - >
apt-get install --no-install-recommends -y qt5-default qtmultimedia5-dev apt-get install --no-install-recommends -y qt5-default qtmultimedia5-dev
clang make git sudo curl ca-certificates pkg-config upx unzip xz-utils clang make git sudo curl ca-certificates pkg-config upx unzip
- git submodule init
- git submodule update
# Print versions # Print versions
- qmake --version - qmake --version
- clang --version - clang --version
# Extract BASS # Extract BASS
#- mkdir bass - mkdir bass
#- cd bass - cd bass
#- curl http://www.un4seen.com/files/bass24-linux.zip -o bass.zip - curl http://www.un4seen.com/files/bass24-linux.zip -o bass.zip
#- unzip bass.zip - unzip bass.zip
#- cp x64/libbass.so ../lib - cp x64/libbass.so ../lib
#- curl http://www.un4seen.com/files/bassopus24-linux.zip -o bassopus.zip - curl http://www.un4seen.com/files/bassopus24-linux.zip -o bassopus.zip
#- unzip bassopus.zip - unzip bassopus.zip
#- cp x64/libbassopus.so ../lib - cp x64/libbassopus.so ../lib
#- cd .. - cd ..
# Extract Discord RPC # Extract Discord RPC
- mkdir discord-rpc - mkdir discord-rpc
@ -61,7 +56,7 @@ build linux x86_64:
- cd .. - cd ..
# Build # Build
- qmake -spec linux-clang "DEFINES += DISCORD QTAUDIO" - qmake -spec linux-clang
- make -j4 - make -j4
# Post-processing # Post-processing
@ -80,11 +75,6 @@ build windows i686:
# Install dependencies # Install dependencies
- apt-get update - apt-get update
- apt-get install --no-install-recommends -y make curl ca-certificates upx unzip - apt-get install --no-install-recommends -y make curl ca-certificates upx unzip
- git submodule init
- git submodule update
# Print versions
- /opt/mxe/usr/${TARGET_SPEC}/qt5/bin/qmake --version
# Extract BASS # Extract BASS
- mkdir bass - mkdir bass
@ -97,19 +87,8 @@ build windows i686:
- cp bassopus.dll ../lib - cp bassopus.dll ../lib
- cd .. - cd ..
# Extract QtApng
# - mkdir qtapng
# - cd qtapng
# - curl -L https://github.com/Skycoder42/QtApng/releases/download/1.1.2-2/qtapng_mingw73_32_5.13.0.zip -o apng.zip
# - unzip apng.zip
# - mkdir ../lib/imageformats
# - cp mingw73_32/plugins/imageformats/qapng.dll ../lib/imageformats/
# - cd ..
- ls lib
# Build # Build
- /opt/mxe/usr/${TARGET_SPEC}/qt5/bin/qmake "DEFINES += DISCORD BASSAUDIO" - /opt/mxe/usr/${TARGET_SPEC}/qt5/bin/qmake
- make -j4 - make -j4
# Post-processing # Post-processing
@ -145,7 +124,7 @@ deploy linux x86_64:
- *deploy_misc - *deploy_misc
# Platform-specific # Platform-specific
- cp -a ../lib/* . - cp -a ../lib/*.so .
- cp -a ../bin/Attorney_Online . - cp -a ../bin/Attorney_Online .
- echo "#!/bin/sh" >> ./run.sh - echo "#!/bin/sh" >> ./run.sh
- echo "LD_LIBRARY_PATH=.:\$LD_LIBRARY_PATH ./Attorney_Online" >> ./run.sh - echo "LD_LIBRARY_PATH=.:\$LD_LIBRARY_PATH ./Attorney_Online" >> ./run.sh
@ -179,8 +158,6 @@ deploy windows i686:
# Platform-specific # Platform-specific
- cp -a ../lib/*.dll . - cp -a ../lib/*.dll .
- mkdir imageformats
- 'cp -a ../lib/imageformats/*.dll imageformats/ || :'
- cp -a ../bin/Attorney_Online.exe . - cp -a ../bin/Attorney_Online.exe .
# Zipping # Zipping
@ -213,17 +190,11 @@ publish linux x86_64:
- deploy linux x86_64 - deploy linux x86_64
when: manual when: manual
script: script:
- apt-get update
- apt-get install --no-install-recommends -y git nodejs npm awscli
- cd scripts
- npm install
- cd ..
- cd zip - cd zip
- ../scripts/wasabi_program.sh - ../scripts/wasabi.sh
variables: variables:
MANIFEST: program_linux_x86_64.json MANIFEST: program_linux_x86_64.json
ARTIFACT_SUFFIX: linux_x64.tar.xz ARTIFACT_SUFFIX: _linux_x64.tar.xz
publish windows i686: publish windows i686:
image: ubuntu image: ubuntu
@ -232,14 +203,8 @@ publish windows i686:
- deploy windows i686 - deploy windows i686
when: manual when: manual
script: script:
- apt-get update
- apt-get install --no-install-recommends -y git nodejs npm awscli
- cd scripts
- npm install
- cd ..
- cd zip - cd zip
- ../scripts/wasabi_program.sh - ../scripts/wasabi.sh
variables: variables:
MANIFEST: program_winnt_i386.json MANIFEST: program_winnt_i386.json
ARTIFACT_SUFFIX: windows_x86.zip ARTIFACT_SUFFIX: _windows_x86.zip

3
.gitmodules vendored
View File

@ -1,3 +0,0 @@
[submodule "base/themes"]
path = base/themes
url = https://github.com/AttorneyOnline/AO2-Themes

View File

@ -1,21 +1,11 @@
language: cpp language: cpp
os: osx os: osx
addons: addons:
homebrew: homebrew:
update: true packages:
packages: - qt5
- qt5
script: script:
- "./scripts/macos_build.sh" - ./scripts/macos_build.sh
- "./scripts/macos_post_build.sh" - ./scripts/macos_post_build.sh
deploy:
provider: releases
api_key:
secure: mZCNwnqKeqJP5CqgYOanYnr/KHydxueGPRhvGLpY0Pop7MiH3CIHMN5dhHbtgJvE5GGMR4xUIEhPpmkCEJw7YiPREMqT4mkV4DR531ZLB3t/FizyvIwXuP6jFwzTofZ51qHfBpcurVc9sMFeD9Pw+rLTTgIiXL2sZxUUXc8U+ZZug1lYndgcO6P00fUJd6V9lyFQUGmbSca97YbG6KuCym0fEpyRnMqzKLjYsUUo8UKRBADtmD822O6z2FSldNZDn45Mkx0MYfHWyT5hzTb7WGa+DrTB/0un1HqqsNPlb/ahjrFQQNR2qd7HNGZa+Mvwi6egTDug+k15x8lbkacUoi34U1eFq9LSTYm8dSO5g23I1OvGvjTCkDj1jOLPqB99XlbAJ0E/9Jzw7wtlLaAzvFzTj/B63TQnO3IsgHBWR14CZlf05WMOFf2irwl+kL6ktspIHnlGgaiWYYrKeAt7QJAXiQOdYDz6SaWVC6TyOE/SszXRU6xFotmCjkP2irM5yGE8SUw2uIzKjD9uG0ZXtbLcdQEFD316+qglqFTCjnKsRfbtQs2u5spZPsZSdsOZCbLfNIn0GSTFRymFsK6gsvji8AD8AZo0zcOZ/7NMVC6A8RnF3Ve+vU/xljhsIOxoLZDvZPia7WozdV99xmnepWBwkuoQs/K0xmWcnLZDcb0=
file: "../bin/Attorney_Online_mac_x86_64.zip"
draft: true
on:
tags: true
repo: AttorneyOnline/AO2-Client

View File

@ -3,7 +3,7 @@ QT += core gui widgets network
TARGET = Attorney_Online TARGET = Attorney_Online
TEMPLATE = app TEMPLATE = app
VERSION = 2.7.2.0 VERSION = 2.6.2.0
INCLUDEPATH += $$PWD/include INCLUDEPATH += $$PWD/include
DESTDIR = $$PWD/bin DESTDIR = $$PWD/bin
@ -16,14 +16,13 @@ HEADERS += $$files($$PWD/include/*.h)
LIBS += -L$$PWD/lib LIBS += -L$$PWD/lib
DEFINES += DISCORD
#DEFINES += DISCORD
contains(DEFINES, DISCORD) { contains(DEFINES, DISCORD) {
LIBS += -ldiscord-rpc LIBS += -ldiscord-rpc
} }
#DEFINES += BASSAUDIO DEFINES += BASSAUDIO
contains(DEFINES, BASSAUDIO) { contains(DEFINES, BASSAUDIO) {
LIBS += -lbass LIBS += -lbass
@ -35,10 +34,6 @@ contains(DEFINES, QTAUDIO) {
QT += multimedia QT += multimedia
} }
contains(CONFIG, qml_debug) {
DEFINES += DEBUG_NETWORK
}
macx:LIBS += -framework CoreFoundation -framework Foundation -framework CoreServices macx:LIBS += -framework CoreFoundation -framework Foundation -framework CoreServices
@ -46,24 +41,5 @@ CONFIG += c++14
RESOURCES += resources.qrc RESOURCES += resources.qrc
TRANSLATIONS = resource/translations/ao_en.ts \
resource/translations/ao_jp.ts \
resource/translations/ao_de.ts \
resource/translations/ao_ru.ts \
resource/translations/ao_es.ts \
resource/translations/ao_pt.ts \
resource/translations/ao_pl.ts
win32:RC_ICONS = resource/logo.ico win32:RC_ICONS = resource/logo.ico
macx:ICON = resource/logo.icns macx:ICON = resource/logo.icns
android:DISTFILES += \
android/AndroidManifest.xml \
android/build.gradle \
android/gradle/wrapper/gradle-wrapper.jar \
android/gradle/wrapper/gradle-wrapper.properties \
android/gradlew \
android/gradlew.bat \
android/res/values/libs.xml
ANDROID_PACKAGE_SOURCE_DIR = $$PWD/android

View File

@ -100,14 +100,6 @@ If you begin a message with `~~` (two tildes), the two tildes are removed and th
If two players are in the same position and select each other's characters using the in-game pair list (or with `/pair [id]`), they will appear alongside each other. You can set the offset of your character using the provided spinbox (or with `/offset [percentage]`). If two players are in the same position and select each other's characters using the in-game pair list (or with `/pair [id]`), they will appear alongside each other. You can set the offset of your character using the provided spinbox (or with `/offset [percentage]`).
### Screenflash (2.6+)
Placing a `$` (dollar symbol) at any point in the message will cause a white flash to appear at that point, and the symbol will disappear. You can do this multiple times in one message and stack it up with any other markup symbol. The flash will be silent, unlike the equivalent button.
### Screenshake (2.6+)
Placing an `@` (at symbol) at any point in the message will cause the screen to shake at that point, and the symbol will disappear. You can do this multiple times in one message and stack it up with any other markup symbol (including the screenflash).
### Non-interrupting preanimations (2.6+) ### Non-interrupting preanimations (2.6+)
When checked, this will force text to immediately begin displaying without waiting for the preanimation to finish. When checked, this will force text to immediately begin displaying without waiting for the preanimation to finish.
@ -157,19 +149,19 @@ Areas can be listed by clicking the A/M button (or `/switch_am`). The statuses o
- `ic_chat_name`, which is an input field for your custom showname. Needs the same stuff. - `ic_chat_name`, which is an input field for your custom showname. Needs the same stuff.
- `ao2_ic_chat_name`, which is the same as above, but comes into play when the background has a desk. - `ao2_ic_chat_name`, which is the same as above, but comes into play when the background has a desk.
- Further comments on this: all `ao2_` UI elements come into play when the background has a desk. However, in AO2 nowadays, it's customary for every background to have a desk, even if it's just an empty gif. So you most likely have never seen the `ao2_`-less UI elements ever come into play, unless someone mis-named a desk or something. - Further comments on this: all `ao2_` UI elements come into play when the background has a desk. However, in AO2 nowadays, it's customary for every background to have a desk, even if it's just an empty gif. So you most likely have never seen the `ao2_`-less UI elements ever come into play, unless someone mis-named a desk or something.
- `showname_enable` is a checkbox that toggles whether you should see shownames or not. This does not influence whether you can USE custom shownames or not, so you can have it off, while still showing a custom showname to everyone else. Needs X, Y, width, height as usual. - `showname_enable` is a tickbox that toggles whether you should see shownames or not. This does not influence whether you can USE custom shownames or not, so you can have it off, while still showing a custom showname to everyone else. Needs X, Y, width, height as usual.
- `settings` is a plain button that takes up the OS's looks, like the 'Call mod' button. Takes the same arguments as above. - `settings` is a plain button that takes up the OS's looks, like the 'Call mod' button. Takes the same arguments as above.
- You can also just type `/settings` in OOC. - You can also just type `/settings` in OOC.
- `char_search` is a text input box on the character selection screen, which allows you to filter characters down to name. Needs the same arguments. - `char_search` is a text input box on the character selection screen, which allows you to filter characters down to name. Needs the same arguments.
- `char_passworded` is a checkbox, that when ticked, shows all passworded characters on the character selection screen. Needs the same as above. - `char_passworded` is a tickbox, that when ticked, shows all passworded characters on the character selection screen. Needs the same as above.
- `char_taken` is another checkbox, that does the same, but for characters that are taken. - `char_taken` is another tickbox, that does the same, but for characters that are taken.
- `not_guilty` is a button similar to the CE / WT buttons, that if pressed, plays the Not Guilty verdict animation. Needs the same arguments. - `not_guilty` is a button similar to the CE / WT buttons, that if pressed, plays the Not Guilty verdict animation. Needs the same arguments.
- `guilty` is similar to `not_guilty`, but for the Guilty verdict. - `guilty` is similar to `not_guilty`, but for the Guilty verdict.
- `pair_button` is a toggleable button, that shows and hides the pairing list and the offset spinbox. Works similarly to the mute button. - `pair_button` is a toggleable button, that shows and hides the pairing list and the offset spinbox. Works similarly to the mute button.
- `pair_list` is a list of all characters in alphabetical order, shown when the user presses the Pair button. If a character is clicked on it, it is selected as the character the user wants to pair up with. - `pair_list` is a list of all characters in alphabetical order, shown when the user presses the Pair button. If a character is clicked on it, it is selected as the character the user wants to pair up with.
- `pair_offset_spinbox` is a spinbox that allows the user to choose between offsets of -100% to 100%. - `pair_offset_spinbox` is a spinbox that allows the user to choose between offsets of -100% to 100%.
- `switch_area_music` is a button with the text 'A/M', that toggles between the music list and the areas list. Though the two are different, they are programmed to take the same space. - `switch_area_music` is a button with the text 'A/M', that toggles between the music list and the areas list. Though the two are different, they are programmed to take the same space.
- `pre_no_interrupt` is a checkbox with the text 'No Intrpt', that toggles whether preanimations should delay the text or not. - `pre_no_interrupt` is a tickbox with the text 'No Intrpt', that toggles whether preanimations should delay the text or not.
- `area_free_color` is a combination of red, green, and blue values ranging from 0 to 255. This determines the colour of the area in the Area list if it's free, and has a status of `IDLE`. - `area_free_color` is a combination of red, green, and blue values ranging from 0 to 255. This determines the colour of the area in the Area list if it's free, and has a status of `IDLE`.
- `area_lfp_color` determines the colour of the area if its status is `LOOKING-FOR-PLAYERS`. - `area_lfp_color` determines the colour of the area if its status is `LOOKING-FOR-PLAYERS`.
- `area_casing_color` determines the colour of the area if its status is `CASING`. - `area_casing_color` determines the colour of the area if its status is `CASING`.
@ -180,7 +172,7 @@ Areas can be listed by clicking the A/M button (or `/switch_am`). The statuses o
- `ooc_default_color` determines the colour of the username in the OOC chat if the message doesn't come from the server. - `ooc_default_color` determines the colour of the username in the OOC chat if the message doesn't come from the server.
- `ooc_server_color` determines the colour of the username if the message arrived from the server. - `ooc_server_color` determines the colour of the username if the message arrived from the server.
- `casing_button` is a button with the text 'Casing' that when clicked, brings up the Case Announcements dialog. You can give the case a name, and tick whom do you want to alert. You need to be a CM for it to go through. Only people who have at least one of the roles ticked will get the alert. - `casing_button` is a button with the text 'Casing' that when clicked, brings up the Case Announcements dialog. You can give the case a name, and tick whom do you want to alert. You need to be a CM for it to go through. Only people who have at least one of the roles ticked will get the alert.
- `casing` is a checkbox with the text 'Casing'. If ticked, you will get the case announcements alerts you should get, in accordance to the above. In the settings, you can change your defaults on the 'Casing' tab. (That's a buncha things titled 'Casing'!) - `casing` is a tickbox with the text 'Casing'. If ticked, you will get the case announcements alerts you should get, in accordance to the above. In the settings, you can change your defaults on the 'Casing' tab. (That's a buncha things titled 'Casing'!)
--- ---

View File

@ -1,79 +0,0 @@
<?xml version="1.0"?>
<manifest package="com.aceattorneyonline.ao2" xmlns:android="http://schemas.android.com/apk/res/android" android:versionName="2.6.2.0" android:versionCode="2" android:installLocation="auto">
<application android:hardwareAccelerated="true" android:name="org.qtproject.qt5.android.bindings.QtApplication" android:label="Attorney Online 2" android:icon="@drawable/icon">
<activity android:configChanges="orientation|uiMode|screenLayout|screenSize|smallestScreenSize|layoutDirection|locale|fontScale|keyboard|keyboardHidden|navigation" android:name="org.qtproject.qt5.android.bindings.QtActivity" android:label="Attorney Online 2 Lobby" android:screenOrientation="unspecified" android:launchMode="singleTop">
<intent-filter>
<action android:name="android.intent.action.MAIN"/>
<category android:name="android.intent.category.LAUNCHER"/>
</intent-filter>
<!-- Application arguments -->
<!-- meta-data android:name="android.app.arguments" android:value="arg1 arg2 arg3"/ -->
<!-- Application arguments -->
<meta-data android:name="android.app.lib_name" android:value="-- %%INSERT_APP_LIB_NAME%% --"/>
<meta-data android:name="android.app.qt_sources_resource_id" android:resource="@array/qt_sources"/>
<meta-data android:name="android.app.repository" android:value="default"/>
<meta-data android:name="android.app.qt_libs_resource_id" android:resource="@array/qt_libs"/>
<meta-data android:name="android.app.bundled_libs_resource_id" android:resource="@array/bundled_libs"/>
<!-- Deploy Qt libs as part of package -->
<meta-data android:name="android.app.bundle_local_qt_libs" android:value="-- %%BUNDLE_LOCAL_QT_LIBS%% --"/>
<meta-data android:name="android.app.bundled_in_lib_resource_id" android:resource="@array/bundled_in_lib"/>
<meta-data android:name="android.app.bundled_in_assets_resource_id" android:resource="@array/bundled_in_assets"/>
<!-- Run with local libs -->
<meta-data android:name="android.app.use_local_qt_libs" android:value="-- %%USE_LOCAL_QT_LIBS%% --"/>
<meta-data android:name="android.app.libs_prefix" android:value="/data/local/tmp/qt/"/>
<meta-data android:name="android.app.load_local_libs" android:value="-- %%INSERT_LOCAL_LIBS%% --"/>
<meta-data android:name="android.app.load_local_jars" android:value="-- %%INSERT_LOCAL_JARS%% --"/>
<meta-data android:name="android.app.static_init_classes" android:value="-- %%INSERT_INIT_CLASSES%% --"/>
<!-- Messages maps -->
<meta-data android:value="@string/ministro_not_found_msg" android:name="android.app.ministro_not_found_msg"/>
<meta-data android:value="@string/ministro_needed_msg" android:name="android.app.ministro_needed_msg"/>
<meta-data android:value="@string/fatal_error_msg" android:name="android.app.fatal_error_msg"/>
<!-- Messages maps -->
<!-- Splash screen -->
<!-- meta-data android:name="android.app.splash_screen_drawable" android:resource="@drawable/logo"/ -->
<!-- meta-data android:name="android.app.splash_screen_sticky" android:value="true"/ -->
<!-- Splash screen -->
<!-- Background running -->
<!-- Warning: changing this value to true may cause unexpected crashes if the
application still try to draw after
"applicationStateChanged(Qt::ApplicationSuspended)"
signal is sent! -->
<meta-data android:name="android.app.background_running" android:value="false"/>
<!-- Background running -->
<!-- auto screen scale factor -->
<meta-data android:name="android.app.auto_screen_scale_factor" android:value="false"/>
<!-- auto screen scale factor -->
<!-- extract android style -->
<!-- available android:values :
* full - useful QWidget & Quick Controls 1 apps
* minimal - useful for Quick Controls 2 apps, it is much faster than "full"
* none - useful for apps that don't use any of the above Qt modules
-->
<meta-data android:name="android.app.extract_android_style" android:value="full"/>
<!-- extract android style -->
</activity>
<!-- For adding service(s) please check: https://wiki.qt.io/AndroidServices -->
</application>
<uses-sdk android:minSdkVersion="21" android:targetSdkVersion="28"/>
<supports-screens android:largeScreens="true" android:normalScreens="true" android:anyDensity="true" android:smallScreens="true"/>
<!-- The following comment will be replaced upon deployment with default permissions based on the dependencies of the application.
Remove the comment if you do not require these default permissions. -->
<!-- The following comment will be replaced upon deployment with default features based on the dependencies of the application.
Remove the comment if you do not require these default features. -->
<!-- %%INSERT_FEATURES -->
<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
<uses-permission android:name="android.permission.INTERNET"/>
</manifest>

View File

@ -1,62 +0,0 @@
buildscript {
repositories {
google()
jcenter()
}
dependencies {
classpath 'com.android.tools.build:gradle:3.5.0'
}
}
repositories {
google()
jcenter()
}
apply plugin: 'com.android.application'
dependencies {
implementation fileTree(dir: 'libs', include: ['*.jar', '*.aar'])
}
android {
/*******************************************************
* The following variables:
* - androidBuildToolsVersion,
* - androidCompileSdkVersion
* - qt5AndroidDir - holds the path to qt android files
* needed to build any Qt application
* on Android.
*
* are defined in gradle.properties file. This file is
* updated by QtCreator and androiddeployqt tools.
* Changing them manually might break the compilation!
*******************************************************/
compileSdkVersion androidCompileSdkVersion.toInteger()
buildToolsVersion '28.0.3'
sourceSets {
main {
manifest.srcFile 'AndroidManifest.xml'
java.srcDirs = [qt5AndroidDir + '/src', 'src', 'java']
aidl.srcDirs = [qt5AndroidDir + '/src', 'src', 'aidl']
res.srcDirs = [qt5AndroidDir + '/res', 'res']
resources.srcDirs = ['resources']
renderscript.srcDirs = ['src']
assets.srcDirs = ['assets']
jniLibs.srcDirs = ['libs']
}
}
lintOptions {
abortOnError false
}
// Do not compress Qt binary resources file
aaptOptions {
noCompress 'rcc'
}
}

View File

@ -1 +0,0 @@
target=android-21

Binary file not shown.

Before

Width:  |  Height:  |  Size: 29 KiB

View File

@ -1,22 +0,0 @@
<?xml version='1.0' encoding='utf-8'?>
<resources>
<array name="qt_sources">
<item>https://download.qt.io/ministro/android/qt5/qt-5.14</item>
</array>
<!-- The following is handled automatically by the deployment tool. It should
not be edited manually. -->
<array name="bundled_libs">
<!-- %%INSERT_EXTRA_LIBS%% -->
</array>
<array name="qt_libs">
<!-- %%INSERT_QT_LIBS%% -->
</array>
<array name="load_local_libs">
<!-- %%INSERT_LOCAL_LIBS%% -->
</array>
</resources>

Binary file not shown.

Binary file not shown.

@ -1 +0,0 @@
Subproject commit 6e1317ed93a9a4831047aa151c28742b1dd8afb5

Binary file not shown.

After

Width:  |  Height:  |  Size: 742 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 730 B

BIN
base/themes/1.8/chatmed.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 505 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.6 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.2 KiB

BIN
base/themes/1.8/holdit.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.9 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.8 KiB

BIN
base/themes/1.8/mute.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.9 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.6 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.9 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.8 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.0 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.9 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 403 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 972 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 938 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 396 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 391 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.9 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 285 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 215 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 5.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.5 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 78 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.6 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 914 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 925 B

View File

@ -0,0 +1,245 @@
; Client size. Changing it to something other than 714, 668 will stretch or
; compress courtroombackground.png accordingly.
courtroom = 0, 0, 714, 668
; IC Area. Changing 256, 192 will stretch or compress character gifs and the
; /bgs being used accordingly
viewport = 0, 0, 256, 192
; IC chatbox
chatbox = 0, 174, 256, 108
; IC chatbox if the current background's folder contains stand.png,
; defensedesk.png and prosecutiondesk.png
ao2_chatbox = 0, 174, 256, 108
; Textbox for custom IC name (the "showname")
showname = 6, 1, 256, 15
; IC message, positioned within the chatbox. Changing 250 affects how
; long text goes on before going onto the next line. Changing 89 affects
; how many lines you can see before the message starts scrolling, based on
; the formula of n = 25+(n-1)*16, where n is the number of lines to be
; displayed. (ie, set it to 25 for 1 line, 41 for 2, 57 for 3, 73 for 4,
; 89 for 5, 105 for 6... Less than 25 displays nothing)
message = 3, 18, 250, 89
; Where you type to make an IC chat message
ic_chat_message = 2, 283, 250, 23
; IC chat message if the current background's folder contains stand.png,
; defensedesk.png and prosecutiondesk.png
ao2_ic_chat_message = 2, 283, 250, 23
; IC chatlog
ic_chatlog = 260, 0, 231, 319
; Master server chatlog
ms_chatlog = 490, 1, 224, 277
; OOC Chatlog
server_chatlog = 490, 1, 224, 277
; Where you type to make an OOC chat message
; NOTE: THIS DOES NOT HAVE ANY VISUAL APPEARANCE
ooc_chat_message = 492, 281, 222, 19
; Where you enter your OOC name, and also where it shows up
ooc_chat_name = 492, 300, 85, 19
; Toggle between Server and Master OOC chats
ooc_toggle = 580, 300, 133, 19
; Where the jukebox is
music_list = 490, 342, 224, 326
; Jukebox search bar
music_search = 490, 319, 100, 23
found_song_color = 100, 255, 100
missing_song_color = 255, 100, 100
; Labels and sliders for music/sfx/blips
music_label = 282, 607, 41, 16
sfx_label = 282, 627, 41, 16
blip_label = 282, 647, 41, 16
music_slider = 326, 608, 140, 16
sfx_slider = 326, 628, 140, 16
blip_slider = 326, 648, 140, 16
; Emote buttons - [490, 98] determines how many columns and rows of buttons are
; displayed per page. 49, 49 is the ABSOLUTE MINIMUM, and displays 1 button per
; page. Having either number lower than 49 crashes the client when you try to
; pick a character. If you want X columns and Y rows, you would change it to
; 49X, 49Y (ie. 490, 147 if you want 10 columns and 3 rows)
emotes = 5, 342, 490, 98
emote_button_spacing = 9, 9
; Page togglers for emotes
emote_left = 5, 434, 60, 32
emote_right = 428, 434, 60, 32
; Emote dropdown/emote names - Change '125' to make it longer/shorter and
; display the full emote name or truncate it based on length
emote_dropdown = 5, 470, 105, 20
; Hold it/Take That/Objection and the "BLING!" buttons
hold_it = 10, 310, 76, 28
objection = 90, 310, 76, 28
take_that = 170, 310, 76, 28
realization = 5, 515, 42, 42
; If the server supports it (AOV does not currently) - if a character has a
; custom.gif and custom.wav in their folder, this button acts as another
; Objection/Take That/Hold It for that character that uses the custom animation
; and sfx. (Think Satorah! Such Insolence!, Gotcha!)
custom_objection = 340, 565, 76, 28
; Text color dropdown menu
text_color = 115, 470, 80, 20
pos_dropdown = 200, 470, 80, 20
; Preanimation toggle
pre = 5, 490, 80, 21
; Flip button
flip = 104, 490, 51, 21
; Guard button
guard = 200, 560, 61, 21
pre_no_interrupt = 200, 490, 80, 21
; Penalty bars and judge's buttons for penalizing. Other than the bars, these
; ONLY show up on a character with /pos jud
defense_bar = 5, 566, 187, 9
prosecution_bar = 5, 582, 187, 9
defense_plus = 183, 566, 9, 9
defense_minus = 5, 566, 9, 9
prosecution_plus = 183, 582, 9, 9
prosecution_minus = 5, 582, 9, 9
; Judge's buttons for WT and CE. /pos jud
witness_testimony = 290, 470, 85, 42
cross_examination = 290, 515, 85, 42
; Buttons to change character/Reload theme/Call Mod
change_character = 5, 610, 120, 23
reload_theme = 5, 637, 94, 23
call_mod = 104, 637, 64, 23
; Mute button
mute_button = 150, 515, 42, 42
; Where the Mute list pops up when you click Mute
mute_list = 280, 469, 210, 198
; ???? - if there was an Area button, where the area list would show up?
; area_list = 270, 494, 224, 174
; ???? - where a password box appears if an area is password locked?
; area_password = 266, 471, 224, 23
; >Evidence meme
evidence_button = 627, 322, 85, 18
evidence_background = 0, 385, 490, 284
evidence_name = 112, 4, 264, 19
evidence_buttons = 28, 27, 430, 216
evidence_button_spacing = 2, 3
evidence_overlay = 24, 24, 439, 222
evidence_delete = 78, 8, 70, 20
evidence_image_name = 150, 8, 130, 20
evidence_image_button = 280, 8, 60, 20
evidence_x = 341, 8, 20, 20
evidence_description = 78, 28, 281, 166
evidence_left = 28, 0, 60, 24
evidence_right = 400, 0, 60, 24
evidence_present = 165, 247, 158, 41
left_evidence_icon = 13, 13, 70, 70
right_evidence_icon = 173, 13, 70, 70
; Character select widgets
char_select = 0, 0, 714, 668
back_to_lobby = 5, 5, 91, 23
char_password = 297, 7, 120, 22
char_buttons = 25, 36, 663, 596
char_button_spacing = 7, 7
char_select_left = 100, 5, 43, 24
char_select_right = 146, 5, 43, 24
spectator = 317, 640, 80, 23
; -------------------------
; New in 2.6.0
; -------------------------
; The log limiter explaining label. This is simply a piece of text that
; explains what the spin box is for.
; log_limit_label = 190, 612, 50, 30
; The spinbox allows you to set the log limit ingame inbetween 1 and 10000,
; with the option to set it to 0 as well (which is considered 'infinite' by
; the log limiter).
; log_limit_spinbox = 168, 636, 70, 25
; This is an input field that allows you to change your in-character showname.
ic_chat_name = 200, 534, 78, 23
; I am sure there are some differences between the 'ao2_' versions and the
; 'ao2_'-less versions of the IC text display and input, but I do not know
; what. Still, here you go!
ao2_ic_chat_name = 200, 534, 78, 23
; An in-game tickbox that allows you to set whether your client should show
; custom shownames where possible, or always keep to character names.
; This is useful if you suspect someone is impersonating others, for example,
; and they are using this in combination with ini-swapping to 'duplicate' a
; character.
showname_enable = 200, 510, 80, 21
; A simple button that opens up the settings menu.
; Equivalent to typing /settings in the OOC chat.
settings = 130, 610, 60, 23
; The character search text input in the character selecton screen.
; The moment you enter some text, it immediately starts filtering.
char_search = 420, 7, 120, 22
; A tickbox that filters based on if a character requires password to access or not.
; Note that this is actually only partially implemented in AO.
; The interface exists for it, but no way to actually password the characters.
char_passworded = 545, 7, 100, 22
; A tickbox that filters characters based on if they are taken.
char_taken = 635, 7, 80, 22
; These buttons are similar to the CE / WT buttons, except they show a
; Not Guilty or Guilty animation instead.
not_guilty = 380, 470, 85, 42
guilty = 380, 515, 85, 42
; These are responsible for the pairing stuff.
; These work much like muting, actually.
pair_button = 104, 515, 42, 42
pair_list = 280, 490, 210, 177
pair_offset_spinbox = 280, 470, 210, 20
; This button allows switching between music and areas.
switch_area_music = 590, 319, 35, 23
; These are colours for the various statuses an area can be in.
area_free_color = 54, 198, 68
area_lfp_color = 255, 255, 0
area_casing_color = 255, 166, 0
area_recess_color = 255, 190, 30
area_rp_color = 200, 52, 252
area_gaming_color = 55, 255, 255
area_locked_color = 165, 43, 43
; These two are casing-related inputs.
; "casing" is a tickbox that toggles whether you should receive case alerts or
; not (you can set your preferences, and its default value, in the Settings!)
; "casing_button" is an interface to help you announce a case (you have to be
; a CM first to be able to announce cases).
casing = 200, 560, 80, 21
casing_button = 173, 637, 60, 23

View File

@ -0,0 +1,11 @@
showname = 8
message = 10
ic_chatlog = 10
ms_chatlog = 10
server_chatlog = 9
music_list = 8
ic_chatlog_color = 255, 255, 255
; Color for all labels and checkboxes
label_color = 255, 255, 255

View File

@ -0,0 +1,8 @@
realization = sfx-realization.wav
witness_testimony = sfx-testimony2.wav
cross_examination = sfx-testimony.wav
evidence_present = sfx-evidenceshoop.wav
word_call = sfx-gaspen-yeah!.wav
mod_call = sfx-gallery.wav
not_guilty = sfx-notguilty.wav
guilty = sfx-guilty.wav

Binary file not shown.

After

Width:  |  Height:  |  Size: 62 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 87 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.4 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 31 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 171 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 188 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 184 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 187 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 187 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 188 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 188 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 188 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 187 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 188 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 188 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 492 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 498 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 249 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.0 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 291 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 931 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 20 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 577 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 637 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.8 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 42 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.8 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 40 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.9 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.8 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.1 KiB

View File

@ -0,0 +1,17 @@
lobby = 0, 0, 517, 666
public_servers = 46, 88, 114, 30
favorites = 164, 88, 114, 30
refresh = 56, 381, 132, 28
add_to_fav = 194, 381, 132, 28
connect = 332, 381, 132, 28
version = 170, 1, 300, 21
about = 428, 1, 88, 21
server_list = 20, 125, 286, 240
player_count = 336, 91, 173, 16
description = 337, 109, 173, 245
chatbox = 2, 445, 515, 198
chatname = 3, 646, 85, 19
chatmessage = 93, 646, 424, 19
loading_label = 135, 92, 254, 95
progress_bar = 135, 188, 254, 21
cancel = 220, 220, 80, 20

Binary file not shown.

After

Width:  |  Height:  |  Size: 29 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.9 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.9 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1013 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 5.6 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 34 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 43 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.9 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.6 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.5 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 9.0 KiB

Some files were not shown because too many files have changed in this diff Show More