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

1666 Commits

Author SHA1 Message Date
smoogipooo 5f440d0b53 Merge branch 'combocounter_bindable' into general_hud 
Conflicts:
	osu.Game.Modes.Osu/OsuRuleset.cs
	osu.Game/Modes/Ruleset.cs
 2017-03-10 14:35:31 +09:00
smoogipooo 605326e8f6 More ComboCounter fixups + refactorings. 2017-03-10 14:34:08 +09:00
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
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 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
smoogipooo 4015b87965 General fixes. 2017-03-10 13:09:50 +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
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
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
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
Huo Yaoyuan 1b182b1361 Fix typo. 2017-03-09 15:55:40 +08: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 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
Dean Herbert 0c4c1689b6 Merge branch 'master' into modselect 2017-03-09 12:51:40 +09:00
Dean Herbert 2821451d5b
Remove unused file. 2017-03-08 16:01:54 +09:00
Dean Herbert 5a42035f88
Update license headers. 2017-03-08 15:50:52 +09:00
Dean Herbert 123c8f3489
Add comment. 2017-03-08 11:54:52 +09:00
Huo Yaoyuan b19405c987 Allow null in mod list to generate a placeholder ModButton. 2017-03-07 19:52:51 +08:00
Dean Herbert 02cab41d34
Move InputManager to a higher and more implicit level. 
Also makes KeyCounterCollection work with replays.
 2017-03-07 19:30:48 +09:00
Huo Yaoyuan ffd79bee06 Remove inherited mods in incompatible list and add between Auto and NoFail. 2017-03-07 16:27:55 +08:00
Huo Yaoyuan 8979b28496 Remove usages of the 'new' keyword. 2017-03-07 16:17:51 +08:00
Huo Yaoyuan b56d6c767b Merge branch 'master' into modselect 2017-03-07 16:10:53 +08:00
Dean Herbert 1fb846e61d
Make playfield scaling optional. 2017-03-07 15:49:04 +09:00
Dean Herbert bff1179624
Merge branch 'master' into replay 
# Conflicts:
#	osu.Game/Modes/Mod.cs
 2017-03-07 14:32:14 +09:00
Dean Herbert 5cbcf7a20a
Fix error-level inspections. 2017-03-07 14:31:54 +09:00
Dean Herbert ecdbcb20cf
Fix error-level inspections. 2017-03-07 13:52:47 +09:00
Dean Herbert 4430255ec4
Merge remote-tracking branch 'upstream/master' into replay 
# Conflicts:
#	osu.Desktop.VisualTests/Tests/TestCasePlayer.cs
#	osu.Desktop/OsuGameDesktop.cs
#	osu.Game.Modes.Osu/Objects/Drawables/DrawableHitCircle.cs
#	osu.Game.Modes.Osu/Objects/Drawables/DrawableSlider.cs
#	osu.Game/Database/BeatmapDatabase.cs
#	osu.Game/Graphics/Cursor/OsuCursorContainer.cs
#	osu.Game/IPC/BeatmapImporter.cs
#	osu.Game/Modes/Mod.cs
#	osu.Game/Modes/Objects/Drawables/DrawableHitObject.cs
#	osu.Game/Modes/UI/Playfield.cs
#	osu.Game/Screens/Play/Player.cs
#	osu.Game/Screens/Play/PlayerInputManager.cs
 2017-03-07 13:50:08 +09:00
Dean Herbert 3e4cd0dc7c
Merge remote-tracking branch 'upstream/master' into less-mods-enum 
# Conflicts:
#	osu.Game.Modes.Mania/ManiaMod.cs
#	osu.Game.Modes.Osu/OsuMod.cs
#	osu.Game/Modes/Mod.cs
 2017-03-07 13:42:50 +09:00
Dean Herbert 1751532a01
Fix a few regressions. 2017-03-07 13:30:36 +09:00
Dean Herbert 0cad5d7d41
Fix most warnings. 2017-03-07 13:05:57 +09:00