1
0
mirror of https://github.com/ppy/osu.git synced 2024-12-20 03:42:57 +08:00
Commit Graph

4641 Commits

Author SHA1 Message Date
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
smoogipooo
2e8607687c Implement DrumRollTick drawing. 2017-03-28 16:49:39 +09:00
smoogipooo
1220972170 Fix ticks not being passed IsStrong. 2017-03-28 16:47:25 +09:00
smoogipooo
1615db386a Give DrumRoll some sane velocity/tickdistance defaults. 2017-03-28 16:47:13 +09:00
smoogipooo
d1f686b1a8 Fix DrawableTaikoHitObject origins. 2017-03-28 16:38:58 +09:00
Andrey Zavadskiy
c1009c2a3c Merge remote-tracking branch 'refs/remotes/ppy/master' into pause_buttons_refactor 2017-03-28 10:20:06 +03:00
Dean Herbert
4bdf9e09ca Merge pull request #560 from smoogipooo/general_taiko_fixes
General taiko fixes
2017-03-28 16:12:19 +09:00
smoogipooo
ae4cabccef Adjust comment. 2017-03-28 16:00:39 +09:00
Dean Herbert
ffbf6888c4 Merge branch 'master' into general_taiko_fixes 2017-03-28 15:40:55 +09:00
Dean Herbert
28bde5eecd Merge pull request #559 from smoogipooo/rename_accented
Rename Accented to Strong.
2017-03-28 15:40:35 +09:00
Dean Herbert
4042b94e01
Use DelayedLoadContainer in more places. 2017-03-28 15:28:58 +09:00
smoogipooo
3f6b17c0bf Add drawable Swell. 2017-03-28 15:05:45 +09:00
Dean Herbert
f690e1d0c4
Move async logic to framework. 2017-03-28 14:24:34 +09:00
Dean Herbert
076dd73e84 Merge branch 'master' into rename_accented 2017-03-28 14:22:33 +09:00
Dean Herbert
8ad4c5f312 Merge pull request #513 from smoogipooo/taiko_drumroll_drawable
Drawable DrumRoll Implementation (Input only)
2017-03-28 14:21:44 +09:00
Andrey Zavadskiy
9774f826ab Pause and fail overlays -> StopOverlay 2017-03-28 06:08:31 +03:00
smoogipooo
ec9a027b59 ZZZZZZZzzzzzzzz. 2017-03-28 11:21:01 +09:00
Andrey Zavadskiy
c4500fa270 fixes 2017-03-28 05:19:32 +03:00
smoogipooo
b7d9de57a2 Add rim hits. 2017-03-28 11:18:12 +09:00
Andrey Zavadskiy
110d43bc25 fixes 2017-03-28 05:12:04 +03:00
smoogipooo
1faff828d1 Move piece to Pieces/. 2017-03-28 11:01:35 +09:00