Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1044 commits
Select commit Hold shift + click to select a range
69e9f26
Added config option to disable searchable iniswap
TrickyLeifa Mar 25, 2022
844bf66
Fix macro condition
TrickyLeifa Mar 25, 2022
acd8e86
Merge pull request #272 from Chrezm/nonum/iniswap_improvements
Chrezm Mar 25, 2022
c1b3fca
Iniswap dropdown stylesheet always applied
TrickyLeifa Mar 25, 2022
67a9927
Merge branch 'master' into 273/faster-logger
TrickyLeifa Mar 25, 2022
309cfdc
Merge branch 'nonum/iniswap_improvements'
TrickyLeifa Mar 25, 2022
39d05bb
Bumped speed at which logs are saved
TrickyLeifa Mar 25, 2022
6b44e8b
Avoid needlessly acquire the system lock if our msg list is empty
TrickyLeifa Mar 25, 2022
1381cb4
Merge pull request #275 from Chrezm/actions-merge-master
TrickyLeifa Mar 26, 2022
fb17152
Merge pull request #274 from Chrezm/273/faster-logger
Chrezm Mar 26, 2022
1028794
Moved all headers to src folder
TrickyLeifa Mar 26, 2022
0983a86
Restructured 3rd-party folder and dependencies
TrickyLeifa Apr 1, 2022
aa466fb
Updated workflow to reflect 3rd-party restructure
TrickyLeifa Apr 1, 2022
a650d9d
Updated workflow to reflect 3rd-party restructure
TrickyLeifa Apr 1, 2022
378922b
Moved bassopus.h to the right folder
TrickyLeifa Apr 1, 2022
3c0f078
Merge pull request #278 from Chrezm/277/restructure-2022-april
TrickyLeifa Apr 1, 2022
a9fb62d
Add trivial lookup checks to avoid unnecessary file IO penalties
Chrezm Apr 2, 2022
35c1595
Remove unnecessary file_exists calls linked to find_theme_asset_path
Chrezm Apr 2, 2022
61aa8cc
Remove unnecessary button reloading
Chrezm Apr 2, 2022
a8a2932
Implicitly assume all Qt versions are 5.12 or above
Chrezm Apr 2, 2022
8b85698
Finish previous commit
Chrezm Apr 2, 2022
8d0d23a
Optimize effect file IO access
Chrezm Apr 2, 2022
3f9b343
Fixed small icon appearing out of nowhere when two widgets are crossi…
TrickyLeifa Apr 2, 2022
3431f6a
Introduced HideCharacter to MS, misc optimizations
TrickyLeifa Apr 3, 2022
2a593c9
Fix pre emote mod not playing pre
TrickyLeifa Apr 3, 2022
60f4019
Fixed missing depends for build-all-merge-master
TrickyLeifa Apr 3, 2022
f8342f7
Renamed ui_hidden to ui_hide_character; added ui_hide_character value…
TrickyLeifa Apr 3, 2022
af9f6ce
Merge branch 'nonum/optimize-empty-trivial-characters' of https://git…
TrickyLeifa Apr 3, 2022
10cd6e3
Fixed final emote change not obeying "hide_character" rule
TrickyLeifa Apr 3, 2022
23d88a8
Small optimization
TrickyLeifa Apr 3, 2022
f18bf53
Merge pull request #279 from Chrezm/nonum/optimize-empty-trivial-char…
Chrezm Apr 3, 2022
25eaf9c
Remove upper bound for clock
Chrezm Apr 4, 2022
cb7db77
Merge pull request #280 from Chrezm/nonum/no_clock_upperbound
Chrezm Apr 4, 2022
aa9a1fa
Added showname to MS packet
TrickyLeifa Apr 7, 2022
2fa9454
Re-ordered MS fields
TrickyLeifa Apr 7, 2022
7a94439
Merge pull request #282 from Chrezm/281/guarantee-showname-to-ms-packet
Chrezm Apr 7, 2022
e1d6df3
Assume v110 server compatible
TrickyLeifa Apr 8, 2022
56a2ff1
Added notification filtering for warnings
TrickyLeifa Apr 8, 2022
03a936a
Restore hiding for misc blank (remove for 1.2.0)
Chrezm Apr 8, 2022
699d43f
Reverted blank emote changes as asked
TrickyLeifa Apr 9, 2022
b63c6f0
Merge pull request #285 from Chrezm/283-284/assume-v110-compatible
TrickyLeifa Apr 9, 2022
8bcbdb1
Enforce proper start and end ranges in certain at and mid calls
Chrezm Apr 9, 2022
3a67570
Apply recommended fixes
Chrezm Apr 9, 2022
d64e006
Choose more descriptive name for CMShowCharacter
Chrezm Apr 9, 2022
5c11a3d
Information notifications may now be suppressed
TrickyLeifa Apr 9, 2022
be20513
Require incoming CL packets have at least one argument
Chrezm Apr 9, 2022
3a791f6
Merge pull request #287 from Chrezm/nonum/small_security_fixes
Chrezm Apr 10, 2022
c8b5a33
Reworked server advertiser, server info, ...
TrickyLeifa Apr 10, 2022
deb0ca5
Added favorite server icon
TrickyLeifa Apr 10, 2022
162df02
Resolve OpenSSL dependency in workflow
TrickyLeifa Apr 10, 2022
fb8233c
Resolve OpenSSL dependency in workflow #2
TrickyLeifa Apr 10, 2022
adc7bfe
Fix link
TrickyLeifa Apr 10, 2022
ea30da0
Fix link
TrickyLeifa Apr 10, 2022
1ada628
Fixed name typo
TrickyLeifa Apr 10, 2022
e6e335b
Fixed name typo
TrickyLeifa Apr 10, 2022
abcd3fe
Added client_version packet support and versioning checks
TrickyLeifa Apr 10, 2022
1c0d452
Merge branch 'multiples/lobby-rework' of https://github.com/Chrezm/DR…
TrickyLeifa Apr 10, 2022
f3d210f
Suppress invalid version prompt when you don't have a server selected
TrickyLeifa Apr 10, 2022
df84175
Added config button to server browser and allow server browser to rel…
TrickyLeifa Apr 10, 2022
2636840
Fixed public/favorite filter resetting to default state after reload
TrickyLeifa Apr 10, 2022
a6b4b39
Renamed config to config_panel and textures as well
TrickyLeifa Apr 10, 2022
eeb948d
Renamed textures for config_panel
TrickyLeifa Apr 10, 2022
1a0841b
Allow both bold and outline text
TrickyLeifa Apr 10, 2022
873ed36
Removed about button from server browser
TrickyLeifa Apr 10, 2022
7224c20
Changed default to transparent black
TrickyLeifa Apr 10, 2022
e7d3ce8
Changed default color to half transparent grey
TrickyLeifa Apr 10, 2022
fee1c1e
Force the config_panel button to be shown if hidden/invalid size
TrickyLeifa Apr 10, 2022
7edf28c
Added switch between image or placeholder text for AOImage
TrickyLeifa Apr 10, 2022
dbd9e7a
Merge pull request #288 from Chrezm/multiples/lobby-rework
Chrezm Apr 11, 2022
c5f476b
Added media tester
TrickyLeifa Apr 15, 2022
3d06301
Added chat message placeholder instructions
TrickyLeifa Apr 15, 2022
627025c
Check control pointer before operations
TrickyLeifa Apr 16, 2022
92d4a47
Always consider SpectatorId as a changed character
TrickyLeifa Apr 16, 2022
69e6fab
Fix division by zero
TrickyLeifa Apr 16, 2022
0b40bfd
Always hide emote buttons
TrickyLeifa Apr 16, 2022
2cf5acb
Reorder variable
TrickyLeifa Apr 16, 2022
a0faf17
Change placeholder to say in-character and out-of-character
Chrezm Apr 16, 2022
2289aa0
Added website link
TrickyLeifa Apr 16, 2022
f06806e
Merge pull request #293 from Chrezm/292/placeholder-for-chat
Chrezm Apr 16, 2022
9a22522
Merge pull request #291 from Chrezm/290/non-compatible-media-warning
TrickyLeifa Apr 16, 2022
5ef9926
Added client Id to MS packet
TrickyLeifa Apr 18, 2022
05b196a
Deprecated ackMS
TrickyLeifa Apr 22, 2022
b73ad3e
Readded ackMS, added checks for client ID being valid
TrickyLeifa Apr 22, 2022
4b7bcd8
Merge pull request #296 from Chrezm/0/client-id-for-ms
TrickyLeifa Apr 23, 2022
e25914b
Reworked music behavior
TrickyLeifa Apr 23, 2022
3168bb0
[FIX] Always hide narrator showname
TrickyLeifa Apr 23, 2022
b49ad53
Improved speaker chr id handling
TrickyLeifa Apr 24, 2022
ec8e23b
Merge pull request #299 from Chrezm/0/hide-narrator-showname
TrickyLeifa Apr 24, 2022
b4250d2
Merge pull request #298 from Chrezm/297/rework-music-behavior
TrickyLeifa Apr 28, 2022
1cf2b7f
Added AL and ML packet
TrickyLeifa Apr 29, 2022
5fff560
Use all variables
TrickyLeifa Apr 29, 2022
560f654
Changed packet header checks.
TrickyLeifa Apr 30, 2022
b157a53
Merge pull request #300 from Chrezm/240/separate-area-and-music-packets
TrickyLeifa Apr 30, 2022
1980d0a
Fix change music packet
TrickyLeifa May 2, 2022
928a95b
Overhauled position file seeking
TrickyLeifa May 2, 2022
df9ef5e
Added expected extension
TrickyLeifa May 2, 2022
a1906a8
Removed default background look-up
TrickyLeifa May 3, 2022
6308e8c
Merge pull request #304 from Chrezm/302/position-reader
TrickyLeifa May 3, 2022
80f8368
Added hardcoded initial background position
TrickyLeifa May 3, 2022
6139f18
Changed the filter server buttons
TrickyLeifa May 3, 2022
2290a0a
Merge pull request #305 from Chrezm/0/filter-server-switch
Chrezm May 4, 2022
99a4cd0
Changed ini-swap dropdown to have elide enabled
TrickyLeifa May 4, 2022
730d131
Restored horizontal scrollbar to ini-swap dropdown
TrickyLeifa May 4, 2022
ebdec77
Final fix for ini-swap dropdown scrollbar
TrickyLeifa May 4, 2022
ffe0dc9
Fix initial ini-swap dropdown not being updated
TrickyLeifa May 4, 2022
ca62297
Ini-swap fix if enabled at start
TrickyLeifa May 4, 2022
563dbda
Bump up post-version to b2
Chrezm May 4, 2022
ab59ed1
Fixed audio device defaulting
TrickyLeifa May 4, 2022
b96922d
Merge branch 'master' of https://github.com/Chrezm/DRO-Client
TrickyLeifa May 4, 2022
6be8921
Fix server given showname not being displayed when playing music
Chrezm May 5, 2022
f8a4cb1
Merge branch 'master' of https://github.com/Chrezm/DRO-Client
Chrezm May 5, 2022
a9be062
Guarantee MC packet argument order
TrickyLeifa May 5, 2022
c23e59b
Fix loop breaking (expecting song name, not path)
TrickyLeifa May 5, 2022
7dd4e5b
Avoid displaying a message from Spectator
TrickyLeifa May 5, 2022
143cb18
Jesus, I need a coding pause.
TrickyLeifa May 5, 2022
c7e5d27
Merge pull request #306 from Chrezm/0/guarantee-mc-packet-order
Chrezm May 5, 2022
85851f4
Added `*_anim_play_once` setting to theme config ini
TrickyLeifa May 5, 2022
268d817
Renamed field
TrickyLeifa May 5, 2022
eea1818
Extra checks for emote modifiers
TrickyLeifa May 5, 2022
780deae
Added legacy background support
TrickyLeifa May 5, 2022
c9e1912
Added version to window title to ease tech-support
TrickyLeifa May 6, 2022
2f4c6a6
Added dynamic scaling to animated images
TrickyLeifa May 6, 2022
e45af03
Merge pull request #309 from Chrezm/0/legacy-background-support
TrickyLeifa May 6, 2022
e97f802
Always calculate the factor based on the lowest value
TrickyLeifa May 6, 2022
02ee1a9
Reworked scaling
TrickyLeifa May 7, 2022
38ec2e1
Merge branch 'master' into 0/background-dynamic-scaling
TrickyLeifa May 7, 2022
4fe4ee1
Removed needless header
TrickyLeifa May 7, 2022
443d939
Fixed legacy background being erroneously considered non-legacy
TrickyLeifa May 7, 2022
6613a9e
Merge pull request #310 from Chrezm/0/background-dynamic-scaling
TrickyLeifa May 7, 2022
3ec4d38
Merge pull request #308 from Chrezm/307/ui-anim-play-once
TrickyLeifa May 7, 2022
d7505ec
No sound audio device was set a driver, ...
TrickyLeifa May 8, 2022
85d4bdb
Added suffix for shouts
TrickyLeifa May 8, 2022
888cf4c
Update Ubuntu readme
Chrezm May 12, 2022
3f77b13
Editable ini-swap now uses the proper icon
TrickyLeifa May 12, 2022
696079d
Fixed chatbox not appearing if an incorrect name was provided
TrickyLeifa May 13, 2022
3dd847f
Fixed sound not playing, added soundd
TrickyLeifa May 13, 2022
fe37c54
Fixed exceptions, back to lobby duplication
TrickyLeifa May 14, 2022
1fe939b
Changed DPI scaling to always be disabled
TrickyLeifa May 15, 2022
9099a8e
Fix no fallback for pre-anim + invis character
TrickyLeifa May 16, 2022
cfb1839
Merge pull request #311 from Chrezm/0/disable-scaling-by-default
TrickyLeifa May 19, 2022
f9a138b
Implement outgoing FS packet
Chrezm May 31, 2022
28ddf73
Merge pull request #313 from Chrezm/feature/241-files-set-outgoing-co…
Chrezm Jun 1, 2022
b4b4b1a
Added context menu for music list
TrickyLeifa Jun 5, 2022
991df2f
Basic implementation
Chrezm Jun 6, 2022
716e429
Improved audio track parsing order of execution
TrickyLeifa Jun 7, 2022
d8c1e11
Renamed file_name to filename
TrickyLeifa Jun 7, 2022
01591dc
Log music title instead of filename in client log
Chrezm Jun 7, 2022
4322c6c
Revert "Log music title instead of filename in client log"
Chrezm Jun 7, 2022
e31577f
Merge pull request #315 from Chrezm/0/demote_audiotrack_filename_to_key
Chrezm Jun 7, 2022
088085b
1.1.0
Chrezm Jun 7, 2022
c34cbd4
Bumped version, hide character now only hides dialog emotes
TrickyLeifa Jun 9, 2022
2cdd1e9
Changed preferred plugin for media playback
TrickyLeifa Jun 16, 2022
bf15cba
Change environment order
TrickyLeifa Jun 16, 2022
e93a15c
Allow to cancel name prompt
TrickyLeifa Jun 17, 2022
ff4c976
Improved media player audio device switching
TrickyLeifa Jun 18, 2022
3af6db4
Avoid needlessly calculating fitting image
TrickyLeifa Jun 19, 2022
ba62d12
Removed unused variable
TrickyLeifa Jun 20, 2022
3e59088
Don't trim names that are just space.
TrickyLeifa Jun 28, 2022
4863d7f
Fixed fav servers sorting, change lobby refresh
TrickyLeifa Jul 2, 2022
763e4d4
Updated build system + added qapng
TrickyLeifa Jul 9, 2022
25e60e6
Added bin destination
TrickyLeifa Jul 9, 2022
7c2f81c
Restored src path
TrickyLeifa Jul 9, 2022
ec83b1d
Removed DESTDIR
TrickyLeifa Jul 9, 2022
b75d174
Reverted expected DESTDIR pathing
TrickyLeifa Jul 9, 2022
4953485
Added config file for actions
TrickyLeifa Jul 9, 2022
c408e0f
Update build.yml
TrickyLeifa Jul 9, 2022
20a7494
Added preloading system derived from dro-mk2 (#316)
TrickyLeifa Jul 11, 2022
9c06682
Removed compatibility checks meant for 1.1.0
TrickyLeifa Jul 11, 2022
c3ce829
Forgot some extra
TrickyLeifa Jul 11, 2022
5a255e1
Properly reset lobby status
TrickyLeifa Jul 12, 2022
7245a8b
Context menu for music list is no longer at odd locations
TrickyLeifa Jul 13, 2022
c9f5f80
Use MSVC2019 (x64)
TrickyLeifa Jul 13, 2022
85b4da5
Added run field
TrickyLeifa Jul 13, 2022
3ded38b
Inverted Window and Others build commands
TrickyLeifa Jul 13, 2022
9562068
Remove extra step
TrickyLeifa Jul 13, 2022
c7ce246
Configure MSVC
TrickyLeifa Jul 13, 2022
2a3bd68
Assume 1.1.0 features to be active
TrickyLeifa Jul 13, 2022
2eed031
Added IC message limit
TrickyLeifa Jul 14, 2022
0320a11
Tweaked character number visibility
TrickyLeifa Jul 14, 2022
3e8c9b2
Further tweaked counter.
TrickyLeifa Jul 14, 2022
9cb88b8
Added customizable message length threshold, ...
TrickyLeifa Jul 14, 2022
ac45c35
Update readmes for MacOS and Linux+Move to RC1
Chrezm Jul 16, 2022
585bec8
Fix MacOS readme name
Chrezm Jul 16, 2022
19003ca
Update build steps for Ubuntu
TrickyLeifa Jul 16, 2022
d09d068
Prefer apt-get
TrickyLeifa Jul 16, 2022
ec1fbca
Install required modules
TrickyLeifa Jul 16, 2022
fc0f167
Possible attempt to fix ambient playing...
TrickyLeifa Jul 17, 2022
a0affba
Reorganized widgets
TrickyLeifa Jul 17, 2022
f8c8ef6
More preventive measures
TrickyLeifa Jul 17, 2022
8729117
Bumped version
TrickyLeifa Jul 17, 2022
2d88861
IC symbols no longer appears in chatlog
TrickyLeifa Jul 18, 2022
a978e62
Completely reworked the rendering process
TrickyLeifa Jul 20, 2022
b6d97b0
Resolve flawed Linux pathing
TrickyLeifa Jul 20, 2022
a32282f
Merge pull request #319 from Chrezm/0/resolve-linux-pathing
TrickyLeifa Jul 20, 2022
4dbc269
Merge pull request #320 from Chrezm/0/render-process-overhaul
TrickyLeifa Jul 20, 2022
2cde526
Updated Linux instructions
TrickyLeifa Jul 20, 2022
b605992
Fix sprites not being centered when drawn
TrickyLeifa Jul 20, 2022
53fd535
Merge branch 'master' of https://github.com/Chrezm/DRO-Client
TrickyLeifa Jul 20, 2022
6ca6f0b
Fix-attempt for clock not showing
TrickyLeifa Jul 20, 2022
b407101
Updated Ubuntu packages
TrickyLeifa Jul 20, 2022
19c2d6b
Very small refactor
TrickyLeifa Jul 20, 2022
84b8021
Merge branch 'master' of https://github.com/Chrezm/DRO-Client
TrickyLeifa Jul 20, 2022
a4714e4
Update README-LINUX.md
TrickyLeifa Jul 20, 2022
ae77cfb
Lowered MacOS deployment target to expected version of Qt5 LTS
TrickyLeifa Jul 21, 2022
d156ae6
Resolve backgrounds not updating on TOD change
TrickyLeifa Jul 22, 2022
9786f65
Bumped RC version
TrickyLeifa Jul 22, 2022
ab262a5
Reformat initializer list, braces and switches
TrickyLeifa Jul 22, 2022
f716da5
Added extra checks and fallbacks for missing themes
TrickyLeifa Jul 22, 2022
aa74d6a
Properly resolve Linux pathing
TrickyLeifa Jul 23, 2022
91c4714
Added add/edit/remove context menu prompt for server list
TrickyLeifa Jul 23, 2022
de32215
Added move up/down server for server menu
TrickyLeifa Jul 24, 2022
9efc39e
Changed swap methodology
TrickyLeifa Jul 24, 2022
d38b126
Added default position, deprecated /pos client-side
TrickyLeifa Jul 24, 2022
355553c
Readded /pos because broken features otherwise.
TrickyLeifa Jul 24, 2022
182c72d
Allow blank servers and editor reset
TrickyLeifa Jul 25, 2022
b318381
Fix viewport shout pathing
TrickyLeifa Jul 25, 2022
f497460
Bumped rc version
TrickyLeifa Jul 26, 2022
98380a7
Chatboxes are now hidden immediately before a video begins to play
TrickyLeifa Jul 26, 2022
210d4aa
Potential fix for character suddenly showing up while hidden
TrickyLeifa Jul 26, 2022
d1b0f05
Reworked media tester
TrickyLeifa Jul 26, 2022
35ceaab
Mark version as release
TrickyLeifa Jul 26, 2022
c49c812
Fix wrong showname being fetched
TrickyLeifa Jul 26, 2022
6170b97
Small optimization for positions
TrickyLeifa Jul 27, 2022
1adae39
Character position immediately reset after switching character
TrickyLeifa Jul 27, 2022
1cf7ac6
Deprecated background sounds look-up and added ambient folder for later
TrickyLeifa Jul 29, 2022
703fd4b
Slight tweak to ensure chat arrow restarts
TrickyLeifa Aug 3, 2022
a0f5859
Lobby no longer reselect servers with empty names
TrickyLeifa Aug 4, 2022
04ee79b
Fixed add to favorite adding an invalid server to favorite
TrickyLeifa Aug 4, 2022
ad4ccf6
Loading/reloading themes no longer reset the reader cache
TrickyLeifa Aug 5, 2022
dbf72ae
Potential fix for one-frame pre-animation issues
TrickyLeifa Aug 5, 2022
83b76b2
Resolve sprite crashing
TrickyLeifa Aug 5, 2022
a5e9815
Delaying theme reloading during preloading of a message
TrickyLeifa Aug 5, 2022
80cd7dd
Improved readability
TrickyLeifa Aug 5, 2022
64f8c53
Fix visibility for Q_ENUM
TrickyLeifa Aug 5, 2022
3c6bc01
Added insert caption action for sound effects
TrickyLeifa Aug 5, 2022
906f07e
Resolved ambient pathing issue
TrickyLeifa Aug 6, 2022
5110b22
Bump version
TrickyLeifa Aug 6, 2022
fbdafe6
Chat arrow now once again displays
TrickyLeifa Aug 6, 2022
e5bdf4b
Bumped version
TrickyLeifa Aug 6, 2022
da6c63c
Under bump version
TrickyLeifa Aug 6, 2022
d713635
Loading appearing regardless of anything else
TrickyLeifa Aug 7, 2022
a1e1682
Fixed ambient not allowing background ambient, bumped version
TrickyLeifa Aug 9, 2022
ce1618d
Update the device properly for video playback
TrickyLeifa Aug 12, 2022
54b82e9
Another attempt
TrickyLeifa Aug 12, 2022
2547b58
Allow character list reload
Chrezm Aug 20, 2022
c8f6306
Merge pull request #322 from Chrezm/feature/0/allow-character-list-re…
Chrezm Aug 21, 2022
304813a
Increase OOC chatbox character limit to 8000
Chrezm Aug 23, 2022
4ea3e0e
Last time I change this crap.
TrickyLeifa Aug 24, 2022
7398d66
Increase OOC chatbox character limit to 1023
Chrezm Aug 26, 2022
e07bbee
Bump to 1.2.3
Chrezm Aug 28, 2022
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
10 changes: 10 additions & 0 deletions .clang-format
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
BasedOnStyle: LLVM
BreakBeforeBraces: Allman
AllowShortBlocksOnASingleLine: Never
AllowShortCaseLabelsOnASingleLine: false
AllowShortFunctionsOnASingleLine: None
AllowShortIfStatementsOnASingleLine: Never
AllowShortLambdasOnASingleLine: None
AllowShortLoopsOnASingleLine: false
AllowShortEnumsOnASingleLine: false
ColumnLimit: 120
215 changes: 215 additions & 0 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,215 @@
name: Build

env:
# Multi-threaded compilation for MSVC
CL: /MP

on: [workflow_dispatch, push]

jobs:
Build:
strategy:
fail-fast: false
matrix:
os: [windows-latest, ubuntu-latest, macos-latest]
version: [5.15.2]
include:
- os: windows-latest
os-caption: Windows
- os: ubuntu-latest
os-caption: Ubuntu
- os: macos-latest
os-caption: MacOS

runs-on: ${{matrix.os}}
steps:
- name: Clone Project
uses: actions/checkout@v2.4.2

- name: Fetch Git Info
shell: bash
working-directory: ${{github.workspace}}
run: |
git_hash=$(git rev-parse --short "$GITHUB_SHA")
git_branch=${GITHUB_REF##*/}
echo "$git_hash" >> ./res/git/git_hash.txt
echo "$git_branch" >> ./res/git/git_branch.txt

- name: Setup externals
run: |
mkdir ./3rd
mkdir ./3rd/bass
mkdir ./3rd/discord-rpc
mkdir ./3rd/openssl

- name: Install OpenSSL (Windows)
if: contains(matrix.os, 'windows')
run: |
curl -L https://mirror.firedaemon.com/OpenSSL/openssl-1.1.1q.zip -o openssl.zip
unzip -d ./openssl -o ./openssl.zip
cp ./openssl/openssl-1.1/x64/bin/*.dll ./3rd

- name: Install BASS (Windows)
if: contains(matrix.os, 'windows')
run: |
curl http://www.un4seen.com/files/bass24.zip -o ./bass.zip
unzip -d ./bass -o ./bass.zip
cp ./bass/c/bass.h ./3rd/bass
cp ./bass/c/x64/bass.lib ./3rd
cp ./bass/x64/bass.dll ./3rd

curl http://www.un4seen.com/files/bassopus24.zip -o ./bassopus.zip
unzip -d ./bass -o ./bassopus.zip
cp ./bass/c/bassopus.h ./3rd/bass
cp ./bass/c/x64/bassopus.lib ./3rd
cp ./bass/x64/bassopus.dll ./3rd

- name: Install BASS (Ubuntu)
if: contains(matrix.os, 'ubuntu')
run: |
curl http://www.un4seen.com/files/bass24-linux.zip -o ./bass.zip
unzip -d ./bass -o ./bass.zip
cp ./bass/bass.h ./3rd/bass/bass.h
cp ./bass/x64/libbass.so ./3rd/libbass.so

curl http://www.un4seen.com/files/bassopus24-linux.zip -o ./bassopus.zip
unzip -d ./bass -o ./bassopus.zip
cp ./bass/bassopus.h ./3rd/bass/bassopus.h
cp ./bass/x64/libbassopus.so ./3rd/libbassopus.so

- name: Install BASS (MacOS)
if: contains(matrix.os, 'macos')
run: |
curl http://www.un4seen.com/files/bass24-osx.zip -o ./bass.zip
unzip -d ./bass -o ./bass.zip
cp ./bass/bass.h ./3rd/bass
cp ./bass/libbass.dylib ./3rd

curl http://www.un4seen.com/files/bassopus24-osx.zip -o ./bassopus.zip
unzip -d ./bass -o ./bassopus.zip
cp ./bass/bassopus.h ./3rd/bass
cp ./bass/libbassopus.dylib ./3rd

- name: Install Discord-RPC (Windows)
if: contains(matrix.os, 'windows')
run: |
curl -L https://github.com/discordapp/discord-rpc/releases/download/v3.4.0/discord-rpc-win.zip -o ./discord-rpc.zip
unzip ./discord-rpc.zip
cp ./discord-rpc/win64-dynamic/include/discord_register.h ./3rd/discord-rpc
cp ./discord-rpc/win64-dynamic/include/discord_rpc.h ./3rd/discord-rpc
cp ./discord-rpc/win64-dynamic/bin/discord-rpc.dll ./3rd
cp ./discord-rpc/win64-dynamic/lib/discord-rpc.lib ./3rd

- name: Install Discord-RPC (Ubuntu)
if: contains(matrix.os, 'ubuntu')
run: |
curl -L https://github.com/discordapp/discord-rpc/releases/download/v3.4.0/discord-rpc-linux.zip -o ./discord-rpc.zip
unzip ./discord-rpc.zip
cp ./discord-rpc/linux-dynamic/include/discord_register.h ./3rd/discord-rpc/discord_register.h
cp ./discord-rpc/linux-dynamic/include/discord_rpc.h ./3rd/discord-rpc/discord_rpc.h
cp ./discord-rpc/linux-dynamic/lib/libdiscord-rpc.so ./3rd/libdiscord-rpc.so

- name: Install Discord-RPC (MacOS)
if: contains(matrix.os, 'macos')
run: |
curl -L https://github.com/discordapp/discord-rpc/releases/download/v3.4.0/discord-rpc-osx.zip -o ./discord-rpc.zip
unzip ./discord-rpc.zip
cp ./discord-rpc/osx-dynamic/include/discord_register.h ./3rd/discord-rpc
cp ./discord-rpc/osx-dynamic/include/discord_rpc.h ./3rd/discord-rpc
cp ./discord-rpc/osx-dynamic/lib/libdiscord-rpc.dylib ./3rd

- name: Update packages (Ubuntu)
if: contains(matrix.os, 'ubuntu')
run: |
sudo apt-get update
sudo apt-get upgrade

- name: Install Qt (Ubuntu)
if: contains(matrix.os, 'ubuntu')
run: |
sudo apt-get install qt5-default libqt5designer5 qttools5-dev libqt5multimedia5 libqt5multimedia5-plugins libqt5multimediawidgets5 qtmultimedia5-dev

- name: Install Qt (Others)
if: contains(matrix.os, 'ubuntu') != true
uses: jurplel/install-qt-action@v2.14.0
with:
version: ${{matrix.version}}

- name: Configure MSVC (Windows)
if: contains(matrix.os, 'windows')
uses: ilammy/msvc-dev-cmd@v1

- name: Clone QtApng
uses: actions/checkout@v2
with:
repository: Skycoder42/QtApng
path: ./qtapng

- name: Build QtApng (Windows)
if: contains(matrix.os, 'windows')
run: |
cd ./qtapng
qmake
nmake

- name: Build QtApng (Others)
if: contains(matrix.os, 'windows') != true
run: |
cd ./qtapng
qmake
make -j3

- name: Make Project
run: |
cp ./data/.qmake.conf .
qmake

- name: Build Project (Windows)
if: contains(matrix.os, 'windows')
run: |
nmake

- name: Build Project (Others)
if: contains(matrix.os, 'windows') != true
run: |
make -j3

- name: Packing (Windows)
if: contains(matrix.os, 'windows')
run: |
cd ./bin
windeployqt dro-client.exe --compiler-runtime --no-quick-import --no-translations
cp ../qtapng/plugins/imageformats/qapng.dll ./imageformats
cp ../3rd/*.dll .
cd ..

- name: Packing (Ubuntu)
if: contains(matrix.os, 'ubuntu')
run: |
cd ./bin
mkdir ./depends
cp ../3rd/*.so ./depends
mkdir ./imageformats
cp ../qtapng/plugins/imageformats/libqapng.so ./imageformats
cp ../data/dro-client.sh .
cp ../data/README-LINUX.md ./README.md
cd ..

- name: Packing (MacOS)
if: contains(matrix.os, 'macos')
run: |
cd ./bin
mv ./dro-client.app "./Danganronpa Online.app"
macdeployqt "./Danganronpa Online.app"
cp ../qtapng/plugins/imageformats/libqapng.dylib "./Danganronpa Online.app/Contents/PlugIns/imageformats"
cp ../3rd/*.dylib "./Danganronpa Online.app/Contents/Frameworks"
hdiutil create -volname "Danganronpa Online" -srcfolder "./Danganronpa Online.app" -ov -format UDZO "Danganronpa Online.dmg"
rm -rf "./Danganronpa Online.app"
cp ../data/README-MACOS.txt ./README.txt
cd ..

- name: Create Artifact
uses: actions/upload-artifact@v2
with:
name: "Danganronpa Online (${{matrix.os-caption}})"
path: ./bin
16 changes: 10 additions & 6 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,11 +1,15 @@
3rd/
3rd_x86/
3rdparty/
base/
docs/
.qmake.conf
.gitignore
*~
*.db
*.user
*.dll
*.so
base_override.h

base-full/
bass.lib
discord-rpc.lib
send-presence.exe
*.autosave
*DS_Store
*.swp
117 changes: 0 additions & 117 deletions Attorney_Online_remake.pro

This file was deleted.

13 changes: 6 additions & 7 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,13 +1,12 @@
# Attorney-Online-Client-Remake
This is a remake of Attorney Online made by FanatSors, licensed under GPLv3.
# Danganronpa-Online-Client
This is the official client used, it is a derivative of [Attorney-Online-Client-Remake](https://github.com/AttorneyOnline/AO2-Client).

## Qt
This project uses Qt 5.7, which is licensed under the [GNU Lesser General Public License](https://www.gnu.org/licenses/lgpl-3.0.txt) with [certain licensing restrictions and exceptions](https://www.qt.io/qt-licensing-terms/). To comply with licensing requirements for static linking, object code is available if you would like to relink with an alternative version of Qt, and the source code for Qt may be found at https://github.com/qt/qtbase, http://code.qt.io/cgit/, or at https://qt.io.
This project uses Qt 5.15.2 (5.12.8 for Linux), which is licensed under the [GNU Lesser General Public License](https://www.gnu.org/licenses/lgpl-3.0.txt) with [certain licensing restrictions and exceptions](https://www.qt.io/qt-licensing-terms/). To comply with licensing requirements for static linking, object code is available if you would like to relink with an alternative version of Qt, and the source code for Qt may be found at https://github.com/qt/qtbase, http://code.qt.io/cgit/, or at https://qt.io.

Copyright (C) 2016 The Qt Company Ltd.
Copyright (C) 2022 The Qt Company Ltd.

## BASS
This project uses [BASS shared library](http://www.un4seen.com/).

This project depends on the BASS shared library. Get it here: http://www.un4seen.com/

Copyright (c) 1999-2016 Un4seen Developments Ltd. All rights reserved.
Copyright (c) 1999-2022 Un4seen Developments Ltd. All rights reserved.
Loading