Mamanyonyo/atrooney-online-2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
1,470 Commits 1 Branch 0 Tags 8.5 MiB
4a9480afdc
Commit Graph

561 Commits

Author SHA1 Message Date
Crystalwarrior
45c78ea5ca Add "id" variable to the clock functions and properly parse the ID 
Implement scalable maximum clock count, right now it's at 5 clocks a theme can have max
Theme "clock_" starts from 1 instead of 0 since users don't know when stuff starts at index 0
TODO: testing lol
 2021-01-11 17:38:08 +03:00
Skye Deving
2ee2cd8bf2 Set log filename to a more sortable format 2021-01-11 04:36:32 -06:00
Skye Deving
90bd02a3e9 Set music and objection to volume slider in update_character 2021-01-11 02:27:10 -06:00
Skye Deving
4f2ac31456 Add arup_clear() and clear arup when fetching new areas 
Theoretically fixes #313

The "FA" packet from the server invalidates the client's previous area
list so it makes sense for the arup information tied to that list to
be invalidated as well (especially seeing that the area and arup share
the same index).  As we repopulate the client's area list, we do the
same for the arup list.
 2021-01-10 06:38:26 -06:00
Crystalwarrior
1ad8f3bf24 Merge branch 'master' into feature/timerclock 
# Conflicts:
#	include/courtroom.h
#	src/courtroom.cpp
 2021-01-10 14:27:27 +03:00
in1tiate
057353e9f6 more comments 2021-01-09 15:19:50 -06:00
in1tiate
3a207dccf0 i barely had to modify this 2021-01-09 15:13:19 -06:00
Skye Deving
ee8c6e3df7
Remove redefinition of variable in same scope (#391) 2021-01-09 22:41:52 +03:00
oldmud0
41c134b1be
Merge pull request #387 from AttorneyOnline/feature/immediate 
Rename noninterrupting bonanza to consistent and short "immediate" instead
 2021-01-09 12:35:09 -06:00
in1tiate
3993ba47e5
Add desk_mods 2 -5 for more flexibility in emotes (#353) 2021-01-09 12:32:24 -06:00
in1tiate
10fb54db61
correct my widdle fucky wucky (#390) 2021-01-09 21:00:26 +03:00
Skye Deving
05dd086fff
Fix segfault in server list without a server selection (#374) 
Also bumps C++ version to C++17 (C++1z).
 2021-01-09 11:59:51 -06:00
Crystalwarrior
5b34df1c5a Rename noninterrupting_preanim and all its associated bullshit with more cooler and nicer bro immediate 
In themes, pre_no_interrupt old-style name is still supported if we cannot find "immediate"
Resolves https://github.com/AttorneyOnline/AO2-Client/issues/64
 2021-01-09 18:43:24 +03:00
in1tiate
883fa8547d
replace "gender" with "blips" (#386) 
Co-authored-by: Crystalwarrior <Varsash@Gmail.com>
 2021-01-09 18:24:06 +03:00
in1tiate
5b09dd45d5
Populate non-default background positions from design.ini, allow 2.8-style default positions (#352) 
* populate pos dropdown from design.ini

* add sane default, remove hardcode bs
 2021-01-09 18:21:35 +03:00
in1tiate
15c3d607c6
Log objections IC, overhaul custom objections context menu, add more configuration options per-character (#356) 
* initial commit

* The Quick-Fix is a secondary weapon for the Medic. It is a prototype Medi Gun with a group of three gauges on one side, a (cosmetic) ÜberCharge gauge on the other side, and what appears to be a blender for a body. The main gun is coupled with a medicinal reactor backpack with glowing portions that replaces Medic's default backpack.

* fixed settings dialog

* slightly less stupid custom objection default

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

Co-authored-by: oldmud0 <oldmud0@users.noreply.github.com>
 2021-01-09 18:17:12 +03:00
in1tiate
7bac3c9514
only play expanded songs, music_random (#376) 2021-01-09 18:14:56 +03:00
Crystalwarrior
1da6e37e04
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 (#383) 2021-01-09 18:14:04 +03:00
in1tiate
fc4e707381
Move user-made iniswaps to a global configuration file and make character folder iniswap files immutable (#350) 
* add default iniswap file

* switch to using base/iniswaps.ini for user iniswaps
 2021-01-09 18:11:57 +03:00
in1tiate
079c45e298
Define IC Log colors independent of character, define message colors according to character (#323) 
* IC Log colors now defined independent of character

* Fix regression causing incorrect colors in the viewport

* fix goof that broke chat scrolling

* Only regenerate color vector when it's needed
 2021-01-09 18:09:18 +03:00
oldmud0
de3533fbf2 Rework timer and ping logic 
The timer's time as received by the server is clarified to be the actual
numerical time, in milliseconds, to be shown on the clock.
 2021-01-09 01:18:19 -06:00
Skye Deving
512b7a37de Adopt the orphaned msgBox's and add delete on close attribute 2021-01-07 23:32:00 -06:00
Skye Deving
df24961c0d Set delete on close attribute for orphaned widgets 2021-01-07 23:31:08 -06:00
Skye Deving
c46ab13c62 Adopt the scroll widget in the options dialog 2021-01-07 23:30:46 -06:00
Skye Deving
86fd030ef0 Adopt the poor orphaned QWidgets 2021-01-07 23:30:10 -06:00
Skye Deving
cbf8391a65
Add QMenu delete on close attributes (#381) 
Fixes a minor memory leak with context menu creation.
 2021-01-07 20:44:58 -06:00
Skye Deving
e2c447f1d7
Set emote format to apng if png supports animation (#379) 2021-01-07 16:21:56 -06:00
oldmud0
d308fc83de
Merge pull request #316 from AttorneyOnline/messagebox 
add BB packet for a MessageBox popup
 2021-01-06 12:41:52 -06:00
oldmud0
c4b739292a
Use call_error() for character load error message 2021-01-06 11:43:31 -06:00
oldmud0
6e57e170e7
Merge pull request #362 from skyedeving/fix-casedoc-loading 
Encode doc contents with hash sign
 2021-01-06 11:23:37 -06:00
Skye Deving
cb19f55a06 Checking for apng should be lower case 2021-01-06 00:59:22 -06:00
oldmud0
9486f44770
Merge pull request #369 from skyedeving/fix-showname-toggle 
Fix timestamps when toggling showname
 2021-01-05 21:07:48 -06:00
Skye Deving
371ca313e6 Add in support for streaming music with bass 2021-01-05 12:36:17 -06:00
Skye Deving
5abc685b47 Sort case evidence numerically before adding in 
inventories get displayed lexigraphically too but it is assumed to not
matter
 2021-01-04 19:58:30 -06:00
Skye Deving
8aaba6633e Change default parameter to be QDateTime::currentDateTime() 
Print debug message if provided timestamp is invalid
 2021-01-04 19:21:11 -06:00
Skye Deving
6570bcf066 Fix timestamps when toggling showname 
On toggling shownames, regenerate_ic_chatlog() gets called to reprint
the entire chatlog with append_ic_text().  The issue is that
append_ic_text() uses QDateTime::currentDateTime() for the timestamp
when it's called.  Therefore the fix is adding a new timestamp
parameter to the append_ic_text() which we supply from the datetime
provided by each chatlogpiece
 2021-01-04 13:45:18 -06:00
Skye Deving
4d02cc8d68
Use QList::mid when constructing QStringList (#365) 
The constructor with two iterators is too cutting edge from 5.14 to be
widely supported right now
 2021-01-04 12:51:27 -06:00
stonedDiscord
714f54b9dc CI needs an extra include for bind 2021-01-04 18:05:03 +01:00
stonedDiscord
04ed1a1812 add 3 second timer before OK shows up 2021-01-04 16:44:14 +01:00
Skye Deving
a0ef2a75ef Encode doc contents with hash sign 2021-01-04 06:43:40 -06:00
Skye Deving
aabb256207 Refactor AOPacket 2021-01-04 06:38:31 -06:00
scatterflower
29f8733dba
FL toggle for Y offset (#360) 
Use "y_offset" to enable the Y offset protocol extension.
 2021-01-03 19:23:01 -06:00
oldmud0
9cd533cf40
Merge pull request #351 from in1tiate/in1tiate/sane-libs 
Search for libraries inside a dedicated "lib" folder (and notes on distributing future releases)
 2020-12-28 12:28:10 -06:00
in1tiate
38b730ce0d
add library path instead of setting it 
Co-authored-by: oldmud0 <oldmud0@users.noreply.github.com>
 2020-12-28 04:37:33 -06:00
Crystalwarrior
570bad6d47
Fix blankposting not respecting character ID's in the equation (#282) 
Fixes an issue where if you blankpost on top of another character's blankpost, your message won't show up on the ic log clientside.
 2020-12-28 01:19:15 -06:00
in1tiate
39a8ab8ab2
Enable support for up to 6 SFX channels (#355) 
I'm somewhat confused as to why this wasn't enabled to begin with, since all the necessary code is here.

Closes #306, and fixes the issue with realizations being cut off by other sounds.

Co-authored-by: oldmud0 <oldmud0@users.noreply.github.com>
 2020-12-28 00:54:08 -06:00
in1tiate
b159ca35df
Fix sounds and blips being muted forever on changing character (#345) 
Re-fix of #277.
 2020-12-28 00:49:50 -06:00
oldmud0
8ed373597b
Merge pull request #340 from AttorneyOnline/path-traversal 
Prevent path from escaping base.

Truly the end of an era.
Alexa, play ../../../../../../../../Users/Public/Music/Sample Music/Kalimba.mp3
 2020-12-28 00:48:00 -06:00
in1tiate
3d4d637838 Search for plugins in "lib" directory 2020-12-12 06:54:45 -06:00
oldmud0
b155ab8488
Merge pull request #342 from AttorneyOnline/charselect-sounds 
Fix #277 (sounds in charselect)
 2020-11-17 15:51:33 -06:00
oldmud0
0356165d82
Fix SFX tooltip description (#343) 
Fixes #290.

Co-authored-by: stonedDiscord <10584181+stonedDiscord@users.noreply.github.com>
 2020-11-17 15:49:10 -06:00
stonedDiscord
fa083923f9 change the sfx tooltop description 2020-11-16 15:17:49 +01:00
stonedDiscord
0c382eea7d move enter courtroom to the PV packet instead of just doing it when you click a character 2020-11-16 15:13:33 +01:00
stonedDiscord
6e58b6a943 don't display the ? in the titlebar 2020-11-16 15:06:25 +01:00
stonedDiscord
548eae95f2 filter path traversal 2020-11-16 14:49:28 +01:00
stonedDiscord
10298230ce clean up path functions 2020-11-16 14:32:04 +01:00
oldmud0
4eb45ef2b0
Merge pull request #305 from Crystalwarrior/bugfix/blip-accuracy 
More accurate/consistent blip rate functionality + punctuation slowdown fixes
 2020-11-10 14:07:45 -06:00
oldmud0
fe3b16829f
Merge pull request #335 from AttorneyOnline/white_space 
* set no maximize flag on lobby
* set no maximize flag on courtroom
* set no maximize flag on charselect
* stop them from dragging the charselect
* stop them from dragging the courtroom
* stop them from dragging the lobby

Co-authored-by: stonedDiscord <10584181+stonedDiscord@users.noreply.github.com>
 2020-11-10 08:56:45 -06:00
in1tiate
fe3224d7e8
Add vertical offset feature (#333) 2020-11-10 08:43:18 -06:00
in1tiate
1502a18593
Reformat emote_mod logic (#307) 
Interjections should not force preanimation if 'Pre' is unchecked.
 2020-11-09 15:05:21 -06:00
in1tiate
5aee23d56b
Add context menu entry to stop music (#301) 
Also included in this commit are changes to the music packet handler that change the text from "has played a song" to "has stopped the music" in the case that the special "stop song" track is played, as well as a condition stopping music categories from triggering a music packet when double-clicked.

Co-authored-by: oldmud0 <oldmud0@users.noreply.github.com>
 2020-11-09 14:47:51 -06:00
oldmud0
2d398c3237
Merge pull request #312 from AttorneyOnline/fix-doubleclick 
fix doubleclick server being buggy
 2020-11-07 19:11:43 -06:00
stonedDiscord
2dbedf5163 stop them from dragging the lobby 2020-11-05 23:27:58 +01:00
stonedDiscord
1e1ada7437 stop them from dragging the courtroom 2020-11-05 23:27:49 +01:00
stonedDiscord
0a5e5582a3 stop them from dragging the charselect 2020-11-05 23:27:43 +01:00
stonedDiscord
c1dfb4928c set no maximize flag on charselect 2020-11-05 23:17:30 +01:00
stonedDiscord
997462ad54 set no maximize flag on courtroom 2020-11-05 23:17:22 +01:00
stonedDiscord
c49ce181c9 set no maximize flag on lobby 2020-11-05 23:17:15 +01:00
scatterflower
a46c7ca8f6 reset doubleclick flag on connect 2020-11-01 13:35:57 -06:00
oldmud0
dd085c8958
Merge pull request #331 from AttorneyOnline/no-fantacrypt 
Drop AO1 compatibility
 2020-11-01 12:32:48 -06:00
oldmud0
93f370b062
Merge pull request #309 from AttorneyOnline/fix-272 
When deciding to present evidence, check if we've already done so
 2020-10-31 18:26:38 -05:00
oldmud0
e0e2898393
Merge pull request #319 from AttorneyOnline/in1tiate/music-missingno 
Indicate when a song was not found to reduce confusion
 2020-10-31 18:26:10 -05:00
in1tiate
f4cdb3954f Fix missing #include, run clang-format 2020-10-13 18:52:23 -05:00
in1tiate
38d5fc7586 Add proper masking to AOImage elements 2020-10-13 15:42:06 -05:00
in1tiate
5fc87a93d2
Inmplement suggested change 2020-10-09 20:17:23 -05:00
in1tiate
74c15447b5 [MISSING] should be translatable 2020-10-09 10:24:03 -05:00
in1tiate
f00801feb6 add indicator when song is not found 2020-10-09 10:22:58 -05:00
stonedDiscord
5ab50c8431 add BB packet for a MessageBox popup 2020-10-06 12:43:50 +02:00
scatterflower
f91fc5739c fix doubleclick server being buggy 2020-10-04 01:41:23 -05:00
oldmud0
849f91d991
Merge pull request #299 from AttorneyOnline/fix-283 
Fix shout sounds not being initialized from the default theme when current theme lacks them
 2020-09-20 09:13:24 -05:00
in1tiate
48f8d8aa27 add variable check for evidence presenting 2020-09-19 04:12:40 -05:00
oldmud0
aa6f073ea8
Merge pull request #298 from AttorneyOnline/fix-293 
Fix iniswap removal button disappearing on clicking 'reload theme'
 2020-09-11 22:19:53 -05:00
Crystalwarrior
d00d0769a9 Lots of blip rate fixes: 
Remove qElapsedTimer method of blip earrape protection due to major inconsistency issues with this method (the same message would produce wildly different blip sounds - consistency is preferred)
More sophisticated blip earrape prevention is calculated in the chat ticker function itself, it also properly adjusts itself depending on the blip_rate used.
 2020-09-11 23:38:36 +03:00
Crystalwarrior
8cc067dee4 More accurate/consistent blip rate functionality inspired by https://youtu.be/Min0hkwO43g 2020-09-11 22:17:13 +03:00
in1tiate
6c2010a1cf Apply suggested change to remove need for additional function 2020-09-07 14:53:17 -05:00
in1tiate
311e260d65 Add 600ms rate limit to IC signal 2020-09-07 13:38:10 -05:00
in1tiate
4562bcd82f Alter logic flow to include theme folders for shout sounds 2020-09-07 13:00:59 -05:00
in1tiate
48c7984d66 Add dropdown function to set_widgets 2020-09-07 12:40:22 -05:00
oldmud0
fe5128280c
Merge pull request #274 from AttorneyOnline/windrammer/fix-273-button-generator 
Fix: Qt failing to paint a darker button if source image is indexed
 2020-08-30 13:34:28 -05:00
Crystalwarrior
e2e3b28de8 Set cache mode to "all" for both QMovie objects to preserve the client's sanity by not horribly lagging them with zoom speedlines and other continuously animated elements. 2020-08-28 15:48:01 +03:00
oldmud0
090e82421d
Merge pull request #276 from Crystalwarrior/bugfix/sprite-freedom 
Allow non-png static image lookups
 2020-08-25 16:36:56 -05:00
Crystalwarrior
610510eb7b move "check" to the very end instead of very start in packet_distribution 2020-08-25 13:00:00 +03:00
Crystalwarrior
6c62980ffc forgot to ctrl+s header definitions fuck 2020-08-25 12:58:48 +03:00
Crystalwarrior
ee3bad44c7 Implement clock pausing 
Implement clock setting w/o starting or stopping
Both of these should make it possible for the server to start/stop/pause/resume the clock with perfect synchronization to the true time.
 2020-08-25 12:48:09 +03:00
Crystalwarrior
7e9c5726e0 Introduce the timer packet - "TI". 
This timer will start the clock accounting for latency! Cool, right?
Remove useless qDebug() for music looping
 2020-08-25 12:21:10 +03:00
Crystalwarrior
febfbeafc1 Actually make use of the completely useless CHECK and CH keepalive timer and use them to determine the client's ping. 
Display ping in the application window title.
keepalive timer now fires every second instead of every minute
Remove meme clock starting on set_widgets()
implement get_ping() on w_courtroom
 2020-08-25 12:18:49 +03:00
Crystalwarrior
18a9bcfe19 Remove the ".png" check from the load_image lookup to allow non-(a) and (b) images being used for static characters 2020-08-24 20:22:13 +03:00
likeawindrammer
d1ac36d3c2 Fix: Qt failing to paint a darker button if source image is indexed 
By converting the image to an 8-bits per channel image with alpha channel
we make sure the client won't fail painting a darker button,
and keep the transparency if the source image had.
 2020-08-23 13:58:30 -06:00
oldmud0
8dcddf289f Only reinitialize audio on device change 2020-08-22 15:33:08 -05:00
oldmud0
48675f00d0 Fix upward log scrolling down instead of up 
Stop using upwards log. Seriously. No other program does this.
 2020-08-22 15:17:48 -05:00