253 Commits

Author	SHA1	Message	Date
Dean Herbert	94ceb1e32b	Move screen change allowance to local usage	2019-02-14 13:28:21 +09:00
Dean Herbert	e2e615cc5c	Merge branch 'master' into leased-bindables-dont-work	2019-02-11 16:30:12 +09:00
smoogipoo	065b0c9076	Fix background not being faded correctly	2019-02-04 17:04:52 +09:00
Dean Herbert	ca5c8d37d1	Use leased bindables	2019-02-01 16:44:06 +09:00
Dean Herbert	d34aa50613	Merge branch 'master' into iscreen	2019-01-31 01:08:06 +09:00
smoogipoo	ac0bc53c4b	Revert "Merge pull request #4154 from phosphene47/carousel-wedge-level" ... This reverts commit cc8793a45e, reversing changes made to 94276c8abb.	2019-01-31 00:02:05 +09:00
smoogipoo	91302ea0bc	Merge remote-tracking branch 'origin/master' into iscreen ... # Conflicts: # osu.Game/Screens/Multi/Match/MatchSubScreen.cs # osu.Game/Screens/Multi/Multiplayer.cs # osu.Game/Screens/Multi/MultiplayerSubScreen.cs # osu.Game/Screens/OsuScreen.cs # osu.Game/osu.Game.csproj # osu.sln	2019-01-29 21:21:36 +09:00
phosphene47	5c70be07ab	Display carousel over beatmap info wedge	2019-01-25 22:58:55 +11:00
smoogipoo	8ea7ec6445	Convert everything to use IScreen	2019-01-24 19:47:44 +09:00
Dean Herbert	8617aaa2a7	Update licence header (and remove year)	2019-01-24 17:43:03 +09:00
smoogipoo	b17b88d071	Fix null beatmap possibly being selected	2019-01-08 18:06:46 +09:00
smoogipoo	daa6292e08	Split results screen to allow for extensibility	2018-12-22 15:39:06 +09:00
smoogipoo	49dd6ae9b0	Move a lot more of PlaySongSelect into SongSelect	2018-12-12 13:21:44 +09:00
smoogipoo	10b526504a	Move ModOverlay to SongSelect	2018-12-06 19:29:18 +09:00
Dean Herbert	a33865efce	Fix home button being cancelled by mod select	2018-12-04 12:06:05 +09:00
smoogipoo	a8ad7d4670	Add silent import parameter	2018-11-30 18:27:13 +09:00
smoogipoo	d07a724970	Only allow replay screen changes in menu + songselect	2018-11-30 18:25:54 +09:00
smoogipoo	a88b69ec43	Notify of existing imports	2018-11-28 20:19:35 +09:00
smoogipoo	f27bd3ef3e	OpenTK -> osuTK	2018-11-20 17:14:59 +09:00
Kyle Chang	214ed43b81	Check if SongSelect is current screen before playing selected song	2018-10-30 23:47:54 -04:00
Kyle Chang	c7e950af7f	Remove EditSelected in favor in inlining beatmapNoDebounce in Edit	2018-10-29 00:04:51 -04:00
Kyle Chang	2b736c3cd6	Make beatmap edit button reload beatmap without mods	2018-10-28 13:04:45 -04:00
Kyle Chang	f8a8c7cb6b	Stop transferring track when editing	2018-10-28 12:43:19 -04:00
Dean Herbert	d28b9860ff	Don't use "beatmapset" terminology	2018-10-10 19:26:35 +09:00
Dean Herbert	841b2e8692	Merge branch 'master' into consistent-terminology-format	2018-10-10 19:19:36 +09:00
ekrctb	b7a2ad1aa5	Use UIEvent level getters for modifier keys.	2018-10-02 13:26:36 +09:00
ekrctb	50091252e2	Adapt signature change of event handlers	2018-10-02 12:02:55 +09:00
ekrctb	99fc04c8af	Change signature to new event handler	2018-10-02 12:02:47 +09:00
Paul Teng	654345f380	Remove duplicate condition test	2018-09-20 22:32:24 -04:00
Paul Teng	1644719893	Update SongSelect.cs	2018-09-20 22:29:37 -04:00
Paul Teng	49fbe8443a	Test if there are beatmaps when click on delete btn	2018-09-20 22:00:20 -04:00
Joehu	f99eff1192	Use consistent terminology format	2018-09-15 07:30:11 -07:00
Dean Herbert	03084aa04b	Revert async changes	2018-08-31 07:07:10 +09:00
Dean Herbert	919e78a89a	Attempt to fix cross-thread database usage	2018-08-29 01:42:25 +09:00
smoogipoo	e7a5816d27	Use GetAsync for all samples	2018-08-27 17:30:16 +09:00
Dean Herbert	18aa30fcb0	Unbind song select's ruleset to avoid test failures	2018-08-20 14:27:32 +09:00
smoogipoo	970aa811bd	Fix mods not being reset prior to ruleset changing	2018-08-14 13:19:50 +09:00
Dean Herbert	9ab56bc4ef	Make Ruleset non-public	2018-07-31 16:35:51 +09:00
Dean Herbert	95cca046fb	Merge branch 'master' into open-downloaded-beatmas	2018-07-25 12:38:49 +02:00
Dean Herbert	0f37758314	Update framework	2018-07-21 16:21:53 +09:00
Dean Herbert	64ead0fdf7	Add more tests and fix one remaining issue case	2018-07-20 11:55:17 +09:00
Dean Herbert	d7f1766ee2	wip	2018-07-19 18:51:08 +09:00
Dean Herbert	c31676f8f1	Rework update methods to separate out ruleset and beatmap changes ... Combining them was causing complexity and logic errors.	2018-07-19 18:48:40 +09:00
Dean Herbert	f1c3fbe644	Improve integrity of song select bind/change logic	2018-07-18 13:18:50 +09:00
Dean Herbert	4f5578245e	Fix regression causing previews to not play	2018-07-13 21:45:49 +09:00
Dean Herbert	63c40e9051	Remove unnecessary cache operations	2018-07-13 21:45:42 +09:00
Dean Herbert	ac078153ae	Merge remote-tracking branch 'upstream/master' into peppy-fix-incorrect-mods	2018-07-13 14:20:56 +09:00
Dean Herbert	fbc5250bf1	Update framework	2018-07-11 17:12:01 +09:00
Dean Herbert	9e59b4a8e2	Fix SongSelect binding to ruleset too early ... Causes music to stop playing while at main menu.	2018-07-10 01:29:24 +09:00
Dan Balasescu	ee4607c86e	Merge branch 'master' into fix-exit-race-condition	2018-07-09 19:02:37 +09:00