Dean Herbert
|
d0b1fda24f
|
Fix merge fail.
|
2017-03-27 12:33:15 +09:00 |
|
Dean Herbert
|
4e50b28884
|
Merge branch 'master' into taiko_drumroll_drawable
|
2017-03-27 12:30:31 +09:00 |
|
smoogipooo
|
e5c674a051
|
Merge branch 'better_taiko_keys' into taiko_drumroll_drawable
Conflicts:
osu.Game.Modes.Taiko/Objects/Drawable/DrawableTaikoHitObject.cs
osu.Game.Modes.Taiko/osu.Game.Modes.Taiko.csproj
|
2017-03-25 23:52:41 +09:00 |
|
smoogipooo
|
9b0a15cd6c
|
Fix post-merge errors.
|
2017-03-25 23:48:00 +09:00 |
|
Dean Herbert
|
a774a68456
|
Merge branch 'master' into taiko_bash_drawable
|
2017-03-25 22:01:50 +09:00 |
|
smoogipooo
|
e7941859e4
|
Rename bash -> swell.
|
2017-03-25 20:57:49 +09:00 |
|
smoogipooo
|
a7cea811f4
|
Merge remote-tracking branch 'origin/master' into taiko_bash_drawable
Conflicts:
osu.Game.Modes.Taiko/osu.Game.Modes.Taiko.csproj
|
2017-03-25 20:55:14 +09:00 |
|
smoogipooo
|
be4ab13f4d
|
Rename finisher -> accented.
|
2017-03-25 20:30:26 +09:00 |
|
smoogipooo
|
cb189bd006
|
Merge remote-tracking branch 'origin/master' into taiko_hit_drawables
|
2017-03-25 20:16:25 +09:00 |
|
Dean Herbert
|
55d7b027d2
|
Merge branch 'master' into taiko_drumroll_drawable
|
2017-03-24 21:26:42 +09:00 |
|
smoogipooo
|
5281842965
|
Rewrite CirclePiece to be referenced to 128x128px and handle accented hits more sanely.
|
2017-03-24 18:37:56 +09:00 |
|
smoogipooo
|
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 |
|
smoogipooo
|
8f7ed813a3
|
Cleanup.
|
2017-03-24 15:45:21 +09:00 |
|
smoogipooo
|
95183279f3
|
Rename ScrollingCirclePiece -> ScrollingPiece.
|
2017-03-24 15:44:43 +09:00 |
|
smoogipooo
|
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 |
|
smoogipooo
|
ce1257ba56
|
Merge branch 'master' into taiko_bash_drawable
Conflicts:
osu.Game.Modes.Taiko/osu.Game.Modes.Taiko.csproj
|
2017-03-24 15:03:55 +09:00 |
|
smoogipooo
|
75dba19e7b
|
Merge branch 'master' into taiko_drumroll_drawable
|
2017-03-24 15:00:35 +09:00 |
|
Dan Balasescu
|
bf3846eedb
|
Merge branch 'master' into taiko_hit_drawables
|
2017-03-24 14:55:07 +09:00 |
|
Dan Balasescu
|
ac2d36da3b
|
Merge branch 'master' into taiko_note_circle
|
2017-03-24 14:33:08 +09:00 |
|
smoogipooo
|
2074812f46
|
Move ScoreProcessor and Score to Scoring/.
|
2017-03-24 09:51:52 +09:00 |
|
smoogipooo
|
217fd14595
|
Merge branch 'taiko_drumroll_tick_judgements' into taiko_drumroll_drawable
|
2017-03-23 19:40:14 +09:00 |
|
smoogipooo
|
35f1f06ee2
|
Rename drum roll tick judgement.
|
2017-03-23 19:36:58 +09:00 |
|
smoogipooo
|
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 |
|
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 |
|
Dan Balasescu
|
2d5bb326f0
|
Merge branch 'master' into taiko_drumroll_drawable
|
2017-03-23 17:55:08 +09:00 |
|
smoogipooo
|
0ac33b59e3
|
Add DrumRoll tick judgement info.
|
2017-03-23 17:52:46 +09:00 |
|
Dean Herbert
|
96fc8eef30
|
Merge branch 'master' into taiko_hitobject_drawable
|
2017-03-23 17:23:22 +09:00 |
|
Dean Herbert
|
315994f2b3
|
Merge pull request #538 from smoogipooo/taiko_base_hit
Add Hit class, make TaikoHitObject abstract.
|
2017-03-23 16:51:45 +09:00 |
|
Dean Herbert
|
1af17fc108
|
Remove cross-reference to osu.Game.Modes.Osu from Taiko.
|
2017-03-23 15:12:08 +09:00 |
|
Dean Herbert
|
acfa4a4aac
|
JudgementText -> DrawableTaikoJudgementInfo.
|
2017-03-23 14:52:18 +09:00 |
|
smoogipooo
|
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 |
|
Dan Balasescu
|
a40338614a
|
Merge branch 'master' into taiko_note_circle
|
2017-03-23 14:29:24 +09:00 |
|
smoogipooo
|
cedcab1e26
|
s/Ring/Hit + privatize Judgement inside RingExplosion.
|
2017-03-23 13:02:01 +09:00 |
|
smoogipooo
|
db8bf8a78f
|
Add Hit class, make TaikoHitObject abstract.
|
2017-03-23 11:21:45 +09:00 |
|
Dan Balasescu
|
2c580f43e9
|
Merge branch 'master' into taiko_playfield_2
|
2017-03-23 11:10:23 +09:00 |
|
Dan Balasescu
|
39134d79a8
|
Merge branch 'master' into taiko_hitobject_drawable
|
2017-03-23 11:03:42 +09:00 |
|
Dean Herbert
|
53c6665e07
|
Merge branch 'master' into taiko_bash_base
|
2017-03-23 10:57:15 +09:00 |
|
Dan Balasescu
|
e3bc837b61
|
Merge branch 'master' into taiko_drawable_drawing
|
2017-03-23 10:44:00 +09:00 |
|
smoogipooo
|
7cf935cef2
|
Merge branch 'taiko_hitobject_drawable' into taiko_bash_drawable
Conflicts:
osu.Game.Modes.Taiko/osu.Game.Modes.Taiko.csproj
|
2017-03-22 01:53:44 +09:00 |
|
smoogipooo
|
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 |
|
smoogipooo
|
1bfc4d484d
|
Merge branch 'taiko_hitobject_drawable' into taiko_hit_drawables
Conflicts:
osu.Game.Modes.Taiko/osu.Game.Modes.Taiko.csproj
|
2017-03-22 01:47:25 +09:00 |
|
smoogipooo
|
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 |
|
smoogipooo
|
afcd42b06d
|
Merge remote-tracking branch 'origin/master' into taiko_playfield_2
|
2017-03-22 01:38:53 +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
|
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
|
d9524f692d
|
Renamings.
|
2017-03-21 21:36:05 +09:00 |
|
Dan Balasescu
|
7bda1866fd
|
Merge branch 'master' into taiko_judgement_scoring
|
2017-03-21 16:44:31 +09:00 |
|
smoogipooo
|
1ac9898a36
|
Add judgement texts.
|
2017-03-21 16:33:25 +09:00 |
|
smoogipooo
|
4c398b106d
|
Add explosion rings.
|
2017-03-21 15:54:57 +09:00 |
|
smoogipooo
|
9b5cb7ec23
|
Merge branch 'taiko_judgement_scoring' into taiko_playfield_2
|
2017-03-21 15:33:59 +09:00 |
|