852 Commits

Author	SHA1	Message	Date
Dean Herbert	2c1f3de47a	Rename 2X resources to be defaults	2017-07-13 10:27:39 +09:00
Dean Herbert	56c817e4b6	Merge branch 'master' into osu-direct-search	2017-07-13 10:16:27 +09:00
Thomas Müller	9d523ea012	Update framework	2017-07-12 11:06:13 +09:00
DrabWeb	b448603d6c	CI fixes.	2017-07-11 01:42:51 -03:00
DrabWeb	fbe414d780	Cleanup.	2017-07-11 01:03:38 -03:00
DrabWeb	84701846ec	Merge https://github.com/ppy/osu into osu-direct-search	2017-07-11 00:26:49 -03:00
Thomas Müller	7729760017	Add beat timings to TestCaseBeatSyncedContainer	2017-07-10 12:08:15 +03:00
Thomas Müller	dfb484cfbb	Restore altered test cases	2017-07-10 11:57:39 +03:00
Dean Herbert	0e2dc9388a	More changes in-line with framework changes.	2017-07-10 12:55:47 +09:00
Dean Herbert	f856e89b58	Fix CI issues	2017-07-10 03:37:51 +09:00
Dean Herbert	7952e7caa9	Fix typos	2017-07-10 03:22:08 +09:00
Dean Herbert	8e7e70bd1a	Merge branch 'master' into update-loop-logic	2017-07-10 03:19:49 +09:00
Thomas Müller	fec6f2ba65	Remove unnecessary usings	2017-07-09 19:57:22 +03:00
Thomas Müller	dedd4561a1	Display indices rather than one-based numbers	2017-07-09 19:41:36 +03:00
Thomas Müller	934a585b94	Better number formatting	2017-07-09 19:40:57 +03:00
Thomas Müller	1f425c3be8	Simplify existing code	2017-07-09 19:40:36 +03:00
Thomas Müller	8c40b80813	Also display negative beats	2017-07-09 19:33:23 +03:00
EVAST9919	d533ac0e98	Simplify info margin	2017-07-09 13:57:13 +03:00
EVAST9919	62fc55521c	Added background colour for better info visibility	2017-07-09 13:54:38 +03:00
EVAST9919	bd45e1f1e7	Make field readonly	2017-07-09 13:48:20 +03:00
EVAST9919	105d57a697	Update Testcase inline with framework	2017-07-09 13:39:48 +03:00
EVAST9919	6e293501e0	Merge remote-tracking branch 'refs/remotes/ppy/master' into beatsync_fixes	2017-07-09 13:23:42 +03:00
Dean Herbert	2c8b8c3f9c	Update loop logic in line with framework changes	2017-07-09 18:23:34 +09:00
Dean Herbert	bb8efcc12f	Fix CI issues (pass #2)	2017-07-08 18:17:47 +09:00
Dean Herbert	3c425dd07f	Fix CI issue	2017-07-08 18:06:59 +09:00
Thomas Müller	22a987f6cc	Update test cases to new framework and fix old crashes	2017-07-07 15:05:55 +03:00
EVAST9919	10a522885a	Merge remote-tracking branch 'refs/remotes/ppy/master' into beatsync_fixes	2017-06-25 23:36:38 +03: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
EVAST9919	3150bdb54b	Fixed wrong display string	2017-06-23 14:56:43 +03:00
EVAST9919	a59af5b005	Applied suggested changes	2017-06-23 10:01:28 +03:00
EVAST9919	608f3fe8c5	oops	2017-06-23 08:41:48 +03:00
EVAST9919	b020fe0d50	Added TestCase	2017-06-23 08:36:47 +03:00
Dean Herbert	89c8a34025	Merge branch 'master' into better-drawablehitobject-lifetimes	2017-06-21 20:13:57 +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
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
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
Dean Herbert	178e2b716e	Merge branch 'master' into us	2017-06-13 15:46:53 +09:00