Mamanyonyo/atrooney-online-2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
941 Commits 1 Branch 0 Tags 8.5 MiB
156a760eba
Commit Graph

941 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
d89a4370a7 Update CI pipeline for release 2020-05-21 14:22:51 -05: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
4af7bc5fff
Fix broken APNG (#153) 
* Remove explicit APNG check

* Update aocharmovie.h
 2020-05-19 18:49:29 -05: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
Pyraq
76a2a12511 Updated Polish translation. 2020-04-18 18:00:13 +02:00
sD
8bc7915f17 only deploy on tagged commits 2020-04-18 17:11:45 +02:00
sD
607e70aeba compress it more 2020-04-18 15:08:33 +02:00
sD
c52dcac9ce please build 2020-04-18 15:08:14 +02:00
sD
f4f441c24c this and post_build do the same thing 2020-04-18 15:07:14 +02:00
sD
1883d4c269 zip it and upload the correct file 2020-04-18 14:33:30 +02:00
likeawindrammer
696e4169d3 Update Spanish translation 2020-04-18 03:26:46 -06:00
likeawindrammer
58b7725406 Change second exclamation to period on tooltip 
No need for two exclamations
 2020-04-18 02:40:46 -06:00
likeawindrammer
26872be05d Add missing periods on two tooltips 2020-04-18 02:35:09 -06:00
likeawindrammer
9faf41a89f "interupted" -> "interrupted"; "expierence" -> "experience" 2020-04-18 00:45:13 -06:00
likeawindrammer
ac60466ac9 "IC_Log" -> "IC Log" 2020-04-18 00:14:59 -06:00
likeawindrammer
9a041bdf2a Change some tooltips 2020-04-18 00:00:43 -06:00
likeawindrammer
ee709f3c92 Change tickbox to checkbox on README.md ☑ 
As far as I know checkbox is more popular than tickbox, on Wikipedia for example it's called checkbox.
And some spell checkers will highlight tickbox as a typo, but not checkbox.
 2020-04-17 23:36:26 -06:00
likeawindrammer
50d5aa2a0e Revert "Change "Custom shownames:" to "Show custom IC names:"" 
This reverts commit cd034b996a.
 2020-04-17 23:26:44 -06:00
likeawindrammer
aed4396584 Change tickbox to checkbox 
As far as I know checkbox is more common
 2020-04-17 23:21:05 -06:00
likeawindrammer
cd034b996a Change "Custom shownames:" to "Show custom IC names:" 
"shownames" isn't a word, and what does "Custom shownames" even mean anyway?
"Show custom IC names" should do a better job at explaining what this option does.
 2020-04-17 23:13:18 -06: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