Commit Graph

2001 Commits

Author SHA1 Message Date
TrickyLeifa
f9c7205210 Clarified test message builder 2024-05-18 03:09:39 +02:00
TrickyLeifa
406a4661ae Tests may now be disabled 2024-05-18 02:34:02 +02:00
TrickyLeifa
db5ceb0569 No longer required Discord-RPC headers when disabled 2024-05-18 02:21:17 +02:00
TrickyLeifa
657145035c Reimplemented unit tests, ...
* Reimplemented unit tests and simplified addition of new tests
* Minimal support of Qt is now 5.15
2024-05-18 00:48:55 +02:00
TrickyLeifa
0500a54260 Changed include definitions to reflect third-party stature 2024-05-17 20:36:36 +02:00
TrickyLeifa
b306929311 Resolved merge conflicts.
This comment format is just tiring for the eyes. Imagine being on 1080p and not being able to read more than 5 method definitions due to comments.
2024-05-17 19:44:37 +02:00
TrickyLeifa
fefaad5394 Merge branch 'master' into kaleidoscope 2024-05-17 19:19:04 +02:00
TrickyLeifa
1ef96383c8 Lightly reworked NetworkManager, ...
* Lightly reworked `NetworkManager`
* Added new modules to handle various connection types.
  * TCP
  * WebSocket
* Added general string splitter alias based on Qt version.
* Replaced `lobby_constructed` and `courtroom_constructed`
* Refactored and partially reimplemented the following classes:
  * `AOBlipPlayer`
  * `AOEmotePreview`
  * `AOMusicPlayer`
  * `AOSfxPlayer`
  * `AOTextArea`
2024-05-17 19:04:57 +02:00
lambdcalculus
469e293a18
ci: use ubuntu's qt on ubuntu (#956)
Co-authored-by: stonedDiscord <Tukz@gmx.de>
2024-05-17 13:34:52 +02:00
TrickyLeifa
39e4354b1d Reimplemented favorite server widget, ...
* Reworked favorite server widget
* Renamed `server_type` to `ServerInfo`
* Renamed `connection_type` to `ServerConnectionType`
* Refactored `AOCharButton`
* Reimplemented `AOButton`
* Partially reimplemented `AOEmoteButton`
* Refactored `AOEvidenceButton`
2024-05-16 03:09:21 +02:00
Cerapter
4fb61b7afd
Lift out most server-related data into its own class (#955)
* Lift out most server-related data into its own class

* Fix missing negation in the auth packet support check

* Update `get_feature(BASE_FEATURE_SET)`'s documentation

* Make the version numbers public

* Add support for custom blips

---------

Co-authored-by: in1tiate <32779090+in1tiate@users.noreply.github.com>
2024-05-15 10:19:03 -05:00
TrickyLeifa
a0cee58c04 Merge branch 'master' into kaleidoscope 2024-05-15 00:23:46 +02:00
TrickyLeifa
c9f52b7223 Ported to CMake, ...
* Ported the project to CMake
  * Android and Mac support dropped for the time
being.
  * Tests, BASS and Discord-RPC are now options
* Restructured and reformated the project.
  * Merged `include` and `src`
  * Renamed `resource` to `data`
  * Renamed various files
  * External libraries headers are no longer included in `src`
  * Replaced header guards with #pragma once
  * Multiple refactors (keywords, headers)
  * Added Qt6 compatibility
* Removed various unused functions and headers
* Reworked AOPacket
  * When content is passed to AOPacket, it should be ensured that the content is already decoded.
  * Encoding/decoding are now static methods.
* Fixed various memory leaks
* Removed animation code for AOImage
  * AOImage is always using static images
* Simplified ChatLogPiece
2024-05-15 00:04:16 +02:00
in1tiate
c9eabf35da
Add [Options] override for blips and shownames for parity with 2.5 (#953)
* split get_blips into two functions

Because otherwise it would always return only what was read from char.ini, and we want it to be able to read our custom QLineEdit too, right?

* include new function, rewrite description

* check for custom blips support in packet

* add custom blips enabled bool

* increase MS_MAXIMUM, add custom blips QLineEdit

* add BLIPNAME to chat message

* introducing custom blips

* introducing custom blips I said

* unfold if

* unfold other if

* retool custom blips code, add ini parser

* remove extraneous debug calls

* fix incorrect default value on get_showname

* restructure ini format

* fix parser again

---------

Co-authored-by: Lernos <lernoskey@gmail.com>
Co-authored-by: stonedDiscord <Tukz@gmx.de>
2024-05-14 18:02:32 +02:00
in1tiate
9517666666
Use the static image lookup for char_icons (#954) 2024-05-10 16:31:43 +02:00
in1tiate
f2cf70232e
Fix stopped ambience updating the music label when it shouldn't (#948) 2024-05-08 23:53:00 -05:00
lambdcalculus
d680a6afdb
Fix combobox options not persisting (#949)
* fix combobox options not persisting

* remove accidental newline

* convert combobox data to string
2024-05-08 22:38:09 -05:00
in1tiate
ad93dd8238
add not-broken looping code using seconds instead of samples (#944) 2024-04-10 19:29:03 -05:00
lambdcalculus
3e42588b51
Fix combobox behaviour for all cases (#947)
* make all option comboboxes work

* correct default page
2024-03-29 21:56:20 +01:00
in1tiate
ad6552cdd5
Fix frame effect on frame 0 playing twice on playback start (#945) 2024-03-25 04:39:39 -05:00
in1tiate
0142ed57c3
Ignore pair offset when zooming (#940) 2024-03-09 17:47:05 +01:00
in1tiate
b48ca2455a
Add the ability for shownames to be outlined (#939)
* showname text outline, partial messagebox outline code

* your honor i plead oopsie daisies

* Focus down code, add config hookups

* remove extraneous qDebug calls
2024-03-03 20:26:39 -06:00
in1tiate
a8b28f5070
Hide chatbox element when objecting (#933) 2024-02-29 10:43:06 +01:00
Salanto
ddd72110bd
Fix combobox behaviour in AOOptionsdialog (#938)
They would not behave correctly otherwise.
2024-02-28 11:42:56 -06:00
stonedDiscord
30bfd8888c
fucking jpeg (#937) 2024-02-26 20:03:32 +01:00
OmniTroid
71ef231e53
Fix ubuntu build script (#936) 2024-02-11 14:14:54 +01:00
in1tiate
27726c9ce1
Add integer-based theme scaling (#935)
Configurable over the options menu,
2024-02-10 12:23:34 +01:00
stonedDiscord
ff577255d3
Windows CI (#920)
* Update build.yml

* forgot to change the other target

* make

* typo

* make

* deall

* msvc

* Fix Windows and Android CI (#928)

* fix CI

* cache qt

* Update zlib

---------

Co-authored-by: lambdcalculus <64238778+lambdcalculus@users.noreply.github.com>
2024-02-10 02:06:45 -06:00
in1tiate
1899f4e1ba
Sort categories ascending instead of leaving them in loaded order (#932) 2024-02-08 12:22:02 -06:00
lambdcalculus
e9469a5ca4
rework ms list callback logic (#927)
fixes crash when joining server before getting ms list back
2023-11-30 13:17:42 +01:00
in1tiate
e6e5e86f68
Merge pull request #919 from AttorneyOnline/fix-option-scaling
Fix scaling option
2023-11-27 19:24:38 -06:00
in1tiate
4d009ea333
Merge branch 'master' into fix-option-scaling 2023-11-27 19:24:24 -06:00
lambdcalculus
0729b917b4
encode URL before streaming (#926) 2023-11-23 13:42:20 +01:00
in1tiate
e690e12ae2
Fix zooms with no emote modifier defaulting to 1 (show desk) (#925) 2023-11-21 11:41:15 +01:00
in1tiate
a417307399
Merge pull request #922 from AttorneyOnline/fix-mounted-themes
Fix themes not loading from mounted base folders
2023-11-05 10:57:17 -06:00
in1tiate
ab4fc177cb fix themes not loading from mounted base folders 2023-11-05 05:28:51 -06:00
in1tiate
80939aa092
critical fix (#921) 2023-10-03 20:51:27 +02:00
stonedDiscord
faf67b87cd
Merge branch 'master' into fix-option-scaling 2023-08-22 01:13:06 +02:00
lambdcalculus
98682ae13f
fix options combobox behavior (#918)
the combobox text, instead of data, was being saved to config
2023-08-22 01:06:30 +02:00
stonedDiscord
4c398d633f
fix zlib vi (#917) 2023-08-21 17:04:24 +02:00
Salanto
a962ba08ba Fix incorrect scaling check
This entire system needs a refactor anyway, good enough^TM
2023-08-09 21:12:05 +02:00
ame
6daaccaa43
Update README.md (#914)
fixed the incorrect dep for ubuntu
2023-07-27 10:40:34 +02:00
stonedDiscord
1f181d6016
new qt creator creates additional project user files (#898) 2023-06-27 01:14:15 +02:00
Salanto
7c1fe80d4c
2.10.1 Changes (#888)
* Utilise .ui file to create settings dialog (#858)

* Remove config loading from AOApplications

Removes most, but not all config functions from AOApplication and moves them into their own class.

Not even remotely done here. but holy shit I'm tired.

* First steps towards UI file

* Fixed your UI layout issue

* Leifa bullies me

* Set all the setters

Reminder : Figure out why username and ooc_name exist. Are they the same? Maybe. Maybe not. Gonna have to look at it and migrate the key.

Todo : Cleanup key naming. Most of these are terrible, imprecise or I just don't like them.

* Make layout appear proper

* Minor option dialog update

* Hookup AOOptionsdialogue to Options Getter/setter

Not done yet, but parts of the options interactions work again.

* More settings menu working

* Mostly working settings dialogue

Restore default and cancel still need work

* Fix asset widget

* Tooltips

Also removes the commented out tooltip code

* Finish Tooltips

Move widget implementation to its own folder

* Migrate callwords to config.ini

Also correct sleep deprived code.

* Fix widget translation

* Language dropdown changes

We might want to look into doing this a bit better.

* Remove QSettings from AOApplication

Try cleaning up stray references to said object anymore

* Fix constructor order to prevent runtime crash

* Slightly sort implementation file

* Remove unused label declarations from header

Fix some comments

* Formatting

* Fix buttons

Also fixes restore settings when a restore to default is aborted.

* Raise pair list after courtroom construction (#859)

* Don't reset evidence selection (#860)

They are defaulted in the header. This SHOULD not affect the client negatively.

* Hitting the emergency exit (#861)

Don't change the widget state when the ID exceeds the current widget list due to pages being changed while evidence is being edited.

* add CI and license badge

* add contributors

* Handle config.temp after confirmation

* Deletes config.temp when the user has confirmed they want to keep the current settings.

* Make reset to default destructive

Don't worry, we ask first! :)

* Fix case of self_offset received without a y offset (#864)

caused by typos in #701

it's possible for older clients to send x offsets without a y
offset. if you think this case is annoying you can remove it in
the next version and handle it server-side instead

* Change default settings (#839)

* Make default config enable features for most cases except for Continuous Playback due to it introducing performance issues according to tooltip and confirmed in testing
* Increase log size to 1000
* Default disable animated themes

Co-authored-by: Salanto <62221668+Salanto@users.noreply.github.com>
Co-authored-by: stonedDiscord <Tukz@gmx.de>

* Make it a singleton? Maybe? I dunno? Ask Longbyte

* Commit suggestions

* More suggestions

Also try fixing a memory leak. Not going to well.

* Return to dialog

Otherwise we don't have Exec.

* Cleanup

* Deprecate ooc_name, implement username

* Remove ooc_name key and copy its value to default_showname if its empty.

* Consistent naming in AOOptionsDialog

* Clang format

* Don't write the username to the showname

* Fix theme dropdown being incorrectly set

* Bandaid callword playing every message

* Remove unused or duplicate includes

* More include removals

Removes lobby and courtroom direct includes from the dialog source

* Burn baby, burn!

* Remove reload_theme function

* Remove "Case Alert Supported Message"

All servers I tested on master supported it. The text is redundant in operation.

Co-authored-by: TrickyLeifa <date.epoch@gmail.com>
Co-authored-by: stonedDiscord <Tukz@gmx.de>
Co-authored-by: oldmud0 <oldmud0@users.noreply.github.com>
Co-authored-by: Crystalwarrior <Varsash@Gmail.com>

* Cleanup lobby (#880)

* Remove config loading from AOApplications

Removes most, but not all config functions from AOApplication and moves them into their own class.

Not even remotely done here. but holy shit I'm tired.

* First steps towards UI file

* Fixed your UI layout issue

* Leifa bullies me

* Set all the setters

Reminder : Figure out why username and ooc_name exist. Are they the same? Maybe. Maybe not. Gonna have to look at it and migrate the key.

Todo : Cleanup key naming. Most of these are terrible, imprecise or I just don't like them.

* Make layout appear proper

* Minor option dialog update

* Hookup AOOptionsdialogue to Options Getter/setter

Not done yet, but parts of the options interactions work again.

* More settings menu working

* Mostly working settings dialogue

Restore default and cancel still need work

* Fix asset widget

* Tooltips

Also removes the commented out tooltip code

* Finish Tooltips

Move widget implementation to its own folder

* Migrate callwords to config.ini

Also correct sleep deprived code.

* Fix widget translation

* Language dropdown changes

We might want to look into doing this a bit better.

* Remove QSettings from AOApplication

Try cleaning up stray references to said object anymore

* Fix constructor order to prevent runtime crash

* Slightly sort implementation file

* Remove unused label declarations from header

Fix some comments

* Formatting

* Fix buttons

Also fixes restore settings when a restore to default is aborted.

* Raise pair list after courtroom construction (#859)

* Don't reset evidence selection (#860)

They are defaulted in the header. This SHOULD not affect the client negatively.

* Hitting the emergency exit (#861)

Don't change the widget state when the ID exceeds the current widget list due to pages being changed while evidence is being edited.

* add CI and license badge

* add contributors

* Handle config.temp after confirmation

* Deletes config.temp when the user has confirmed they want to keep the current settings.

* Make reset to default destructive

Don't worry, we ask first! :)

* Fix case of self_offset received without a y offset (#864)

caused by typos in #701

it's possible for older clients to send x offsets without a y
offset. if you think this case is annoying you can remove it in
the next version and handle it server-side instead

* Change default settings (#839)

* Make default config enable features for most cases except for Continuous Playback due to it introducing performance issues according to tooltip and confirmed in testing
* Increase log size to 1000
* Default disable animated themes


Co-authored-by: Salanto <62221668+Salanto@users.noreply.github.com>
Co-authored-by: stonedDiscord <Tukz@gmx.de>

* Make it a singleton? Maybe? I dunno? Ask Longbyte

* Commit suggestions

* More suggestions

Also try fixing a memory leak. Not going to well.

* Return to dialog

Otherwise we don't have Exec.

* Cleanup

* Deprecate ooc_name, implement username

* Remove ooc_name key and copy its value to default_showname if its empty.

* Consistent naming in AOOptionsDialog

* Clang format

* Don't write the username to the showname

* Fix theme dropdown being incorrectly set

* Bandaid callword playing every message

* Remove unused or duplicate includes

* More include removals

Removes lobby and courtroom direct includes from the dialog source

* Burn baby, burn!

* Remove reload_theme function

* Remove "Case Alert Supported Message"

All servers I tested on master supported it. The text is redundant in operation.

* Create preliminary lobby design

Attempts to slightly modernize the aging lobby to a scheme more akin to modern server browsers.

* Fix missing header, add necessary search lineedits

* More UI changes

* Start hooking up new UI elements

* Hookup Serverbrowser to new UI frontend

Still need to fix the favorites AND implement the NEW demolist

* Fixup demo ui and make demoserver functional

* More demoserver cleanup

* Remove jarring ao_app pointer shenigans

Still a bit to do before we can safely remove that pointer, but hey, its something.

* *unholy screeches*

Tried to untangle the tange of dependencies that is connection behaviour

* Rip out loading screen

Some servers are not even sending proper values anymore, like vanilla, so why keep it?

* Optimise includes, format header

Lobby should not even have to know what an AOPacket is, smh

* Formatting fixes

and turn settings menu opening into a signal

* Why does netmanager never emit when the server is connected

* Fixup final parts

About as well implemented as I can do rn. Missing the load screen, but that was more flair than anything else

* Correct start page

* demo qol

Co-authored-by: TrickyLeifa <date.epoch@gmail.com>
Co-authored-by: stonedDiscord <Tukz@gmx.de>
Co-authored-by: oldmud0 <oldmud0@users.noreply.github.com>
Co-authored-by: Crystalwarrior <Varsash@Gmail.com>

* Delete rebase artifact

* only set setting codec on qt5

* fix old regex

* qlocale include was missing

* Add default soundfont value + cleaup stream checks

* Remove Case Announcement

* Add add_server dialog and move logic to options.h

* Add Direction Connection Widget and function

* Visual Fluff, don't show direct connection on demo screen

* Implement ui-file reload and RCC mounting.

* Add edit menu to favorites

* Add Server remains active when no server is selected

* Hack together window title for courtroom

I hate this.

* Fix incorrect subtheme location code

* Cleanup

* Make all charicons appear on first join

This entire system needs a rework, but this will do for now.

Also slightly improves performance by not making it load the character list 4 times, only 2 now :^)
closes #854

* Fix evidence hover selector under Qt5

#closes #890

* Remove options calling itself trough pointer

* Fix Android CI (#891)

* pro gamer move

* remove pregenerated android files

* version

* install old ass android platform

* Revert "remove pregenerated android files"

This reverts commit c81a94c6fd337e187af61e9dd706fac5cd51bcc0.

* switch to 24

* CharButton - Fix enterEvent override in Qt5

Also mark them as override. Also make the preprocessor if a bit less copypastey.

* version bump

* Update embeeded lobby ui color sheme

Shoutout to Dumb Fuck (That is their real discord name).

Co-Authored-By: Crystalwarrior <3470436+Crystalwarrior@users.noreply.github.com>

* Add changelog.md loading logic from main mount path

* Expand tabbar of optional Tabbar widget

* Fix order column being incorrectly sized

* missed a space

* remove fonts

* change margins

* fix minimum sizes

* Allow theme overwrite of settings menu

* Cleanup iterator for subthemes

* Allow reload of settings menu

Might aswell do them all 🤷

* AO base path (#893)

* make get_base_path global

and move parts that use base to use it

* options uses base

* sal moved a bunch of code

* fix creating case folder

---------

Co-authored-by: stonedDiscord <10584181+stonedDiscord@users.noreply.github.com>

* Android 2 10 1 (#894)

* ask for file permissions before trying to load a file

* create armv7 gitignore

* extract all the abis

* don't fail if the dir exists

* Clear options map before reloading the UI

* Fix runtime warning for theme/subtheme combobox

Shouldn't do the job of something that the template can do for me.
Also fix formatting cause it was busted.
Also made the subtheme/theme load code not give me cancer.

* Sort dropdown numerically to match explorer preview

closes #793

* fuck bass

* copy mingw

* copy other dll

* wrong folder

* Account for server subtheme

* Replace incorrect subtheme check

* Settings, not server

* Remove debug

* Add compatibility code, suppress compiler warning (#896)

lobby.cpp:
* Added compatibility code so 2.10.1 can run on Qt versions older than 5.14, such as the version that ships with Ubuntu 20.04

courtroom.cpp:
* Used a Q_UNUSED macro on an unused variable to suppress a compiler warning

* Resolve Qt6(.5.0) compiler errors

* Undo incompetence.

* Force theme reload on theme change

If a user saves a new theme and does not reload the UI it will cause misplacement of widgets inside of courtroom.
This is mitigated by forcing a reload.

* make speedlines stretch by default (in *actually* non-stupid way this time) (#901)

* Rework default volume settings (#903)

* rework volume default settings

* remove default volume settings in options dialog
* make client remember last volume settings instead

* fix options starting tab

* Reworked direct connect (#906)

Resolve issue #905
Works as advertised.

* Set join text when double-click on connected server

Good enough. I would handle this a bit smarter and lock based on the connection state of NetworkManager, but NetworkManager sucks and I refuse to fix it this close before 2.10.1 is done.

* remove unused m_looping

* remove useless underflow check

* do not fall from server to favorites

* Ci android fix (#899)

* pro gamer move

* remove pregenerated android files

* version

* install old ass android platform

* Revert "remove pregenerated android files"

This reverts commit c81a94c6fd337e187af61e9dd706fac5cd51bcc0.

* switch to 24

* use android\src\android\templates instead

* deprecate "chat" deskmod (#910)

* ignore deskmod when zoom speaking

* clean up deskmod a bit

* adds an enum for deskmods
* deprecates the "chat" deskmood
* modifies set_scene since it never rly used the deskmod argument
  meaningfully

* actually use the enums i made lol

* fix typo

* Add credits for lamdacalculus

---------

Co-authored-by: TrickyLeifa <date.epoch@gmail.com>
Co-authored-by: stonedDiscord <Tukz@gmx.de>
Co-authored-by: oldmud0 <oldmud0@users.noreply.github.com>
Co-authored-by: Crystalwarrior <Varsash@Gmail.com>
Co-authored-by: Crystalwarrior <3470436+Crystalwarrior@users.noreply.github.com>
Co-authored-by: stonedDiscord <10584181+stonedDiscord@users.noreply.github.com>
Co-authored-by: segfault <128277930+memsecviolator@users.noreply.github.com>
Co-authored-by: lambdcalculus <64238778+lambdcalculus@users.noreply.github.com>
Co-authored-by: Leifa♥ <26681464+TrickyLeifa@users.noreply.github.com>
2023-05-31 20:17:30 +02:00
lambdcalculus
2915f4cc04
add instructions for installing Qt dependencies (#902) 2023-05-02 20:42:41 +02:00
Salanto
50beb7de44
Fix incorrect judge-button display behaviour(#884)
Co-authored-by: stonedDiscord <Tukz@gmx.de>
2023-01-29 22:11:04 +01:00
OmniTroid
74b02513e3
Cmake fixes (#885)
* Add required macos frameworks

* Make building tests optional

* Add missing source and header files from cmakelists
2023-01-05 08:10:30 +01:00
stonedDiscord
a449aa86e9
Qt6 (#824)
* 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

* don't set codec in qt6

* switch to new regex

* remove qdesktopwidget (was unused)

* make enter event an enter event

* forgot header file

* rename emote_mod enum as there is an enum of the same name in chat_message

* regexp

* no more codec

* fix warning about emote_mod type

* change to new qtconcurrent

* misc was unused

* fix run

* change qtconcurrent for music

* codecs came back

* make CI run on qt6 too

* seperate artifacts

* qFormatLogMessage is wonky here

* maybe actually use the qt version from matrix

* change qt version here as well

* even lower

* use my own fixed installer

* use my own fixed version of qapng

* get websockets

* minor spelling mistake

* yOu nEeD aDdOnS

* aaaaaaaaaaaaaaaaaaaaaaaaaaaaa

* Revert "maybe actually use the qt version from matrix"

This reverts commit 7ab6b1b4c2f1200318d52f325efd2ef46c3fbd6a.

* Revert "Revert "maybe actually use the qt version from matrix""

This reverts commit a6f7c5bedf214a1992c15b296edd195f96a9196a.

* use jurplels again

* Revert "use jurplels again"

This reverts commit 5795474bca64590f1479af3ccbf7d8cc57f427e7.

* revert CI to master

* main not master

Co-authored-by: in1tiate <woodward.randall02+github@gmail.com>
2022-12-28 21:35:11 +01:00
Salanto
1aca9a19db
Switch Linux HDID code to Qt shenanigans (#879)
* Replace legacy Linux HDID code

This should, I guess, fix t

* Bump zlib version

* Libbass changed the folder structure, it seems.

* Should update the rest too.

* Add default HDID
2022-12-17 11:44:30 +01:00
Caleb Mabry
8a0404f424
Gitignore bin (#867)
* Adding MS

* Ignore bin folder contents but keep folder

* Undo a file change

* On pull request
2022-12-17 11:44:12 +01:00