Commit Graph

1941 Commits

Author SHA1 Message Date
stonedDiscord
517b67e952
Android CI (#850)
* as if this is going to work

* use android libs and spec for android

* install ndk and use clang over g++

* shut the fuck up

* SHUT THE FUCK UP

* shut up shut up shut up

* actually install old ndk version

* Delete .gitlab-ci.yml
2022-08-08 18:51:46 +02:00
Salanto
4a2f19433d
Properly enter loop if starting point is 0, i.E undefined. (#844)
* Fix channel 0 being ignored

* Allow music to properly loop

* Added channel index.

Co-authored-by: Leifa♥ <26681464+TrickyLeifa@users.noreply.github.com>
2022-08-05 16:43:16 +03:00
Leifa♥
90ff911376
Merge pull request #840 from AttorneyOnline/removed-unused-method
Removed unused prompt remove favorite server method in AOApplication
2022-08-01 21:57:56 +02:00
TrickyLeifa
2f24589b28 Removed unused function.
The function removed was meant to provide a prompt before removing the favorite server. I accidentally left it in, removing it will not affect the functionality of the client.
2022-08-01 21:44:30 +02:00
dyviacat
7d395b4a33
Let's try that again. This time, less stupid. (#838)
* Let's try that again. This time, less stupid.

Made the updated licensing from 2021 to 2022 and new credits and whatnot.

* executive meddling

* Update credits.

Co-authored-by: oldmud0 <oldmud0@users.noreply.github.com>
Co-authored-by: Salanto <62221668+Salanto@users.noreply.github.com>
2022-08-01 17:40:10 +03:00
Crystalwarrior
b9aa2039d3
Add "edit" and "open folder" actions for dropdowns (#776)
* Add "edit" and "open folder" actions for dropdowns:
 - CharSelect char button with "edit char.ini," "open this char folder"
 - pos dropdown with "open this background"
 - text color dropdown with "open chat_config.ini"
 - evidence button with "open evidence folder"
 - sound list with "open sounds folder"
 - music list with "open music folder"
 - theme list with "open themes folder"
* Implement "Play <sfx_name>" for the Play action, and only show it if the sfx is not "0" or "1" or "-"

Co-authored-by: stonedDiscord <Tukz@gmx.de>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: oldmud0 <oldmud0@users.noreply.github.com>
2022-07-31 13:05:09 -05:00
Crystalwarrior
dd8eee7eed
Pending ghost messages (#736)
This feature allows text to be posted to the IC log as a "ghost" before it has been displayed in-game. When desync chat is enabled, it's common for the player to wait a little while before their messages are displayed.

Ghosts only apply to the active player's messages, not all queued messages. They are also pinned at the end of the IC log until they are displayed.

Co-authored-by: oldmud0 <oldmud0@users.noreply.github.com>
Co-authored-by: stonedDiscord <Tukz@gmx.de>
2022-07-31 11:33:10 -05:00
Crystalwarrior
4124a43674
Fix evidence out of range issue due to an oversight (#836) 2022-07-31 15:17:25 +02:00
Leifa♥
1cfbfd51a7
Added server list context menu, ... (#835)
* Added server list context menu, ...

Resolve #832, #560

* The demo server listing now always appears at the top for consistency.

* Add a context menu to server listing.
Only appears during favorite server listing. Requires a valid item under cursor. Cannot be the demo server item.

* Add a new UI element: `remove_from_fav`
Only appears during favorite server listing. Require a selection to remove. Cannot be the demo server.

Uses `removefromfav.png` and `removefromfav_pressed.png` images as textures.

* Favorite servers are now loaded whenever the Lobby is created in addition to refresh and server listing switch.

* `serverlist.txt` is now renamed to `(deprecated)serverlist.txt` if read from.

* Updated comments

* Typos
2022-07-31 05:57:01 +03:00
Salanto
14731a0fca
Merge pull request #833 from AttorneyOnline/back-up-effects-ini
Auto-create a backup of the effects.ini before migration.
2022-07-31 03:24:39 +02:00
Salanto
786e782220 Punctuation. 2022-07-31 02:57:51 +02:00
Alex Noir
31ecd7a007 Implement Salanto warning wording suggestion 2022-07-31 02:57:36 +03:00
Alex Noir
1e49b38db7 Back up old effects ini 2022-07-30 21:05:21 +03:00
Crystalwarrior
091cd9d5c9
Update theme subproject (#831) 2022-07-30 20:00:20 +02:00
Salanto
4fa86c0174
Add option to disable music streaming. (#829)
* Add option to disable streamintg

This one gets a unique message to prevent people forgetting they disable it and the wondering why streaming broke.

* Fix code order

* Fixes the music channel still playing audio when a new stream was blocked.

* Update tooltip

* Update tooltip to reflect the current way the feature works.
2022-07-30 18:42:55 +02:00
Crystalwarrior
7b88d4be95
Never send an unencoded packet to the server (#719)
* never send an unencoded packet to the server

* oops

* Improve packet validation to remove segfaults

* WARNING: commit breaks connecting to servers, need help
start fixing omniwhy caused by single fuckin string packets (AAAAAAAAAAAAAAAAA)

* Fix failed connections to servers (Thanks to @Iuvee for helping me figure this out!)

* Fix demoserver

* who the fuck still uses goto

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

* ANOTHER GOTO????

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

* braces

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

* good bot Update src/packet_distribution.cpp

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

* Fix demoserver harder

* Improve demo logging

* Fix memory leakage by deleting the packet
Fix useless demoserver wait packet creation when none of that packet is used

Co-authored-by: stonedDiscord <Tukz@gmx.de>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: Salanto <62221668+Salanto@users.noreply.github.com>
2022-07-30 18:42:22 +02:00
Crystalwarrior
cf91cc03f8
Add settings option for "sfx_on_idle" which allows you to play a custom SFX alongside an Idle emote (#744)
* Add an "sfx_on_idle" FL packet flag, UNFORTUNATELY servers have to go out of their way to support this feature due to clients below 2.10 fucking spamming sfx for 2.10 otherwise

* Revert feature flag, implement a method that works regardless of server instead

* Revert "Revert feature flag, implement a method that works regardless of server instead"

This reverts commit c14b4fb2a1bbf2796db4a26e83609ba743826655.

* Stop using FL packet, but make SFX on Idle a client-side setting to reduce confusion and reliance on servers for a client feature to a minimum.

This reverts commit 687e64e37839b77923c93d13f971ee6750bd4330.

* Update src/aooptionsdialog.cpp

Co-authored-by: stonedDiscord <Tukz@gmx.de>
Co-authored-by: oldmud0 <oldmud0@users.noreply.github.com>
2022-07-30 14:55:58 +02:00
Crystalwarrior
d9bdb7e6bc
Fix get_effect_property ignoring the provided effect folder and using the char.ini instead. Makes it consistent with get_effect behavior (#828) 2022-07-30 14:38:37 +02:00
Crystalwarrior
d8c89f056b
Add private evidence autosaving into inventories/autosave.ini (#778)
* Add private evidence autosaving into inventories/autosave.ini

* Make evidence autosave more robust by accounting for evidence transfers and deleteions
Fix the ini not using UTF-8 codec
Correct save/load functions working on local evidence list (displayed) rather than the proper private one

* set ini codec

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

Co-authored-by: Salanto <62221668+Salanto@users.noreply.github.com>
Co-authored-by: stonedDiscord <Tukz@gmx.de>
Co-authored-by: oldmud0 <oldmud0@users.noreply.github.com>
2022-07-30 05:06:34 +03:00
Crystalwarrior
f896475de4
Stop iniswapping from modifying the char.ini file (#712)
* Stop iniswapping from modifying the char.ini (which can potentially remove comments such as credits, charmaker notes, etc.)
* Fix iniswaps.ini and soundlist.ini not using vpath
* Deprecate get_char_name, making "name=" part in the char.ini no longer a thing
* Fix iniswap and emote dropdowns not getting properly updated when theme is reloaded
* Prevent reload theme from resetting your emote to the first one
* Fallback soundlist.ini

Co-authored-by: stonedDiscord <Tukz@gmx.de>
Co-authored-by: oldmud0 <oldmud0@users.noreply.github.com>
2022-07-29 19:45:42 -05:00
Rosemary Witchaven
e36d79f749
Fix or suppress compiler warnings (Qt 5.15 w/MinGW) (#818)
* 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

* only run qsrand on old versions

* Squash compiler warnings

* >= not > please

* only run qsrand on old versions

* Squash compiler warnings

* >= not > please

Co-authored-by: stonedDiscord <Tukz@gmx.de>
Co-authored-by: Salanto <62221668+Salanto@users.noreply.github.com>
2022-07-29 18:23:36 +02:00
Crystalwarrior
834c5ff929
Fix lobby force-switching you from Favorites list if you switched from the Serverlist before it was populated (#826) 2022-07-29 18:40:02 +03:00
Crystalwarrior
da5437ab6f
Fix evidence image lookup behaving weirdly if the mounted path from which it looks for evidence starts with "base" , so "base_Extra" will be ignored for example if it's next to the normal "base" folder (#825)
Start evidence image search in the base evidence folder rather than the topmost mounted path
2022-07-29 18:39:10 +03:00
Crystalwarrior
3c3002122e
Add settings option for Evidence double-click that can be turned off (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-29 18:36:58 +03:00
Crystalwarrior
7301e62c73
Fix iniswaps.ini and soundlist.ini not using vpath (#714)
Fixes #670

Co-authored-by: stonedDiscord <Tukz@gmx.de>
Co-authored-by: oldmud0 <oldmud0@users.noreply.github.com>
2022-07-28 20:29:32 -05:00
Crystalwarrior
f40b3d162d
Code to support effects ini version 2 (#813)
* 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-27 21:43:50 +02:00
Crystalwarrior
b9e9e02977
Fix an extremely rare issue where loop point goes outside track bounds if 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-27 00:27:01 +02:00
Crystalwarrior
f8c2b1a2f0
Part 2 of #713: merge get_real_suffixed_path into get_real_path (#717)
* 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-26 00:54:11 +03:00
oldmud0
0dac3cc2c0
Merge pull request #819 from AttorneyOnline/lambda-core
Make lambda captures of 'this' explicit
2022-07-23 16:31:37 -05:00
stonedDiscord
b0a958e744
Android hdid (#822)
* get ANDROID_ID

* make it more complicated
2022-07-23 18:19:40 +03:00
Rosemary Witchaven
0519abab03
Fix multiple issues with screenshake code (#812)
* 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-23 18:19:06 +03:00
Rosemary Witchaven
8138187f92
Change FL variable names for clarity (#810)
* Change FL variable names for clarity

* Missed one somehow

Co-authored-by: Salanto <62221668+Salanto@users.noreply.github.com>
2022-07-23 18:19:00 +03:00
Crystalwarrior
ef49b46c37
Add Emote preview (#774)
* 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-23 18:18:54 +03:00
Crystalwarrior
ad578eb0bd
Suppress application volume when alt-tabbed (#730)
* 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-23 18:18:45 +03:00
stonedDiscord
1953b26233
Linux apng (#820)
* copy qapng

* correct case

* delete folder from zip

* build qapng without it crashing
2022-07-21 18:10:53 +02:00
in1tiate
df7214fdb5 Make lambda captures of 'this' explicit 2022-07-19 08:10:07 -05:00
stonedDiscord
972ce47fc2
use base folder on android so the error matches (#815)
also makes extracting vanilla or applying updates easier
2022-07-19 09:20:14 +02:00
stonedDiscord
3e0e4583cb
Linux ci (#816)
* 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-19 09:13:48 +02:00
Salanto
881913e78d
Remove floating scrollbar (#817)
I probably shouldn't copy paste code while not knowing what they do.
2022-07-19 09:13:30 +02:00
Crystalwarrior
c8914c9302
Add effect layering under the character, flippable effects and more (#701)
* 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-18 15:45:47 +03:00
Rosemary Witchaven
9849ce2610
Use QStyle to fetch checkbox size and spacing info instead of relying on 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-18 15:01:53 +03:00
Salanto
2977016b5f
Prevent dupes of default mount path on default (#808)
Properly clears the mount list when restoring the default settings. Fixes #804.
2022-07-17 15:46:11 -05:00
stonedDiscord
4f559374fd
Begone bot (#811)
* this branch was dead

* bot was more annoying than helpful
2022-07-17 14:54:58 -05:00
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
e587c76eb0
correct spelling of "deprecated" (#803) 2022-07-16 15:47:56 +02:00
Salanto
368f2b04ea
Reorganise logging option into its own settings tab (#790)
* 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-16 15:47:04 +02:00
Rosemary Witchaven
15c2e0022d
add compatibility code for pre 5.15 qt (#807) 2022-07-16 15:45:04 +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
758ea0c516
Add support for sounds/ subfolder in themes, misc and char folders (#732)
* 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-07 14:00:27 +03:00