aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2022-07-29Add settings option for Evidence double-click that can be turned off ↵Crystalwarrior
(single-click evidence view) and more (#749) * Add 'evidence_one_click_view' courtroom_design.ini function, which allows you to treat every click as if it's a double-click (meaning every click will bring evidence overlay) Fix name not being set to read only when evidence is initialized If evidence is double-clicked and overlay is visible, trigger "on_x_clicked" behavior Make sure evidence is selected when double-click is called Stop hovering from changing name text if overlay is visible Simplify on_evidence_x_clicked "modified" check by simply checking if "ui_evidence_ok" is visible * Fix pressing "cancel" when trying to switch between evidence still acting the same as "discard" * Remove unnecessary ic message input focus setters for evidence, make only the Present button set focus on ic message input * Fix second page ignoring the evidence_one_click_view setting because of a wrong ID being used for the double-click call * Make evidence_switch() have everything required to properly switch between private/global * Make evidence cursor start at the top when looking at evidence description * Change it from theme setting to settings option * Make evidence double click default option to "true" due to it being the default for years Co-authored-by: Salanto <62221668+Salanto@users.noreply.github.com>
2022-07-28Fix iniswaps.ini and soundlist.ini not using vpath (#714)Crystalwarrior
Fixes #670 Co-authored-by: stonedDiscord <Tukz@gmx.de> Co-authored-by: oldmud0 <oldmud0@users.noreply.github.com>
2022-07-27Code to support effects ini version 2 (#813)Crystalwarrior
* Code to support effects ini version 2 * Update theme commit * Get it to actually work properly * Rework effect loading code * Added auto-migration to new format * Reorganised code for improved readability and clarity * Add functional checks for operation to not run into missing file issues * Minor logic fix * Add debug message * Trim any empty items from the list * Add mandatory culling * See https://discord.com/channels/278529040497770496/323377366997008394/998661402669617233 * Reworked implementation * Resolve warning of temporary container allocation * Unbreak what I broke last commit * Also make it a QStringLiteral to cheat clazy. * Set default layer * Ignore that for realization, that one covers the screen. * Document migration regex * This should clarify the ambiguity of its functionality and reason why it exists. Co-authored-by: Salanto <62221668+Salanto@users.noreply.github.com> Co-authored-by: TrickyLeifa <date.epoch@gmail.com>
2022-07-27Fix an extremely rare issue where loop point goes outside track bounds if ↵Crystalwarrior
loop end is not defined (#748) * Fix an incredibly edge-case loop end issue where the loop end is outside track boundaries somehow * WIP-AB Cleanup and incorrect loop bugfix Cleanup AB-Loop code * Someone has to check if AB loop works properly still cause I have no idea how this shit works and the code prior was unreadable. Don't blame me, blame whoever left this code undocumented like the hag they are. * Increase max-sample we can accept in the AB loop Also change conversion to UInt. If someone adds a bad value, it will just return 0, which I guess is fair. Co-authored-by: Salanto <62221668+Salanto@users.noreply.github.com>
2022-07-26Part 2 of #713: merge get_real_suffixed_path into get_real_path (#717)Crystalwarrior
* Fix get_real_suffixed_path existing, causing the previous PR to not function on suffixed... anything Fix suffixes ignoring a case where a suffixed path is already provided, causing that pre-suffixed filepath to fail to find anything * Fix image paths being used as sound effects and vice versa Better check for sfx and image absolute paths which double-checks the absolute path we got is *actually a valid file format* Co-authored-by: stonedDiscord <Tukz@gmx.de> Co-authored-by: Salanto <62221668+Salanto@users.noreply.github.com>
2022-07-23Merge pull request #819 from AttorneyOnline/lambda-coreoldmud0
Make lambda captures of 'this' explicit
2022-07-23Android hdid (#822)stonedDiscord
* get ANDROID_ID * make it more complicated
2022-07-23Fix multiple issues with screenshake code (#812)Rosemary Witchaven
* Major cleanup of screenshake code * Add pre-5.10 support for screenshake math * more compat, uglier too * add surprise tool * we don't need inline functions
2022-07-23Change FL variable names for clarity (#810)Rosemary Witchaven
* Change FL variable names for clarity * Missed one somehow Co-authored-by: Salanto <62221668+Salanto@users.noreply.github.com>
2022-07-23Add Emote preview (#774)Crystalwarrior
* Add an emote preview which pops up from right click context menu * rename action names to "preanim/idle/talk" * Improve emote preview window * Preview no longer ignores offsets No longer override stylesheets Add "Preview Selected" option to the dropdown * bruh * Fix "set play once" being ignored when a (c) emote is loaded * Remove useless comments * Implement Salanto suggestions Co-authored-by: stonedDiscord <Tukz@gmx.de>
2022-07-23Suppress application volume when alt-tabbed (#730)Crystalwarrior
* Suppress application volume when alt-tabbed Add a "suppress_audio" slider setting, 50% by default, which decides how much audio remains when the client is not in focus Add a "muted" setting for blip, music, and sfx players Add update_audio_volume func * change "suppress" to "how much audio is suppressed" instead of "how much audio remains" * Fix last commit just flipping the behavior and being ultra wacky * Fix evidence present sound ignoring audio suppression settings Co-authored-by: stonedDiscord <Tukz@gmx.de> Co-authored-by: Salanto <62221668+Salanto@users.noreply.github.com>
2022-07-21Linux apng (#820)stonedDiscord
* copy qapng * correct case * delete folder from zip * build qapng without it crashing
2022-07-19Make lambda captures of 'this' explicitin1tiate
2022-07-19use base folder on android so the error matches (#815)stonedDiscord
also makes extracting vanilla or applying updates easier
2022-07-19Linux ci (#816)stonedDiscord
* turn off sized deallocation on desktop * add an easy launch script and tar it to keep the +x bit * too many spaces * add os name and fix linux deploy
2022-07-19Remove floating scrollbar (#817)Salanto
I probably shouldn't copy paste code while not knowing what they do.
2022-07-18Add effect layering under the character, flippable effects and more (#701)Crystalwarrior
* Fix effect offsets only applying after the effect already plays Add "_layer" property which can be "behind", "character" or default "chat". This deprecates the "under_chatbox" property * Add a "sticky" effect property which is the same as "stickyeffects" setting being enabled but just for that 1 effect * Clang is tidy, clang is caring * make character layer actually stack over the character but under the desk add new "over" layer which is over everything in the viewport but under the chat box * Switch "ignore_offset" to "respect_offset" so effects only respect character offsets if explicitly told to * Appease clang tidy... mostly. I don't understand the last thing it's talking about. * Appease clang tidy further * Remove "effect_done" due to it overwriting the AOLayers behavior Add "loop" effect property so you set up in the ini if the effect should loop rather than it using the file's loop settings Add "max_duration" effect property Add "cull" effect property which decides whether to clear the effect or not when it's done (if loop is false) * Fix effects not allowed to have underscores (_) in them without breaking * Change the way effects.ini looks and is parsed to be more sane and doable. However, since order may or may not matter, you can optionally include index:name and it orders it properly. * Appeal to clang * Fix a dumb way I created QSettings in get_effects * Fix effect properties being broken due to optional index * Fix get_effect_property not getting the current theme properties if a misc theme exists * If sound list has a sound effect selected, if pre is not checked, don't play effect sound and prefer the sfx we chose instead. * Fix \f not using the theme's realization effect * Add missing curly bracket * Yolo Co-authored-by: Salanto <62221668+Salanto@users.noreply.github.com> Co-authored-by: stonedDiscord <Tukz@gmx.de>
2022-07-18Use QStyle to fetch checkbox size and spacing info instead of relying on ↵Rosemary Witchaven
magic numbers for label truncation (#805) * Use QStyle to fetch checkbox size and spacing info * remove unnecessary use of auto* * access static member the correct way
2022-07-17Prevent dupes of default mount path on default (#808)Salanto
Properly clears the mount list when restoring the default settings. Fixes #804.
2022-07-17Begone bot (#811)stonedDiscord
* this branch was dead * bot was more annoying than helpful
2022-07-16Add "chatbox_always_show" courtroom_config.ini option (#725)Crystalwarrior
* 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-16Optimize area list slightly by recycling QTreeWidgetItems instead of ↵Crystalwarrior
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-16correct spelling of "deprecated" (#803)Rosemary Witchaven
2022-07-16Reorganise logging option into its own settings tab (#790)Salanto
* Split logging options into its own tab This is so ugly its not even funny. * Update src/aooptionsdialog.cpp bot being annoying. Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * Can't trust the bot with anything Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
2022-07-16add compatibility code for pre 5.15 qt (#807)Rosemary Witchaven
2022-07-16Swap a bitwise AND for a logical AND (#809)Rosemary Witchaven
Didn't cause any problems here because these are both of type bool, but it's bad form anyway
2022-07-07Add support for sounds/ subfolder in themes, misc and char folders (#732)Crystalwarrior
* Add support for sounds/ subfolder checking for character folder, themes and misc folder, replacing weird behavior where it would prefer an unorganized sound file in any of the above over the sound folder * Revert "Add support for sounds/ subfolder checking for character folder, themes and misc folder, replacing weird behavior where it would prefer an unorganized sound file in any of the above over the sound folder" This reverts commit 8dd5c8299676e7cd89644c85db622aa6048b8616. * Implement a better method that doesn't break anything That weird behavior I menteioned previously is what shouts rely on...
2022-07-07Support for DRO's sounds.ini as a fallback if soundlist.ini is not found for ↵Crystalwarrior
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-07Overlay emote_buttons with emote_selected image from theme instead of ↵Crystalwarrior
generating files (#727) * Create an "emote_selected" overlay for emote buttons using default theme's emote_selected image It is used if "_on" button image is not found on the character. If emote_selected image is missing from the default theme, use a simple transparent black color overlay instead. Replaces auto-generation of _off images * clang plz * use static overlays only
2022-07-07Added Play SFX context menu action (#791)Leifa♥
* 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-06-23Added penalty effects (#786)Leifa♥
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-15Shutup ci (#782)stonedDiscord
* stop magic number spam * forgot to remove avoid * Update .clang-format * yeet qt translations and unused image formats * also remove bearer and styles * remove another svg dll * create dmg on mac * forgot .app * delete folder after packing * skip runtime webkit and opengl * switch back to fixed qt setup * try installing the NDK * update discord rpc includes * enable discord in CI builds * copypaste lmao * windows doesn't have export * forgot the quotes * guess i'm not root * downgrade ubuntu * lets hope ubuntu 18 comes with android ndk * it doesn't * try to update libpng * script wasn't executable * downgrade android * typo * use qmake to enable discord * exit code 101 very funny qmake * its in defines not just true * can i use qmake like this? * add discord * exclude android from discord * android runs on linux after all
2022-06-11Add line limit to server chat and debug log panes (#784)Salanto
Set default maximum block size to 5,000 unless otherwise specified
2022-06-08Fix relative paths for evidence image and mounted base folders (#757)Crystalwarrior
* Fix adding mounted folders not using relative path if the chosen folder is inside the application folder Fix evidence relative pathing not being aware of mounted base folders, and fix default evidence folder being in base/evidence rather than first found "evidence" folder * more braces Co-authored-by: stonedDiscord <Tukz@gmx.de>
2022-06-06save and load server description in favorites (#783)stonedDiscord
2022-06-06Clear selection when switching between favorites and public servers (#763)Rosemary Witchaven
Co-authored-by: in1tiate <radwoodward@vikings.grayson.edu>
2022-06-06Polish translation update (#779)Pyraqq
2022-06-06Dual-Stack AO2 Client to handle both TCP and Websocket connections ↵Salanto
seemlessly (#696) * Replace TCP Serversocket with Websocket * Have TCP sockets live harmoniously with WS "like 5 lines" yeah probably lost a bet. * Update .gitlab-ci.yml * hack to fix favorites * Add support for websockets in the favorites list (serverlist.txt) Make "add_favorite_server" remember the socket type * Preserve old serverlist style This will keep new entries compatible with 2.9 and prior clients. Makes parsing the list easier too. * Add lookup table and correct write code to use lowercase * I have no idea what a lookup table is, but this looks close enough * Fix lookup table * Otherwise backend selection behaviour is inverted * clang-tidy had one job * Yet it did not do it. Co-authored-by: oldmud0 <oldmud0@users.noreply.github.com> * const p_data * Switch serverlist.txt to an ini format * Fixes an Omni bug where : would split the servername * Utilises internally QSettings properly for low parsing effort and clear structure * Automatically migrates the legacy serverlist.txt to favorite_servers.ini * Pleases my OCD * Replace sample serverlist. Co-authored-by: oldmud0 <oldmud0@users.noreply.github.com> Co-authored-by: stonedDiscord <Tukz@gmx.de> Co-authored-by: Alex Noir <Varsash@gmail.com>
2022-06-05UTF-8 support and human sorting for evidence (#781)Lernos
2022-06-03Merge pull request #777 from AttorneyOnline/shorter-offsetsoldmud0
make x/y pair spinboxes shorter and not have "offset" in it
2022-06-03Merge pull request #770 from AttorneyOnline/fix-stickersoldmud0
Fix stickers being layered under the chatbox rather than above
2022-06-03improve placeholder text for IC and OOC (#753)Crystalwarrior
* 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-03Add icons for pos dropdown (#715)Crystalwarrior
* 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-03italian translation by dev and mandarino (#771)stonedDiscord
* italian translation by dev and mandarino * swap music and character loading * update all the other translations as well
2022-06-03make x/y pair spinboxes shorter and not have "offset" in it cuz it always ↵Alex Noir
gets in the fuckin way
2022-06-02Update build.yml (#775)oldmud0
2022-05-24GitHub android ci (#767)stonedDiscord
* try this matrix thing * syntax error * use my own qt installer so it actually works * allow changing path * whoops cant have it twice * get the right version of discord rpc * get correct bass * try to fix windows * overwrite bass files * forgot to delete these * here's your version bro * what did we even use catch2 for?? * linux doesnt have a c folder * android bass * switch from cmake to qmake * opus dylib * we don't install * put bass in a subfolder so we don't build the stupid examples * was using wrong arch for android * fix up gitignore * get correct artifact folder * lets hope qmake will ignore the ABI for all the other platforms * use platform name for artifact * copy dlls into bin folder * lmao i yeeted the folder * create folder * use more recent mingw * windows uses dlls * 2017 doesn't work * our libs are 64 bit * install msvc * shitty ms documentation * ok ms * wrong directory for deploy * copy apng * use correct image for msvc2019 * deploy android * 32bit windows it is * adroideploy * try this * Update build.yml * move libs * armeabi-v7a * fix android build files * only get linux bass for linux * don't try to install discord on android * deploy mac * get rid of double permission warning * define filename for APK * add mac dependencies * put android bass in the correct folder * mac apng * android apng * remove old CI * ask for storage permissions * qt bug .......... * update clang-tidy-review * update everything * fuck you lukka * fuck you jurplel for merging that shitty PR that broke everything * give it what it wants * Update clang-tidy-review.yml * github is failing it because it's too big * wait for the user and request a proper permission string * underscore moment * use write external storage instead * try this instead * 082 fails with docker again
2022-05-23Fix screenshake misaligning the char on idle screenshake (#724)Crystalwarrior
2022-05-23Add compatibility layer for "witnesstestimony" in courtroom_sounds.ini ↵Crystalwarrior
because bubbles and buttons have no underscore, yet courtroom_design.ini does (#756)
2022-05-23Fix custom objection folders not working (#726)Crystalwarrior
Fix reload theme screwing up the default custom objection folder if a custom.gif doesn't exist near char.ini