RepoMirrors
/
osu
mirror of https://github.com/ppy/osu
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
2,548 Commits 3 Branches 651 Tags 357 MiB
Commit Graph

2548 Commits

Author SHA1 Message Date
Dan Balasescu 8f724bd586 Merge branch 'master' into general_hud 2017-03-10 14:17:34 +09:00
Dan Balasescu 79fffdb7ef Merge branch 'master' into combocounter_bindable 2017-03-10 14:17:14 +09:00
Dean Herbert e5bde712ed Merge pull request #464 from smoogipooo/remove_float_interpolation 
Remove float ValueAt method.
 2017-03-10 14:16:33 +09:00
smoogipooo 2fb5334d09 Why tho? 2017-03-10 14:15:56 +09:00
smoogipooo 7a68e46366 Merge remote-tracking branch 'origin/master' into combocounter_bindable 
Conflicts:
	osu.Game.Modes.Osu/OsuRuleset.cs
	osu.Game/Modes/Ruleset.cs
 2017-03-10 14:15:06 +09:00
smoogipooo 5f72265eff Remove float ValueAt method. 2017-03-10 14:09:55 +09:00
smoogipooo ff3faeaf40 Fix silly spelling mistake. 2017-03-10 14:01:54 +09:00
smoogipooo 712739d779 s/SetHP/SetHealth. 2017-03-10 13:58:17 +09:00
smoogipooo 122792eb93 Remove unused methods. 2017-03-10 13:49:56 +09:00
smoogipooo cd1717c42f More bindables! 2017-03-10 13:49:51 +09:00
smoogipooo f44fa56646 Merge branch 'general_hud' of https://github.com/smoogipooo/osu into general_hud 
Conflicts:
	osu.Game.Modes.Osu/OsuRuleset.cs
 2017-03-10 13:42:50 +09:00
smoogipooo 2d6e667c7c Renaming + use IEnumerable. 2017-03-10 13:40:44 +09:00
Dean Herbert 2813484f2e Merge branch 'master' into general_hud 2017-03-10 13:25:26 +09:00
Dean Herbert e6f4fe9e61 Merge pull request #458 from Lahvuun/master 
Options sidebar flickering fix.
 2017-03-10 13:20:07 +09:00
Dean Herbert 9e223bd77b Merge pull request #459 from Jorolf/rulesetAndPlayModeRemake 
Added Descriptions to Rulesets + PlayModes list
 2017-03-10 13:18:43 +09:00
smoogipooo 4015b87965 General fixes. 2017-03-10 13:09:50 +09:00
smoogipooo 75f004eeb9 Merge branch 'general_hud' of https://github.com/smoogipooo/osu into general_hud 2017-03-10 13:03:26 +09:00
smoogipooo 7c1a3067e6 Oops o_o. 2017-03-10 13:03:13 +09:00
smoogipooo 444c645da0 General fixes. 2017-03-10 13:02:50 +09:00
smoogipooo 4cc032e1d7 Make ComboCounter count a bindable, and properly bind it to the processor. 2017-03-10 12:55:10 +09:00
Dan Balasescu 70d91e16d5 Merge branch 'master' into general_hud 2017-03-10 12:49:37 +09:00
smoogipooo 617ceb8001 Rename to StandardComboCounter, add HealthDisplay abstraction. 2017-03-10 12:47:00 +09:00
smoogipooo 31f6cbd8cf Rename ScoreOverlay -> HUDOverlay, move to osu.Game, make it not overridable by rulesets. 2017-03-10 12:14:13 +09:00
Dean Herbert 69776d436f Merge pull request #460 from smoogipooo/remove_custom_combocounters 
Remove custom combo counters.
 2017-03-10 11:43:00 +09:00
Dean Herbert 2b64de9dd8 Fix using statements. 2017-03-10 11:37:53 +09:00
smoogipooo fa9110ce6e Remove custom combo counters. 2017-03-10 11:04:46 +09:00
Jorolf 9dd835e256 didn't see this was unnecessary after my changes 2017-03-09 21:43:11 +01:00
Jorolf d9a4a677fd Added Descriptions to Rulesets + PlayModes list 2017-03-09 21:37:03 +01:00
Lahvuun 427a0dd0f5 Options sidebar flickering fix. 2017-03-09 22:29:39 +02:00
Alex Amadori faecaa297a Fix warnings 2017-03-09 21:07:21 +01:00
Alex Amadori f969c3b7b3 Fix test 2017-03-09 21:00:13 +01:00
Alex Amadori c60353faf7 Merge branch 'archive-reader' of https://github.com/tacchinotacchi/osu into archive-reader 2017-03-09 17:07:37 +01:00
Alex Amadori 7374839923 Merge remote-tracking branch 'upstream/master' into archive-reader 2017-03-09 17:07:00 +01:00
Dean Herbert a266add670 Merge pull request #450 from huoyaoyuan/modselect 
Modselect refactor
 2017-03-09 18:16:16 +09:00
Huo Yaoyuan 9007409072 Follow appveyor's code style check. 2017-03-09 16:44:45 +08:00
Dean Herbert 115ebd4773 Merge branch 'master' into modselect 2017-03-09 17:31:25 +09:00
Dean Herbert ca4c524fae Merge pull request #456 from peppy/general-fixes 
Update framework.
 2017-03-09 17:30:51 +09:00
Huo Yaoyuan 1b182b1361 Fix typo. 2017-03-09 15:55:40 +08:00
Dean Herbert 30de7aa59c
Remove duplicate reference to nunit. 2017-03-09 16:15:33 +09:00
Dean Herbert dad6060149
Fix warnings not covered by resharper locally. 2017-03-09 16:07:34 +09:00
Dean Herbert 1b532b0741
Fix second mono regression. 2017-03-09 15:53:16 +09:00
Dean Herbert d7497330b2
Reduce warning/suggestion count to zero. 2017-03-09 15:52:40 +09:00
Dean Herbert a048e666d7
Fix autoproperty which doesn't work on mono. 2017-03-09 14:26:09 +09:00
Dean Herbert da751804b6
Reduce error count. 2017-03-09 14:24:16 +09:00
Dean Herbert 149bf7b5fc
Bring dotsettings up-to-date. 2017-03-09 14:03:26 +09:00
Dean Herbert 01c379da19
User invariant culture sorting. 2017-03-09 14:02:20 +09:00
Dean Herbert 3eece390cb
Abstract constructors -> protected. 2017-03-09 14:01:08 +09:00
Dean Herbert 0976e205d8
Remove redundant parentheses. 2017-03-09 14:00:17 +09:00
Dean Herbert dc5ac6e88f
Add missing access modifiers. 2017-03-09 13:55:29 +09:00
Dean Herbert 9772f2a042
Update framework. 2017-03-09 13:50:33 +09:00