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

95 Commits

Author SHA1 Message Date
smoogipooo 6287ba321d Rewrite ScoreProcessor to have a new method for when existing judgements are changed. 
- OnNewJudgement: Keeps its previous functionality. It is now only invoked when a _new_ judgement has been added to the Judgements hashset.
- OnJudgementChanged: Has a similar funcitonality to OnNewJudgement, but is only invoked whenever a judgement that was _previously_ in the Judgements hashset is changed.
 2017-03-30 10:51:14 +09:00
smoogipooo 2a6da0751d Rename UpdateJudgement -> OnNewJugement + rename judgement parameter. 2017-03-24 11:32:48 +09:00
smoogipooo 4e31e3b443 Rename things around to make a bit more sense. 2017-03-24 09:51:58 +09:00
smoogipooo 2074812f46 Move ScoreProcessor and Score to Scoring/. 2017-03-24 09:51:52 +09:00
Dean Herbert 2cb801317d
JudgementInfo -> Judgement. 
There is no case where we use the term "Judgement" without the suffix, so deemed it unnecessary.
 2017-03-23 19:00:18 +09:00
Dean Herbert d441114011 Merge branch 'master' into taiko_playfield_2 2017-03-23 14:28:42 +09:00
Dean Herbert 681ed38941
Use const whenever possible. 2017-03-23 13:52:38 +09:00
Dean Herbert 54e1b24fe9
Enforce readonly private members where possible. 2017-03-23 13:50:08 +09:00
smoogipooo 8b71d70633 Add a way to get the score string from JugementInfo. 2017-03-23 12:21:09 +09:00
smoogipooo 5cafec3b6a Add back CreateScoreProcessor to Ruleset to instantiate a non-generic ScoreProcessor for ScoreDatabase. 2017-03-16 13:13:45 +09:00
smoogipooo c82ae011fb Make ScoreProcessors take generic judgements. 2017-03-16 12:45:23 +09:00
smoogipooo afefde7ecf Remove old comments. 2017-03-15 21:53:01 +09:00
smoogipooo 42da0f1a72 Merge remote-tracking branch 'origin/master' into generic_judgements_2 
Conflicts:
	osu.Desktop.VisualTests/Tests/TestCaseHitObjects.cs
	osu.Game.Modes.Catch/UI/CatchHitRenderer.cs
	osu.Game.Modes.Mania/UI/ManiaHitRenderer.cs
	osu.Game.Modes.Mania/osu.Game.Modes.Mania.csproj
	osu.Game.Modes.Osu/Objects/Drawables/DrawableSlider.cs
	osu.Game.Modes.Osu/Objects/Drawables/DrawableSpinner.cs
	osu.Game.Modes.Osu/UI/OsuHitRenderer.cs
	osu.Game.Modes.Taiko/UI/TaikoHitRenderer.cs
	osu.Game.Modes.Taiko/osu.Game.Modes.Taiko.csproj
	osu.Game/Modes/Objects/Drawables/DrawableHitObject.cs
	osu.Game/Modes/UI/HitRenderer.cs
	osu.Game/osu.Game.csproj
 2017-03-15 21:36:43 +09:00
smoogipooo 3a8d1d3619 Add license headers. 2017-03-15 21:32:47 +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 069a7a24ce Fix defaults not being set (keep in mind this will be changed in a later pullrequest). 2017-03-14 19:04:40 +09:00
smoogipooo 2b3b3b7255 Fix license headers (sorry I have to do this as post-processing for now cos VS 2017...). 2017-03-14 17:07:38 +09:00
smoogipooo 7141bc86d3 Rework beatmap post-processing into HitRenderer. 2017-03-14 17:01:21 +09:00
smoogipooo 854212a7aa Merge branch 'master' into beatmap_parsing 
Conflicts:
	osu.Desktop.VisualTests/app.config
	osu.Game.Modes.Catch/CatchRuleset.cs
	osu.Game.Modes.Mania/ManiaRuleset.cs
	osu.Game.Modes.Mania/app.config
	osu.Game.Modes.Osu/OsuRuleset.cs
	osu.Game.Modes.Osu/app.config
	osu.Game.Modes.Taiko/TaikoRuleset.cs
	osu.Game/Modes/Ruleset.cs
	osu.Game/app.config
	osu.Game/osu.Game.csproj
 2017-03-14 13:39:19 +09:00
smoogipooo 5a47fd659c Fix up warnings, convert back to float position. 2017-03-14 13:11:07 +09:00
smoogipooo bbd81dbc47 Add license headers. 2017-03-14 13:02:42 +09:00
smoogipooo 34ab708cb6 Fix using statement before license. 2017-03-14 12:58:31 +09:00
smoogipooo 99c23d8715 I don't like this renaming. 2017-03-14 12:54:09 +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 f50e0bbf3c Rework/rewrite beatmap parsing to parse to base hit objects, which mode-specific beatmap converters can then use. 2017-03-13 19:15:25 +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 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 b47c9e808e usings 2017-03-12 14:37:39 +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 1c7a9e3a07 General fixups. 2017-03-12 01:26:07 +09:00
smoogipooo 592e05a2c8 Better beatmap conversion model. 2017-03-12 00:34:21 +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 02281d8a2a Make HitRenderer not have a publicly-settable Beatmap, replace AllObjectsJudged for performance. 2017-03-10 15:19:36 +09:00
smoogipooo d3e14aad1b Use =>. 2017-03-10 14:55:43 +09:00
smoogipooo 58a88cc715 More general refactorings. 2017-03-10 14:42:14 +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 9e223bd77b Merge pull request #459 from Jorolf/rulesetAndPlayModeRemake 
Added Descriptions to Rulesets + PlayModes list
 2017-03-10 13:18:43 +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
smoogipooo fa9110ce6e Remove custom combo counters. 2017-03-10 11:04:46 +09:00
Jorolf d9a4a677fd Added Descriptions to Rulesets + PlayModes list 2017-03-09 21:37:03 +01:00
Dean Herbert 0c4c1689b6 Merge branch 'master' into modselect 2017-03-09 12:51:40 +09:00
Dean Herbert 5a42035f88
Update license headers. 2017-03-08 15:50:52 +09:00