Commit Graph

5539 Commits

Author SHA1 Message Date
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
ea87aca032 We no longer need to pass in the control point. 2017-06-16 13:12:36 +09:00
874db28478 CI fixes. 2017-06-16 13:09:06 +09:00
c8a1933874 Implement proper expiry in test case. 2017-06-16 13:06:44 +09:00
5bac0919f0 Remove gross autoSizingAxes and life time. 2017-06-16 13:00:08 +09:00
6bfb716cc6 CI fixes.
Update SpeedAdjustmentCollection.cs
2017-06-16 11:48:14 +09:00
41c6140435 We don't need to use Cached just yet.
This was here to support dynamic re-ordering of hit objects and speed adjustment containers, however there needs to be more work done to TimingControlPoints/MultiplierControlPoints in general before this is possible.
2017-06-16 10:53:02 +09:00
5d7336b235 A bit more cleanup. 2017-06-16 10:06:47 +09:00
ff84a11c37 We don't need this to be protected anymore. 2017-06-16 09:54:16 +09:00
03b2b254ba Make SpeedAdjustmentCollection support unordered adds of speed adjustments and hit objects. 2017-06-16 09:38:06 +09:00
fda220acbc Move speed adjustment code from ManiaHitRenderer to SpeedAdjustedHitRenderer. 2017-06-15 19:34:28 +09:00
6fd37ebc32 Merge branch 'master' into timingchange-rework 2017-06-15 16:23:51 +09:00
aa830e435a Add comment. 2017-06-15 16:15:41 +09:00
f07a31b2ca Make hitobjects a bit more visual 2017-06-15 15:17:05 +09:00
6679575c13 Add current time labels 2017-06-15 15:06:38 +09:00
32226f90db Enforce exception better 2017-06-15 14:53:39 +09:00
585e7ba312 Add a check to make sure all hitobjects use relativepositionaxes 2017-06-15 14:42:25 +09:00
021019648e Add labels to playfield area 2017-06-15 14:40:30 +09:00
149eaa64de Use a relative width definition 2017-06-15 14:36:41 +09:00
63ca8a428d Add xmldoc to MultiplierControlPoint 2017-06-15 14:20:54 +09:00
f439237bd7 Set a more sane default for TimingControlPoint's BeatLength 2017-06-15 14:19:06 +09:00
cfb7e4f61a Tidy up testcase a bit 2017-06-15 14:16:47 +09:00
df79fff996 Merge pull request #931 from peppy/fix-hacky-tabs
Fix hacky channel selector tab
2017-06-13 19:51:51 +09:00
99a93d98dc Merge remote-tracking branch 'origin/master' into fix-hacky-tabs 2017-06-13 19:46:01 +09:00
cd2db315b8 Update framework. 2017-06-13 19:45:01 +09:00
0e7afc91fa Merge pull request #932 from peppy/nuget-update
Update nuget packages
2017-06-13 16:07:19 +09:00
3ca80eb149 Add readonly 2017-06-13 15:54:26 +09:00
19236dcd1e Merge branch 'improved-loading-animation' into nuget-update 2017-06-13 15:50:21 +09:00
178e2b716e Merge branch 'master' into us 2017-06-13 15:46:53 +09:00
d6e042aec0 Merge pull request #930 from EVAST9919/context_menu
Context menu (osu-side)
2017-06-13 15:40:33 +09:00
700d6f9d38 Adjust appearance slightly 2017-06-13 15:27:47 +09:00
679786c76f Move MenuItemType to correct namespace 2017-06-13 15:20:21 +09:00
cec9053f0b Update framework 2017-06-13 14:01:56 +09:00
41d4aee4f5 Update nuget packages
- [ ] Depends on framework partner in crime https://github.com/ppy/osu-framework/pull/820
2017-06-13 11:50:46 +09:00
9f8c66b8c6 Forgot to add dropdown-like animation 2017-06-12 13:39:45 +03:00
41eb084191 CI fixes 2017-06-12 13:37:13 +03:00
1711258038 Context Menu 2017-06-12 12:56:07 +03:00
6c71e8447c update framework 2017-06-12 12:55:58 +03:00
3efe8629d6 Fix hacky tabs 2017-06-12 18:39:22 +09:00
95db62c385 Remove unused using. 2017-06-12 17:32:28 +09:00
56244e0134 Add small test case to demonstrate usage. 2017-06-12 17:31:24 +09:00
e94425f311 Improve the loading animation and use it in multiple places
- Supersedes https://github.com/ppy/osu/pull/926.
- [ ] Depends on https://github.com/ppy/osu-framework/pull/817.
2017-06-12 17:04:42 +09:00
ba8014bbd9 Cleanups + xmldoc rewordings/improvements. 2017-06-12 15:20:34 +09:00
419682b740 Merge remote-tracking branch 'origin/master' into timingchange-rework
# Conflicts:
#	osu-framework
2017-06-12 13:09:02 +09:00
8bd9c112ba Merge pull request #927 from smoogipooo/general-fixes
Update framework.
2017-06-12 13:02:36 +09:00
157e0e569a Remove unused file. 2017-06-12 12:57:34 +09:00
ffbb46f668 Update in line with framework. 2017-06-12 12:48:47 +09:00
df899d3de3 Merge pull request #921 from smoogipooo/dynamic-vertex-attributes
Dynamically determine vertex attributes (framework update)
2017-06-10 17:31:58 +09:00
0521d4b761 Merge branch 'master' into dynamic-vertex-attributes
# Conflicts:
#	osu-framework
2017-06-10 17:26:16 +09:00
de35ea22b1 Make bar lines work again. 2017-06-09 22:03:28 +09:00