3777 Commits

Author	SHA1	Message	Date
Dan Balasescu	3702d4b921	Merge branch 'master' into settings-improvements	2017-07-14 18:43:08 +10:00
Dean Herbert	95a40e39ec	Merge branch 'master' into mods_overlay_fix	2017-07-14 17:31:52 +09:00
Dean Herbert	b957bca4c5	Merge branch 'master' into settings-improvements	2017-07-14 17:27:09 +09:00
Dean Herbert	3aeed86392	Merge branch 'master' into drawable-room-update	2017-07-14 15:29:27 +09:00
Dean Herbert	bce4b838d8	Formatting	2017-07-14 14:40:50 +09:00
Dean Herbert	133bcdec7a	Move async loading to a higher level to simplify logic	2017-07-14 14:39:15 +09:00
Dean Herbert	980fb18ed6	Remove unnecessary alpha/alwayspresent changes	2017-07-14 14:30:35 +09:00
Dean Herbert	20052b060c	Nest delays and implement IStateful, allowing for flushing on early dismiss ... Note that this will break rotation loops until https://github.com/ppy/osu-framework/issues/900 is addressed.	2017-07-14 13:25:31 +09:00
Dean Herbert	ab5341eadc	Merge remote-tracking branch 'upstream/master' into DrabWeb/medal-splash	2017-07-14 09:46:36 +09:00
Dean Herbert	6c9219856d	Add comment	2017-07-14 09:39:40 +09:00
Nabile Rahmani	840cc918ea	Use Enabled instead of a private field.	2017-07-13 23:35:19 +02:00
Nabile Rahmani	8014cd55a2	Make the skip button clickable only once.	2017-07-13 21:59:17 +02:00
Dean Herbert	2ff92ac25a	Contract sidebar on click ... Also makes queueing of expand more correct.	2017-07-13 17:09:12 +09:00
Dean Herbert	939e167d6a	Correct offset settings vertically based on toolbar visibility	2017-07-13 17:09:12 +09:00
Dean Herbert	f4fd263671	Fix settings not offsetting scroll operations by fixed header content	2017-07-13 17:09:12 +09:00
Dean Herbert	8460e29bcb	Sidebar now pushes full settings out further	2017-07-13 17:09:12 +09:00
Dean Herbert	fc28617099	Merge remote-tracking branch 'upstream/master' into ruleset-settings	2017-07-13 15:35:53 +09:00
Dean Herbert	de46f3ab07	Remove all unnecessary parenthesis where object initialisers are used ... Enforces at CI.	2017-07-13 15:11:33 +09:00
DrabWeb	b196b1d3c6	CI fixes, switch RoomInspector to use BeatmapSetCover.	2017-07-13 01:24:59 -03:00
DrabWeb	fea40ccc1a	Share BeatmapSet cover sprite code.	2017-07-13 01:17:47 -03:00
DrabWeb	0624f578eb	Update with online beatmap changes.	2017-07-13 01:06:46 -03:00
DrabWeb	dc5ec319a2	Merge https://github.com/ppy/osu into drawable-room-update	2017-07-13 01:00:32 -03:00
Dean Herbert	f142bd0dc0	Improve formatting of panel creation code	2017-07-13 12:52:51 +09:00
DrabWeb	321ae42351	Formatting.	2017-07-13 00:27:41 -03:00
Dean Herbert	8045e0566f	Use a bindable for the current query. ... Aso debounce and don't require hitting enter.	2017-07-13 12:22:51 +09:00
Dean Herbert	4e1a998f9d	Don't return so early on empty search (never clears results)	2017-07-13 12:20:32 +09:00
Dean Herbert	e30f0a2e69	Avoid potentially calling updateSearch more than once in a single update	2017-07-13 12:20:07 +09:00
DrabWeb	931adcf677	Typo.	2017-07-13 00:13:56 -03:00
DrabWeb	ca12fd3042	Better medal sprite loading, fade in particles, visual test update.	2017-07-13 00:13:18 -03:00
Dean Herbert	190ea3bfab	Remove unnused variable	2017-07-13 11:06:28 +09:00
Dean Herbert	3f2f42d13c	Always load high resolution for now ... Also rename GetBackground to CreateBackground, since it's returning a new instance.	2017-07-13 10:30:09 +09:00
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
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	0322e66c25	Merge remote-tracking branch 'upstream/master' into container-collection-readonlylist	2017-07-12 13:07:23 +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	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
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	cbb521e395	Merge master in	2017-07-11 15:11:44 +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