Merge branch 'master' into music_list_update

.gitignore

@@ -4,6 +4,7 @@
 *.dll
 *.so
 *.pro.autosave
+*.pro.user
 base_override.h
 .DS_Store
 
@@ -21,6 +22,7 @@ debug/
 
 Makefile*
 object_script*
+/android/gradle*
 /Attorney_Online_remake_resource.rc
 /attorney_online_remake_plugin_import.cpp
 

.gitlab-ci.yml

@@ -23,6 +23,8 @@ build linux x86_64:
     - >
       apt-get install --no-install-recommends -y qt5-default qtmultimedia5-dev
       clang make git sudo curl ca-certificates pkg-config upx unzip
+    - git submodule init
+    - git submodule update
 
     # Print versions
     - qmake --version
@@ -75,6 +77,8 @@ build windows i686:
     # Install dependencies
     - apt-get update
     - apt-get install --no-install-recommends -y make curl ca-certificates upx unzip
+    - git submodule init
+    - git submodule update
 
     # Extract BASS
     - mkdir bass
@@ -124,7 +128,7 @@ deploy linux x86_64:
     - *deploy_misc
 
     # Platform-specific
-    - cp -a ../lib/*.so .
+    - cp -a ../lib/* .
     - cp -a ../bin/Attorney_Online .
     - echo "#!/bin/sh" >> ./run.sh
     - echo "LD_LIBRARY_PATH=.:\$LD_LIBRARY_PATH ./Attorney_Online" >> ./run.sh

.gitmodules

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

Attorney_Online.pro

@@ -3,7 +3,7 @@ QT += core gui widgets network
 TARGET = Attorney_Online
 TEMPLATE = app
 
-VERSION = 2.6.2.0
+VERSION = 2.7.2.0
 
 INCLUDEPATH += $$PWD/include
 DESTDIR = $$PWD/bin
@@ -34,6 +34,10 @@ contains(DEFINES, QTAUDIO) {
 QT += multimedia
 }
 
+contains(CONFIG, qml_debug) {
+DEFINES += DEBUG_NETWORK
+}
+
 macx:LIBS += -framework CoreFoundation -framework Foundation -framework CoreServices
 
 
@@ -45,7 +49,19 @@ 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_es.ts \
+                    resource/translations/ao_pl.ts
 
 win32:RC_ICONS = resource/logo.ico
 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

README.md

@@ -100,6 +100,14 @@ 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]`).
 
+### 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+)
 
 When checked, this will force text to immediately begin displaying without waiting for the preanimation to finish.

android/AndroidManifest.xml

@@ -0,0 +1,79 @@
+<?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>

android/build.gradle

@@ -0,0 +1,62 @@
+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'
+    }
+}

android/project.properties

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

android/res/values/libs.xml

@@ -0,0 +1,22 @@
+<?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>

base/themes

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

base/themes/default/courtroom_design.ini

@@ -1,245 +0,0 @@
-; 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, 580, 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

base/themes/default/courtroom_fonts.ini

@@ -1,11 +0,0 @@
-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

base/themes/default/courtroom_sounds.ini

@@ -1,8 +0,0 @@
-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

base/themes/default/lobby_design.ini

@@ -1,17 +0,0 @@
-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