aboutsummaryrefslogtreecommitdiff
path: root/include/aooptionsdialog.h
AgeCommit message (Collapse)Author
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-08-19list audio devices (doesn't apply it yet)stonedDiscord
2019-08-05language settingstonedDiscord
2019-02-01bugfixes and shitiamgoofball
2019-01-21final commitiamgoofball
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.
2018-12-26moved headers into include and cpp files into src + logo into resourceDavid Skoland