Commit Graph

1467 Commits

Author SHA1 Message Date
Skye Deving
07450e9fe8 Add tests aopacket 2021-01-28 11:05:42 -06:00
oldmud0
9c6e703bfc
Merge pull request #432 from AttorneyOnline/revert-416-fix/ghost-music-fade
Fix music fading being completely broken
2021-01-27 18:11:26 -06:00
oldmud0
580313cbcd
Merge pull request #429 from AttorneyOnline/fix/continuous-bg
Fix continuous playback being nonfunctional on non-CharLayer elements, and allow users to toggle the feature
2021-01-27 18:10:52 -06:00
oldmud0
7e180db1e6
Merge pull request #437 from oldmud0/update-themes
Update themes submodule
2021-01-27 18:09:23 -06:00
oldmud0
6de2105f2f
Merge pull request #438 from AttorneyOnline/feature/textspeed
Text crawl setting
2021-01-27 18:08:46 -06:00
oldmud0
e1214d49a9
Merge pull request #439 from AttorneyOnline/fix/optionsdialog
Fix some of the options dialog suckery
2021-01-27 18:08:32 -06:00
Crystalwarrior
0041352b18
Update src/aomusicplayer.cpp
Co-authored-by: oldmud0 <oldmud0@users.noreply.github.com>
2021-01-27 20:20:26 +03:00
Crystalwarrior
d1e7b2920b Refactor "text scrawl" to "text crawl" (sounds more simple to understand than scrawl tbh) 2021-01-27 20:05:06 +03:00
Crystalwarrior
9ebc0f9b54 Initialize blip_rate and blank_blip before the text message chat_tick is called instead of when reload_theme is pressed (more intuitive application of the settings) 2021-01-27 20:01:50 +03:00
Crystalwarrior
615901c435 Fix options dialog squishing and being annoying when we add more settings
Fix resizing the options dialog causing the save/cancel buttons to take up half the dialog box
Add suffixes to all gameplay tab spinboxes
Make size policy less suck
2021-01-27 20:00:44 +03:00
Crystalwarrior
1a3f500034 Update text scrawl tooltip info and spinbox suffix 2021-01-27 19:58:29 +03:00
Crystalwarrior
423fe3d3fe Add the setting for the text scrawl 2021-01-27 19:18:43 +03:00
Crystalwarrior
88cdf3c376 Fix a thing not being removed 2021-01-27 18:33:25 +03:00
Crystalwarrior
b040449f7f Redesign the text display speed delay to be more modular by introducing a "base display speed" variable 2021-01-27 18:20:56 +03:00
oldmud0
3767ae4c8a Update themes submodule 2021-01-26 21:09:46 -06:00
oldmud0
e3f11ebed3
Merge pull request #435 from AttorneyOnline/fix/css-resize
Call set_widgets() every time we select a character to prevent erroneously displaying courtroom with char_select's window size
2021-01-24 23:08:22 -06:00
Skye Deving
5d9309b1b3
Handle packet decoding separately for SC packet (#433)
Should fix special (escaped) characters not being parsed correctly in character list.
2021-01-24 18:26:39 -06:00
oldmud0
f4c359733a
Merge pull request #434 from skyedeving/debug-option
Add info for building with debug options
2021-01-24 18:18:24 -06:00
in1tiate
1aa9cef44c add set_widgets call to css 2021-01-24 09:09:37 -06:00
Skye Deving
94a0e4a7c3 Add info for building with debug options
It's been useful for using something like gdb for debugging
2021-01-24 00:00:20 -06:00
Crystalwarrior
b394eb84fa Revert "fix music fading being audible when volume is 0 (#416)"
This reverts commit 75c1df5312.
2021-01-24 04:25:42 +03:00
in1tiate
9624af5412 fix continuous and make it configurable 2021-01-23 12:53:47 -06:00
in1tiate
c13e6b7ab0
Allow effects to decide whether they go over or under the chatbox (#424)
Also re-adds pair ordering following viewport refactor.
2021-01-22 22:43:01 -06:00
oldmud0
56750c343b
Merge pull request #421 from AttorneyOnline/fix/tooltip-shenanigans
Label truncation fixes
2021-01-20 11:15:51 -06:00
in1tiate
a0d0546c66 add some tooltip exceptions 2021-01-20 03:23:45 -06:00
oldmud0
0bb8574d79
Merge pull request #420 from AttorneyOnline/version-bump
Version bump
2021-01-19 10:15:54 -06:00
oldmud0
e097df09ad
Merge pull request #384 from AttorneyOnline/feature/timerclock
Countdown timer
2021-01-19 10:02:31 -06:00
Crystalwarrior
1b016ddf91 Merge branch 'master' into feature/timerclock
# Conflicts:
#	include/courtroom.h
2021-01-19 16:04:58 +03:00
Crystalwarrior
0926f3c158
Implement sticker logic with animated image support (#414)
* Implement sticker logic with animated image support (will probably be remade in a much better way for AOLayers)

* port to aolayer

Co-authored-by: in1tiate <radwoodward@vikings.grayson.edu>
2021-01-19 16:02:28 +03:00
in1tiate
8c60fb2fcd
add MatchRecursive flag (#418) 2021-01-19 16:02:03 +03:00
in1tiate
894b2b2a0e
Consolidate AOScene, AOMovie, and AOCharMovie into one class, add support for (c) animations, implement emote continuity, add scaling overrides to all layer types, allow for stretch-to-fill images, allow for additional effect configuration (#302)
* Rewrite AOScene and remove the need for AOMovie and AOCharMovie by consolidation

* Rename AOScene to AOLayer, apply suggestions to improve functionality

* Implement suggested change to allocation

* Switch from pointer to field, fix ui_vp_player_char not resetting play_once

* Use the variable gif_name instead of the string "gif_name"
 Oops.

* Total rewrite of AOLayer (again)

* Add support for (c) animations, do some housekeeping

* allow themes to override misc chatboxes

* add support for pulling InterfaceLayer elements from theme/misc

* mistakes were made

* move all frame fx functionality to CharLayer subclass

* virtual functions are cool mkay

* remove evidence of my incompetence

* allow themes to override font design inis under theme/misc

* Proper support for theme/misc chatbox, fixes

* Fix chatbox dimensions not updating and inline color causing missingnos

* rename chat markdown to chat markup

* add missing misc overrides

* quick hotfix for chatblank and misc overrides

* Fix oversight with backgrounds causing them to be culled

* Same as last commit but for FG layer

* amend comment to explain impossible shenanigans

* Adjust ForegroundLayer to take charname rather than miscname, allow for checking in char folder

* fix an incredibly embarrassing pathing bug

* add scaling overrides for all layer types, parent orphaned viewport elements to the viewport

* stupid fix because themes use "custom.png" as a button

* switch to .append()

* Revert "Merge branch 'aoscene_rewrite' of https://github.com/AttorneyOnline/AO2-Client into aoscene_rewrite"

This reverts commit bdeb1bff7639d522031aab3c133a83b0e2a291df, reversing
changes made to 125ee63b97a6f6c156e69525d88fddc625e7a978.

* switch to .append() (again)

* move function call to fix showname length calculation error

* fix nonlooping character animations being broken Again

* unparent elements from the viewport and do fancy masking arithmetic instead

* use override keyword

* move scaling override to char.ini, allow stretching, restructure effect property loading

* fix some redundancy

* unparent chat_arrow from chatbox to prevent accidental masking

* at no point do we want a frozen gif to display

* overhaul how wtce is handled

* oops

* also let sounds be pulled from theme miscs

* i should probably compile before i push

* actually make it work

* don't check a default bg

* readd 1x1 stretch thing

* actually the 1x1 thing was a bad idea

* Add missing parenthesis

* Use load_image instead of play

play is a nonexistent method now

* Remote shout_message and usages because it does nothing

* Remove multiple redefinitions

* Add in missing brackets and indent to fix build

I have know idea what this does but it brings fear

* fix build error

* fix chat arrow and remove duped code

* remove more duped code and fix misc themes

* only update chat_arrow when needed

* consolidate log_chatmessage and display_log_chatmessage

Co-authored-by: scatterflower <marisaposs@gameboyprinter.moe>
Co-authored-by: Skye Deving <76892045+skyedeving@users.noreply.github.com>
Co-authored-by: oldmud0 <oldmud0@users.noreply.github.com>
2021-01-19 14:32:11 +03:00
in1tiate
21b4aa5072
unused macro and update QTime to QElapsedTimer (#417) 2021-01-19 14:30:56 +03:00
in1tiate
75c1df5312
fix music fading being audible when volume is 0 (#416) 2021-01-19 14:26:07 +03:00
oldmud0
a929c950a0
Merge pull request #415 from AttorneyOnline/fix/char_list
Fix a very strange OOB error
2021-01-18 21:01:57 -06:00
in1tiate
fa969dee4f add sanity check for empty matching list 2021-01-18 20:57:35 -06:00
in1tiate
d41ec17fe7
Add a new "char_list" QTreeWidget that allows for categorizing characters (#399)
* initial commit

* use a "category" value instead

* add filtering and taken indicator

* hide serverlist header

* set the items to disabled in place of the [X] text

Co-authored-by: stonedDiscord <10584181+stonedDiscord@users.noreply.github.com>
2021-01-18 23:10:45 +03:00
in1tiate
d8dd429c20
cursed way of preserving inheritance (#413) 2021-01-18 21:37:42 +03:00
oldmud0
2f3ca8613d
Merge pull request #400 from AttorneyOnline/bugfix/blanklogs
Fix blankposts not showing up in logs
2021-01-18 12:35:19 -06:00
Crystalwarrior
7877739146 Simplify the logic behind last message = blankpost detection
I need to stop overcomplicating things.
2021-01-18 18:54:11 +03:00
Crystalwarrior
ea94644cf5 Attempt a theoretically safer method of tracking last displayed message 2021-01-18 17:56:21 +03:00
stonedDiscord
ed9ecfda47
forgot to return after destroying the connection (#412)
Co-authored-by: stonedDiscord <10584181+stonedDiscord@users.noreply.github.com>
2021-01-18 17:39:35 +03:00
Crystalwarrior
5786694b53
Stack default soundlist after the character soundlist instead of making the character soundlist overwrite the default (#411) 2021-01-18 15:39:13 +01:00
Crystalwarrior
c42496e204
Make chat rate limit configurable (#398)
Co-authored-by: stonedDiscord <10584181+stonedDiscord@users.noreply.github.com>
2021-01-14 15:45:30 -06:00
oldmud0
31798583a9
Merge pull request #405 from AttorneyOnline/lupdate1
update all but the german translation
2021-01-13 18:29:26 -06:00
stonedDiscord
a4a24e372d
Update German translation (#401)
* voranimation

klingt wie vorhaut

* run lupdate and add missing strings

Co-authored-by: stonedDiscord <10584181+stonedDiscord@users.noreply.github.com>
2021-01-13 18:27:30 -06:00
stonedDiscord
096f68288b update all but the german translation 2021-01-14 00:29:24 +01:00
Skye Deving
9965d1603e
Add some translations for jpn (#402) 2021-01-14 00:25:31 +01:00
Crystalwarrior
147892bae9
Overhaul sound lists to introduce aliases, rethink editing behavior (#389)
* Resolve https://github.com/AttorneyOnline/AO2-Client/issues/275 by adding a "Nothing" option to play no SFX even when playing a preanimation that behaves similar to the Default option

* Overhaul sound list:
* Allow aliases. .ini file syntax is "filename = alias".
* Do not allow editing the .ini files from the client anymore.
* The sound list dropdown is still editable, but all it does is play your custom sfx without adding it to any files.
* Overhaul get_char_sfx

* Fix aliases not working properly with a rather tricky solution

* save character soundlist in base and drop the character_ from the filename

Co-authored-by: stonedDiscord <10584181+stonedDiscord@users.noreply.github.com>
2021-01-13 23:34:20 +01:00
oldmud0
8fb87c9f3a
Merge pull request #403 from Pyraqq/master
Polski translation update
2021-01-13 16:00:27 -06:00
Crystalwarrior
2f84055af9
[2.8.6] Demo Recording/Playback (#337)
* initial commit with horrible code dupcliation haha lol
Set up elapsedtimer to generate wait# stuff between packets recorded

* implement groundwork for internal demo server

* add core playback functionality

* make it work kinda by including SC packet in demo

* Add a file dialog for loading a demo file instead of a hardcoded path

* Change /play to > in OOC to begin playback or skip to next element
Pop up file dialog box *before* establishing the connection, not after.
TODO:
* Fix having to load the same file *twice* to be able to connect to the demo server for some reason
* Fix the segfault caused by calling the playback() function when there's no remaining data, it's almost like demo_data.isEmpty() is ignored for whatever reason???

* Clear demo data when loading a demo file to prevent stacking demos

* Properly disconnect the client when sending the request for file browser fails to obtain a good demo file

* Fix append_to_file newlining even if file didn't exist prior to calling this function

* Add a very scuffed exception to not log or demo record anything that happens in the Demo playback local server

* Reduce invalid file spam by checking for non-logging server better
Use file_exists() to be more consistent in append_to_file

* Fix the client crashing when receiving loading packets etc. at runtime such as SC, SM, CI etc. (TODO: parity???)
Remove useless debug stuff

* Preserve newlines for demo packets such as "CT", "MS" etc.

* Implement /max_wait, /min_wait for adjusting the maximum and minimum wait in milliseconds between wait packets
Add /pause or | shorthand to pause playback
Re-add /play and keep > as a shorthand
Remove clientside restrictions from sending empty OOC messages and sending OOC messages without a name - these should be serverside.

* Empty music list
Default the character to Spectator char no matter the selection in CSS

* Allow -1 character ID or character ID that does not fit into the local Character Select Screen list to still be parsed corectly, using the character folder in the MS packet as reference.
Allow servers with no selectable characters to still be properly loaded
Bypass the Character Select Screen when joining a server with no character select screen and automatically become a spectator

* Properly handle demo files without SC packet to dictate which chars exist
Add a /load command letting you load a demo file without rejoining the demo server (the CS packet will not be properly handled but I cannot think of a single tangible problem this causes lol)
Make sure all DEMO CT messages are colored properly

* Fix logs bleeding into each other if you disabled logging or you joined a demo server after leaving another

* Prevent logging even if log_filename is defined because a user might disable auto logging when running the game

* Fix custom shownames not appearing in the IC logs

* Set up new logic for max_wait, meaning that dead air being skipped is prioritized with MS (IC chat) packets being used as the anchor.

* Better logic for min_wait to only affect important packets (IC Chat)

* Fix encoding not being performed on packets that are saved to the .demo file, resulting in characters having something like "#1" in their message breaking that specific message

* Fix a weird setup in courtroom.cpp that happened out of the merge and bugged the code
Fix aopacket being busted up as well

* add missing feature flags to the demoserver

* use random port

* move writing to the demo file to a function

* only listen on localhost

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

* remove copypasta

* add a help to the demo server

* fix empty demo disconnecting the server

* tell the user how to begin

Co-authored-by: scatterflower <marisaposs@gameboyprinter.moe>
Co-authored-by: stonedDiscord <10584181+stonedDiscord@users.noreply.github.com>
Co-authored-by: stonedDiscord <stoned@derpymail.org>
Co-authored-by: oldmud0 <oldmud0@users.noreply.github.com>
2021-01-13 22:25:24 +01:00