Dean Herbert
|
561b517dec
|
Merge branch 'master' into skip-redesign
|
2017-05-20 00:42:04 +09:00 |
|
Dean Herbert
|
da31d129ee
|
Merge branch 'master' into mania-beatmap-conversion
|
2017-05-19 18:18:59 +09:00 |
|
Dean Herbert
|
a7d16ac213
|
Move skip logic to inside SkipButton
|
2017-05-19 18:18:21 +09:00 |
|
smoogipooo
|
67cf64062a
|
Add flag to determine whether the beatmap requested for conversion is for the current ruleset.
|
2017-05-19 16:02:40 +09:00 |
|
Dean Herbert
|
f112546085
|
Don't load a mode when opening TestCaseHitObjects
|
2017-05-18 19:42:20 +09:00 |
|
smoogipooo
|
eebd5a910e
|
Merge remote-tracking branch 'origin/master' into mania-beatmap-conversion
|
2017-05-18 11:59:31 +09:00 |
|
Dean Herbert
|
41c252760d
|
Move all pause logic into PauseContainer
|
2017-05-17 21:57:01 +09:00 |
|
smoogipooo
|
9565bb9572
|
Fix hold notes - remove glow for now.
# Conflicts:
# osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNote.cs
# osu.Game.Rulesets.Mania/Objects/Drawables/DrawableManiaHitObject.cs
|
2017-05-17 13:09:49 +09:00 |
|
Huo Yaoyuan
|
d213706d07
|
Use DateTimeOffset.
|
2017-05-16 21:14:50 +08:00 |
|
Dean Herbert
|
85daddcf6f
|
Merge branch 'master' into mania-timing-sections
|
2017-05-16 20:12:26 +09:00 |
|
smoogipooo
|
6231a19b8c
|
Merge remote-tracking branch 'origin/master' into mania-timing-sections
|
2017-05-16 18:35:32 +09:00 |
|
smoogipooo
|
235a5b1dff
|
Add notes to test case.
|
2017-05-16 18:27:33 +09:00 |
|
smoogipooo
|
8ed97a8335
|
Let's invert the playfield by default for now.
|
2017-05-16 18:02:54 +09:00 |
|
smoogipooo
|
ac02d1ab10
|
TimeRelativeContainer -> ControlPointContainer, optimize AutoTimeRelativeContainer a little bit (only recompute on invalidation).
|
2017-05-16 17:50:09 +09:00 |
|
Dean Herbert
|
0feaa407f2
|
Merge branch 'margin-padding-namespace' into on-screen-display
|
2017-05-16 16:40:06 +09:00 |
|
Dean Herbert
|
5e5ad9a899
|
Add basic on-screen display
|
2017-05-16 15:03:03 +09:00 |
|
Dean Herbert
|
efab186384
|
Update namespaces in line with framework
|
2017-05-16 12:50:30 +09:00 |
|
Dean Herbert
|
eaaba11586
|
Change all instances of options to settings where applicable
|
2017-05-15 10:55:29 +09:00 |
|
EVAST9919
|
1f34cec5ce
|
Merge remote-tracking branch 'refs/remotes/ppy/master' into percentage
|
2017-05-11 22:22:57 +03:00 |
|
smoogipooo
|
0739a76497
|
Make the playfield work in TestCaseGamefield.
|
2017-05-11 20:04:45 +09:00 |
|
smoogipooo
|
f6677125af
|
Merge branch 'mania-notes' into mania-timing-sections
|
2017-05-11 14:11:58 +09:00 |
|
smoogipooo
|
a6b71f8ccb
|
Resharper fixes.
|
2017-05-11 14:11:52 +09:00 |
|
smoogipooo
|
cdf827df8e
|
CI fixes.
|
2017-05-11 13:55:52 +09:00 |
|
smoogipooo
|
94585672b6
|
Merge remote-tracking branch 'origin/master' into mania-notes
|
2017-05-11 13:01:00 +09:00 |
|
smoogipooo
|
b10df74079
|
Full rewrite of timing section code, partially working for now.
|
2017-05-11 12:33:19 +09:00 |
|
Dean Herbert
|
70ef503403
|
Merge branch 'master' into metadata
|
2017-05-11 12:23:00 +09:00 |
|
EVAST9919
|
c0acc1799b
|
Now progress testcase has it's own clock
|
2017-05-11 01:49:57 +03:00 |
|
Dan Balasescu
|
cdd71b496d
|
Fix unnecessary newline.
|
2017-05-09 21:08:53 +09:00 |
|
smoogipooo
|
5b323ad483
|
Cleanups.
|
2017-05-09 20:55:20 +09:00 |
|
smoogipooo
|
d852567d1d
|
Rewrite notes to have time-relative position and length.
|
2017-05-09 20:33:59 +09:00 |
|
smoogipooo
|
e3b01e7b8c
|
Merge branch 'master' into mania-notes
# Conflicts:
# osu.Desktop.VisualTests/osu.Desktop.VisualTests.csproj
|
2017-05-08 12:12:40 +09:00 |
|
Huo Yaoyuan
|
4f49151984
|
Make metadata a member of WorkingBeatmap.
|
2017-05-06 14:52:28 +08:00 |
|
Dean Herbert
|
c9ba1ac4f6
|
Adjust namespaces.
Also adds transition, uses IHasCurrentValue, combines Mod TestCases and more.
|
2017-05-05 13:00:05 +09:00 |
|
EVAST9919
|
95f6c999bd
|
Adjust scale and CI fixes
|
2017-05-04 17:59:01 +03:00 |
|
EVAST9919
|
66c858030a
|
Merge remote-tracking branch 'refs/remotes/ppy/master' into mods_refactor
|
2017-05-04 17:35:41 +03:00 |
|
EVAST9919
|
475eb6fe5f
|
Cleanup
|
2017-05-04 17:29:52 +03:00 |
|
smoogipooo
|
4ad3e3d64e
|
Basic implementation of hold notes (not finalized yet).
|
2017-05-04 18:02:43 +09:00 |
|
EVAST9919
|
57c4232416
|
Added testcase
|
2017-05-04 11:58:37 +03:00 |
|
Dean Herbert
|
efa60ee287
|
Merge branch 'master' into mania-stage
|
2017-05-04 16:58:16 +09:00 |
|
smoogipooo
|
f945c636c2
|
Make note accent colour work again.
|
2017-05-04 15:36:37 +09:00 |
|
smoogipooo
|
e307b6d563
|
Make SpecialColumnPosition only have an effect during load().
|
2017-05-04 15:12:32 +09:00 |
|
smoogipooo
|
a2bdd020e5
|
ColumnStyle -> ColumnPosition.
|
2017-05-04 14:54:31 +09:00 |
|
Dean Herbert
|
19f6d58723
|
Merge remote-tracking branch 'upstream/master' into options-implementation
|
2017-05-03 21:54:27 +09:00 |
|
smoogipooo
|
956a7288fb
|
Add basic DrawableNote.
|
2017-05-03 20:12:27 +09:00 |
|
smoogipooo
|
8d82a52942
|
Add revert to normal special style after all steps.
|
2017-05-03 19:38:27 +09:00 |
|
smoogipooo
|
14e4714f08
|
Rewrite a lot of ManiaPlayfield/Column to support left/right special styles and arbitrary number of columns.
|
2017-05-03 19:38:15 +09:00 |
|
smoogipooo
|
7de36b7aa2
|
CI cleanups.
|
2017-05-03 12:58:46 +09:00 |
|
smoogipooo
|
71acf1c57d
|
Move classes out of test case.
|
2017-05-03 12:37:47 +09:00 |
|
smoogipooo
|
b4052a099f
|
Create ManiaPlayfield, support up to 9 columns, improve testcase automation.
|
2017-05-03 12:30:03 +09:00 |
|
smoogipooo
|
27e16b8cfd
|
Merge remote-tracking branch 'origin/master' into mania-stage
|
2017-05-03 10:50:10 +09:00 |
|