move themes into bin folder (#849)
* as if this is going to work * use android libs and spec for android * install ndk and use clang over g++ * shut the fuck up * SHUT THE FUCK UP * shut up shut up shut up * get remove from favs button * move themes into bin folder * bin folder now already comes with repo * actually install old ndk version * Delete .gitlab-ci.yml * apply font for version
4
.github/workflows/build.yml
vendored
@ -80,10 +80,6 @@ jobs:
|
||||
${{steps.qt.outputs.make}}
|
||||
${{steps.qt.outputs.make}} INSTALL_ROOT="${{steps.qt.outputs.installdir}}" install
|
||||
|
||||
- name: Create bin folder
|
||||
run: |
|
||||
mkdir bin
|
||||
|
||||
- name: Install Windows Discord RPC
|
||||
if: contains(matrix.os, 'windows')
|
||||
run: |
|
||||
|
10
.gitignore
vendored
@ -1,6 +1,7 @@
|
||||
*~
|
||||
*.db
|
||||
*.user
|
||||
*.exe
|
||||
*.dll
|
||||
*.so
|
||||
*.pro.autosave
|
||||
@ -14,7 +15,13 @@ moc*
|
||||
base-full/
|
||||
logs/
|
||||
bass.lib
|
||||
bin/
|
||||
bin/base/background/
|
||||
bin/base/cases/
|
||||
bin/base/characters/
|
||||
bin/base/evidence/
|
||||
bin/base/fonts/
|
||||
bin/base/sounds/
|
||||
bin/user*
|
||||
bins/
|
||||
build/
|
||||
release/
|
||||
@ -25,6 +32,7 @@ base/sounds
|
||||
base/callwords.ini
|
||||
base/config.ini
|
||||
base/serverlist.txt
|
||||
*.ini
|
||||
|
||||
.qmake.stash
|
||||
.vs/
|
||||
|
6
.gitmodules
vendored
@ -1,3 +1,3 @@
|
||||
[submodule "base/themes"]
|
||||
path = base/themes
|
||||
url = https://github.com/AttorneyOnline/AO2-Themes
|
||||
[submodule "bin/base/themes"]
|
||||
path = bin/base/themes
|
||||
url = https://github.com/AttorneyOnline/AO2-Themes.git
|
||||
|
@ -1,5 +0,0 @@
|
||||
[0]
|
||||
name=Default Local Server
|
||||
address=127.0.0.1
|
||||
port=27016
|
||||
protocol=tcp
|
@ -1,59 +0,0 @@
|
||||
c0 = 255, 255, 255
|
||||
c0_name = White
|
||||
c0_talking = 1
|
||||
|
||||
c1 = 0, 255, 0
|
||||
c1_name = Green
|
||||
c1_start = `
|
||||
c1_end = `
|
||||
c1_remove = 1
|
||||
c1_talking = 1
|
||||
|
||||
c2 = 255, 0, 0
|
||||
c2_name = Red
|
||||
c2_start = ~
|
||||
c2_end = ~
|
||||
c2_remove = 1
|
||||
c2_talking = 1
|
||||
|
||||
c3 = 255, 165, 0
|
||||
c3_name = Orange
|
||||
c3_start = |
|
||||
c3_end = |
|
||||
c3_remove = 1
|
||||
c3_talking = 0
|
||||
|
||||
c4 = 45, 150, 255
|
||||
c4_name = Blue
|
||||
c4_start = (
|
||||
c4_end = )
|
||||
c4_remove = 0
|
||||
c4_talking = 0
|
||||
|
||||
c5 = 255, 255, 0
|
||||
c5_name = Yellow
|
||||
c5_start = º
|
||||
c5_end = º
|
||||
c5_remove = 1
|
||||
c5_talking = 1
|
||||
|
||||
c6 = 255, 192, 203
|
||||
c6_name = Pink
|
||||
c6_start = №
|
||||
c6_end = №
|
||||
c6_remove = 1
|
||||
c6_talking = 1
|
||||
|
||||
c7 = 0, 255, 255
|
||||
c7_name = Cyan
|
||||
c7_start = √
|
||||
c7_end = √
|
||||
c7_remove = 1
|
||||
c7_talking = 1
|
||||
|
||||
c8 = 187, 187, 187
|
||||
c8_name = Gray
|
||||
c8_start = [
|
||||
c8_end = ]
|
||||
c8_remove = 0
|
||||
c8_talking = 1
|
@ -1 +0,0 @@
|
||||
Subproject commit 859f59b5d441fbf6c4d992a1af3ece35f1b0e946
|
Before Width: | Height: | Size: 505 B After Width: | Height: | Size: 505 B |
Before Width: | Height: | Size: 38 KiB After Width: | Height: | Size: 38 KiB |
Before Width: | Height: | Size: 42 KiB After Width: | Height: | Size: 42 KiB |
Before Width: | Height: | Size: 40 KiB After Width: | Height: | Size: 40 KiB |
1
bin/base/themes
Submodule
@ -0,0 +1 @@
|
||||
Subproject commit 32a130d1a35220b27deecf22f59c83e92cac1fee
|
@ -225,6 +225,7 @@ void Lobby::set_size_and_pos(QWidget *p_widget, QString p_identifier)
|
||||
|
||||
void Lobby::set_fonts()
|
||||
{
|
||||
set_font(ui_version, "version");
|
||||
set_font(ui_player_count, "player_count");
|
||||
set_font(ui_description, "description");
|
||||
set_font(ui_chatbox, "chatbox");
|
||||
|