Commit Graph

63 Commits

Author SHA1 Message Date
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
sD
992c0b14e1 what is this, c++ for ANDs
this kept it from buildinf with MSVC
2020-04-24 12:54:48 +02:00
cents
896c4e4dbc Fixed wrong name being written in mirror mode 2020-04-23 11:57:27 -07:00
cents
8fa96535ef Hooked up the new settings
Did you know you could scale the iclog with ctrl + mouse wheel?
2020-04-20 12:37:28 -07: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
58b7725406 Change second exclamation to period on tooltip
No need for two exclamations
2020-04-18 02:40:46 -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
in1tiate
901012eb28
Remove dumb memes (#141)
* remove memes

* Update courtroom.cpp
2020-04-12 15:43:39 -07:00
in1tiate
ed9632f220 fix dropdown bug, add minor feature 2020-04-11 20:04:41 -05:00
cents02
558fa55be8
Made the shake button useful.
Apparently nobody tested it before.
2020-03-27 21:11:33 +02:00
sD
beb469cd80 Merge branch 'master' into pr/104 2020-03-15 13:12:52 +01:00
in1tiate
64f18ee632 add placeholder to OOC chat message box 2020-03-14 23:00:50 -05:00
in1tiate
a2f1a79bc9 add theme support 2020-03-08 05:44:49 -05:00
sD
369cc298e4 rename fallback chatbox 2020-03-07 21:45:27 +01:00
in1tiate
cc1afbe30e add support for 2.4-style chatboxes 2020-03-07 01:49:54 -06:00
stonedDiscord
b668bb2276
Merge branch 'master' into music_list_update 2020-03-06 16:43:03 +01:00
stonedDiscord
d276f14766 full music path in log 2020-03-01 15:59:44 +01:00
sD
a6f980f444 rename modcalls 2020-02-23 20:12:41 +01:00
sD
ea099a5141 loading lost in translation 2020-02-23 12:59:20 +01:00
sD
4af8ba9c38 what was graphmeme even fot 2020-02-23 12:28:07 +01:00
sD
0b16ac863c the charselect works again 2020-02-23 02:56:57 +01:00
sD
2716416b62 only load bass plugins when bass is included 2020-02-21 18:00:23 +01:00
sD
87e359487d combine these conditions 2020-02-21 17:57:46 +01:00
sD
f93459ed0e remove fuck 2020-02-21 17:18:25 +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
d94d2fb405 read and store qt audio device 2019-08-19 19:38:47 +02:00
stonedDiscord
c974ab01ca add es and ru to options and translate a lot more strings from the courtroom 2019-08-06 20:29:04 +02:00
stonedDiscord
230b1a7622 numbered arguments and more strings 2019-08-05 22:07:39 +02:00
stonedDiscord
582417a902 german translation 2019-07-28 20:19:09 +02:00
stonedDiscord
319cb0adee translate new features. is i18n dead 2019-07-28 18:43:46 +02:00
stonedDiscord
98389e7e03 1% more readable 2019-07-26 01:37:11 +02:00
stonedDiscord
71d91e5012 fixed copypasta mistake on objection sfx 2019-07-26 01:33:29 +02: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
Windrammer
b15c6f15f0 Fix bug #82 causing a client crash if /save_case was used without providing a courtroom state 2019-07-11 09:05:26 -06:00
cents02
432069844a Revert "More bug fixing."
This reverts commit ca84ba516fc892deaeafc18b23ad5a06822b29f5
2019-07-07 22:32:57 +00:00
oldmud0
1552f3f19c Merge branch 'master' into 'master'
Fix escaped HTML characters screwing up the grapheme cluster sizes.

See merge request AttorneyOnline/AO2-Client!61
2019-07-07 14:45:16 +00:00
cents02
099fea176c Indentation 2019-06-30 22:09:12 +00:00
cents02
f826ba390b New feature! /save_case . Takes two parameters, name and cr status.
E.g: /save_case case1 lfp . It takes court evidence but leaves the doc and cmdoc options blank to be entered manually(if anybody actually puts anything).
2019-06-30 21:47:48 +00:00
cents02
ae85525780 Resolved requests/issues. 2019-06-03 09:00:24 +00:00
cents02
09d8e9e7a4 Update courtroom.cpp 2019-05-31 21:52:22 +00:00
cents02
1f9a1bdd5d Fixed issues #47 on both client and server 2019-05-31 21:47:47 +00:00
Cerapter
c8a4f69d14 Fix escaped HTML characters fucking up the grapheme cluster sizes. 2019-05-10 20:49:59 +02:00
Cerapter
2e4f0117b0 Text is now advanced based on graphemes, rather than bytes. 2019-05-09 23:49:20 +02:00
iamgoofball
2d9fff2e96 Reverts screenshake on object, was controversial 2019-03-25 11:14:53 -07:00
iamgoofball
e6cb5bd2cf Fixes Objections hiding the current character, instead of overlaying on top of it. Adds screenshake to objects. 2019-03-23 14:33:31 -07:00