6184 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Dean Herbert	4cf409ab35	Adjust padding slightly	2017-07-13 14:23:52 +09:00
Dean Herbert	c7a13740f9	Move sections to own namespace	2017-07-13 13:53:45 +09:00
Dean Herbert	c02a85bc4a	Formatting	2017-07-13 13:52:40 +09:00
Dean Herbert	3a4150c6c3	Merge remote-tracking branch 'upstream/master' into profile ... # Conflicts: # osu.Game/Graphics/Containers/SectionsContainer.cs	2017-07-13 13:44:21 +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
Dean Herbert	80f88cf5bb	Merge pull request #977 from VPeruS/window-icon-lin-mac ... Insert window icon as EmbeddedResource into osu!.exe	2017-07-13 13:11:10 +09:00
DrabWeb	0624f578eb	Update with online beatmap changes.	2017-07-13 01:06:46 -03:00
Dean Herbert	e73382f313	Merge branch 'master' into window-icon-lin-mac	2017-07-13 13:03:44 +09:00
DrabWeb	dc5ec319a2	Merge https://github.com/ppy/osu into drawable-room-update	2017-07-13 01:00:32 -03:00
Dean Herbert	644edbd006	Merge pull request #1008 from DrabWeb/osu-direct-search ... osu!direct search	2017-07-13 12:59:55 +09: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
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