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

197 Commits

Author SHA1 Message Date
smoogipooo e0e0a2726d Move OsuJudgementInfo to its own class, remove PositionalJudgementInfo. 2017-03-15 19:23:42 +09:00
smoogipooo a9bc253b8c General refactoring (no more casts :D). 2017-03-15 19:18:23 +09:00
smoogipooo 36e8618370 Make DrawableHitObjects have generic JudgementInfos. 2017-03-15 18:55:38 +09:00
smoogipooo 1c87d998a6 Rename HitObjectType -> TObject. 2017-03-15 16:29:14 +09:00
smoogipooo bf66b84ff8 Move a few classes/enums into separate files. 2017-03-15 16:07:40 +09:00
Dean Herbert 14b22445fa
Merge remote-tracking branch 'upstream/master' into general-fixes 
# Conflicts:
#	osu.Game/Modes/UI/HitRenderer.cs
 2017-03-14 16:15:26 +09:00
Dean Herbert 1f68731a09
Split PlayerInputManager into two classes, allowing more precise handling of input (for KeyCounter). 2017-03-14 16:00:35 +09:00
smoogipooo db8cbba8d5 Okay resharper u da boss. 2017-03-14 12:52:12 +09:00
Dan Balasescu 879a78156d Merge branch 'master' into mod_application 2017-03-14 12:38:55 +09:00
smoogipooo 6ebd88060a Simplify foreach. 2017-03-14 12:38:30 +09:00
smoogipooo bc5912eab5 Applyable -> Applicable. 2017-03-14 12:32:31 +09:00
Dean Herbert 1eacafc7b4
Merge branch 'master' into general-fixes 2017-03-14 12:02:24 +09:00
Dean Herbert 4fa037c0b2
Update framework. 2017-03-14 12:01:58 +09:00
Dean Herbert 2756d5f09f Merge branch 'master' into mod_application 2017-03-13 23:00:11 +09:00
smoogipooo 842f938439 General fixes. 2017-03-13 21:05:34 +09:00
smoogipooo 35ddca78f5 Remove old, unused hit object converters (will be re-implemented through IBeatmapConverter). 2017-03-13 14:50:55 +09:00
smoogipooo 7d129ebd6d Attempt to fix things. 2017-03-12 22:38:50 +09:00
smoogipooo 447cc17de8 Merge branch 'beatmap_conversion' into mod_application 
Conflicts:
	osu.Game.Modes.Catch/CatchRuleset.cs
	osu.Game.Modes.Mania/ManiaRuleset.cs
	osu.Game.Modes.Osu/OsuRuleset.cs
	osu.Game.Modes.Taiko/TaikoRuleset.cs
 2017-03-12 22:20:52 +09:00
smoogipooo 5be1839710 Remove unused method. 2017-03-12 22:19:35 +09:00
smoogipooo c0e29652a6 Initial attempt at making mods apply better. 2017-03-12 22:13:43 +09:00
smoogipooo 64aab090d5 Instantiate HitRenderer with WorkingBeatmap. 2017-03-12 18:03:13 +09:00
smoogipooo 3480dca0ad Remove PlayMode enum requirement. Clean things up a lot. 2017-03-12 14:32:50 +09:00
smoogipooo b0ea282a06 Fix map would always be converted to itself when actually converting to a different game mode. 2017-03-12 02:26:10 +09:00
smoogipooo f484792546 Merge branch 'refactor_hitrenderer' into beatmap_conversion 
Conflicts:
	osu.Game/Modes/UI/HitRenderer.cs
 2017-03-12 01:27:28 +09:00
smoogipooo 59b62b8fd4 Merge remote-tracking branch 'origin/master' into refactor_hitrenderer 2017-03-12 01:20:11 +09:00
smoogipooo 74db255c78 Move back to using an abstract method to determine if all objects have been judged. 
Because sliderticks provide judgements even though they are added as nested hitobjects, the count method would not work to determine if all hitobjects have been judged. This needs a little bit more thought put in...
 2017-03-12 01:19:51 +09:00
smoogipooo 592e05a2c8 Better beatmap conversion model. 2017-03-12 00:34:21 +09:00
smoogipooo e126a5600a Fix using. 2017-03-11 14:28:06 +09:00
smoogipooo 42b19cd3b3 Re-add files. 2017-03-11 14:27:18 +09:00
smoogipooo b63a1c549e Remove files temporarily. 2017-03-11 14:26:58 +09:00
smoogipooo 75ed7406e4 Merge remote-tracking branch 'origin/master' into refactor_hitrenderer 
Conflicts:
	osu.Game.Modes.Catch/CatchRuleset.cs
	osu.Game.Modes.Mania/ManiaRuleset.cs
	osu.Game.Modes.Osu/OsuRuleset.cs
	osu.Game.Modes.Taiko/TaikoRuleset.cs
 2017-03-11 14:22:59 +09:00
smoogipooo 3276316ac8 Merge remote-tracking branch 'origin/master' into counter_bindables 
Conflicts:
	osu.Game/Modes/UI/HudOverlay.cs
 2017-03-11 14:19:25 +09:00
smoogipooo eef18eea42 General fixes. 2017-03-11 14:17:07 +09:00
smoogipooo 529cabb001 Make HudOverlay not dependent on Ruleset. 2017-03-10 16:16:07 +09:00
smoogipooo 75a5da62d0 Fix filenames. 2017-03-10 16:11:38 +09:00
smoogipooo 2bc36fecc6 Combo should not be longs. 2017-03-10 16:05:05 +09:00
smoogipooo eca980bb95 Remove .orig files (not sure how they got here). 2017-03-10 15:57:14 +09:00
smoogipooo 02281d8a2a Make HitRenderer not have a publicly-settable Beatmap, replace AllObjectsJudged for performance. 2017-03-10 15:19:36 +09:00
smoogipooo aed89b7c0f Merge branch 'general_hud' into counter_bindables 
Conflicts:
	osu.Desktop.VisualTests/Tests/TestCaseScoreCounter.cs
	osu.Game/Modes/UI/HUDOverlay.cs
 2017-03-10 14:44:29 +09:00
smoogipooo 58a88cc715 More general refactorings. 2017-03-10 14:42:14 +09:00
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
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 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