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

1532 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
likeawindrammer
955a32a95a Update Portuguese translation 2020-04-21 02:48:22 -06:00
likeawindrammer
44670e3b02 Update Spanish translation 2020-04-21 02:47:52 -06:00
likeawindrammer
0a656d222d fix typo 2020-04-21 01:52:17 -06:00
likeawindrammer
ee0c42ea54 Update reference for the themes submodule 2020-04-20 23:45:22 -05:00
cents
8fa96535ef Hooked up the new settings 
Did you know you could scale the iclog with ctrl + mouse wheel?
 2020-04-20 12:37:28 -07:00
cents
5b6d58bd02 Added additional customization options. 
I didn't format anything tho that is at the end
 2020-04-20 07:51:42 -07:00
likeawindrammer
7a3ebc8362 Revert faster blip speed 
Without an option to change it users will complain
Thanks Initiate for telling me how to change this
 2020-04-19 17:04:19 -06:00
cents
5f88b1fd30 Removed Duplicates 2020-04-19 12:47:50 -07:00
likeawindrammer
5bd8c960c9 Fix crash on saving settings 
Thanks Initiate for actually fixing this
 2020-04-19 12:35:03 -06:00
stonedDiscord
1e2d71fb96
Merge pull request #134 from AttorneyOnline/streammusic 
Streaming music
 2020-04-19 16:10:59 +02:00
stonedDiscord
c0f579864b
Merge pull request #144 from AttorneyOnline/deploy_mac 
Deploy mac
 2020-04-19 15:34:53 +02:00
stonedDiscord
bba8f4f1c0
Delete label.yml 2020-04-19 15:04:54 +02:00
likeawindrammer
609fedfbf4 Merge branch 'master' into 2.7-rc 2020-04-18 16:45:11 -06:00
windrammer
dca156ec01
Merge pull request #145 from Pyraqq/master 
Polish translation update
 2020-04-18 16:39:57 -06:00
likeawindrammer
dfa5436427 Change "IC log colorido" to "Log IC colorido" on the Spanish translation 2020-04-18 16:16:38 -06:00
likeawindrammer
33c8cf7793 Update Portuguese translation with the strings added on the CR branch 2020-04-18 16:14:45 -06:00
likeawindrammer
f224ea0589 Add Polish to the language options 2020-04-18 15:04:34 -06:00