Commit Graph

26 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
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
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
1b0930b977 move area list detection algorithm into a seperate function 2020-03-13 16:29:01 +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
stonedDiscord
d94d2fb405 read and store qt audio device 2019-08-19 19:38:47 +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
oldmud0
e3187b6824
Bump version to 2.6.2 (#87) 2019-07-27 10:11:48 -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
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
f9406d0a7f multithread the music **harder** 2019-01-23 01:56:56 -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
oldmud0
9008ec8d9d Remove constexpr from aoapplication.h 2019-01-21 02:49:00 +00:00
iamgoofball
248444307f Fix bug with simultaneous shakes 2019-01-19 00:13:25 -06:00
iamgoofball
3c0cedbe92 Add screenshake, frame-specific effects, looping SFX, and clientside music looping
Committed by patch since Goof is currently banned on GitHub for no good reason.
2019-01-18 23:08:46 -06:00
oldmud0
57b02c084a Bump version to 2.6.1 2019-01-03 21:46:10 -06:00
David Skoland
00cfd2750d moved headers into include and cpp files into src + logo into resource 2018-12-26 16:43:08 +01:00