Commit Graph

450 Commits

Author SHA1 Message Date
Crystalwarrior
229a423e0f
Add "chatbox_always_show" courtroom_config.ini option (#725)
* Add "chatbox_always_show" courtroom_config.ini option
Remove copy-pasted code from set_widgets for initializing chatbox

* make chatbox_always_show work with misc folders

* Fix sticker disappearing despite chatbox_always_show setting

Co-authored-by: stonedDiscord <Tukz@gmx.de>
2022-07-16 16:00:03 +02:00
Crystalwarrior
fef33dfc4f
Optimize area list slightly by recycling QTreeWidgetItems instead of clearing and creating them every time (#754)
Remove index that only shows up during ARUP cuz it confuses the hell out of area indexes defined by server

Co-authored-by: stonedDiscord <Tukz@gmx.de>
2022-07-16 15:51:05 +02:00
Rosemary Witchaven
d056030e6c
Swap a bitwise AND for a logical AND (#809)
Didn't cause any problems here because these are both of type bool, but it's bad form anyway
2022-07-16 15:18:49 +02:00
Crystalwarrior
06e8f82c87
Support for DRO's sounds.ini as a fallback if soundlist.ini is not found for the character (#731)
* Support for DRO's sounds.ini as a fallback if soundlist.ini is not found for the character

* readability i guess?

Co-authored-by: oldmud0 <oldmud0@users.noreply.github.com>

Co-authored-by: stonedDiscord <Tukz@gmx.de>
Co-authored-by: oldmud0 <oldmud0@users.noreply.github.com>
2022-07-07 13:59:50 +03:00
Leifa♥
7805e80e83
Added Play SFX context menu action (#791)
* Added Play SFX context menu action

Resolve #746

* The SFX context menu now allows the user to preview the sound selected by playing it.

* Changed declarations for methods.
2022-07-07 13:55:44 +03:00
Leifa♥
7b4b297a22
Added penalty effects (#786)
Themes can be configured to play an SFX and/or effect when the HP bar increases or decreases. Effects can be any defined effect, or a built-in effect such as "screenshake" or "flash".

Resolves AttorneyOnline/AO2-Client#743
2022-06-23 18:58:17 -05:00
Salanto
ffcd783c10
Add line limit to server chat and debug log panes (#784)
Set default maximum block size to 5,000 unless otherwise specified
2022-06-11 18:09:53 -05:00
oldmud0
87d3310efa
Merge pull request #777 from AttorneyOnline/shorter-offsets
make x/y pair spinboxes shorter and not have "offset" in it
2022-06-03 22:40:52 -05:00
oldmud0
e4125d3f52
Merge pull request #770 from AttorneyOnline/fix-stickers
Fix stickers being layered under the chatbox rather than above
2022-06-03 22:27:30 -05:00
Crystalwarrior
d4e3956271
improve placeholder text for IC and OOC (#753)
* improve placeholder text for IC and OOC

* Keep showname box placeholder at "showname" so as not to be confusing

* Apply my own suggestions

* Revert "Keep showname box placeholder at "showname" so as not to be confusing"

This reverts commit bad5507b9e4b9501d27b7b46e66c5e1cc2eb9859.

* Bring back showname for showname box
let "update_character" handle placeholder text properly
Fix spectator placeholder text not appearing if switching to spectator using /switch, etc.

* fix an oopsie

Co-authored-by: oldmud0 <oldmud0@users.noreply.github.com>
2022-06-03 22:26:32 -05:00
Crystalwarrior
c3a5bfb98a
Add icons for pos dropdown (#715)
* Add icons for pos dropdown

* Make sure to upscale the icons to actually fit (so tiny 1pix bg images for ex. still show up properly)

* move get_pos_path

* add const to desk mod

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

* Revert "add const to desk mod"

This reverts commit 7d6007fb1be0781e29985d0b83f2f6da16295e90.

* make set_scene const

* make pos const

* add and to const

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

* add braces

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

* Revert "add and to const"

This reverts commit aa5e5066dcf42ae18c2aeb349d470271226601da.

* make desk const

* fix get pos path for real

Co-authored-by: stonedDiscord <Tukz@gmx.de>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
2022-06-03 12:41:31 +02:00
Alex Noir
af91da7cb0 make x/y pair spinboxes shorter and not have "offset" in it cuz it always gets in the fuckin way 2022-06-03 02:17:02 +03:00
Crystalwarrior
868c26f52e
Fix screenshake misaligning the char on idle screenshake (#724) 2022-05-23 20:49:41 +02:00
Crystalwarrior
629066f376
Add compatibility layer for "witnesstestimony" in courtroom_sounds.ini because bubbles and buttons have no underscore, yet courtroom_design.ini does (#756) 2022-05-23 20:49:03 +02:00
Crystalwarrior
967e6a00ff
Fix custom objection folders not working (#726)
Fix reload theme screwing up the default custom objection folder if a custom.gif doesn't exist near char.ini
2022-05-23 20:46:24 +02:00
Alex Noir
7d687955d4 Fix stickers being layered under the chatbox rather than above (but still under text/showname)
Fix stickers being incorrectly layered and affected by effects etc.
2022-05-21 20:34:49 +03:00
Crystalwarrior
b56805e3e2
Try to fix music list disappearing randomly (#768) 2022-05-21 16:27:45 +02:00
Rosemary Witchaven
94dbdf73e0
Feature: Clicking the evidence icon when it's presented by a player will show the details of that evidence (#760)
* Add click-to-view evidence icons

* Fix the clicky icon not being functional if the presented evidence comes from a different page from the first

Co-authored-by: in1tiate <radwoodward@vikings.grayson.edu>
Co-authored-by: Alex Noir <Varsash@gmail.com>
2022-05-21 16:21:34 +02:00
Crystalwarrior
a1edef048f
Remove "debug_log" moniker for debug log and reuse ms_chatlog so old themes don't break (#716) 2022-05-21 16:12:24 +02:00
Crystalwarrior
9214952aea
Fix iniswap remove button removing character iniswaps (#710)
Fix the character being added twice to the iniswap if the iniswap list contains the og character name
2022-05-21 16:07:07 +02:00
Crystalwarrior
1544d5d3a6
Fix sound in the sound list using the alias of the sound list as the sound instead of its actual reference (#708) 2022-05-21 16:06:07 +02:00
Rosemary Witchaven
6d1c8fd560
Check for settings.png if courtroom_settings.png doesn't exist (#762)
Co-authored-by: in1tiate <radwoodward@vikings.grayson.edu>
2022-05-18 18:42:51 +02:00
Rosemary Witchaven
68d0b838cf
Add two ways of controlling judge buttons that aren't hardcoded nonsense (networked and local) (#537)
* add both network and local ways to show judge buttons on pos other than jud

* hide judge buttons when pos_removing to a non-judge position

* alter packet header

* Only use pos jud hardcoding if no design.ini

if design.ini does not define judges= then we fall back to pos jud garbage

* Fix judge buttons being disabled if default_side pos is judge (logic poopy)
Fix positions.isEmpty() returning False cuz a split of an empty string returns the list with an empty string by default

* Expand JD packet to be able to send -1, 0 and 1. If -1 is received, fall back on client-sided judge button behavior. If 0 or 1 is received, treat it as "absolute override" and adhere to that packet.

* alter check for empty qstringlist to support old qt versions

* heehoo

* trigger client side behavior when jd -1 is sent

* less confusing variable names

* remove useless code, trim some fat

Co-authored-by: oldmud0 <oldmud0@users.noreply.github.com>

* use an enum dammit! & warn on malformed auth

* use an enum dammit! pt. 2

* appease clang, rewrite ugly judge controls function

* please squash this its so bad

Co-authored-by: Crystalwarrior <Varsash@Gmail.com>
Co-authored-by: oldmud0 <oldmud0@users.noreply.github.com>
2022-03-29 17:37:02 +03:00
Crystalwarrior
7bb7889923
Add timestamp colors you can change in courtroom_fonts.ini (#698)
* Add ic_chatlog_timestamp_color and ic_chatlog_selftimestamp_color to courtroom_fonts.ini

* clang tidy. clang stronk.
2022-03-25 16:01:57 +03:00
Crystalwarrior
ca83573d1b
Objections no longer force you into preanimations (#697)
* Make objections respect the user's preanim setting

* Replace all magic numbers with the emote mod enum
Fix preanim zoom not toggling the checkbox from char.ini, but deprecated "4" doing it

* Comment handle_emote_mod a bit better to explain some jank

* Fix play SFX logic being inconsistent during narrator chat (emote is "")

* hail clang-tidy
2022-03-25 16:01:39 +03:00
oldmud0
9dd1407103
Merge pull request #674 from AttorneyOnline/pausechar
Add \p for "pause", which lasts 0.1 seconds
2022-03-24 08:10:51 -05:00
Crystalwarrior
c3fd82eacc
Fix SFX dropdown regressions, make dropdown play sound if custom sound is listed regardless of Pre (#656)
* Fix SFX dropdown not playing a sound despite a sound being selected.
It was waiting on a preanim box to be checked, but that behavior was not intuitive. Plus this is a regression from intended behavior

* Make "default" sfx behavior behave as expected

* Tidy up the network logic for emote_mod and comment all of its behavior
Fix sfx not playing when immeidate is checked on

* make emote_mod an enum so I don't have to go scouring documentation to learn what it does anymore
not adding emote mod for enums 2, 3 and 4 cuz those are planned to be deprecated in a later PR
Make Clang happy with no bracket-less if statements
2022-03-24 03:05:27 +03:00
Crystalwarrior
35fcbdeea8
Add showname and selfname colors to courtroom_fonts.ini (#672)
Co-authored-by: oldmud0 <oldmud0@users.noreply.github.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
2022-03-19 17:21:24 -05:00
Crystalwarrior
df1c8ccd83
Add blip rate of 0 which only plays a single blip sound per message (#659)
* Add blip rate of 0 which only plays a single blip sound per message

* don't have copy-pasted code I GUESS
2022-03-19 15:31:38 -05:00
Crystalwarrior
fa6eef8eba
Allow character select list to refresh even if client is already loaded in (#655)
* Allow "SC" packet to be used to refresh the character list even if the client is loaded in
Fix tree list of characters not being cleared properly between "SC" packets
Fix client theme breaking when joining a server with empty character select list

* Do my review suggestions on CW's behalf

Co-authored-by: oldmud0 <oldmud0@users.noreply.github.com>
2022-03-13 18:29:42 +03:00
stonedDiscord
92633e5ff2
try this reviewer (#668)
* try this reviewer

* test the reviewer with a very bad piece of code

* it can't handle spaces

* run cmake to find all the files

* file go brr haha

* cmake needs qt installed

* rename file once again

* use windows

* also doesn't like brackets

* can't use windows

* install qt the linux way

* try using cmake this way

* cmon cmake

* install qt before running cmake

* forgot catch2

* need to install as root

* add build dir

* delete test file

* fix 3 warnings

* enable clazy

* Revert "fix 3 warnings"

This reverts commit 7e64d4a546c397b5b69554ccf6765bf0a068f695.

* disable 3 warnings

* add a bracket for readability

* install clazy before

* get qt 5 real

* try lukkas cmake modules

* dupe courtroom again to test clang-tidy

* courtroom.cpp was a mistake

* remove magic number warning
2022-03-01 21:37:11 +01:00
Alex Noir
d424020f42 Add \p for "pause" similar to \s and \f, which will pause the text for 0.1 secods 2022-02-23 21:35:07 +03:00
Crystalwarrior
ad460ceaff
Fix pos dropdown failing to get properly populated with bg pos (#661)
(caused by bc49b3e976
2022-02-20 23:03:36 -06:00
oldmud0
bcbbb899f9
Merge pull request #657 from AttorneyOnline/icons-for-all
Add icons for iniswaps and emotes in the dropdown
2022-02-20 23:00:04 -06:00
oldmud0
d0336c1035
Merge pull request #654 from AttorneyOnline/fix-bg-bug
Fix backgrounds getting messed up, closes #635
2022-02-20 22:51:35 -06:00
oldmud0
7ecb43d3a2
Merge pull request #665 from AttorneyOnline/background-ini-overlays
Add [Overlay] overrides to background design.ini
2022-02-20 19:13:17 -06:00
Salanto
e4779f09eb
Effects follow offset, add ini option to disable offset for effect (#663)
* Effects follow offset, add ini option to disable offset for effect

This is pretty hacky, but the offset data is necessary to move the effect layer in relation to the character.
2022-02-20 18:56:10 -06:00
Alex Noir
57ff1b9d2c Add background overlay overrides so you don't have to copy-paste the same file if you're just using it across multiple pos 2022-02-20 02:23:26 +03:00
Salanto
dd53b01ffd
Address potential source of race confition inside the play function (#658)
Current working theory is that setting the future opens a brief interval where it deconstructs the old future and returning an invalid QFuture,, causing a segmentation fault.
2022-02-18 22:51:27 +03:00
Alex Noir
0e2bd0b110 Add icons for iniswaps and emotes in the dropdown
Fix iniswap list not recognizing a name that's different from a character folder when switching to that character
2022-02-18 22:02:18 +03:00
Alex Noir
737d581b73 Fix backgrounds getting messed up, closes #635 2022-02-18 18:27:56 +03:00
oldmud0
7389b5071b Don't restart background if background is unchanged 2022-01-08 14:52:08 -06:00
oldmud0
c80a019574
Merge pull request #619 from AttorneyOnline/feature/http-ms
Switch to HTTP-based server list
2022-01-07 20:17:02 -06:00
oldmud0
7b4d1e96c6 Disambiguate settings with lobby_settings and courtroom_settings 2021-12-31 10:40:21 -06:00
oldmud0
6e1e847750
Add and refine debug log messages (#625)
Since these are going to be visible to the user now, at least let's properly format them and make them somewhat helpful.
2021-12-30 20:44:59 -06:00
oldmud0
ee76c2ce61 Merge branch 'master' into feature/http-ms
# Conflicts:
#	src/networkmanager.cpp
2021-12-30 20:31:44 -06:00
oldmud0
a180600bf4
Merge pull request #623 from AttorneyOnline/feature/debug-log
Remove MS chat and add debug log
2021-12-25 22:57:51 -06:00
oldmud0
ecfe6f2542 Change master chat in courtroom to debug log
Since the MS chat has been disabled for quite some time now (and we aren't planning on bringing it back since Discord, Guilded etc. have better chat features), I decided to go ahead and change the pane into a debug log to keep it useful and avoid creating a gaping hole in themes.

Though, maybe it is worth removing the whole switcher and keeping the debug log hidden away where it can't scare people.
2021-12-25 19:17:27 -06:00
Salanto
c57afe821e
Sanity check before removing the ui element (#612)
Co-authored-by: oldmud0 <oldmud0@users.noreply.github.com>
2021-12-24 14:36:41 -06:00
Salanto
5ce0e6416e
Fix animation freeze when loading music files (#609)
* Implement async music loading

* Simplify music filename parsing and fix "missing" on streams

Co-authored-by: oldmud0 <oldmud0@users.noreply.github.com>
2021-12-24 14:05:01 -06:00