Commit Graph

21 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
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
3c30098360 translate char not found 2020-02-23 13:08:19 +01:00
sD
5cf1fdcc2d connect the signal to char_clicked 2020-02-23 03:13:07 +01:00
sD
ed240c6ab0 same here 2020-02-21 18:33:04 +01:00
sD
4580816f96 character is a little nondescriptive for the button 2020-02-21 18:29:36 +01:00
sD
8d6b69e2f2 replace mycourt_fuck 2020-02-21 17:02:55 +01:00
stonedDiscord
7d55ff01f5
Merge branch 'master' into 2.7 2020-02-21 16:39:32 +01:00
stonedDiscord
7fe64163ea
Merge pull request #88 from AttorneyOnline/i18n
I18n
2019-08-08 00:20:51 +02:00
stonedDiscord
230b1a7622 numbered arguments and more strings 2019-08-05 22:07:39 +02:00
stonedDiscord
223f69d67a eat shit tsuserver 2019-08-05 21:57:17 +02:00
stonedDiscord
df72671105 Revert "make the password field in charselect useful"
This reverts commit 15a48a051c.
2019-08-05 21:54:03 +02:00
stonedDiscord
15a48a051c make the password field in charselect useful
let the server decide what to do with this
2019-08-05 18:53:34 +02:00
stonedDiscord
b7012cec10 fixed 2 strings 2019-07-29 21:46:26 +02:00
David Skoland
5eccabcad1 Less insane debugging; minor refactoring (!75) 2019-07-12 23:00:25 +00:00
iamgoofball
0649e7b28e Case Announcer: Witness Support also some other shit 2019-01-23 07:35:29 -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
David Skoland
00cfd2750d moved headers into include and cpp files into src + logo into resource 2018-12-26 16:43:08 +01:00