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

59 Commits

Author SHA1 Message Date
oldmud0
8928aa2718 Perform clang-format 
If you don't want to see this commit on blames, use the hidden
whitespace option on GitHub, or use `-w` in git-blame.
 2020-05-22 17:13:37 -05:00
oldmud0
156a760eba Full revert to tag 2.6.2 
Due to a countless number of changes made to the core that were not
fully understood, tested, or documented, it was decided to roll
everything back to the last known stable version (2.6.2).

Changes dropped include:
 - Witness needed
 - Shake
 - Frame SFX
 - Multiple custom objections
 - Multithreaded thumbnail generation
 - Looping
 - Various translation additions
 - "Mirror IC"
 - Color in IC log
 - An invocation of clang-format

Next time, work together and split your big fork into independently
testable feature branches.
 2020-05-22 17:02:32 -05:00
oldmud0
4af7bc5fff
Fix broken APNG (#153) 
* Remove explicit APNG check

* Update aocharmovie.h
 2020-05-19 18:49:29 -05:00
cents
5b6d58bd02 Added additional customization options. 
I didn't format anything tho that is at the end
 2020-04-20 07:51:42 -07:00
likeawindrammer
7a3ebc8362 Revert faster blip speed 
Without an option to change it users will complain
Thanks Initiate for telling me how to change this
 2020-04-19 17:04:19 -06:00
oldmud0
13942345c6 Run clang-format on entire project 
Indentation fixed to 2 spaces per tab. Braces set to Stroustrup style.
Lines reflow at 80 characters. One-line method bodies are on the same
line as the signature. Space always after `//`. No indentation
on preprocessor macros. Includes are sorted lexicographically.

If you don't want to see this commit on blames, use the hidden
whitespace option on GitHub, or use `-w` in git-blame.
 2020-04-17 21:57:16 -05:00
oldmud0
faac191f0b Mega-merge of CR fork 
CR likely stands for "CentsRaidensnake." Like the Case Cafe mega-merge
before it, this was not a clean merge, and it had to be split up into
two parts: the actual changes, and the attempt it made to reformat the
entire code via clang-format.

This branch had a complicated set of changes that would be difficult to
describe in this commit message. It would be better described in a
proper changelog.
 2020-04-17 21:48:34 -05:00
sD
dd2daf55f3 it's basically the same packet minus requesting the next list 2020-03-15 13:20:33 +01:00
sD
beb469cd80 Merge branch 'master' into pr/104 2020-03-15 13:12:52 +01:00
sD
1b0930b977 move area list detection algorithm into a seperate function 2020-03-13 16:29:01 +01:00
in1tiate
a2f1a79bc9 add theme support 2020-03-08 05:44:49 -05:00
stonedDiscord
b668bb2276
Merge branch 'master' into music_list_update 2020-03-06 16:43:03 +01:00
sD
0123b4d192 move the click event back to the slots 2020-02-23 03:19:05 +01:00
sD
2716416b62 only load bass plugins when bass is included 2020-02-21 18:00:23 +01:00
sD
f93459ed0e remove fuck 2020-02-21 17:18:25 +01:00
sD
c8b11b398a fix audio 2020-02-21 16:48:11 +01:00
sD
cb1ed6d60d put minor version back 2020-02-21 16:43:40 +01:00
stonedDiscord
7d55ff01f5
Merge branch 'master' into 2.7 2020-02-21 16:39:32 +01:00
Crystalwarrior
c2fd3796a9 Add clear_music and clear_areas 
Comment out the index as it can be potentially confusing alongside "true" area numbers
Add "FM" to Packet Received that would reload the areas and music list

TODO: Test this with arup systems
 2019-09-11 00:49:30 +03:00
stonedDiscord
5807410b1d doubleclick to join a server 2019-08-20 18:35:42 +02:00
stonedDiscord
d94d2fb405 read and store qt audio device 2019-08-19 19:38:47 +02:00
stonedDiscord
35f2333403 list audio devices (doesn't apply it yet) 2019-08-19 19:06:41 +02:00
stonedDiscord
49be444d74 OOP 🏪 2019-08-17 21:09:13 +02:00
stonedDiscord
4700902551 fix qaudio volume 2019-08-17 20:47:41 +02:00
stonedDiscord
7fe64163ea
Merge pull request #88 from AttorneyOnline/i18n 
I18n
 2019-08-08 00:20:51 +02:00
David Skoland
05debed60b removed meaningless modifiers (see https://software.intel.com/en-us/articles/cdiag858) 2019-08-05 18:42:19 -05:00
stonedDiscord
078ad79b65 language setting 2019-08-05 23:30:00 +02:00
stonedDiscord
3f0ff19615 what was gbp thinking 2019-07-29 21:58:49 +02:00
oldmud0
762702aff8 Make all strings translatable 2019-07-28 19:00:34 +02:00
oldmud0
e3187b6824
Bump version to 2.6.2 (#87) 2019-07-27 10:11:48 -05:00
windrammer
2dbd0c1482 Remove C style char buffer in favor of QByteArray 2019-07-22 21:39:37 -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
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
David Skoland
5eccabcad1 Less insane debugging; minor refactoring (!75) 2019-07-12 23:00:25 +00:00
oldmud0
f489f2064c Merge branch 'ci' into 'master' 2019-07-02 21:11:59 -05:00
Cerapter
2e4f0117b0 Text is now advanced based on graphemes, rather than bytes. 2019-05-09 23:49:20 +02:00
stonedDiscord
1504aaf6b2 saves space i guess 2019-03-13 13:05:10 +01:00
stonedDiscord
1514ffea6a qt music 2019-03-12 20:47:47 +01:00
stonedDiscord
71da60b5d6 sfx tested and works 2019-03-12 20:14:54 +01:00
stonedDiscord
0b6f376f8f qt can play the blips just fine 2019-03-12 19:53:06 +01:00
stonedDiscord
8a23f10040 gcc didn't like that 2019-03-12 00:27:22 +01:00
iamgoofball
0dcf8a7f17 bump the version number to 2.7.2 2019-02-01 17:20:08 -08:00
iamgoofball
fc984fcfe2 bugfixes and shit 2019-02-01 16:28:14 -08:00
iamgoofball
0649e7b28e Case Announcer: Witness Support also some other shit 2019-01-23 07:35:29 -08:00
iamgoofball
f9406d0a7f multithread the music **harder** 2019-01-23 01:56:56 -08:00
iamgoofball
f750328404 Multithreaded filtering of the character list 2019-01-23 01:07:20 -08:00
iamgoofball
906c9016bb Multithreaded character generation TODO: fix loading screen 2019-01-23 00:58:30 -08:00
iamgoofball
13bc82094f >>>>multi-threading the frame sfx/screenshake/flashes 2019-01-23 00:14:47 -08:00
iamgoofball
a7a614482e final commit 2019-01-21 15:45:51 -08:00