Commit Graph

907 Commits

Author SHA1 Message Date
Crystalwarrior
f9b3bd5bb5 forgot to actually uncomment the change, oops 2019-09-13 17:57:30 +03:00
Crystalwarrior
f1b3169713 CONTROVERSIAL: Detach ui_vp_message from ui_vp_chatbox to prevent it from being affected by the screenshake. ui_vp_message still sets position relative to the chat box for now (as doing otherwise would break a lot of themes). 2019-09-13 15:13:40 +03:00
Crystalwarrior
040898feff Set up screenshake button ui
Rewrite Goofball's doScreenshake() function to be much more modular and multi-purpose (also rename to do_screenshake() to match other functions)
Add networking needed to make screenshake work. Works with AOV version of tsuserver3 (button screenshake only so far).
Add get_theme_pos helper function, currently unused.
2019-09-13 15:11:30 +03:00
Crystalwarrior
ab072132c3 Merge branch 'aomovies'
# Conflicts:
#	include/aomovie.h
#	src/aomovie.cpp
#	src/courtroom.cpp
2019-09-13 12:00:27 +03:00
Crystalwarrior
86523bb101 Rename dubious "duration" to "default_duration" for play function in AOMovie class 2019-09-13 11:56:22 +03:00
Crystalwarrior
9aa88b1d6e Use brace constructors instead of << append operator for path lists
Rename gif_path into emote_path for charmovie.cpp
Rename p_gif into p_image for aomovie.cpp
2019-09-13 11:44:50 +03:00
Crystalwarrior
bb8edab579 Make shout, verdict and wtce default duration values into constants 2019-09-13 11:41:59 +03:00
Crystalwarrior
8027bbffad Use brace constructors instead of << append operator for path lists 2019-09-13 11:37:06 +03:00
Crystalwarrior
5c69d10cd5 Add a tool tip to blip rate settings
Adapt the blip rate to allow variable speed value array sizes
2019-09-13 11:31:06 +03:00
Crystalwarrior
455e020b19 Make log go downwards by default
Rename kill_music_on_object to objection_stop_music for readability
Update blip rate (faster overall, more accurate to the trilogy) - based on AOV values
Update default blip rate to be "once every two symbols"
2019-09-13 11:13:50 +03:00
Crystalwarrior
ba41b070a2 Cut music on objection if config is enabled for it (does not transmit networked message yet) 2019-09-13 11:03:23 +03:00
iamgoofball
8a5bc8632e Kill Music on Object option
(todo: actual functionality, cherrypicked from Goofball's 2.7 branch)
2019-09-13 00:34:15 +03:00
Crystalwarrior
2a5cd56d57 Fixes Objections hiding the current character, instead of overlaying on top of it. (from goofball's 2.7 branch commit e6cb5bd2cf) 2019-09-12 22:55:24 +03:00
Crystalwarrior
3b3507df60 Fix compilation error
Allow realization flashes to be animated images by making them AOMovies
Eploit the newly added 'duration' system for realization AOMovie

(cherry picked from commit bb98f79083)
2019-09-12 22:46:06 +03:00
Crystalwarrior
5a31516a36 Remove unecessary hard-coded timers for the witness testimony .png
Make the witness testimony use AOMovie instead of AOImage
Remove pointless "testimony_in_progress" variable
CONTROVERSIAL: Make the witness testimony indicator be position-ignorant so as to reduce the amount of hardcoding and allow broader usage of the witness testimony system (For example, Danganronpa investigation indicator, etc.) - This should not affect how the testimony indicator is received currently, as witness testimony usually requires the entire rest of the court to shut up until the cross-examination either way.

(cherry picked from commit 932f430b68)
2019-09-12 22:45:52 +03:00
Crystalwarrior
e76a83ddfe Allow AOMovie to have timers that take priority over the animated image frame count
Set it up so feeding the timer value when playing the AOMovie would use the timer but only in cases where a non-animated image is used
Update shouts and wtce to pass the 'duration' argument which will be used if the image used is non-animated. Otherwise, prioritize the animated image duration.
2019-09-12 22:45:02 +03:00
Crystalwarrior
280abedf63 Merge branch 'music_list_update' 2019-09-12 22:26:00 +03:00
Crystalwarrior
bb98f79083 Fix compilation error
Allow realization flashes to be animated images by making them AOMovies
Eploit the newly added 'duration' system for realization AOMovie
2019-09-12 19:37:44 +03:00
Crystalwarrior
932f430b68 Remove unecessary hard-coded timers for the witness testimony .png
Make the witness testimony use AOMovie instead of AOImage
Remove pointless "testimony_in_progress" variable
CONTROVERSIAL: Make the witness testimony indicator be position-ignorant so as to reduce the amount of hardcoding and allow broader usage of the witness testimony system (For example, Danganronpa investigation indicator, etc.) - This should not affect how the testimony indicator is received currently, as witness testimony usually requires the entire rest of the court to shut up until the cross-examination either way.
2019-09-12 19:03:42 +03:00
Crystalwarrior
2a899b1476 Allow AOMovie to have timers that take priority over the animated image frame count
Set it up so feeding the timer value when playing the AOMovie would use the timer but only in cases where a non-animated image is used
Update shouts and wtce to pass the 'duration' argument which will be used if the image used is non-animated. Otherwise, prioritize the animated image duration.
2019-09-12 18:28:08 +03:00
Crystalwarrior
3b415f5a70 Expand get_image_suffix to fall back on .png last
Reorganize the file_exists checks to be an array iterator instead for much less code duplication and easier ordering of priority
Reorganize desk and set_image loading on AOScene class, resolve issues with last_image setting to prevent animations from being restarted when characters talk on the same pos in succession
Apply get_image_suffix for seancestand and jurystand searches
TODO: At the moment, if you feed a .png shout, it will send the "Done" signal on the first frame (frame 0), not showing you the .png image at all. The shout code should be reorganized to allow static images to be displayed for exactly 720ms - the standard AA objection length. Usage of the timer similarly to the realizationflash.png might be possible.
2019-09-12 15:40:19 +03:00
Crystalwarrior
c2fd3796a9 Add clear_music and clear_areas
Comment out the index as it can be potentially confusing alongside "true" area numbers
Add "FM" to Packet Received that would reload the areas and music list

TODO: Test this with arup systems
2019-09-11 00:49:30 +03:00
Crystalwarrior
7e2ec58c7e Prevent the animated background/foreground from restarting itself if the image is the exact same as the currently playing one 2019-09-10 23:26:03 +03:00
Crystalwarrior
7378205523 Expand .apng and .webp support for get_image_suffix
Add get_image_suffix for all .gif's so that all animated pieces can be .webp or .apng instead
Expand on .webp .apng support and clean up the code somewhat
2019-09-10 21:57:06 +03:00
oldmud0
961563daf3
Merge pull request #97 from likeawindrammer/improve-ao_es.ts
Improve the Spanish translation
2019-09-02 11:00:13 -05:00
windrammer
c0d0c5cf1e Mark untranslated strings as done
These are better left off untranslated because they would get cut otherwise thanks to AO having the size for the text tags fixed on the theme files
2019-09-02 00:07:50 -06:00
stonedDiscord
5520c24869 bass blips were slightly too quiet 2019-08-22 21:02:09 +02:00
stonedDiscord
5807410b1d doubleclick to join a server 2019-08-20 18:35:42 +02:00
stonedDiscord
177c56e2b8 move button enabling to ID because not all servers understand FL 2019-08-20 18:28:25 +02:00
stonedDiscord
d94d2fb405 read and store qt audio device 2019-08-19 19:38:47 +02:00
stonedDiscord
35f2333403 list audio devices (doesn't apply it yet) 2019-08-19 19:06:41 +02:00
stonedDiscord
49be444d74 OOP 🏪 2019-08-17 21:09:13 +02:00
stonedDiscord
4700902551 fix qaudio volume 2019-08-17 20:47:41 +02:00
mac builder
2509cc5e0b get mac serial for hdid 2019-08-13 20:01:42 +02:00
mac builder
5bdb57a8ba forgot macdeployqt 2019-08-13 19:13:01 +02:00
mac builder
172406efa2 post build executable 2019-08-13 18:59:43 +02:00
mac builder
3052b53aa4 bruh moment, qmake isn't in path 2019-08-13 18:54:17 +02:00
oldmud0
13cd1c9b8b
Travis CI: Always update Homebrew 2019-08-13 11:27:59 -05:00
stonedDiscord
047ce04631 fix mac content loading
it now looks for the content next to the .app bundle and not inside it
2019-08-11 23:58:43 +02:00
windrammer
84f91ee6ea Use "bloqueado" in the spanish translation instead of "baneado" 2019-08-09 13:56:29 -06:00
windrammer
c948e1533d Improve the Spanish translation 2019-08-08 22:41:44 -06:00
stonedDiscord
7fe64163ea
Merge pull request #88 from AttorneyOnline/i18n
I18n
2019-08-08 00:20:51 +02:00
stonedDiscord
0247ca07fe show current setting 2019-08-07 14:51:21 +02:00
stonedDiscord
338dd2003e missed a backwards lowercase N with accent mark 2019-08-07 14:22:18 +02:00
stonedDiscord
f49757f9eb add numbered argument bans to other languages 2019-08-06 21:38:23 +02:00
stonedDiscord
c6b949335a +1 on style 2019-08-06 21:27:27 +02:00
stonedDiscord
47eb36789e numbered arguments for kick and ban torture 2019-08-06 21:25:33 +02:00
stonedDiscord
dd325de31e use languages own name 2019-08-06 21:22:49 +02:00
stonedDiscord
41dd29fbb0 ja_JP to be precise 2019-08-06 21:11:21 +02:00
stonedDiscord
5180bb4f21 its called jp not ja 2019-08-06 21:09:03 +02:00