Commit Graph

292 Commits

Author SHA1 Message Date
21d07428fe Fix some test regressions 2017-07-19 15:16:59 +09:00
6063219b72 Update framework 2017-07-16 13:59:26 +03:00
a5e610a7ba Update framework and fix compilation
Most issues were related to BeginLoopedSequence usage and lack of
"this." in front of transform helpers.
2017-07-14 19:18:12 +03:00
e8ce3e16b0 Address CI concern 2017-07-10 12:52:29 +03:00
0e2dc9388a More changes in-line with framework changes. 2017-07-10 12:55:47 +09:00
89c8a34025 Merge branch 'master' into better-drawablehitobject-lifetimes 2017-06-21 20:13:57 +09:00
fc0e44b214 Update framework. 2017-06-21 11:28:27 +09:00
62dee59672 Shapes namespace
Depends on https://github.com/ppy/osu-framework/pull/837
2017-06-20 15:54:23 +10:00
4afe83e74e Rework DrawableHitObject to provide default life times and proper DrawableTimingSection autosizing.
This exposes LifetimeOffset from DrawableHitObject which is used by the XSRG rulesets to adjust the life time range by the VisibleTimeRange.
2017-06-16 19:21:54 +09:00
5bac0919f0 Remove gross autoSizingAxes and life time. 2017-06-16 13:00:08 +09:00
5d7336b235 A bit more cleanup. 2017-06-16 10:06:47 +09:00
fda220acbc Move speed adjustment code from ManiaHitRenderer to SpeedAdjustedHitRenderer. 2017-06-15 19:34:28 +09:00
419682b740 Merge remote-tracking branch 'origin/master' into timingchange-rework
# Conflicts:
#	osu-framework
2017-06-12 13:09:02 +09:00
ffbb46f668 Update in line with framework. 2017-06-12 12:48:47 +09:00
de35ea22b1 Make bar lines work again. 2017-06-09 22:03:28 +09:00
1f56848442 Rewrite the way speed adjustments are applied. 2017-06-09 19:57:03 +09:00
921350128d Rename SpeedAdjustment -> MultiplierControlPoint + reworking. 2017-06-09 16:57:17 +09:00
4b2669e65d Namespace movement. 2017-06-09 16:20:55 +09:00
d11002e499 Use new naming structure + VisibleTimeRange bindable. 2017-06-09 16:11:49 +09:00
cd435f7ec6 Merge remote-tracking branch 'origin/master' into timingchange-rework
# Conflicts:
#	osu-framework
#	osu.Game.Rulesets.Mania/Timing/ControlPointContainer.cs
2017-06-09 03:37:55 +09:00
8de6bdf340 Rewrite mania to use the new timing section stuff. 2017-06-09 02:43:48 +09:00
55f238f6a9 Remove IHasTimeSpan, add rename to TimingSection. 2017-06-08 23:40:24 +09:00
2f7d9655fd More Clean up 2017-06-08 15:27:35 +08:00
8641379424 Not sure how these CI issues were missed. 2017-06-07 19:27:22 +09:00
6f191193a1 Rename timing changes, simplify + improve columns/dictionary usage. 2017-06-07 19:15:51 +09:00
7aee8ee547 Make TimeSpan a double again. 2017-06-07 19:08:32 +09:00
d66f114b5b Properly set starting lifetime for mania hit objects. 2017-06-03 18:18:25 +09:00
7022c8d496 Move timing change stuff to osu.Game project. 2017-06-02 20:17:44 +09:00
a4cd409835 Super huge abstraction changes to (hopefully) make this TimingChangeContainer usable for non-mania rulesets.
Also includes commenting improvements/fixes.
2017-06-02 19:27:22 +09:00
1d3f5d8649 CI fixes. 2017-06-02 18:19:21 +09:00
5ebe08ed2a Make default mania playfield timespan 1.5s for now. 2017-06-02 17:45:48 +09:00
b46a9dd0ef Add gravity mod. 2017-06-02 17:33:58 +09:00
d30706f640 Move drawable timing changes to Timing/Drawables. 2017-06-01 15:13:52 +09:00
3e2aa26722 Add bar line timing changes. 2017-06-01 15:08:41 +09:00
f612914e87 Initial rewrite of timing changes to allow them to be more extensible. 2017-06-01 14:26:21 +09:00
4b6f2efa76 Cleanups. 2017-05-29 15:32:58 +09:00
32550bda4f Make drawable bar line a bit more sane. 2017-05-29 15:18:06 +09:00
4fce0c1189 Rename Barline -> BarLine. 2017-05-29 15:05:20 +09:00
ee7158aa95 Implement bar lines. 2017-05-29 14:44:42 +09:00
e4b59314ea Use new HitObjectStartTimeComparer. 2017-05-26 18:52:43 +09:00
a5b79b2192 Fix notes not getting accent colours. 2017-05-24 21:56:49 +09:00
78067e085c Fix note input ordering. 2017-05-24 20:53:47 +09:00
836bf930a0 More cleanups. 2017-05-23 15:29:38 +09:00
002a0e99a2 Use SortedList + BinarySearch to find control points at time values. 2017-05-23 15:20:32 +09:00
3cdfd2eef5 Split ControlPoint into different types.
# Conflicts:
#	osu.Game.Rulesets.Mania/UI/Column.cs
2017-05-23 14:03:40 +09:00
3dfe88c068 Make Key a bindable, pass down to drawable hit objects. 2017-05-22 15:28:30 +09:00
c972335297 Add InputTarget to capture input from columns before hit objects. 2017-05-22 15:25:37 +09:00
93182e5da3 Merge branch 'master' into generic-interface 2017-05-22 09:52:40 +09:00
67cf64062a Add flag to determine whether the beatmap requested for conversion is for the current ruleset. 2017-05-19 16:02:40 +09:00
4e8ead9cf4 Fix possible nullref. 2017-05-18 19:05:03 +09:00