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

3265 Commits

Author SHA1 Message Date
smoogipooo
c5f9c4cac9 Fix possible nullref. 2017-03-29 16:20:54 +09:00
Dean Herbert
e8efdcfe0f Merge pull request #561 from smoogipooo/taiko_hit_drawing
Taiko hit drawing
2017-03-29 16:08:23 +09:00
smoogipooo
1b3e908565 Fix notelocking by pressing a key before the swell's start time. 2017-03-29 16:02:12 +09:00
smoogipooo
3d2c8f19ae Make Swells require alternating key hits. 2017-03-29 15:59:12 +09:00
smoogipooo
7ba7bc18f8 Don't use a List for HitKeys. 2017-03-29 15:35:22 +09:00
Dan Balasescu
7ee7954f62 Merge branch 'master' into taiko_hit_drawing 2017-03-29 15:22:32 +09:00
smoogipooo
982fcbbf53 Update framework. 2017-03-29 15:20:20 +09:00
smoogipooo
37dcc8b71d Rewrite how swell circle piece is instantiated. 2017-03-29 14:52:14 +09:00
smoogipooo
400a57ace6 Fix delay + animations a bit (peppy). 2017-03-29 14:50:10 +09:00
smoogipooo
74e12bd95e Rewrite how drawable-specific circle pieces are instantiated. 2017-03-29 14:01:01 +09:00
Dean Herbert
d64f00cae2 Merge pull request #563 from smoogipooo/general_taiko_fixes
General taiko fixes
2017-03-29 13:33:40 +09:00
smoogipooo
59648b99a6 Merge remote-tracking branch 'origin/master' into taiko_swell_drawing 2017-03-29 13:21:41 +09:00
smoogipooo
1c503edad1 Add explicit delay + expire (this will be moved into the base DrawableHitObject later). 2017-03-29 13:19:48 +09:00
smoogipooo
1a56c48ddb Don't need CentreLeft anchors. 2017-03-29 13:07:43 +09:00
Dan Balasescu
cd799823f0 Merge pull request #569 from peppy/general-fixes
General fixes
2017-03-29 12:44:49 +09:00
Dean Herbert
9877a57ba1
Update framework. 2017-03-29 12:38:29 +09:00
Dean Herbert
b96a153e0e
Resize ranks better. 2017-03-29 12:24:04 +09:00
Dean Herbert
d9a4a8d0d4
VisualTests should run at full speed. 2017-03-29 12:23:53 +09:00
smoogipooo
b10f9512ad Remove unused using. 2017-03-29 11:40:13 +09:00
smoogipooo
a3a0199817 Merge remote-tracking branch 'origin/master' into taiko_drumroll_drawing 2017-03-29 11:38:27 +09:00
smoogipooo
eed50784ba Make player work with TaikoHitRenderer. 2017-03-29 11:35:57 +09:00
smoogipooo
1cfe58e905 Implement convesion from TaikoHitObjects to DrawableTaikoHitObjects. 2017-03-29 11:22:27 +09:00
smoogipooo
6333cd5225 Merge branch 'taiko_replays' into taiko-drawable-generation
Conflicts:
	osu.Game.Modes.Taiko/osu.Game.Modes.Taiko.csproj
2017-03-29 11:17:55 +09:00
smoogipooo
df88121f34 Fix post-merge errors. 2017-03-29 11:16:14 +09:00
smoogipooo
3c21e6538b Merge branch 'taiko_drumroll_drawing' into taiko-drawable-generation
Conflicts:
	osu.Desktop.VisualTests/Tests/TestCaseTaikoHitObjects.cs
	osu.Desktop.VisualTests/Tests/TestCaseTaikoPlayfield.cs
	osu.Game.Modes.Taiko/osu.Game.Modes.Taiko.csproj
2017-03-29 11:15:10 +09:00
smoogipooo
24c6ee620f Merge branch 'taiko_hit_drawing' into taiko-drawable-generation
Conflicts:
	osu.Desktop.VisualTests/Tests/TestCaseTaikoHitObjects.cs
	osu.Desktop.VisualTests/Tests/TestCaseTaikoPlayfield.cs
2017-03-29 11:12:39 +09:00
smoogipooo
9da28d372a Merge branch 'taiko_swell_drawing' into taiko-drawable-generation 2017-03-29 11:09:51 +09:00
smoogipooo
475c865968 Implement TaikoModAutoplay. 2017-03-29 11:04:47 +09:00
smoogipooo
589bdde03c Fix post-merge errors. 2017-03-29 10:59:35 +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
Dean Herbert
42f4d67de2
Update framework. 2017-03-29 10:43:29 +09:00
Dan Balasescu
604d487366 Merge pull request #565 from peppy/dynamic-recompile
Dynamically recompile VisualTests
2017-03-29 10:20:33 +09:00
smoogipooo
8f01bd75a1 Update framework. 2017-03-29 10:16:35 +09:00
Dan Balasescu
d7674e2367 Merge branch 'master' into dynamic-recompile 2017-03-29 10:12:48 +09:00
smoogipooo
762cbfc997 Merge remote-tracking branch 'peppy/dynamic-recompile' into taiko_drumroll_drawing 2017-03-29 09:57:25 +09:00
Dean Herbert
ab97967237
Update references and framework. 2017-03-29 09:54:00 +09:00
smoogipooo
1b291ec1a1 Make drumroll body colour depending on completion. 2017-03-29 09:38:24 +09:00
smoogipooo
2a018e708d Better life time end. 2017-03-29 09:36:07 +09:00
smoogipooo
7b479ac737 Merge remote-tracking branch 'origin/master' into taiko_drumroll_drawing 2017-03-29 09:12:48 +09:00
smoogipooo
d74454141b Remove explicit life time end. 2017-03-29 09:12:21 +09:00
smoogipooo
e518508f2d Better life time ends. 2017-03-29 09:11:07 +09:00
smoogipooo
bbc6a4234a Fix post-merge errors. 2017-03-29 09:08:26 +09:00
smoogipooo
c478c74227 Merge remote-tracking branch 'origin/master' into taiko_hit_drawing 2017-03-29 09:03:19 +09:00
smoogipooo
6d5b0a13e4 Fix resharper warning. 2017-03-29 09:02:49 +09:00
smoogipooo
7fc68864be Move swells on top of the playfield when they reach the hit target. 2017-03-29 09:01:40 +09:00
smoogipooo
6bee57c94f Better life time ends. 2017-03-29 08:41:50 +09:00
smoogipooo
45653d7b43 Fix post-merge errors. 2017-03-29 08:32:34 +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
5e734a9271 Merge pull request #566 from peppy/move-easingtypes
Move EasingTypes up one namespace level.
2017-03-29 08:24:38 +09:00
smoogipooo
6856e17364 Update framework. 2017-03-29 08:17:54 +09:00