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

3483 Commits

Author SHA1 Message Date
Dean Herbert
782c6bf28e Remove unnecessary usings. 2017-04-01 16:07:54 +09:00
Dean Herbert
d610b9e884 Merge remote-tracking branch 'upstream/master' into taiko_drumroll_drawing
# Conflicts:
#	osu.Desktop.VisualTests/Tests/TestCaseTaikoPlayfield.cs
2017-04-01 16:02:32 +09:00
Dan Balasescu
9bd19e99ee Merge pull request #579 from peppy/general-fixes
Framework & VisualTests update
2017-04-01 15:44:13 +09:00
Dean Herbert
062d99607b Merge branch 'master' into general-fixes 2017-04-01 15:40:20 +09:00
Dean Herbert
041e4f921a Merge remote-tracking branch 'upstream/master' into taiko_drumroll_drawing 2017-04-01 14:53:25 +09:00
Jorolf
e380254386 remove unnecessary code 2017-03-31 22:32:09 +02:00
Jorolf
1f19d72474 removed wrong using >.> 2017-03-31 21:24:05 +02:00
Jorolf
d8bb72dd78 remove unused using-directive 2017-03-31 21:19:23 +02:00
Jorolf
50b8580141 add license header 2017-03-31 21:13:20 +02:00
Jorolf
47698be1f5 Merge branch 'master' into details 2017-03-31 21:10:45 +02:00
Andrey Zavadskiy
d7c39a00b4 Hud Visibility 2017-03-31 16:43:31 +03:00
Dean Herbert
904efb2916
Update framework again. 2017-03-31 18:13:24 +09:00
Dean Herbert
01538ed7d7
Fix nullref. 2017-03-31 18:05:24 +09:00
Dean Herbert
2b847aa2f4
Bring VisualTests up-to-date. 2017-03-31 18:00:14 +09:00
Dean Herbert
24d06fa92d
CheckBox -> Checkbox. 2017-03-31 17:38:33 +09:00
Dean Herbert
ba7f1233b3 Merge pull request #568 from smoogipooo/taiko_replays
Taiko replays
2017-03-31 17:27:25 +09:00
Dean Herbert
1110747648 Merge branch 'master' into taiko_replays 2017-03-31 17:10:56 +09:00
Dean Herbert
f42935eccf Merge pull request #571 from smoogipooo/partial-judgements
Implement partial judgements + make Result non-nullable.
2017-03-31 17:07:32 +09:00
Dean Herbert
14fcc197e9 Merge branch 'master' into partial-judgements 2017-03-31 16:53:49 +09:00
Dean Herbert
b078dfdc4e Merge pull request #577 from smoogipooo/accented-interface
Accented interface
2017-03-31 16:46: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
Dean Herbert
5d25fa3282
Merge remote-tracking branch 'upstream/master' into accented-interface 2017-03-31 16:38:19 +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
Dan Balasescu
8773dfcc49 Merge pull request #578 from peppy/framed-replay
Add FramedReplay and use where legacy is not needed.
2017-03-31 16:05:48 +09:00
Dean Herbert
75bdccdc3e
Update framework. 2017-03-31 16:03:59 +09:00
Dean Herbert
3f080ab424
Add some commenting. 2017-03-31 16:01:48 +09:00
Dean Herbert
cf87330f80
Allow SetReplay to receive null. 2017-03-31 16:00:40 +09:00
Dean Herbert
fa7c72a099
Refactor ReplayInputHandler creation for more flexibility. 2017-03-31 15:59:53 +09:00
Dean Herbert
0f4b98ce73
Move FramedReplayInputHandler to own file and un-nest. 2017-03-31 15:32:34 +09:00
Dean Herbert
c531d774b7
Fix file naming. 2017-03-31 15:21:30 +09:00
Dan Balasescu
9be60e7a25 Merge branch 'master' into accented-interface 2017-03-31 15:08:22 +09:00
smoogipooo
a48224bd6d Don't need Drawable type. 2017-03-31 15:06:33 +09:00
smoogipooo
43c306d658 IAccented -> IHasAccentColour. 2017-03-31 15:06:31 +09:00
smoogipooo
09b98d71a7 Add back Capacity. 2017-03-31 13:33:19 +09:00
Dean Herbert
79031b9e74
Update framework. 2017-03-31 12:58:54 +09:00
Dean Herbert
0bcec4e61a
Add null-checks to comparers. 2017-03-31 12:55:43 +09:00
Dean Herbert
e7ecc479c9
Add FramedReplay and use where legacy is not needed. 2017-03-31 12:43:42 +09:00
smoogipooo
cd915a32be Let's use a List for now. 2017-03-31 11:58:24 +09:00
smoogipooo
49575c3447 Special case not needed. 2017-03-31 11:54:12 +09:00
smoogipooo
c2dbbc608a General fixes. 2017-03-31 11:50:31 +09:00
Dean Herbert
591ecc0ef4
Update framework. 2017-03-31 11:48:54 +09:00
Dan Balasescu
dbcd2d134b Merge branch 'master' into taiko_drumroll_drawing 2017-03-31 11:43:58 +09:00
Dean Herbert
2cb64cbf52 Merge pull request #567 from smoogipooo/taiko_swell_drawing
Taiko swell drawing
2017-03-31 11:41:41 +09:00
smoogipooo
0e2f725425 Fade the accent colour instead of stepping. 2017-03-31 11:41:06 +09:00
Dean Herbert
bcd7e41bf7
Visual adjustments to DrawableSwell. 2017-03-31 11:20:04 +09:00
Dean Herbert
b48def1627
Align SwellSymbolPiece better for rotation. 2017-03-31 11:19:33 +09:00
smoogipooo
5a8099a591 Merge branch 'accented-interface' into taiko_drumroll_drawing 2017-03-31 11:13:52 +09:00
smoogipooo
b54201cbe3 Appease resharpoo. 2017-03-31 11:09:02 +09:00
smoogipooo
d944b8c192 Implement IAccented interface + transform. 2017-03-31 11:01:42 +09:00