|
|
50c328f1b4
|
Merge remote-tracking branch 'upstream/master' into partial-judgements
# Conflicts:
# osu.Game/osu.Game.csproj
|
2017-03-31 16:46:40 +09:00 |
|
|
|
5d25fa3282
|
Merge remote-tracking branch 'upstream/master' into accented-interface
|
2017-03-31 16:38:19 +09:00 |
|
|
|
8f37d1ad91
|
Update to match new replay structure.
|
2017-03-31 16:20:31 +09:00 |
|
|
|
fb6f27a439
|
Merge branch 'master' into taiko_replays
|
2017-03-31 16:11:58 +09:00 |
|
|
|
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 |
|
|
|
75bdccdc3e
|
Update framework.
|
2017-03-31 16:03:59 +09:00 |
|
|
|
3f080ab424
|
Add some commenting.
|
2017-03-31 16:01:48 +09:00 |
|
|
|
cf87330f80
|
Allow SetReplay to receive null.
|
2017-03-31 16:00:40 +09:00 |
|
|
|
fa7c72a099
|
Refactor ReplayInputHandler creation for more flexibility.
|
2017-03-31 15:59:53 +09:00 |
|
|
|
0f4b98ce73
|
Move FramedReplayInputHandler to own file and un-nest.
|
2017-03-31 15:32:34 +09:00 |
|
|
|
c531d774b7
|
Fix file naming.
|
2017-03-31 15:21:30 +09:00 |
|
|
|
9be60e7a25
|
Merge branch 'master' into accented-interface
|
2017-03-31 15:08:22 +09:00 |
|
|
|
a48224bd6d
|
Don't need Drawable type.
|
2017-03-31 15:06:33 +09:00 |
|
|
|
43c306d658
|
IAccented -> IHasAccentColour.
|
2017-03-31 15:06:31 +09:00 |
|
|
|
09b98d71a7
|
Add back Capacity.
|
2017-03-31 13:33:19 +09:00 |
|
|
|
79031b9e74
|
Update framework.
|
2017-03-31 12:58:54 +09:00 |
|
|
|
0bcec4e61a
|
Add null-checks to comparers.
|
2017-03-31 12:55:43 +09:00 |
|
|
|
e7ecc479c9
|
Add FramedReplay and use where legacy is not needed.
|
2017-03-31 12:43:42 +09:00 |
|
|
|
cd915a32be
|
Let's use a List for now.
|
2017-03-31 11:58:24 +09:00 |
|
|
|
49575c3447
|
Special case not needed.
|
2017-03-31 11:54:12 +09:00 |
|
|
|
c2dbbc608a
|
General fixes.
|
2017-03-31 11:50:31 +09:00 |
|
|
|
591ecc0ef4
|
Update framework.
|
2017-03-31 11:48:54 +09:00 |
|
|
|
dbcd2d134b
|
Merge branch 'master' into taiko_drumroll_drawing
|
2017-03-31 11:43:58 +09:00 |
|
|
|
2cb64cbf52
|
Merge pull request #567 from smoogipooo/taiko_swell_drawing
Taiko swell drawing
|
2017-03-31 11:41:41 +09:00 |
|
|
|
0e2f725425
|
Fade the accent colour instead of stepping.
|
2017-03-31 11:41:06 +09:00 |
|
|
|
bcd7e41bf7
|
Visual adjustments to DrawableSwell.
|
2017-03-31 11:20:04 +09:00 |
|
|
|
b48def1627
|
Align SwellSymbolPiece better for rotation.
|
2017-03-31 11:19:33 +09:00 |
|
|
|
5a8099a591
|
Merge branch 'accented-interface' into taiko_drumroll_drawing
|
2017-03-31 11:13:52 +09:00 |
|
|
|
b54201cbe3
|
Appease resharpoo.
|
2017-03-31 11:09:02 +09:00 |
|
|
|
d944b8c192
|
Implement IAccented interface + transform.
|
2017-03-31 11:01:42 +09:00 |
|
|
|
e335b16ee3
|
Merge remote-tracking branch 'origin/master' into general-fixes
|
2017-03-31 10:57:45 +09:00 |
|
|
|
41aaf42183
|
Remove DrumRollCirclePiece, cleanup CirclePiece a bit.
|
2017-03-31 09:57:24 +09:00 |
|
|
|
52ab445f99
|
Merge branch 'master' into taiko_swell_drawing
|
2017-03-31 09:08:32 +09:00 |
|
|
|
8e8d1bbd6d
|
Merge branch 'master' into partial-judgements
|
2017-03-31 09:08:22 +09:00 |
|
|
|
d721f57410
|
Merge branch 'master' into taiko_replays
|
2017-03-31 09:08:13 +09:00 |
|
|
|
a4f3816626
|
Merge branch 'master' into taiko_drumroll_drawing
|
2017-03-31 09:08:08 +09:00 |
|
|
|
e57de373a8
|
Add opentk to osu.Desktop's packages.
|
2017-03-31 09:02:55 +09:00 |
|
|
|
e9a22b9738
|
Merge pull request #552 from ElegantMonkey/fix-opentk-hint
Fix OpenTK hint on project file
|
2017-03-31 08:50:03 +09:00 |
|
|
|
6e88e30442
|
Merge branch 'master' into fix-opentk-hint
|
2017-03-31 08:44:20 +09:00 |
|
|
|
0d4f2c59a5
|
there's probably something in here I overlooked
|
2017-03-30 17:32:18 +02:00 |
|
|
|
15326204d5
|
Merge branch 'master' of git://github.com/ppy/osu into details
|
2017-03-30 16:38:25 +02:00 |
|
|
|
d3f285e455
|
Merge pull request #575 from smoogipooo/better-transformation-helpers
Fix custom transform.
|
2017-03-30 22:47:03 +09:00 |
|
|
|
76d0beb64f
|
Fix custom transform.
|
2017-03-30 22:28:51 +09:00 |
|
|
|
f3599b080c
|
Fix using.
|
2017-03-30 16:12:21 +09:00 |
|
|
|
cf4d11c51c
|
Add explicit CentreHit/RimHit classes.
|
2017-03-30 15:51:16 +09:00 |
|
|
|
ff325ac330
|
Merge branch 'master' into taiko_replays
|
2017-03-30 14:18:51 +09:00 |
|
|
|
aa1a333a4b
|
Merge branch 'master' into taiko_swell_drawing
|
2017-03-30 14:16:58 +09:00 |
|
|
|
71baf916d1
|
Fix post-merge errors.
|
2017-03-30 14:15:42 +09:00 |
|
|
|
5f0c681feb
|
Merge branch 'master' into taiko_drumroll_drawing
|
2017-03-30 14:10:57 +09:00 |
|
|
|
ddc6d45985
|
Merge pull request #572 from smoogipooo/general-fixes
Fix missing base call that may result in invalid ScoreProcessor state.
|
2017-03-30 14:07:50 +09:00 |
|
