6636 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Dean Herbert	9d47dd9ff9	Add support for right mouse absolute scrolling (when enabled) ... Will likely need to be bindable when hooked up to settings and actually used.	2017-07-12 18:57:44 +09:00
EVAST9919	0b1db1502d	removed useless bool	2017-07-12 09:42:38 +03:00
EVAST9919	ab8fb2edab	Merge remote-tracking branch 'refs/remotes/ppy/master' into mods_overlay_fix	2017-07-12 09:31:56 +03:00
Dean Herbert	04e99d1369	Only apply disable rules when in a screen stack.	2017-07-12 13:40:17 +09:00
Dean Herbert	54f6befd67	Merge branch 'master' into fix-track-rotation	2017-07-12 13:18:16 +09:00
Dean Herbert	a5d0bfb02f	Merge pull request #1010 from Tom94/container-collection-readonlylist ... Update framework with ICollection & IReadOnlyList Containers	2017-07-12 13:15:44 +09:00
Dean Herbert	0322e66c25	Merge remote-tracking branch 'upstream/master' into container-collection-readonlylist	2017-07-12 13:07:23 +09:00
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	9bbcc0526d	Disable beatmap changes in specified screens	2017-07-11 18:39:10 +09:00
Dean Herbert	773ef26ce3	Make MusicController support disabled beatmap bindable	2017-07-11 18:38:49 +09:00
Dean Herbert	1bd3519ecb	Have beatmap return a zero-length TrackVirtual instead of null on load failure	2017-07-11 18:38:27 +09:00
Dean Herbert	311c2aec1c	Fix next track not automatically playing when music controller is not visible	2017-07-11 17:53:36 +09: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
Huo Yaoyuan	752f625a62	Set relative axes inside AsyncLoadWrapper.	2017-07-11 09:19:36 +08:00
Huo Yaoyuan	fd4a054921	Merge branch 'master' into profile	2017-07-11 09:16:32 +08: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