|
|
b9f1b44ca4
|
Merge branch 'taiko_hitobject_drawable' into taiko_drumroll_drawable
Conflicts:
osu.Game.Modes.Taiko/osu.Game.Modes.Taiko.csproj
|
2017-03-22 01:49:45 +09:00 |
|
|
|
24e78d015e
|
Make UpdateScrollPosition virtual.
|
2017-03-22 01:46:06 +09:00 |
|
|
|
62dcd4fa59
|
Merge remote-tracking branch 'origin/master' into taiko_hitobject_drawable
Conflicts:
osu.Game.Modes.Taiko/osu.Game.Modes.Taiko.csproj
|
2017-03-22 01:45:02 +09:00 |
|
|
|
863f49c2bd
|
Rename MAX_SCORE -> MAX_HIT_RESULT.
|
2017-03-21 21:38:39 +09:00 |
|
|
|
d9524f692d
|
Renamings.
|
2017-03-21 21:36:05 +09:00 |
|
|
|
ad74797cd4
|
End letter oppression.
|
2017-03-21 21:31:31 +09:00 |
|
|
|
7bda1866fd
|
Merge branch 'master' into taiko_judgement_scoring
|
2017-03-21 16:44:31 +09:00 |
|
|
|
34b734275b
|
Add license headers.
|
2017-03-20 18:24:28 +09:00 |
|
|
|
aaa368e014
|
Merge branch 'taiko_hitobject_drawable' into taiko_drumroll_drawable
Conflicts:
osu.Game.Modes.Taiko/osu.Game.Modes.Taiko.csproj
|
2017-03-20 18:12:16 +09:00 |
|
|
|
75fb7a3eb3
|
Suppress Resharper.
|
2017-03-20 18:10:09 +09:00 |
|
|
|
a27dae0beb
|
Merge branch 'master' into taiko_hitobject_drawable
Conflicts:
osu.Game.Modes.Taiko/osu.Game.Modes.Taiko.csproj
|
2017-03-20 18:09:05 +09:00 |
|
|
|
409160859d
|
Remove explicit namespacing.
|
2017-03-20 18:07:44 +09:00 |
|
|
|
70be33bde0
|
Merge branch 'taiko_drumroll_base' into taiko_drumroll_drawable
|
2017-03-20 18:06:00 +09:00 |
|
|
|
a3e406af6a
|
Merge branch 'master' into taiko_drumroll_drawable
Conflicts:
osu.Game.Modes.Taiko/osu.Game.Modes.Taiko.csproj
|
2017-03-20 18:05:54 +09:00 |
|
|
|
090e8bbb79
|
Remove hit object types solution-wide.
|
2017-03-20 13:10:24 +09:00 |
|
|
|
b3b8fadf03
|
Remove Type.
|
2017-03-20 13:02:52 +09:00 |
|
|
|
7b7255863c
|
Merge remote-tracking branch 'origin/master' into taiko_drumroll_base
|
2017-03-20 13:01:43 +09:00 |
|
|
|
73ffbf8142
|
Remove unnecessary using.
|
2017-03-19 11:52:16 +09:00 |
|
|
|
4b3308fd1d
|
Remove TaikoHitObject Type, we won't be using this going forward.
|
2017-03-18 18:40:26 +09:00 |
|
|
|
ecd6958eea
|
Add basic DrawableDrumRoll (no graphics yet, just input).
|
2017-03-17 19:30:22 +09:00 |
|
|
|
7860199fbd
|
Fix post-merge errors.
|
2017-03-17 19:27:06 +09:00 |
|
|
|
04bc37b079
|
Merge branch 'taiko_hitobject_drawable' into taiko_drumroll_drawable
|
2017-03-17 19:26:30 +09:00 |
|
|
|
5136064cb3
|
Revert "Make DrawableTaikoHitObject generic."
This reverts commit 0e4ed829f2.
|
2017-03-17 19:23:18 +09:00 |
|
|
|
1ede12d847
|
Add basic DrawableDrumRollTick (no graphics yet, just input).
|
2017-03-17 19:08:50 +09:00 |
|
|
|
1e7511a923
|
Merge branch 'taiko_judgement_scoring' into taiko_drumroll_drawable
Conflicts:
osu.Game.Modes.Taiko/osu.Game.Modes.Taiko.csproj
|
2017-03-17 19:01:02 +09:00 |
|
|
|
e977f25cc4
|
Merge branch 'taiko_drumroll_base' into taiko_drumroll_drawable
Conflicts:
osu.Game.Modes.Taiko/osu.Game.Modes.Taiko.csproj
|
2017-03-17 19:00:35 +09:00 |
|
|
|
0e4ed829f2
|
Make DrawableTaikoHitObject generic.
|
2017-03-17 18:55:54 +09:00 |
|
|
|
977b506587
|
Add TaikoJudgementInfo.
|
2017-03-17 17:06:34 +09:00 |
|
|
|
35f63cb2aa
|
Set Anchor/Origin and RelativePositionAxes.
|
2017-03-17 16:10:40 +09:00 |
|
|
|
cdfe95c159
|
Add AcentColour and xmldoc.
|
2017-03-17 16:05:16 +09:00 |
|
|
|
f48af91686
|
Appease the resharper gods.
|
2017-03-17 15:45:54 +09:00 |
|
|
|
2e0d100a22
|
Add base DrawableTaikoHitObject, remove DrawableTaikoHit.
|
2017-03-17 15:19:56 +09:00 |
|
|
|
12de3f6657
|
Implement DrumRoll + DrumRollTick.
|
2017-03-17 13:56:14 +09:00 |
|
|
|
b399c6adbb
|
Implement TaikoHitObject.
|
2017-03-17 13:38:48 +09:00 |
|
|
|
28240fb3b5
|
Rename TaikoBaseHit -> TaikoHitObject.
|
2017-03-17 13:33:48 +09:00 |
|
|
|
5cafec3b6a
|
Add back CreateScoreProcessor to Ruleset to instantiate a non-generic ScoreProcessor for ScoreDatabase.
|
2017-03-16 13:13:45 +09:00 |
|
|
|
c82ae011fb
|
Make ScoreProcessors take generic judgements.
|
2017-03-16 12:45:23 +09:00 |
|
|
|
afefde7ecf
|
Remove old comments.
|
2017-03-15 21:53:01 +09:00 |
|
|
|
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 |
|
|
|
3a8d1d3619
|
Add license headers.
|
2017-03-15 21:32:47 +09:00 |
|
|
|
a9bc253b8c
|
General refactoring (no more casts :D).
|
2017-03-15 19:18:23 +09:00 |
|
|
|
36e8618370
|
Make DrawableHitObjects have generic JudgementInfos.
|
2017-03-15 18:55:38 +09:00 |
|
|
|
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 |
|
|
|
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 |
|
|
|
7141bc86d3
|
Rework beatmap post-processing into HitRenderer.
|
2017-03-14 17:01:21 +09:00 |
|
|
|
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 |
|
|
|
5a47fd659c
|
Fix up warnings, convert back to float position.
|
2017-03-14 13:11:07 +09:00 |
|
|
|
bbd81dbc47
|
Add license headers.
|
2017-03-14 13:02:42 +09:00 |
|
|
|
99c23d8715
|
I don't like this renaming.
|
2017-03-14 12:54:09 +09:00 |
|
|
|
2756d5f09f
|
Merge branch 'master' into mod_application
|
2017-03-13 23:00:11 +09:00 |
|
