Commit Graph

363 Commits

Author SHA1 Message Date
oldmud0
e9940c82bd
Fix syntax error from unclean merge 2020-05-02 21:44:34 -05:00
oldmud0
bbdad2a40d Merge branch '2.7-rc'
Includes full code reformat.

# Conflicts:
#	src/aomusicplayer.cpp
#	src/path_functions.cpp
2020-05-02 21:29:06 -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
likeawindrammer
0a656d222d fix typo 2020-04-21 01:52:17 -06: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
cents
5f88b1fd30 Removed Duplicates 2020-04-19 12:47:50 -07:00
likeawindrammer
5bd8c960c9 Fix crash on saving settings
Thanks Initiate for actually fixing this
2020-04-19 12:35:03 -06:00
stonedDiscord
1e2d71fb96
Merge pull request #134 from AttorneyOnline/streammusic
Streaming music
2020-04-19 16:10:59 +02:00
likeawindrammer
f224ea0589 Add Polish to the language options 2020-04-18 15:04:34 -06:00
likeawindrammer
58b7725406 Change second exclamation to period on tooltip
No need for two exclamations
2020-04-18 02:40:46 -06:00
likeawindrammer
26872be05d Add missing periods on two tooltips 2020-04-18 02:35:09 -06:00
likeawindrammer
9faf41a89f "interupted" -> "interrupted"; "expierence" -> "experience" 2020-04-18 00:45:13 -06:00
likeawindrammer
ac60466ac9 "IC_Log" -> "IC Log" 2020-04-18 00:14:59 -06:00
likeawindrammer
9a041bdf2a Change some tooltips 2020-04-18 00:00:43 -06:00
likeawindrammer
50d5aa2a0e Revert "Change "Custom shownames:" to "Show custom IC names:""
This reverts commit cd034b996a.
2020-04-17 23:26:44 -06:00
likeawindrammer
aed4396584 Change tickbox to checkbox
As far as I know checkbox is more common
2020-04-17 23:21:05 -06:00
likeawindrammer
cd034b996a Change "Custom shownames:" to "Show custom IC names:"
"shownames" isn't a word, and what does "Custom shownames" even mean anyway?
"Show custom IC names" should do a better job at explaining what this option does.
2020-04-17 23:13:18 -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
Crystalwarrior
dfac0652c8 Add possibility for custom use text besides just "played music"
Implemented "presented evidence" message
2020-04-13 17:16:26 +03:00
in1tiate
901012eb28
Remove dumb memes (#141)
* remove memes

* Update courtroom.cpp
2020-04-12 15:43:39 -07:00
oldmud0
21a8b6f6e6
Merge pull request #139 from AttorneyOnline/posdrp
Fix an oversight with the pos dropdown, add a small feature
2020-04-11 22:46:57 -05:00
in1tiate
ed9632f220 fix dropdown bug, add minor feature 2020-04-11 20:04:41 -05:00
likeawindrammer
8486e19119 Add Portuguese translation 2020-04-11 18:21:04 -06:00
Crystalwarrior
e0ae7c0eb5 Fix evidence display viewport element being a FUCKING JACKASS 2020-04-02 23:10:54 +03:00
Crystalwarrior
71ebdac1c1 Fix collapse all rightclick option being annoying in its behavior. Now it's *smart*! 2020-04-01 20:01:00 +03:00
Crystalwarrior
c49c9cdd77 Fix weird behavior with area list and arup system + wrong column being used for 'metadata' 2020-04-01 19:48:58 +03:00
sD
02dd9b0a35 bass being bass again 2020-04-01 12:51:24 +02:00
sD
1b5c1ebb04 don't look in music for URLs 2020-04-01 12:51:13 +02:00
Crystalwarrior
8007b1d1b9 Add courtroom_design.ini partial parsing for misc/ folder (only chat_arrow and showname atm)
Initialize chat arrow n stuff
this is still pretty gay because you can't ignore size and set pos or something like that
2020-03-31 18:12:15 +03:00
Crystalwarrior
7816c8ab23 Add legacy fallback for "chatbox.png" name if chat.png doesn't exist 2020-03-31 17:09:00 +03:00
Crystalwarrior
feaf04a5c4 Fix custom chatboxes not working at all 2020-03-31 17:03:41 +03:00
Crystalwarrior
7fb19ae7bd Fix aomovie resizing algorithm for BG's crashing the client because I fucked up, lol 2020-03-31 14:24:48 +03:00
Crystalwarrior
4aa1ae62e1 Fix wrong pos being shown when entering area due to index signal being called in the wrong place 2020-03-28 19:29:46 +03:00
cents02
558fa55be8
Made the shake button useful.
Apparently nobody tested it before.
2020-03-27 21:11:33 +02:00
Crystalwarrior
614522bc0c Quality of Life improvements
Fix a bug where IC view received focus as soon as you receive the BG image update (it made navigating using /area commands a pain in the ass)
Make music search behave better and not reset when server sends us music list update (todo: remember which elements were/weren't expanded)
2020-03-27 15:48:16 +03:00
Crystalwarrior
1634db7864 Make backgrounds preserve aspect ratio when used with different aspect ratio themes
(e.g. a 16:9 theme would not stretch a 4:3 bg and instead have a letterboxing effect. A 4:3 theme using a 16:9 BG will not stretch the BG but instead center it, making it look like the BG is 4:3 all along.)
2020-03-26 14:41:56 +03:00
Crystalwarrior
f668d70ac5 Change @ and $ to \s and \f standing for s[hake] and f[lash].
This is done because @ is used very often to refer to people, and $ is used to indicate cash money.
2020-03-25 00:42:20 +03:00
oldmud0
ede1236b70 Fix syntax error introduced in 530721f 2020-03-22 15:25:13 -05:00
Crystalwarrior
825042b32c Fix a really obscure bug breaking custom realization sound effects (realization=thing) char.ini definition not starting from base/sounds/general folder 2020-03-22 22:26:46 +03:00
in1tiate
530721f2d0
frame count check 2 electric boogaloo
re-fix the same bug oh joy
2020-03-22 07:44:01 -05:00
in1tiate
6db808ec60
If frame count is 0, don't try to play the next frame (#129)
ya goofus.
2020-03-21 18:03:12 -05:00
sD
dd2daf55f3 it's basically the same packet minus requesting the next list 2020-03-15 13:20:33 +01: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
sD
1b0930b977 move area list detection algorithm into a seperate function 2020-03-13 16:29:01 +01:00
sD
ba03fb03e2 musictime is a bad name for this 2020-03-13 16:22:41 +01:00
Crystalwarrior
71967d44fd Keep verison string as-is and only update the actual VERSION display as for some weird ass reason doing it this way won't let you join KFO server 2020-03-12 19:20:26 +03:00
Crystalwarrior
4c8bf57268 VERSION 2.8.3 BABYYYYYYYY
Add "KFO" to version display in lobby so it's even clearer this is a custom client
Add a settings button to the Lobby screen
2020-03-12 18:34:51 +03:00
Crystalwarrior
7aa24bf501 Add a search bar for server list
Add options for sticky sounds, sticky effects and sticky preanims
Optimize the search for areas and music (previously, area search also searched for music in the background, causing lag with huge music lists)
2020-03-12 18:09:56 +03:00
Crystalwarrior
ce3269cc36 Only use anti-aliasing when sprites are being downscaled, otherwise preserve crispyness™️ 2020-03-12 00:47:39 +03:00
Crystalwarrior
9b8f60061a The Crispy™️ update
Make it so BG's and Characters will not be blurred when rescaled

TODO: Make Qmovies ditch anti-aliasing during scaling as well
Only apply crispy scaling if the size is 2x of the previous size or something
2020-03-08 17:40:52 +03: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
sD
80bf49ee90 ok bass 2020-03-06 22:14:59 +01:00
Crystalwarrior
e4b90d36a9 Fix the rightclick options for editing files not working 2020-03-06 23:29:26 +03:00
sD
2701fab91f indentation 2020-03-06 17:14:49 +01:00
sD
27a101d010 fix compiler warnings for unused vars 2020-03-06 17:14:42 +01:00
stonedDiscord
b668bb2276
Merge branch 'master' into music_list_update 2020-03-06 16:43:03 +01:00
BuildTools
21314271ae Add condition for classic PNG folders 2020-03-05 20:14:53 -06:00
Crystalwarrior
ee9de222ad Fix a bug where you couldn't join servers from your favorites list
Make column 0 the area index instead so that the areas take the full width of the treewidget
2020-03-06 01:14:05 +03:00
Crystalwarrior
39f9d1043e Add sorting by name for lobby 2020-03-05 21:23:42 +03:00
stonedDiscord
b44338996b make volume scale log 2020-03-01 16:05:40 +01:00
stonedDiscord
d276f14766 full music path in log 2020-03-01 15:59:44 +01:00
stonedDiscord
88b686b9d1 put full path in debug log 2020-03-01 14:37:32 +01:00
Crystalwarrior
a4e448576b Make pos dropdown more abstract and actually useful by letting servers send only pos you can actually access.
Pos dropdown system also reads the actual bg folder of the current BG to see all the created pos.
2020-02-24 22:20:43 +03:00
sD
a6f980f444 rename modcalls 2020-02-23 20:12:41 +01:00
sD
b6eb61c187 move language setting to the correct position 2020-02-23 13:18:51 +01:00
sD
3c30098360 translate char not found 2020-02-23 13:08:19 +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
1291e776b6 handle all types of musiclists 2020-02-23 12:25:10 +01:00
sD
444b0ff60f replace music loading 2020-02-23 11:43:41 +01:00
sD
16bd89b6ad detect == as music start 2020-02-23 11:35:32 +01:00
sD
5cf1fdcc2d connect the signal to char_clicked 2020-02-23 03:13:07 +01:00
sD
0b16ac863c the charselect works again 2020-02-23 02:56:57 +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
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
9f5343e0bd put the old char loading back 2020-02-21 17:18:39 +01:00
sD
f93459ed0e remove fuck 2020-02-21 17:18:25 +01:00
sD
8d6b69e2f2 replace mycourt_fuck 2020-02-21 17:02:55 +01:00
sD
6c154841c3 area count got renamed 2020-02-21 16:54:06 +01:00
sD
0afca9243a looping wasnt in 2020-02-21 16:53:56 +01:00
stonedDiscord
7d55ff01f5
Merge branch 'master' into 2.7 2020-02-21 16:39:32 +01:00
Crystalwarrior
43c4e3e9d7 Network effects folder so you don't need to modify your own char.ini to see custom effects 2020-01-17 18:41:27 +03:00
Crystalwarrior
6138bb107b Separate screenshake options button from effects options button
Add a color logging option button
Update version to 2.8.2
2020-01-15 16:42:44 +03:00
Crystalwarrior
f30013f7f9 i am REtArd
Fixed a major bug that crashed the clients on chatting + broke a lot of assets because of a single `.` boi anywhere in the filepath.
2020-01-15 16:06:27 +03:00
Crystalwarrior
8791109c66 Remove borders for chatlogs 2020-01-03 22:34:22 +03:00
Crystalwarrior
59e8a72a50 Allow colors in server chatlogs 2019-12-28 05:47:33 +03:00
Crystalwarrior
7518ed8a00 excuse me what the fuck 2019-12-27 01:20:15 +03:00
Crystalwarrior
819d091171 UGH I BROKE BACKWARDS COMPATIBILITY NOW I'M SCRAMBLING TO FIX IT 2019-12-27 01:04:48 +03:00
Crystalwarrior
eb014a9778 Add a message delay modifier when punctuation is reached to simulate Ace Attorney 1 chat parsing (replicating the effect where characters would make a short pause, as if saying the line out loud)
TODO: Make this a configurable thing
2019-12-05 22:46:26 +03:00
Crystalwarrior
07763c5ac0 actually fix the chat instead of breaking it 2019-11-22 00:31:17 +03:00
Crystalwarrior
34848c4eaf Fix a bug where user would be unable to speak if the BG changed when someone else was speaking
Make it so blip sounds are accessed in base/sounds/blips/* if such a path exists
2019-11-18 20:27:37 +03:00
Crystalwarrior
886ec26e20 "temporarily" simplify code by stripping long since botched and unused AO1 backwards compatibility 2019-11-04 17:14:46 +03:00