aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2019-07-30Merge branch 'master' into i18nstonedDiscord
2019-07-30move #ifdef BASSAUDIO so the audio tab isn't deleted as a wholestonedDiscord
2019-07-30make discord integration the same for all localesstonedDiscord
2019-07-29what was gbp thinkingstonedDiscord
2019-07-29adjust translation path in main.cppstonedDiscord
2019-07-29add translations to resource filestonedDiscord
2019-07-29adjust path in .prostonedDiscord
2019-07-29move translations to resource folderstonedDiscord
2019-07-29add translation to .pro so lupdate and lrelease find themstonedDiscord
2019-07-29update translation templatestonedDiscord
2019-07-29update japanese translation (thanks to gbp)stonedDiscord
2019-07-29update german translationstonedDiscord
2019-07-29fixed 2 stringsstonedDiscord
2019-07-29Merge pull request #89 from cents02/trojanaostonedDiscord
Curl added in Ubuntu config
2019-07-29Update configure_ubuntu.shcents02
2019-07-29Ubuntu config gets curl toocents02
Config now gets curl incase of fresh vm.
2019-07-28at least the german translation worksstonedDiscord
2019-07-28german translationstonedDiscord
2019-07-28it didn't like doing that with a pointerstonedDiscord
2019-07-28Update japanese translationsDenton
someone check these pls
2019-07-28Make all strings translatableoldmud0
2019-07-28translate new features. is i18n deadstonedDiscord
2019-07-27Add publish instructions to .gitlab-ci.ymloldmud0
2019-07-27Fall back to Sans if no font setting foundoldmud0
Sigh...
2019-07-27CI: Add libarchive for launcher buildsoldmud0
2019-07-27CI: Fix entry point bug in build artifactoldmud0
2019-07-27Bump version to 2.6.2 (#87)oldmud0
2019-07-26yeet all of these .obj files awaystonedDiscord
2019-07-261% more readablestonedDiscord
2019-07-26fixed copypasta mistake on objection sfxstonedDiscord
2019-07-22Remove C style char buffer in favor of QByteArraywindrammer
2019-07-20Change the shebang of configure_ubuntu.sh from sh to bashwindrammer
because the script it's using the bash only variable BASH_SOURCE
2019-07-20Merge branch 'bass-optional' into 'master'oldmud0
Bass+discord optional See merge request AttorneyOnline/AO2-Client!59
2019-07-20Merge branch 'trojanAO' into 'master'oldmud0
Added ability to set fonts on widgets. See merge request AttorneyOnline/AO2-Client!76
2019-07-20Revert "More bug fixing."cents02
This reverts commit ca84ba516fc892deaeafc18b23ad5a06822b29f5
2019-07-20Merge branch 'master' into 'bass-optional'stonedDiscord
# Conflicts: # Attorney_Online.pro # include/aoapplication.h
2019-07-12Merge branch 'less_insane_debugging' into 'master'oldmud0
Less insane debugging See merge request AttorneyOnline/AO2-Client!75
2019-07-12Less insane debugging; minor refactoring (!75)David Skoland
2019-07-12Merge branch 'fix82' into 'master'oldmud0
Fix bug #82 causing a client crash if /save_case was used without providing a courtroom state Closes #82 See merge request AttorneyOnline/AO2-Client!74
2019-07-11Fix bug #82 causing a client crash if /save_case was used without providing ↵Windrammer
a courtroom state
2019-07-07Merge branch 'master' into 'master'oldmud0
Small bug fixing for /save_case See merge request AttorneyOnline/AO2-Client!72
2019-07-07Revert "More bug fixing."cents02
This reverts commit ca84ba516fc892deaeafc18b23ad5a06822b29f5
2019-07-07Merge branch 'master' into 'master'oldmud0
Fix escaped HTML characters screwing up the grapheme cluster sizes. See merge request AttorneyOnline/AO2-Client!61
2019-07-03Merge branch 'master' into 'master'oldmud0
Fixed evidence not recognizing subfolder issue. See merge request AttorneyOnline/AO2-Client!66
2019-07-03Permanent and not temporary solution for evidence. Supports up to infite ↵cents02
subfolders.
2019-07-03CI: install dependencies not in builder container (?!)oldmud0
2019-07-02Merge branch 'ci' into 'master'oldmud0
2019-07-01Fixed evidence not recognizing subfolder issue. Can support 1 folder tho.cents02
2019-07-01Merge request AttorneyOnline/AO2-Client!63oldmud0
Fixes issue #74 for client and #47 for tsuserver3 + /save_case feature What the title says basically. /save_case takes two parameters, name and cr status. E.g /save_case case1 lfp Doc and cmdoc link are left blank if anybody wants to use them.
2019-06-30Indentationcents02