Commit Graph

70 Commits

Author SHA1 Message Date
55d7b027d2 Merge branch 'master' into taiko_drumroll_drawable 2017-03-24 21:26:42 +09:00
5281842965 Rewrite CirclePiece to be referenced to 128x128px and handle accented hits more sanely. 2017-03-24 18:37:56 +09:00
33c160efeb Merge branch 'taiko_note_circle' into taiko_drawable_drawing
Conflicts:
	osu.Game.Modes.Taiko/osu.Game.Modes.Taiko.csproj
2017-03-24 16:02:49 +09:00
8f7ed813a3 Cleanup. 2017-03-24 15:45:21 +09:00
95183279f3 Rename ScrollingCirclePiece -> ScrollingPiece. 2017-03-24 15:44:43 +09:00
20e80a758a Merge branch 'master' into taiko_drawable_drawing
Conflicts:
	osu.Desktop.VisualTests/osu.Desktop.VisualTests.csproj
	osu.Game.Modes.Taiko/Objects/Drawable/DrawableTaikoHitObject.cs
	osu.Game.Modes.Taiko/osu.Game.Modes.Taiko.csproj
2017-03-24 15:11:56 +09:00
75dba19e7b Merge branch 'master' into taiko_drumroll_drawable 2017-03-24 15:00:35 +09:00
ac2d36da3b Merge branch 'master' into taiko_note_circle 2017-03-24 14:33:08 +09:00
2074812f46 Move ScoreProcessor and Score to Scoring/. 2017-03-24 09:51:52 +09:00
217fd14595 Merge branch 'taiko_drumroll_tick_judgements' into taiko_drumroll_drawable 2017-03-23 19:40:14 +09:00
35f1f06ee2 Rename drum roll tick judgement. 2017-03-23 19:36:58 +09:00
11fb404574 Merge remote-tracking branch 'origin/master' into taiko_drumroll_tick_judgements
Conflicts:
	osu.Game.Modes.Taiko/osu.Game.Modes.Taiko.csproj
2017-03-23 19:35:36 +09:00
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
2d5bb326f0 Merge branch 'master' into taiko_drumroll_drawable 2017-03-23 17:55:08 +09:00
0ac33b59e3 Add DrumRoll tick judgement info. 2017-03-23 17:52:46 +09:00
96fc8eef30 Merge branch 'master' into taiko_hitobject_drawable 2017-03-23 17:23:22 +09:00
315994f2b3 Merge pull request #538 from smoogipooo/taiko_base_hit
Add Hit class, make TaikoHitObject abstract.
2017-03-23 16:51:45 +09:00
1af17fc108 Remove cross-reference to osu.Game.Modes.Osu from Taiko. 2017-03-23 15:12:08 +09:00
acfa4a4aac JudgementText -> DrawableTaikoJudgementInfo. 2017-03-23 14:52:18 +09:00
3d1dad8185 Merge remote-tracking branch 'origin/master' into taiko_hitobject_drawable
Conflicts:
	osu.Game.Modes.Taiko/Objects/Drawable/DrawableTaikoHit.cs
	osu.Game.Modes.Taiko/osu.Game.Modes.Taiko.csproj
2017-03-23 14:40:06 +09:00
a40338614a Merge branch 'master' into taiko_note_circle 2017-03-23 14:29:24 +09:00
cedcab1e26 s/Ring/Hit + privatize Judgement inside RingExplosion. 2017-03-23 13:02:01 +09:00
db8bf8a78f Add Hit class, make TaikoHitObject abstract. 2017-03-23 11:21:45 +09:00
2c580f43e9 Merge branch 'master' into taiko_playfield_2 2017-03-23 11:10:23 +09:00
39134d79a8 Merge branch 'master' into taiko_hitobject_drawable 2017-03-23 11:03:42 +09:00
53c6665e07 Merge branch 'master' into taiko_bash_base 2017-03-23 10:57:15 +09:00
e3bc837b61 Merge branch 'master' into taiko_drawable_drawing 2017-03-23 10:44:00 +09:00
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
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
afcd42b06d Merge remote-tracking branch 'origin/master' into taiko_playfield_2 2017-03-22 01:38:53 +09:00
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
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
d9524f692d Renamings. 2017-03-21 21:36:05 +09:00
7bda1866fd Merge branch 'master' into taiko_judgement_scoring 2017-03-21 16:44:31 +09:00
1ac9898a36 Add judgement texts. 2017-03-21 16:33:25 +09:00
4c398b106d Add explosion rings. 2017-03-21 15:54:57 +09:00
9b5cb7ec23 Merge branch 'taiko_judgement_scoring' into taiko_playfield_2 2017-03-21 15:33:59 +09:00
10ed6ef10d Move TaikoPlayfield to separate file. 2017-03-21 15:09:54 +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
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
f87f334dcd Merge branch 'master' into taiko_note_circle 2017-03-20 16:55:08 +09:00
730824fa58 Move pieces out of the visual test, fix up comments, rewrite FinisherPiece. 2017-03-20 16:50:22 +09:00
090e8bbb79 Remove hit object types solution-wide. 2017-03-20 13:10:24 +09:00
b629766892 Add initial taiko note circles. 2017-03-17 22:01:06 +09:00
ecd6958eea Add basic DrawableDrumRoll (no graphics yet, just input). 2017-03-17 19:30:22 +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
977b506587 Add TaikoJudgementInfo. 2017-03-17 17:06:34 +09:00
2e0d100a22 Add base DrawableTaikoHitObject, remove DrawableTaikoHit. 2017-03-17 15:19:56 +09:00