Commit Graph

1349 Commits

Author SHA1 Message Date
cents
c83fd9f732 Added backwards compatibility for the music list 2020-05-23 10:41:20 -07:00
sD
e81fac7e07 fix qt sfx player 2020-05-23 19:28:34 +02:00
sD
7a7dd25459 i don't need this 3 times 2020-05-23 19:21:25 +02:00
sD
8a4fc4516c fix qt music player 2020-05-23 19:18:35 +02:00
cents
53c72227c4 Disable html injection 2020-05-23 09:54:33 -07:00
sD
f0a0ecb983 ignore the logs 2020-05-23 18:53:31 +02:00
sD
e7ec42f977 undo branding 2020-05-23 18:41:27 +02:00
sD
7166b50f4b rename logo files 2020-05-23 18:36:28 +02:00
sD
3329ce1416 use new hdid method if supported 2020-05-23 18:32:45 +02:00
sD
ba9aebec57 translate stuff that got run over 2020-05-23 18:32:05 +02:00
cents
86cc795006 Other image formats now support the present evidence 2020-05-23 09:23:42 -07:00
sD
68bd38b7fe forgot those on noaudio 2020-05-23 17:28:54 +02:00
sD
5922bf748a no and zone 2020-05-23 17:28:27 +02:00
sD
52736498b1 fix up nomusic 2020-05-23 17:21:22 +02:00
oldmud0
80daf94895 Fix Linux build trying to use BASS 2020-05-22 21:55:09 -05:00
oldmud0
75453510e0 Fix compile errors from merge 2020-05-22 21:14:37 -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
df8f19320b Bring back CI changes and macOS support 2020-05-22 19:35:49 -05:00
oldmud0
fd1855b8d0 Merge KFO source unconditionally into AO2 2020-05-22 19:17:55 -05:00
oldmud0
8928aa2718 Perform clang-format
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-05-22 17:13:37 -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
Crystalwarrior
4617e3135e Change version number to 2.8.4 2020-05-22 15:28:33 +03:00
Crystalwarrior
a5868aa380 Fix looping frame SFX not working w/ AOV's definitions 2020-05-22 04:53:19 +03:00
Crystalwarrior
88de4cde04 clang 2 electric boogaloo
{ BasedOnStyle: LLVM, BreakBeforeBraces: Stroustrup}
2020-05-22 02:14:54 +03:00
Crystalwarrior
c8e12558cd Clang-ify the code with this styling using Visual Studio Code:
{ BasedOnStyle: LLVM, UseTab: Never, IndentWidth: 4, TabWidth: 4, BreakBeforeBraces: Stroustrup, AllowShortIfStatementsOnASingleLine: false, IndentCaseLabels: false, ColumnLimit: 0, AccessModifierOffset: -4, NamespaceIndentation: All }
(this is the Visual Studio preset with only "BreakBeforeBraces" changed from Allman to Stroustrup)
2020-05-22 01:18:24 +03:00
oldmud0
d89a4370a7 Update CI pipeline for release 2020-05-21 14:22:51 -05:00
oldmud0
5a023e3e07 CI: npm install before running script 2020-05-20 19:38:23 +00:00
oldmud0
8a4d5e88e0 CI: install more dependencies for publish job 2020-05-20 19:24:56 +00:00
oldmud0
2cf5a046ca wasabi_program.sh: use bash instead of sh 2020-05-20 19:08:38 +00:00
oldmud0
7754175206 CI: use simpler release script 2020-05-20 18:20:44 +00:00
oldmud0
5010f57a33
Merge pull request #156 from AttorneyOnline/fix-155
Fix #155 "Certain special characters are not correctly displayed as part of ini-defined shownames"
2020-05-20 00:42:11 -05:00
in1tiate
8c0bb87f09 specify encoding for qsettings calls 2020-05-20 00:22:48 -05:00
oldmud0
8989c4fbc9 CI: Update Dockerfile 2020-05-19 23:50:48 +00:00
oldmud0
4af7bc5fff
Fix broken APNG (#153)
* Remove explicit APNG check

* Update aocharmovie.h
2020-05-19 18:49:29 -05:00
oldmud0
4f8367bf2f CI: Fix YAML syntax error 2020-05-19 22:28:21 +00:00
oldmud0
bc4fd2bccd CI: Don't use dynamic QtApng on Windows 2020-05-19 22:24:38 +00:00
oldmud0
c9b9822bdb CI: Copy qapng.dll to correct location 2020-05-18 00:01:00 +00:00
oldmud0
dbde914a9b Bundle QtApng on Windows 2020-05-17 23:54:35 +00:00
oldmud0
f052a7f2ea
CI: fix missing xz-utils 2020-05-16 12:02:36 -05:00
oldmud0
0a76100072
CI: fix apt asking questions 2020-05-02 22:57:51 -05:00
oldmud0
e9940c82bd
Fix syntax error from unclean merge 2020-05-02 21:44:34 -05:00
oldmud0
bbdad2a40d Merge branch '2.7-rc'
Includes full code reformat.

# Conflicts:
#	src/aomusicplayer.cpp
#	src/path_functions.cpp
2020-05-02 21:29:06 -05:00
sD
992c0b14e1 what is this, c++ for ANDs
this kept it from buildinf with MSVC
2020-04-24 12:54:48 +02:00
sD
c7fd5c9bd9 use the smaller themes 2020-04-24 12:49:21 +02:00
sD
df42b9e3bf Merge branch '2.7-rc' of https://github.com/AttorneyOnline/AO2-Client into 2.7-rc 2020-04-23 23:42:06 +02:00
cents
896c4e4dbc Fixed wrong name being written in mirror mode 2020-04-23 11:57:27 -07:00
sD
c4b0262c72 it's just the katakana for the colors but here you go 2020-04-23 20:39:27 +02:00
sD
0e3fe4c004 add german translations for new features 2020-04-23 20:32:49 +02:00
sD
2c71bd1adc run lupdate so translators can do their work 2020-04-23 20:01:37 +02:00