5840 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Dean Herbert	349dbfe263	Merge pull request #1011 from Tom94/update-framewörk ... Update sorting comparers in line with framework changes	2017-07-12 13:02:08 +09:00
Dean Herbert	e1e7cb7178	Remove unnecessary using statements	2017-07-12 12:55:52 +09:00
Dean Herbert	c8c1dcae28	Fix incorrect filename	2017-07-12 12:55:40 +09:00
Thomas Müller	6209f193e3	Update framework	2017-07-12 12:51:42 +09:00
Thomas Müller	9d523ea012	Update framework	2017-07-12 11:06:13 +09:00
DrabWeb	204d2ee43d	Convert MedalOverlay animation durations to constants.	2017-07-11 22:43:16 -03:00
DrabWeb	29cdbc65bc	CI fixes.	2017-07-11 22:38:13 -03:00
DrabWeb	aef2a3bdda	Cleanup.	2017-07-11 22:26:58 -03:00
DrabWeb	16bb96e6aa	Async medal sprite loading.	2017-07-11 22:12:49 -03:00
DrabWeb	6b0ba1f98d	Fix merge error.	2017-07-11 20:44:28 -03:00
Seth	b30721edbe	Merge branch 'master' into drawable-room-update	2017-07-11 20:42:44 -03:00
Jorolf	f7c9e449d4	add ruleset settings	2017-07-11 20:25:24 +02:00
Thomas Müller	4045083dcd	Update sorting comparers in line with framework changes	2017-07-11 21:21:58 +03:00
Dean Herbert	39d20565aa	Merge pull request #1006 from peppy/fix-unit-test-on-linux ... Remove assert which is not always true on some operating systems	2017-07-11 15:27:21 +09:00
Dean Herbert	c398ea764a	Merge branch 'master' into fix-unit-test-on-linux	2017-07-11 15:17:50 +09:00
Dean Herbert	b2ee7d55b6	Merge pull request #1007 from peppy/fix-osu-logo-transforms ... Fix osu! logo on main menu ending up in the wrong place	2017-07-11 15:17:32 +09:00
Dean Herbert	e6deef5963	Merge branch 'master' into fix-unit-test-on-linux	2017-07-11 15:12:40 +09:00
Dean Herbert	cbb521e395	Merge master in	2017-07-11 15:11:44 +09:00
Dean Herbert	896582fc06	Update framework	2017-07-11 14:54:24 +09:00
DrabWeb	2ee0f3f5f6	Update with framework changes.	2017-07-11 02:11:08 -03:00
DrabWeb	202e3ca530	Merge https://github.com/ppy/osu into medal-splash	2017-07-11 02:00:36 -03:00
DrabWeb	a9ff0b5317	Make SlimMenu more opaque.	2017-07-11 01:59:52 -03:00
DrabWeb	b448603d6c	CI fixes.	2017-07-11 01:42:51 -03:00
DrabWeb	fc7b4ceff1	Fix osu!direct visual test initially not having a mode selected.	2017-07-11 01:30:59 -03:00
Dean Herbert	a9c50786b2	Fix osu! logo on main menu ending up in the wrong place ... Also switch to using BeginDelayedSequence where possible.	2017-07-11 13:27:45 +09:00
DrabWeb	c449491c04	Fix RoomInspector covers.	2017-07-11 01:18:16 -03:00
DrabWeb	fbe414d780	Cleanup.	2017-07-11 01:03:38 -03:00
DrabWeb	69b290519f	Better BeatmapSetOnlineInfo comments.	2017-07-11 00:28:25 -03:00
DrabWeb	84701846ec	Merge https://github.com/ppy/osu into osu-direct-search	2017-07-11 00:26:49 -03:00
Dean Herbert	55d999e4a1	Fix comment	2017-07-11 10:45:43 +09:00
Dean Herbert	327327ea92	Remove custom windows configuration from tasks.json ... No longer required as mono 5.0 upwards handles this gracefully (while not yet adding full parallel support).	2017-07-11 10:43:43 +09:00
Dean Herbert	e9b397f06f	Remove assert which is not always true on some operating systems	2017-07-11 10:41:18 +09:00
Dan Balasescu	7f719257d4	Merge pull request #1004 from peppy/update-framework ... Update framework	2017-07-11 10:38:36 +09:30
Dean Herbert	d6d79432c9	Update framework	2017-07-11 09:59:08 +09:00
Thomas Müller	2d21a7d2bf	Merge pull request #1001 from peppy/update-loop-logic ... Update transform usage in line with framework changes	2017-07-10 13:05:13 +03:00
Thomas Müller	4134f84559	Increase test timeout to 1 minute	2017-07-10 12:54:11 +03:00
Thomas Müller	e8ce3e16b0	Address CI concern	2017-07-10 12:52:29 +03:00
Thomas Müller	7729760017	Add beat timings to TestCaseBeatSyncedContainer	2017-07-10 12:08:15 +03:00
Thomas Müller	d9b362489b	Fix incorrect TimeUntilNextBeat and add TimeSinceLastBeat	2017-07-10 12:07:38 +03:00
Thomas Müller	dfb484cfbb	Restore altered test cases	2017-07-10 11:57:39 +03:00
Thomas Müller	c4e378571b	Update framework	2017-07-10 11:54:23 +03:00
Dean Herbert	0e0c32008b	More changes	2017-07-10 15:40:40 +09: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	15fe01d5ee	Update framework	2017-07-10 03:20:05 +09:00
Dean Herbert	8e7e70bd1a	Merge branch 'master' into update-loop-logic	2017-07-10 03:19:49 +09:00
Thomas Müller	adf2f1e4c4	Merge pull request #958 from EVAST9919/beatsync_fixes ... TestCase for BeatSyncedContainer	2017-07-09 20:45:10 +03: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