Dean Herbert
|
1110747648
|
Merge branch 'master' into taiko_replays
|
2017-03-31 17:10:56 +09:00 |
|
Dean Herbert
|
50c328f1b4
|
Merge remote-tracking branch 'upstream/master' into partial-judgements
# Conflicts:
# osu.Game/osu.Game.csproj
|
2017-03-31 16:46:40 +09:00 |
|
smoogipooo
|
8f37d1ad91
|
Update to match new replay structure.
|
2017-03-31 16:20:31 +09:00 |
|
smoogipooo
|
fb6f27a439
|
Merge branch 'master' into taiko_replays
|
2017-03-31 16:11:58 +09:00 |
|
smoogipooo
|
cf4d11c51c
|
Add explicit CentreHit/RimHit classes.
|
2017-03-30 15:51:16 +09:00 |
|
Dan Balasescu
|
ff325ac330
|
Merge branch 'master' into taiko_replays
|
2017-03-30 14:18:51 +09:00 |
|
Dan Balasescu
|
aa1a333a4b
|
Merge branch 'master' into taiko_swell_drawing
|
2017-03-30 14:16:58 +09:00 |
|
smoogipooo
|
c0dae89844
|
Implement partial strong hit judgements.
|
2017-03-29 18:35:38 +09:00 |
|
smoogipooo
|
37dcc8b71d
|
Rewrite how swell circle piece is instantiated.
|
2017-03-29 14:52:14 +09:00 |
|
smoogipooo
|
74e12bd95e
|
Rewrite how drawable-specific circle pieces are instantiated.
|
2017-03-29 14:01:01 +09:00 |
|
smoogipooo
|
b54e8356f2
|
Merge remote-tracking branch 'origin/master' into taiko_replays
Conflicts:
osu.Game.Modes.Taiko/Beatmaps/TaikoBeatmapConverter.cs
osu.Game.Modes.Taiko/osu.Game.Modes.Taiko.csproj
|
2017-03-29 10:56:24 +09:00 |
|
smoogipooo
|
bbc6a4234a
|
Fix post-merge errors.
|
2017-03-29 09:08:26 +09:00 |
|
smoogipooo
|
eabcae82c6
|
Merge remote-tracking branch 'origin/master' into taiko_swell_drawing
Conflicts:
osu.Game.Modes.Taiko/osu.Game.Modes.Taiko.csproj
|
2017-03-29 08:30:30 +09:00 |
|
Dan Balasescu
|
0a1b9fe398
|
Merge branch 'master' into taiko_hit_drawing
|
2017-03-28 17:25:07 +09:00 |
|
smoogipooo
|
3f6b17c0bf
|
Add drawable Swell.
|
2017-03-28 15:05:45 +09:00 |
|
Dean Herbert
|
076dd73e84
|
Merge branch 'master' into rename_accented
|
2017-03-28 14:22:33 +09:00 |
|
smoogipooo
|
b7d9de57a2
|
Add rim hits.
|
2017-03-28 11:18:12 +09:00 |
|
smoogipooo
|
1faff828d1
|
Move piece to Pieces/.
|
2017-03-28 11:01:35 +09:00 |
|
smoogipooo
|
621bcaed59
|
Add drawable Hits/StrongHits.
|
2017-03-28 10:33:23 +09:00 |
|
smoogipooo
|
4c7e523d18
|
Rename Accented to Strong.
|
2017-03-28 10:02:41 +09:00 |
|
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
|
fcf9a599dd
|
Implement taiko auto replays.
|
2017-03-24 14:24:10 +09:00 |
|
smoogipooo
|
730051520e
|
Add a way to determine the type of a Hit.
|
2017-03-24 14:23:32 +09:00 |
|
smoogipooo
|
99b9623671
|
Implement taiko replays + key conversion.
|
2017-03-24 14:09:58 +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 |
|