1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-12 00:27:25 +08:00
Commit Graph

112 Commits

Author SHA1 Message Date
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
Dean Herbert
53c6665e07 Merge branch 'master' into taiko_bash_base 2017-03-23 10:57:15 +09:00
Dean Herbert
bf94587ca7 Add TODO. 2017-03-23 10:56:30 +09:00
smoogipooo
b3dde2c399 A bit more protection. 2017-03-22 01:35:39 +09:00
smoogipooo
cf251618c7 Merge remote-tracking branch 'origin/master' into taiko_bash_base
Conflicts:
	osu.Game.Modes.Taiko/osu.Game.Modes.Taiko.csproj
2017-03-22 01:34:47 +09:00
smoogipooo
712d2e194c A bit more protection. 2017-03-22 01:33:22 +09:00
smoogipooo
a346191ca7 Merge remote-tracking branch 'origin/master' into taiko_drumroll_base
Conflicts:
	osu.Game.Modes.Taiko/osu.Game.Modes.Taiko.csproj
2017-03-22 01:27:07 +09:00
smoogipooo
863f49c2bd Rename MAX_SCORE -> MAX_HIT_RESULT. 2017-03-21 21:38:39 +09:00
smoogipooo
d9524f692d Renamings. 2017-03-21 21:36:05 +09:00
smoogipooo
ad74797cd4 End letter oppression. 2017-03-21 21:31:31 +09:00
Dan Balasescu
7bda1866fd Merge branch 'master' into taiko_judgement_scoring 2017-03-21 16:44:31 +09:00
smoogipooo
090e8bbb79 Remove hit object types solution-wide. 2017-03-20 13:10:24 +09:00
smoogipooo
b9006e4026 Remove Type. 2017-03-20 13:04:09 +09:00
smoogipooo
c3d10f8abf Merge remote-tracking branch 'origin/master' into taiko_bash_base 2017-03-20 13:03:25 +09:00
smoogipooo
b3b8fadf03 Remove Type. 2017-03-20 13:02:52 +09:00
smoogipooo
7b7255863c Merge remote-tracking branch 'origin/master' into taiko_drumroll_base 2017-03-20 13:01:43 +09:00
Dean Herbert
73ffbf8142 Remove unnecessary using. 2017-03-19 11:52:16 +09:00
smoogipooo
4b3308fd1d Remove TaikoHitObject Type, we won't be using this going forward. 2017-03-18 18:40:26 +09:00
smoogipooo
977b506587 Add TaikoJudgementInfo. 2017-03-17 17:06:34 +09:00
smoogipooo
f48af91686 Appease the resharper gods. 2017-03-17 15:45:54 +09:00
smoogipooo
d478a58a89 Invert getters and setters for EndTime / Duration. 2017-03-17 14:43:00 +09:00
smoogipooo
d2194e3d2a Implement Bash. 2017-03-17 14:01:32 +09:00
smoogipooo
12de3f6657 Implement DrumRoll + DrumRollTick. 2017-03-17 13:56:14 +09:00
smoogipooo
b399c6adbb Implement TaikoHitObject. 2017-03-17 13:38:48 +09:00
smoogipooo
28240fb3b5 Rename TaikoBaseHit -> TaikoHitObject. 2017-03-17 13:33:48 +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
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
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
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