Mamanyonyo/atrooney-online-2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
851 Commits 1 Branch 0 Tags 8.5 MiB
b44338996b
Commit Graph

851 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
stonedDiscord
d71aad9d72 Revert "make default clone compileable to improve new dev experience and switch to qt on linux" 
This reverts commit bf8aad33de.
 2019-07-31 22:33:15 +02:00
stonedDiscord
bf8aad33de make default clone compileable to improve new dev experience and switch to qt on linux 2019-07-31 21:50:16 +02:00
stonedDiscord
77a536e2a9 Merge branch 'master' into i18n 2019-07-30 20:43:12 +02:00
stonedDiscord
afbbc5476b move #ifdef BASSAUDIO so the audio tab isn't deleted as a whole 2019-07-30 20:42:33 +02:00
stonedDiscord
460805d072 make discord integration the same for all locales 2019-07-30 19:42:38 +02:00
stonedDiscord
3f0ff19615 what was gbp thinking 2019-07-29 21:58:49 +02:00
stonedDiscord
adf1a97304 adjust translation path in main.cpp 2019-07-29 21:54:35 +02:00
stonedDiscord
571af31861 add translations to resource file 2019-07-29 21:54:23 +02:00
stonedDiscord
847da688b1 adjust path in .pro 2019-07-29 21:54:12 +02:00
stonedDiscord
3fd6dbd320 move translations to resource folder 2019-07-29 21:53:25 +02:00
stonedDiscord
95da26195f add translation to .pro so lupdate and lrelease find them 2019-07-29 21:50:47 +02:00
stonedDiscord
274310aebc update translation template 2019-07-29 21:47:21 +02:00
stonedDiscord
ed16f91939 update japanese translation (thanks to gbp) 2019-07-29 21:47:09 +02:00
stonedDiscord
a7a2d02dcd update german translation 2019-07-29 21:46:45 +02:00
stonedDiscord
b7012cec10 fixed 2 strings 2019-07-29 21:46:26 +02:00
stonedDiscord
a9b803a739
Merge pull request #89 from cents02/trojanao 
Curl added in Ubuntu config
 2019-07-29 19:23:16 +02:00
cents02
326425f54b
Update configure_ubuntu.sh 2019-07-29 08:14:51 -07:00
cents02
abff73de3c
Ubuntu config gets curl too 
Config now gets curl incase of fresh vm.
 2019-07-29 08:11:14 -07:00
stonedDiscord
259422c4af at least the german translation works 2019-07-28 20:39:36 +02:00
stonedDiscord
582417a902 german translation 2019-07-28 20:19:09 +02:00
stonedDiscord
69e4da4c43 it didn't like doing that with a pointer 2019-07-28 19:17:47 +02:00
Denton
9145d20093 Update japanese translations 
someone check these pls
 2019-07-28 19:00:34 +02:00
oldmud0
762702aff8 Make all strings translatable 2019-07-28 19:00:34 +02:00
stonedDiscord
319cb0adee translate new features. is i18n dead 2019-07-28 18:43:46 +02:00
oldmud0
131792d3d4
Add publish instructions to .gitlab-ci.yml 2019-07-27 21:23:55 -05:00
oldmud0
56ddd024eb
Fall back to Sans if no font setting found 
Sigh...
 2019-07-27 21:19:45 -05:00
oldmud0
c09fdc49a7
CI: Add libarchive for launcher builds 2019-07-27 12:34:18 -05:00
oldmud0
ede4c512ae
CI: Fix entry point bug in build artifact 2019-07-27 12:33:52 -05:00
oldmud0
e3187b6824
Bump version to 2.6.2 (#87) 2019-07-27 10:11:48 -05:00
stonedDiscord
1a0d7a7cc4 update gitignore to leave out obj files and the base folder 2019-07-26 02:04:30 +02:00
stonedDiscord
d56a53bcbd yeet all of these .obj files away 2019-07-26 01:43:29 +02:00
stonedDiscord
98389e7e03 1% more readable 2019-07-26 01:37:11 +02:00
stonedDiscord
71d91e5012 fixed copypasta mistake on objection sfx 2019-07-26 01:33:29 +02:00
windrammer
2dbd0c1482 Remove C style char buffer in favor of QByteArray 2019-07-22 21:39:37 -05:00
windrammer
16947224a2 Change the shebang of configure_ubuntu.sh from sh to bash 
because the script it's using the bash only variable BASH_SOURCE
 2019-07-20 17:30:46 -05:00
oldmud0
e0c49ceb07 Merge branch 'bass-optional' into 'master' 
Bass+discord optional

See merge request AttorneyOnline/AO2-Client!59
 2019-07-20 16:57:27 +00:00
oldmud0
e5c2898bac Merge branch 'trojanAO' into 'master' 
Added ability to set fonts on widgets.

See merge request AttorneyOnline/AO2-Client!76
 2019-07-20 16:33:34 +00:00
cents02
82db3e2263 Revert "More bug fixing." 
This reverts commit ca84ba516fc892deaeafc18b23ad5a06822b29f5
 2019-07-20 16:33:33 +00:00
stonedDiscord
4a2a167f7d Merge branch 'master' into 'bass-optional' 
# Conflicts:
#   Attorney_Online.pro
#   include/aoapplication.h
 2019-07-20 16:20:05 +00:00
oldmud0
2a5d569511 Merge branch 'less_insane_debugging' into 'master' 
Less insane debugging

See merge request AttorneyOnline/AO2-Client!75
 2019-07-12 23:00:25 +00:00
David Skoland
5eccabcad1 Less insane debugging; minor refactoring (!75) 2019-07-12 23:00:25 +00:00
oldmud0
621aa1adac Merge branch 'fix82' into 'master' 
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-12 22:57:54 +00:00
Windrammer
b15c6f15f0 Fix bug #82 causing a client crash if /save_case was used without providing a courtroom state 2019-07-11 09:05:26 -06:00
oldmud0
a504ca7f9a Merge branch 'master' into 'master' 
Small bug fixing for /save_case

See merge request AttorneyOnline/AO2-Client!72
 2019-07-07 22:32:57 +00:00
cents02
432069844a Revert "More bug fixing." 
This reverts commit ca84ba516fc892deaeafc18b23ad5a06822b29f5
 2019-07-07 22:32:57 +00:00
oldmud0
1552f3f19c Merge branch 'master' into 'master' 
Fix escaped HTML characters screwing up the grapheme cluster sizes.

See merge request AttorneyOnline/AO2-Client!61
 2019-07-07 14:45:16 +00:00
oldmud0
2ef6aecb0d Merge branch 'master' into 'master' 
Fixed evidence not recognizing subfolder issue.

See merge request AttorneyOnline/AO2-Client!66
 2019-07-03 22:28:13 +00:00
cents02
d07dd1d5fe Permanent and not temporary solution for evidence. Supports up to infite subfolders. 2019-07-03 08:48:04 +00:00
oldmud0
6c1d5ea41e CI: install dependencies not in builder container (?!) 2019-07-03 02:47:32 +00:00
oldmud0
f489f2064c Merge branch 'ci' into 'master' 2019-07-02 21:11:59 -05:00