Commit Graph

75 Commits

Author SHA1 Message Date
stonedDiscord
0be8d0f5ae
Shutup ci (#782)
* stop magic number spam

* forgot to remove avoid

* Update .clang-format

* yeet qt translations and unused image formats

* also remove bearer and styles

* remove another svg dll

* create dmg on mac

* forgot .app

* delete folder after packing

* skip runtime webkit and opengl

* switch back to fixed qt setup

* try installing the NDK

* update discord rpc includes

* enable discord in CI builds

* copypaste lmao

* windows doesn't have export

* forgot the quotes

* guess i'm not root

* downgrade ubuntu

* lets hope ubuntu 18 comes with android ndk

* it doesn't

* try to update libpng

* script wasn't executable

* downgrade android

* typo

* use qmake to enable discord

* exit code 101 very funny qmake

* its in defines not just true

* can i use qmake like this?

* add discord

* exclude android from discord

* android runs on linux after all
2022-06-15 22:16:30 -05:00
Salanto
f0a5e48f5c
Dual-Stack AO2 Client to handle both TCP and Websocket connections seemlessly (#696)
* Replace TCP Serversocket with Websocket

* Have TCP sockets live harmoniously with WS

"like 5 lines" yeah probably lost a bet.

* Update .gitlab-ci.yml

* hack to fix favorites

* Add support for websockets in the favorites list (serverlist.txt)
Make "add_favorite_server" remember the socket type

* Preserve old serverlist style

This will keep new entries compatible with 2.9 and prior clients. Makes parsing the list easier too.

* Add lookup table and correct write code to use lowercase

* I have no idea what a lookup table is, but this looks close enough

* Fix lookup table

* Otherwise backend selection behaviour is inverted

* clang-tidy had one job

* Yet it did not do it.

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

* const p_data

* Switch serverlist.txt to an ini format

* Fixes an Omni bug where : would split the servername
* Utilises internally QSettings properly for low parsing effort and clear structure
* Automatically migrates the legacy serverlist.txt to favorite_servers.ini
* Pleases my OCD

* Replace sample serverlist.

Co-authored-by: oldmud0 <oldmud0@users.noreply.github.com>
Co-authored-by: stonedDiscord <Tukz@gmx.de>
Co-authored-by: Alex Noir <Varsash@gmail.com>
2022-06-06 19:14:44 +02:00
stonedDiscord
a392d31ad2
italian translation by dev and mandarino (#771)
* italian translation by dev and mandarino

* swap music and character loading

* update all the other translations as well
2022-06-03 10:43:41 +02:00
stonedDiscord
d87371b65e
GitHub android ci (#767)
* try this matrix thing

* syntax error

* use my own qt installer so it actually works

* allow changing path

* whoops cant have it twice

* get the right version of discord rpc

* get correct bass

* try to fix windows

* overwrite bass files

* forgot to delete these

* here's your version bro

* what did we even use catch2 for??

* linux doesnt have a c folder

* android bass

* switch from cmake to qmake

* opus dylib

* we don't install

* put bass in a subfolder so we don't build the stupid examples

* was using wrong arch for android

* fix up gitignore

* get correct artifact folder

* lets hope qmake will ignore the ABI for all the other platforms

* use platform name for artifact

* copy dlls into bin folder

* lmao i yeeted the folder

* create folder

* use more recent mingw

* windows uses dlls

* 2017 doesn't work

* our libs are 64 bit

* install msvc

* shitty ms documentation

* ok ms

* wrong directory for deploy

* copy apng

* use correct image for msvc2019

* deploy android

* 32bit windows it is

* adroideploy

* try this

* Update build.yml

* move libs

* armeabi-v7a

* fix android build files

* only get linux bass for linux

* don't try to install discord on android

* deploy mac

* get rid of double permission warning

* define filename for APK

* add mac dependencies

* put android bass in the correct folder

* mac apng

* android apng

* remove old CI

* ask for storage permissions

* qt bug ..........

* update clang-tidy-review

* update everything

* fuck you lukka

* fuck you jurplel for merging that shitty PR that broke everything

* give it what it wants

* Update clang-tidy-review.yml

* github is failing it because it's too big

* wait for the user and request a proper permission string

* underscore moment

* use write external storage instead

* try this instead

* 082 fails with docker again
2022-05-24 21:16:04 +02:00
stonedDiscord
7e9ad9946b
add new hdid algo (#694)
* add new hdid algo

* forgot the w for unicode

* add advapi32 to windows

* get rid of visual studio 2022 shit

* Update src/hardware_functions.cpp

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

* close handle when it fails

Co-authored-by: oldmud0 <oldmud0@users.noreply.github.com>
2022-03-27 15:02:08 +02:00
stonedDiscord
e0c67124a6
Midi music (#614)
* add bassmidi everywhere but CI

* hello CI please don't ban me from github

* add lib and open midi files with the lib

* overlooked windows CI

* yes, overwrite everything

* add tracker support

* add file formats that bass supports

* forgot .mid smh

* load all plugins in one function
2022-03-25 15:58:59 +03:00
Alex Noir
db663f0e28 Update version to 2.10.0
Also do we need RELEASE, MAJOR_VERSION and MINOR_VERSION? Can't we just grab the app verison from Attorney_Online.pro somehow?
2022-03-04 00:24:39 +03:00
in1tiate
d84194871e comment out debug_movie 2021-08-11 09:38:05 -05:00
in1tiate
51698ca6ac debug_movie fixes 2021-08-11 09:28:59 -05:00
oldmud0
e89178bc4d
Version bump Attorney_Online.pro 2021-03-24 18:53:10 -05: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
oldmud0
5f38fd6246 Bump version to 2.9.0 2021-01-11 18:42:28 -06: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
in1tiate
ffbaab5a2a Add QMake flags for "lib" directory 2020-12-12 06:54:31 -06:00
scatterflower
b036134414 add project comment toggle for verbose network logs 2020-08-21 15:52:23 -05:00
scatterflower
7cd0fa0c6e version bump to 2.8.5 2020-08-19 22:56:36 -05:00
scatterflower
9eb0f53db1
Reset BASS when switching devices; drop Qt Multimedia support (#262)
* Allow changing audio device on the fly while in a server
* Use default audio device if device in config doesn't exist
* Automatically change audio device to default when current one is invalid
* Destroy Qt Multimedia support

It was decided that there was not enough attention being given to Qt
Multimedia support to justify its continued maintenance simply as a
libre alternative to BASS. While substantial changes to audio were being
made in 2.8, the Qt Multimedia support code fell behind in disrepair.
It's clear that there is no vested interest in implementing audio
features twice for the sake of licensing.

When it's time to switch to another audio library, it will be done
unilaterally.

* CI: Use BASS for Linux build

Co-authored-by: oldmud0 <oldmud0@users.noreply.github.com>
2020-08-19 16:40:37 -05:00
oldmud0
4bc23c889f Bump .pro version to 2.8.4
I won't roll the minor version back to 2.8.0 - that'll just cause
headaches.
2020-06-10 16:00:29 -05:00
oldmud0
012a03e961 Warn/error on incorrect compile settings for audio 2020-05-31 21:22:54 -05:00
sD
e7ec42f977 undo branding 2020-05-23 18:41:27 +02:00
oldmud0
80daf94895 Fix Linux build trying to use BASS 2020-05-22 21:55:09 -05:00
oldmud0
392cefbee4 Bring back translation files
Note that there are some strings that had the tr() qualification
removed, and also a LOT of strings that were never wrapped with
tr() to begin with. It will take some work to bring back i18n support.
2020-05-22 19:42:47 -05:00
oldmud0
25ae8071fb Bring back Android project files 2020-05-22 19:37:12 -05:00
oldmud0
fd1855b8d0 Merge KFO source unconditionally into AO2 2020-05-22 19:17:55 -05:00
oldmud0
156a760eba Full revert to tag 2.6.2
Due to a countless number of changes made to the core that were not
fully understood, tested, or documented, it was decided to roll
everything back to the last known stable version (2.6.2).

Changes dropped include:
 - Witness needed
 - Shake
 - Frame SFX
 - Multiple custom objections
 - Multithreaded thumbnail generation
 - Looping
 - Various translation additions
 - "Mirror IC"
 - Color in IC log
 - An invocation of clang-format

Next time, work together and split your big fork into independently
testable feature branches.
2020-05-22 17:02:32 -05:00
oldmud0
13942345c6 Run clang-format on entire project
Indentation fixed to 2 spaces per tab. Braces set to Stroustrup style.
Lines reflow at 80 characters. One-line method bodies are on the same
line as the signature. Space always after `//`. No indentation
on preprocessor macros. Includes are sorted lexicographically.

If you don't want to see this commit on blames, use the hidden
whitespace option on GitHub, or use `-w` in git-blame.
2020-04-17 21:57:16 -05:00
likeawindrammer
8486e19119 Add Portuguese translation 2020-04-11 18:21:04 -06:00
Crystalwarrior
2e89f0d199 Change the ultra-tiny-minor version so people can right-click for details and tell me which version they're using during qa-testing 2020-03-31 14:26:16 +03:00
Crystalwarrior
4c8bf57268 VERSION 2.8.3 BABYYYYYYYY
Add "KFO" to version display in lobby so it's even clearer this is a custom client
Add a settings button to the Lobby screen
2020-03-12 18:34:51 +03:00
sD
2e8ae44167 Revert "reactivate discord and bass so they get used in the CI pipeline"
This reverts commit d077bab4e3.
2020-02-24 19:20:34 +01:00
sD
d077bab4e3 reactivate discord and bass so they get used in the CI pipeline 2020-02-24 00:49:49 +01:00
sD
b5c5141007 make network debug depend on if its a debug build or not 2020-02-21 18:47:46 +01:00
stonedDiscord
7d55ff01f5
Merge branch 'master' into 2.7 2020-02-21 16:39:32 +01:00
sD
6ccabdd568 maybe at some point, someone will try this again 2020-01-22 15:24:59 +01:00
Crystalwarrior
6138bb107b Separate screenshake options button from effects options button
Add a color logging option button
Update version to 2.8.2
2020-01-15 16:42:44 +03:00
sD
abbbb43c98 redundant headers in projectfile 2019-12-26 16:34:47 +01:00
Crystalwarrior
159f073514 Set version to 2.8.1 woop woop 2019-11-21 00:23:35 +03:00
Crystalwarrior
a49c4a503b add .opus support 2019-11-04 16:10:54 +03:00
Crystalwarrior
7d73347618 Version 2.8.0.5
Add Killing Fever Online icon (mac icon not updated yet)
2019-10-20 17:59:38 +03:00
Crystalwarrior
1cc5b5b441 Version 4 2019-10-12 17:58:17 +03:00
Crystalwarrior
8ab5a3a6b2 version 3 2019-10-05 22:50:39 +03:00
Crystalwarrior
292c425c78 Fix music volume being weird due to m_volume being shared by ambience and music at the same time
Fix version= being wrong
2019-10-01 04:58:57 +03:00
Crystalwarrior
9bf41a714b Bump up version numbers to 2.8.0 2019-09-29 16:51:37 +03:00
Crystalwarrior
adc3cbfe5b MMMYEAH THIS BIT REQUIRES ME TO UPDATE THE ACTUAL DOCKERFILE. 2019-09-29 03:42:58 +03:00
Crystalwarrior
d5cbb085db Update Bass.dll headers to newer version
Remove a bunch of comments
Add lqapng and lqwebp to try and get apng and webp support to fuckin load already
2019-09-29 03:27:36 +03:00
Pyraq
327661c0a4 Added polish translation. 2019-09-14 21:29:23 +02:00
Pyraq
9967a57f46 Added polish translation. 2019-09-14 21:16:29 +02: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
stonedDiscord
7fe64163ea
Merge pull request #88 from AttorneyOnline/i18n
I18n
2019-08-08 00:20:51 +02:00
stonedDiscord
5180bb4f21 its called jp not ja 2019-08-06 21:09:03 +02:00