16436 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
smoogipoo	aac41d2de6	Disable resharper inspections on case-by-case basis	2017-11-20 18:55:48 +09:00
Dan Balasescu	5c1bfd257d	Merge pull request #1534 from peppy/fix-escape-no-repeat ... FocusedTextBox should not handle repeated escapes	2017-11-20 18:51:28 +09:00
smoogipoo	f0966a2e12	Update framework	2017-11-20 18:40:00 +09:00
Dan Balasescu	2c4a068940	Merge branch 'master' into fix-escape-no-repeat	2017-11-20 18:37:12 +09:00
Dan Balasescu	fdd0cf29e4	Merge pull request #1527 from Aergwyn/fix-result-screen ... fix result screen not showing name of mapper	2017-11-20 18:36:50 +09:00
Dan Balasescu	7906bc030d	Merge branch 'master' into fix-result-screen	2017-11-20 18:19:46 +09:00
Dan Balasescu	5061a81e88	Merge pull request #1526 from jorolf/profile-beatmaps-missing-fix ... fix missing text appearing when request returns nothing but beatmaps are already there	2017-11-20 18:18:50 +09:00
Dan Balasescu	a2e45293d6	Merge branch 'master' into fix-result-screen	2017-11-20 18:18:08 +09:00
Dean Herbert	6df18ffb7a	FocusedTextBox should not handle repeated escapes	2017-11-20 18:14:58 +09:00
Brayzure	da30d76f9b	Implement Score Processor Mod Interface ... - Add a delegate whenever we want to register an additional fail condition	2017-11-20 02:15:29 -05:00
smoogipoo	e608d2841b	Prefer net461	2017-11-20 16:10:34 +09:00
EVAST9919	ecc2877be6	Fix possible null and adjust timeline width	2017-11-20 09:29:26 +03:00
EVAST9919	9fe7ebc0ce	Merge remote-tracking branch 'refs/remotes/ppy/master' into editor-playback-speed	2017-11-20 09:18:22 +03:00
Dean Herbert	8919e98d13	Fix CI issue	2017-11-20 11:32:20 +09:00
smoogipoo	756f6f2d16	Remove net461 targets	2017-11-20 10:10:28 +09:00
jorolf	66c51c7b44	cleanup	2017-11-19 14:33:50 +01:00
jorolf	4281d76bcf	historical section now shows the most played beatmaps	2017-11-19 14:19:05 +01:00
jorolf	48b44e8e4e	add a user most played beatmaps request/response	2017-11-19 14:18:14 +01:00
jorolf	1f379cab8f	move BeatmapMetadataContainer to a separate class	2017-11-19 14:17:14 +01:00
jorolf	fe7f9cccaa	BeatmapSetCover can display other types of covers now	2017-11-19 14:16:00 +01:00
smoogipoo	067c018422	Cleanups	2017-11-19 17:31:35 +09:00
smoogipoo	7f757123e5	Update vscode launch configurations	2017-11-19 17:24:32 +09:00
smoogipoo	5fd16c6268	Make osu.Desktop.Deploy work	2017-11-19 16:30:41 +09:00
Dean Herbert	492120e88c	Add migration for unique constraint on online id	2017-11-19 16:02:08 +09:00
smoogipoo	db4c912e1e	Fix up assembly name	2017-11-19 14:46:51 +09:00
smoogipoo	440c1a9f83	Make osu.Desktop and osu.Game.Tests compile under net461+netstandard	2017-11-19 14:30:56 +09:00
smoogipoo	d2ab0621f3	Make osu.Game + rulesets compile with netstandard	2017-11-19 13:46:51 +09:00
Aergwyn	0b5614e4ee	fix result screen not showing name of mapper	2017-11-18 22:12:15 +01:00
jorolf	9aaefb5e97	same for PaginatedScoreContainer	2017-11-18 20:09:31 +01:00
jorolf	4264641303	fix missing text appearing when request returns nothing but beatmaps are already there	2017-11-18 18:27:30 +01:00
Dean Herbert	d704e9cf7e	Ensure we correctly handle importing beatmaps/sets when the onlineID already exists locally	2017-11-19 01:45:17 +09:00
Dean Herbert	7d2bbc50a3	Add unique constraint on OnlineBeatmapID	2017-11-19 01:45:17 +09:00
Dan Balasescu	7b1083b824	Merge pull request #1524 from peppy/leaderboard-fade-out-fix ... Fix leaderboard fadeout causing constant flow changes	2017-11-19 01:33:04 +09:00
Dean Herbert	9325730f5d	Fix leaderboard fadeout causing constant flow changes ... Also cleans up logic significantly.	2017-11-19 00:53:59 +09:00
EVAST9919	2ff88c86ea	CI fixes	2017-11-18 18:53:21 +03:00
EVAST9919	915ccf3c84	Fix some layout issues	2017-11-18 18:41:00 +03:00
EVAST9919	87f1368869	Add KudosuInfo container in the kudosu section	2017-11-18 18:19:35 +03:00
Dan Balasescu	7046d0a675	Merge pull request #1518 from peppy/fix-main-menu-osu-logo ... Fix osu! logo occasionally being in the wrong state on entering the main menu	2017-11-18 22:52:10 +09:00
Dean Herbert	60778593c3	Make pressing space twice at main menu a bit smoother	2017-11-18 22:24:51 +09:00
Dean Herbert	b835f1b708	Merge branch 'master' into fix-main-menu-osu-logo	2017-11-18 21:53:04 +09:00
Dean Herbert	8df0227bbc	Merge pull request #1521 from EVAST9919/leaderboard_fix ... Fix incorrect scores indexes in leaderboard	2017-11-18 21:52:45 +09:00
Brayzure	de4d8eb196	Implement Sudden Death and Perfect ... - Two additional fail conditions	2017-11-18 01:28:09 -05:00
EVAST9919	4ee3a89c12	Remove using	2017-11-18 08:35:00 +03:00
EVAST9919	34d8f94f99	Add track timer	2017-11-18 08:24:09 +03:00
Dean Herbert	68d4e420dd	Update framework	2017-11-18 12:18:55 +09:00
Dean Herbert	c2d1de34fc	Fix logo not always returning to the correct state when rapidly changing menus ... Fixes #1005 for real	2017-11-18 11:19:15 +09:00
EVAST9919	a741d6cea7	Fix incorrect score indexes in leaderboard	2017-11-18 04:46:02 +03:00
Dean Herbert	322dd1bd05	Rename variables to make more sense	2017-11-18 10:35:17 +09:00
Dean Herbert	f6ea5b0590	Remove duplicated code	2017-11-18 10:34:17 +09:00
Dean Herbert	c2b6e958f7	Merge remote-tracking branch 'upstream/master' into fix-main-menu-osu-logo	2017-11-18 10:28:00 +09:00