768 Commits

Author	SHA1	Message	Date
Dean Herbert	b90c9bcacf	Merge branch 'master' into profile	2017-06-23 22:51:31 +09:00
Dean Herbert	f314f5f7ea	CI fixes	2017-06-23 22:34:36 +09:00
Dean Herbert	1a8f207db3	Code formatting	2017-06-23 22:19:41 +09:00
Dean Herbert	81de1bd5a7	Merge branch 'master' into multiplayer-room-inspector	2017-06-23 21:55:18 +09:00
Dean Herbert	076d561615	Merge branch 'master' into profile	2017-06-23 13:12:36 +09:00
Dean Herbert	89c8a34025	Merge branch 'master' into better-drawablehitobject-lifetimes	2017-06-21 20:13:57 +09:00
Dean Herbert	45d3c2cd52	Merge branch 'master' into profile	2017-06-21 16:40:17 +09:00
smoogipooo	b191d96aab	CI fixes.	2017-06-21 11:35:19 +09:00
paparony03	62dee59672	Shapes namespace ... Depends on https://github.com/ppy/osu-framework/pull/837	2017-06-20 15:54:23 +10:00
smoogipooo	34ac932fe2	Reduce pollution in DrawableHitObject in favor of a loosely-coupled IScrollingHitObject.	2017-06-19 10:54:23 +09:00
smoogipooo	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
Huo Yaoyuan	69270814d5	CI fixes.	2017-06-16 16:54:05 +08:00
Huo Yaoyuan	af4ddf8fbd	Merge branch 'master' into profile.	2017-06-16 16:32:54 +08:00
Huo Yaoyuan	43569d69a7	Update transforms.	2017-06-16 16:13:23 +08:00
smoogipooo	ea87aca032	We no longer need to pass in the control point.	2017-06-16 13:12:36 +09:00
smoogipooo	874db28478	CI fixes.	2017-06-16 13:09:06 +09:00
smoogipooo	c8a1933874	Implement proper expiry in test case.	2017-06-16 13:06:44 +09:00
smoogipooo	5bac0919f0	Remove gross autoSizingAxes and life time.	2017-06-16 13:00:08 +09:00
Huo Yaoyuan	53bd22cf9c	Update usage design.	2017-06-15 20:06:17 +08:00
Huo Yaoyuan	13d9f3b9bb	Move namespace and setup for DI.	2017-06-15 17:53:12 +08:00
Dan Balasescu	6fd37ebc32	Merge branch 'master' into timingchange-rework	2017-06-15 16:23:51 +09:00
Dean Herbert	f07a31b2ca	Make hitobjects a bit more visual	2017-06-15 15:17:05 +09:00
Dean Herbert	6679575c13	Add current time labels	2017-06-15 15:06:38 +09:00
Dean Herbert	021019648e	Add labels to playfield area	2017-06-15 14:40:30 +09:00
Dean Herbert	149eaa64de	Use a relative width definition	2017-06-15 14:36:41 +09:00
Dean Herbert	cfb7e4f61a	Tidy up testcase a bit	2017-06-15 14:16:47 +09:00
Huo Yaoyuan	b37c3f8ce1	Some CI fixes.	2017-06-15 07:58:20 +08:00
Huo Yaoyuan	f7a451ed82	Update test case.	2017-06-15 02:38:51 +08:00
Huo Yaoyuan	9ceb4930e9	Merge branch 'master' into profile	2017-06-13 15:23:12 +08:00
Dean Herbert	679786c76f	Move MenuItemType to correct namespace	2017-06-13 15:20:21 +09:00
EVAST9919	41eb084191	CI fixes	2017-06-12 13:37:13 +03:00
EVAST9919	1711258038	Context Menu	2017-06-12 12:56:07 +03:00
smoogipooo	95db62c385	Remove unused using.	2017-06-12 17:32:28 +09:00
smoogipooo	56244e0134	Add small test case to demonstrate usage.	2017-06-12 17:31:24 +09:00
smoogipooo	921350128d	Rename SpeedAdjustment -> MultiplierControlPoint + reworking.	2017-06-09 16:57:17 +09:00
smoogipooo	4b2669e65d	Namespace movement.	2017-06-09 16:20:55 +09:00
smoogipooo	d11002e499	Use new naming structure + VisibleTimeRange bindable.	2017-06-09 16:11:49 +09:00
Huo Yaoyuan	283b6b2b5e	Merge branch 'master' into profile	2017-06-09 13:45:32 +08:00
smoogipooo	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
smoogipooo	8de6bdf340	Rewrite mania to use the new timing section stuff.	2017-06-09 02:43:48 +09:00
smoogipooo	55f238f6a9	Remove IHasTimeSpan, add rename to TimingSection.	2017-06-08 23:40:24 +09:00
John Neijzen	2f7d9655fd	More Clean up	2017-06-08 15:27:35 +08:00
John Neijzen	4abad17b92	Fix Black Space after } and Symbol Spacing	2017-06-08 14:48:42 +08:00
John Neijzen	431d225a60	Keyword Spacing and Brackets Fixing	2017-06-08 14:35:10 +08:00
smoogipooo	1932b58663	g -> gravity + one more xmldoc.	2017-06-07 19:21:31 +09:00
smoogipooo	1017cf54d9	CI fixes.	2017-06-07 19:17:45 +09:00
smoogipooo	6f191193a1	Rename timing changes, simplify + improve columns/dictionary usage.	2017-06-07 19:15:51 +09:00
Dean Herbert	a07f6801da	Merge remote-tracking branch 'upstream/master' into timingchange-rework	2017-06-07 18:39:27 +09:00
Dean Herbert	1de296747f	Merge remote-tracking branch 'upstream/master' into social-browser	2017-06-07 17:38:06 +09:00
Dean Herbert	5f537780cf	Bring framework up-to-date	2017-06-07 15:32:50 +09:00