1
0
mirror of https://github.com/ppy/osu.git synced 2024-12-17 01:32:55 +08:00
Commit Graph

3710 Commits

Author SHA1 Message Date
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
Dan Balasescu
bca18ce209 Merge branch 'master' into move-easingtypes 2017-03-29 08:14:13 +09:00
Dan Balasescu
2bb8e3bae8 Merge pull request #558 from peppy/avatars-and-login
Avatar refactoring & better focus handling in login form.
2017-03-29 08:12:05 +09:00
Dan Balasescu
e53a5a3521 Merge branch 'master' into avatars-and-login 2017-03-29 07:52:43 +09:00
Jorolf
199c70ff95 Added fails and retries 2017-03-28 20:18:56 +02:00
Jorolf
305bc9cff6 Merge branch 'master' of git://github.com/ppy/osu into details 2017-03-28 17:14:35 +02:00
Jorolf
909fdb647c Added ratings and different bar rotations 2017-03-28 17:12:54 +02:00
Dean Herbert
f7dc7e9bb9
Update references. 2017-03-28 21:26:20 +09:00
Andrey Zavadskiy
1c166bdf32 Edited pause visual test 2017-03-28 15:03:12 +03:00
Dean Herbert
24a105704a
Update framework. 2017-03-28 20:39:08 +09:00
Andrey Zavadskiy
91e18cc63e Fix usings 2017-03-28 12:12:35 +03:00
Andrey Zavadskiy
cf3db49631 Inherit Pause/Fail overlay from InGameOverlay 2017-03-28 12:09:26 +03:00
Andrey Zavadskiy
687f71e410 Fixes 2017-03-28 11:45:48 +03:00
Andrey Zavadskiy
60be69d3b0 Fixes 2017-03-28 11:41:08 +03:00
Andrey Zavadskiy
85c2184170 Fixes 2017-03-28 11:33:56 +03:00
smoogipooo
714c280531 One more xmldoc. 2017-03-28 17:26:39 +09:00
Dan Balasescu
0a1b9fe398 Merge branch 'master' into taiko_hit_drawing 2017-03-28 17:25:07 +09:00
smoogipooo
c14759ebad Use new circle piece in test case. 2017-03-28 17:24:14 +09:00
Dan Balasescu
0d0096aced Merge branch 'master' into general_taiko_fixes 2017-03-28 17:21:50 +09:00
smoogipooo
2ff213d2c8 Fix resharper warning. 2017-03-28 17:19:27 +09:00
smoogipooo
79764603d7 Adjust comment. 2017-03-28 17:19:05 +09:00
smoogipooo
efa7e5cb7d Adjust radius. 2017-03-28 17:14:06 +09:00
smoogipooo
adf2550811 Base playfield height + hit target offset on hit object height. 2017-03-28 17:13:05 +09:00
smoogipooo
6f66558e29 Use relative size for ticks. 2017-03-28 17:10:01 +09:00
smoogipooo
6b1dab5b83 Implement drawable drumroll. 2017-03-28 17:08:34 +09:00
Andrey Zavadskiy
62693a6a59 Again separate classes 2017-03-28 10:49:58 +03:00