Commit Graph

2136 Commits

Author SHA1 Message Date
oldmud0
064cde6759 Merge branch 'discord-toggle' 2018-07-05 21:33:27 -05:00
oldmud0
42e26d6775 Enable Discord by default if not in config.ini 2018-07-05 21:32:49 -05:00
oldmud0
e36dae20b7 Fix hex_functions compile errors 2018-07-05 21:26:05 -05:00
oldmud0
17601c3723 Merge branch 'headers' 2018-07-05 21:15:01 -05:00
oldmud0
a7c63a44c6 Merge remote-tracking branch 'upstream/master' 2018-07-05 21:06:02 -05:00
Denton
bb0b767ba4
pretend you didnt see this 2018-07-05 12:47:36 -05:00
stonedDiscord
30a87d23c9 moved includes to header files 2018-07-05 19:32:51 +02:00
gameboyprinter
4e96a41b4e better int to hex 2018-07-05 12:26:15 -05:00
gameboyprinter
bed0b55e70 Make discord toggleable, OOC name option, default bg fix 2018-07-05 12:21:32 -05:00
oldmud0
e761805cd1
Merge pull request #19 from LeifaBot/master
Fix buffer overflow exploit
2018-07-04 10:53:31 -04:00
Leifa
0e15be73af segfault 2018-07-04 15:05:24 +02:00
oldmud0
7e4be0edd7 Manual option for master server
This will only trigger when SRV lookup fails.
2018-06-02 23:36:34 -05:00
oldmud0
f5e0177b9e Relicense/dual-license under MIT
See https://github.com/OmniTroid/attorney_online.
This is to say that the Attorney Online open-source client project
no longer requires releasing any source code as a result of modifying
or redistributing the client. Go in peace :)
2018-03-15 20:38:58 -05:00
stonedDiscord
7995410b21 Merge branch 'master' of https://github.com/AttorneyOnline/AO2-Client 2018-03-03 12:10:44 +01:00
stonedDiscord
a8a848ecc2 update d-rpc 2018-03-03 12:10:38 +01:00
oldmud0
379731919d Add line left off after revert 2018-03-02 20:46:40 -06:00
David Skoland
4eba53ebb2 Reverted qss stuff and added more comments 2018-02-11 18:55:16 -06:00
oldmud0
34a4519d1e
Merge pull request #10 from OmniTroid/master
fixed that performance issue related to big IC logs
2018-02-08 18:55:46 -06:00
David Skoland
0d82ce72fa less tabs more spaces 2018-02-09 01:20:04 +01:00
David Skoland
4ec662d826 renaming some functions and starting qss theme functionality 2018-02-09 01:13:47 +01:00
David Skoland
403e5b4328 tabs vs. spaces: the eternal struggle 2018-02-08 12:52:03 +01:00
David Skoland
ebe4968175 removed dirty hack and optimized IC chat 2018-02-08 12:46:06 +01:00
oldmud0
28decf8dbf Add BASSOPUS support
Nothing will happen if you do not have the DLL.
Sample rate was changed to 48 kHz as Opus only supports 48 kHz audio,
and pretty much all sound cards support 48 kHz.
2018-01-18 20:06:07 -06:00
oldmud0
b214ca87c7 Increment version to 2.4.8 2018-01-08 13:43:37 -06:00
oldmud0
e8809f6de6 Merge branch 'discord-rich-presence' 2018-01-08 13:40:29 -06:00
oldmud0
8a91dea6ce Add spectate state; add "playing as character" state 2018-01-08 13:33:39 -06:00
oldmud0
dee8de29da Just switch to DLLs. 2018-01-08 01:13:56 -06:00
oldmud0
3797a1e9ef Add Discord rich presence
This would work, were it not for some freak stack corruption caused by
GCC not liking the Discord RPC library...
2018-01-08 00:40:50 -06:00
unknown
0504d2b5d7 Bump ver number and increase chat log size 2017-12-30 14:57:54 -06:00
oldmud0
ea01016d8c Bump version to 2.4.6 2017-12-29 17:10:47 -06:00
oldmud0
2925c8c891 Fail over to non-SRV master server connection
This will eliminate the connection failure dialog. Instead, the reconnect timer will run indefinitely.
2017-12-29 17:10:47 -06:00
oldmud0
0770c8f5bf Compatibility with older Qt versions 2017-11-17 10:45:38 -06:00
oldmud0
32df766e61 Set version to 2.4.5 2017-11-05 14:41:07 -06:00
oldmud0
5257f6b382 Fix red text in append_error 2017-11-05 14:39:21 -06:00
oldmud0
9c7895922a Truncate chat (needs testing) 2017-11-05 11:51:24 -06:00
oldmud0
43448296fc Notify user if lobby layout file is missing 2017-11-05 11:22:30 -06:00
stonedDiscord
5ea3f9b919 we still need the definition
but its stubbed so its k
2017-11-05 16:54:15 +01:00
oldmud0
a8ccbe77c1 Don't do failover for Android, try reconnecting automatically once
Issue: AOTextArea is supposed to have red text for errors, but it's not working
2017-11-04 18:42:44 -05:00
oldmud0
d93a558ae7 Fix impatient failover wait loop 2017-11-03 11:55:36 -05:00
oldmud0
294d2150d0 Change basic connection to DNS SRV lookup for master server failover 2017-07-24 22:44:35 -05:00
OmniTroid
1fe290aa74 ready for the REAL real (really real this time) 2.4.3 release 2017-07-08 19:57:43 +02:00
OmniTroid
a6c1e1d470 ready for the REAL 2.4.3 release 2017-07-08 19:01:39 +02:00
OmniTroid
eae7cc791b Merge branch 'master' of https://github.com/Attorney-Online-Engineering-Task-Force/AO2-Client
bruh
2017-07-08 18:41:36 +02:00
OmniTroid
a327c3a1e7 made IC names bold too 2017-07-08 18:41:13 +02:00
stonedDiscord
4780ea5715 not really animated backgrounds 2017-07-06 14:23:31 +02:00
oldmud0
b961ff3075 Include copyright information in readme 2017-07-04 10:55:58 -05:00
OmniTroid
6d1a49e920 incremented to 2.4.3, ready to release 2017-06-19 22:49:43 +02:00
OmniTroid
3a2e0b02f3 added pick evidence image button 2017-06-19 22:49:04 +02:00
OmniTroid
4796cc6677 added bold OOC names and fixed the url regex 2017-06-16 16:07:34 +02:00
OmniTroid
dc79673bee fixed evidence description bug and local mute 2017-06-16 08:16:09 +02:00