Commit Graph

818 Commits

Author SHA1 Message Date
f314f5f7ea CI fixes 2017-06-23 22:34:36 +09:00
1a8f207db3 Code formatting 2017-06-23 22:19:41 +09:00
81de1bd5a7 Merge branch 'master' into multiplayer-room-inspector 2017-06-23 21:55:18 +09:00
89c8a34025 Merge branch 'master' into better-drawablehitobject-lifetimes 2017-06-21 20:13:57 +09:00
b191d96aab CI fixes. 2017-06-21 11:35:19 +09:00
62dee59672 Shapes namespace
Depends on https://github.com/ppy/osu-framework/pull/837
2017-06-20 15:54:23 +10:00
34ac932fe2 Reduce pollution in DrawableHitObject in favor of a loosely-coupled IScrollingHitObject. 2017-06-19 10:54:23 +09: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
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
6fd37ebc32 Merge branch 'master' into timingchange-rework 2017-06-15 16:23:51 +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
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
cfb7e4f61a Tidy up testcase a bit 2017-06-15 14:16:47 +09:00
178e2b716e Merge branch 'master' into us 2017-06-13 15:46:53 +09:00
679786c76f Move MenuItemType to correct namespace 2017-06-13 15:20:21 +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
41eb084191 CI fixes 2017-06-12 13:37:13 +03:00
1711258038 Context Menu 2017-06-12 12:56:07 +03: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
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
4abad17b92 Fix Black Space after } and Symbol Spacing 2017-06-08 14:48:42 +08:00
431d225a60 Keyword Spacing and Brackets Fixing 2017-06-08 14:35:10 +08:00
1932b58663 g -> gravity + one more xmldoc. 2017-06-07 19:21:31 +09:00
1017cf54d9 CI fixes. 2017-06-07 19:17:45 +09:00
6f191193a1 Rename timing changes, simplify + improve columns/dictionary usage. 2017-06-07 19:15:51 +09:00
a07f6801da Merge remote-tracking branch 'upstream/master' into timingchange-rework 2017-06-07 18:39:27 +09:00
1de296747f Merge remote-tracking branch 'upstream/master' into social-browser 2017-06-07 17:38:06 +09:00
5f537780cf Bring framework up-to-date 2017-06-07 15:32:50 +09:00
e3d10fc4d3 Update with more framework changes. 2017-06-06 15:52:35 +09:00
4307242bb6 Update with framework changes. 2017-06-05 20:06:46 +09:00
bf971f6613 Merge branch 'master' into social-browser 2017-06-05 19:16:28 +09:00
af6f8bbd89 Fix namespaces and class names 2017-06-05 16:47:42 +09:00
0cb1df35e9 Merge remote-tracking branch 'upstream/master' into ingame_options 2017-06-05 14:53:37 +09:00
a3299809fe Merge remote-tracking branch 'origin/master' into timingchange-rework
# Conflicts:
#	osu.Game/Graphics/Containers/ReverseDepthFillFlowContainer.cs
2017-06-05 10:19:53 +09:00
0afb188cde Remove unused using 2017-06-03 20:05:51 +02:00
04925594ca Merge branch 'master' into separate-skip 2017-06-03 17:45:57 +02:00
d498a4a022 Trim whitespace 2017-06-03 17:45:44 +02:00
8cd2f509ef Move skip button into its own test, because it is no longer two-layered 2017-06-03 17:33:24 +02:00