Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

2.10.1 Changes #888

Merged
merged 62 commits into from
May 31, 2023
Merged
Show file tree
Hide file tree
Changes from 50 commits
Commits
Show all changes
62 commits
Select commit Hold shift + click to select a range
fd1d8a6
Utilise .ui file to create settings dialog (#858)
Salanto Oct 30, 2022
fbec20e
Cleanup lobby (#880)
Salanto Nov 4, 2022
a5c9657
Delete rebase artifact
Salanto Jan 22, 2023
eb0814e
only set setting codec on qt5
stonedDiscord Dec 28, 2022
f413f5b
fix old regex
stonedDiscord Dec 28, 2022
ec9d619
qlocale include was missing
stonedDiscord Dec 28, 2022
60411da
Add default soundfont value + cleaup stream checks
Salanto Jan 22, 2023
693f21d
Remove Case Announcement
Salanto Jan 23, 2023
2e312f0
Add add_server dialog and move logic to options.h
Salanto Jan 23, 2023
ba070be
Add Direction Connection Widget and function
Salanto Jan 24, 2023
b961344
Visual Fluff, don't show direct connection on demo screen
Salanto Jan 24, 2023
fc0156a
Implement ui-file reload and RCC mounting.
Salanto Jan 25, 2023
6eeceb4
Add edit menu to favorites
Salanto Jan 28, 2023
fd324e9
Add Server remains active when no server is selected
Salanto Jan 28, 2023
8dce3af
Hack together window title for courtroom
Salanto Jan 29, 2023
05959a8
Fix incorrect subtheme location code
Salanto Feb 1, 2023
b362a57
Cleanup
Salanto Feb 10, 2023
b330e3d
Make all charicons appear on first join
Salanto Feb 11, 2023
3da086c
Fix evidence hover selector under Qt5
Salanto Feb 12, 2023
8859305
Remove options calling itself trough pointer
Salanto Feb 12, 2023
5b634c8
Fix Android CI (#891)
stonedDiscord Feb 13, 2023
4459493
CharButton - Fix enterEvent override in Qt5
Salanto Feb 13, 2023
bae43d8
version bump
Salanto Feb 16, 2023
6ec735a
Update embeeded lobby ui color sheme
Salanto Feb 16, 2023
1e3e957
Add changelog.md loading logic from main mount path
Salanto Feb 20, 2023
250fd7c
Expand tabbar of optional Tabbar widget
Salanto Feb 21, 2023
bd4c7fb
Fix order column being incorrectly sized
Salanto Feb 21, 2023
68a20ac
missed a space
stonedDiscord Feb 22, 2023
680b125
remove fonts
stonedDiscord Feb 22, 2023
188deec
change margins
stonedDiscord Feb 22, 2023
b27a1a8
fix minimum sizes
stonedDiscord Feb 22, 2023
a33f5c1
Allow theme overwrite of settings menu
Salanto Feb 22, 2023
a0feb07
Cleanup iterator for subthemes
Salanto Feb 22, 2023
28129e8
Allow reload of settings menu
Salanto Feb 22, 2023
27e585c
AO base path (#893)
stonedDiscord Feb 24, 2023
063b81b
Android 2 10 1 (#894)
stonedDiscord Feb 24, 2023
89c838a
Clear options map before reloading the UI
Salanto Feb 25, 2023
b60765d
Fix runtime warning for theme/subtheme combobox
Salanto Feb 26, 2023
b35baff
Sort dropdown numerically to match explorer preview
Salanto Feb 26, 2023
8c370fd
fuck bass
stonedDiscord Feb 27, 2023
129447f
copy mingw
stonedDiscord Feb 27, 2023
d62d8f1
copy other dll
stonedDiscord Feb 27, 2023
e3c9ecc
wrong folder
stonedDiscord Feb 27, 2023
4a67e2e
Account for server subtheme
Salanto Mar 7, 2023
c85c23d
Replace incorrect subtheme check
Salanto Mar 10, 2023
e86ce37
Settings, not server
Salanto Mar 10, 2023
d0ebe9e
Remove debug
Salanto Mar 10, 2023
f20236c
Add compatibility code, suppress compiler warning (#896)
memsecviolator Mar 19, 2023
e027d29
Resolve Qt6(.5.0) compiler errors
Salanto Mar 23, 2023
0cace9b
Undo incompetence.
Salanto Mar 23, 2023
fb755b4
Force theme reload on theme change
Salanto Apr 18, 2023
e4eb370
make speedlines stretch by default (in *actually* non-stupid way this…
lambdcalculus Apr 23, 2023
454e1f2
Rework default volume settings (#903)
lambdcalculus May 3, 2023
1c9c42b
Reworked direct connect (#906)
TrickyLeifa May 4, 2023
fa01488
Set join text when double-click on connected server
Salanto May 4, 2023
03acc74
remove unused m_looping
stonedDiscord May 4, 2023
e42a02c
remove useless underflow check
stonedDiscord May 4, 2023
dbe09eb
do not fall from server to favorites
stonedDiscord May 4, 2023
39d17a0
Ci android fix (#899)
stonedDiscord May 8, 2023
40de0e7
deprecate "chat" deskmod (#910)
lambdcalculus May 14, 2023
0b886e5
Merge branch 'master' into devel-2-10-1
Salanto May 14, 2023
548ae8c
Add credits for lamdacalculus
Salanto May 26, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion .clang-format
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
BasedOnStyle: LLVM
BreakBeforeBraces: Stroustrup
AllowShortIfStatementsOnASingleLine: true
AllowShortIfStatementsOnASingleLine: true
NamespaceIndentation: All

27 changes: 19 additions & 8 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ jobs:
- platform: gcc_64
os: ubuntu-latest
- platform: android
os: ubuntu-latest
os: ubuntu-20.04
- platform: msvc2019
os: windows-2019
- platform: mingw81_32
Expand Down Expand Up @@ -59,6 +59,7 @@ jobs:
ANDROID_NDK_ROOT=${ANDROID_SDK_ROOT}/ndk-bundle
SDKMANAGER=${ANDROID_SDK_ROOT}/cmdline-tools/latest/bin/sdkmanager
echo "y" | $SDKMANAGER "ndk;21.4.7075529"
echo "y" | $SDKMANAGER "platforms;android-24"
ln -sfn $ANDROID_SDK_ROOT/ndk/21.4.7075529 $ANDROID_NDK_ROOT

- uses: Skycoder42/action-setup-qt@master
Expand Down Expand Up @@ -164,21 +165,23 @@ jobs:
- name: Install Android BASS
if: matrix.platform == 'android'
run: |
mkdir ./android/libs/
mkdir ./android/libs/armeabi-v7a/
mkdir -p ./android/libs/armeabi-v7a/
curl http://www.un4seen.com/files/bass24-android.zip -o bass.zip
unzip -d bass -o bass.zip
unzip -o bass.zip -d bass
cp ./bass/libs/armeabi-v7a/libbass.so ./lib/
unzip -o bass.zip "libs/*" -d "./android/libs/"
cp ./bass/libs/armeabi-v7a/libbass.so ./android/libs/armeabi-v7a/

curl http://www.un4seen.com/files/bassmidi24-android.zip -o bassmidi.zip
unzip -d bass -o bassmidi.zip
cp ./bass/libs/armeabi-v7a/libbassmidi.so ./lib/
unzip -o bassmidi.zip "libs/*" -d "./android/libs/"
cp ./bass/libs/armeabi-v7a/libbassmidi.so ./android/libs/armeabi-v7a/

curl http://www.un4seen.com/files/bassopus24-android.zip -o bassopus.zip
unzip -d bass -o bassopus.zip
cp ./bass/libs/armeabi-v7a/libbassopus.so ./lib/
unzip -o bassopus.zip "libs/*" -d "./android/libs/"
cp ./bass/libs/armeabi-v7a/libbassopus.so ./android/libs/armeabi-v7a/

- name: qmake
Expand Down Expand Up @@ -214,13 +217,22 @@ jobs:
rm -r bearer
rm -r styles

- name: Copy MingW DLL
if: matrix.platform == 'mingw81_32'
working-directory: ${{github.workspace}}/bin/
shell: bash
run: |
cp D:/a/AO2-Client/AO2-Client/.cache/qt/Tools/mingw810_32/bin/libgcc_s_dw2-1.dll .
cp D:/a/AO2-Client/AO2-Client/.cache/qt/Tools/mingw810_32/bin/libstdc++-6.dll .
cp D:/a/AO2-Client/AO2-Client/.cache/qt/Tools/mingw810_32/bin/libwinpthread-1.dll .

- name: Deploy Linux
if: matrix.platform == 'gcc_64'
working-directory: ${{github.workspace}}/bin/
shell: bash
run: |
cp ../scripts/launch.sh .
mkdir imageformats
mkdir -p imageformats
cp ../QtApng/plugins/imageformats/libqapng.so ./imageformats/libqapng.so
chmod +x launch.sh
chmod +x Attorney_Online
Expand Down Expand Up @@ -251,11 +263,10 @@ jobs:
working-directory: ${{github.workspace}}/
shell: bash
run: |
mkdir ./build/libs/
mkdir ./build/libs/armeabi-v7a/
mkdir -p ./build/libs/armeabi-v7a/
mv ./bin/*.so ./build/libs/armeabi-v7a/
cp ./QtApng/plugins/imageformats/libplugins_imageformats_qapng_armeabi-v7a.so ./build/libs/armeabi-v7a/
androiddeployqt --input android-Attorney_Online-deployment-settings.json --output ./build/ --apk ./bin/AttorneyOnline.apk
androiddeployqt --android-platform android-24 --input android-Attorney_Online-deployment-settings.json --output ./build/ --apk ./bin/AttorneyOnline.apk

- name: Upload Artifact
uses: actions/upload-artifact@master
Expand Down
13 changes: 8 additions & 5 deletions Attorney_Online.pro
Original file line number Diff line number Diff line change
@@ -1,17 +1,19 @@
QT += core gui widgets network websockets
QT += core gui widgets network websockets uitools
Salanto marked this conversation as resolved.
Show resolved Hide resolved

TARGET = Attorney_Online
TEMPLATE = app

VERSION = 2.10.0.0
VERSION = 2.10.1.0

INCLUDEPATH += $$PWD/include
DESTDIR = $$PWD/bin
OBJECTS_DIR = $$PWD/build
MOC_DIR = $$PWD/build

SOURCES += $$files($$PWD/src/*.cpp)
HEADERS += $$files($$PWD/include/*.h)
SOURCES += $$files($$PWD/src/*.cpp, true)
HEADERS += $$files($$PWD/include/*.h, true)

FORMS += $$files($$PWD/resource/ui/*.ui)

LIBS += -L$$PWD/lib
QMAKE_LFLAGS += -Wl,-rpath,"'\$$ORIGIN/lib'"
Expand Down Expand Up @@ -57,7 +59,8 @@ TRANSLATIONS = resource/translations/ao_en.ts \
resource/translations/ao_es.ts \
resource/translations/ao_pt.ts \
resource/translations/ao_pl.ts \
resource/translations/ao_it.ts
resource/translations/ao_it.ts \
ressource/ui/

win32:RC_ICONS = resource/logo_ao2.ico
macx:ICON = resource/logo_ao2.icns
Expand Down
3 changes: 3 additions & 0 deletions android/libs/armeabi-v7a/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
libbass.so
libbassmidi.so
libbassopus.so
2 changes: 1 addition & 1 deletion android/project.properties
Original file line number Diff line number Diff line change
@@ -1 +1 @@
target=android-21
target=android-24
Loading