aboutsummaryrefslogtreecommitdiff
path: root/src/text_file_functions.cpp
AgeCommit message (Collapse)Author
2020-04-17Run clang-format on entire projectoldmud0
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-17Mega-merge of CR forkoldmud0
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-02-21Merge branch 'master' into 2.7stonedDiscord
2019-07-27Fall back to Sans if no font setting foundoldmud0
Sigh...
2019-07-20Merge branch 'bass-optional' into 'master'oldmud0
Bass+discord optional See merge request AttorneyOnline/AO2-Client!59
2019-07-20Revert "More bug fixing."cents02
This reverts commit ca84ba516fc892deaeafc18b23ad5a06822b29f5
2019-03-13add a default for thisstonedDiscord
2019-02-01bugfixes and shitiamgoofball
2019-01-21final commitiamgoofball
2019-01-20Bugfixes and blip speedsiamgoofball
2019-01-18Add screenshake, frame-specific effects, looping SFX, and clientside music ↵iamgoofball
looping Committed by patch since Goof is currently banned on GitHub for no good reason.
2019-01-05Merge remote-tracking branch 'upstream/master'David Skoland
2019-01-03Fix APNG preanimations not working (#52)oldmud0
2019-01-02fixed a crash condition where blip rate is less than 1David Skoland
2018-12-26moved headers into include and cpp files into src + logo into resourceDavid Skoland