11689 Commits

Author	SHA1	Message	Date
Dan Balasescu	ad2a495dbc	Merge branch 'master' into screen-title-custom-icon	2019-05-21 15:56:56 +09:00
Dean Herbert	58efa7a177	Merge pull request #4729 from peppy/fix-control-point-ordering ... Fix control points with same timestamp potentially being parsed incorrectly	2019-05-21 15:33:27 +09:00
Dan Balasescu	67ac76aae7	Merge branch 'master' into move-tooltip-text	2019-05-21 15:00:09 +09:00
Dan Balasescu	ab183949df	Merge branch 'master' into new-colours-osu-colour	2019-05-21 14:49:25 +09:00
smoogipoo	7a56fe84f2	Remove ControlPoint.EquivalentTo	2019-05-21 14:27:57 +09:00
smoogipoo	7e38aabe75	Remove equivalence check from controlpoint parsing	2019-05-21 14:27:41 +09:00
Dan Balasescu	de08bab0a1	Merge branch 'master' into move-tooltip-text	2019-05-21 14:25:38 +09:00
Dean Herbert	4ac2acbfc0	Fix usages of SpriteText (instead of OsuSpriteText)	2019-05-21 14:13:52 +09:00
Dean Herbert	e0da919fe9	Allow custom icon specification in ScreenTitle ... Not all icons are available in fonts so IconUsage alone is not enough to cover all scenarios.	2019-05-21 14:10:21 +09:00
Dean Herbert	587e4bb5d5	Remove unnecessary getters from ScreenTitle	2019-05-21 14:10:16 +09:00
Dean Herbert	247dad7e86	Use OsuColour for profile overlay	2019-05-21 13:54:19 +09:00
Dean Herbert	bc962bf8f0	Move TooltipText to OsuClickableContainer	2019-05-21 13:51:38 +09:00
Dean Herbert	85a41cf6c3	Allow chaining of loadComponentSingleFile	2019-05-21 13:44:18 +09:00
Dean Herbert	5e499cf55d	Update resources	2019-05-18 12:45:06 +09:00
Dean Herbert	98189b2b87	Merge branch 'master' into update-framework	2019-05-18 12:10:37 +09:00
Dean Herbert	9106200c65	Bump framework version	2019-05-18 12:08:22 +09:00
Roman Kapustin	a538c94fed	Update NuGet packages	2019-05-17 21:40:46 +03:00
smoogipoo	ccbf3ff812	Update framework	2019-05-17 22:35:23 +09:00
Dan Balasescu	553d786b94	Merge branch 'master' into fix-logo-tracking-crash	2019-05-17 19:23:14 +09:00
Dean Herbert	359e5b71a5	Fix race condition causing player to never restart	2019-05-16 17:13:03 +09:00
Dean Herbert	8ee3958b4a	Fix some padding issues with DirectListPanel	2019-05-16 15:17:44 +09:00
Dean Herbert	7f30f61d1b	Update DirectListPanel to use same styling	2019-05-16 15:02:13 +09:00
Dean Herbert	a5074d550c	Merge branch 'master' into linkify-user-links	2019-05-16 14:42:44 +09:00
Dean Herbert	958598d13b	Fix crash on switching from main menu to gameplay too fast	2019-05-15 19:39:36 +09:00
Dan Balasescu	29a415de48	Merge branch 'master' into TextLengthLimit	2019-05-15 19:21:01 +09:00
Dean Herbert	1ccef61f7b	Fix some missed instances of TestCase	2019-05-15 18:32:29 +09:00
smoogipoo	5f56c38475	Merge remote-tracking branch 'origin/master' into rename_test_case	2019-05-15 15:52:06 +09:00
Dean Herbert	1fd44d7945	Move OsuScreenDependencies to GameBase	2019-05-15 13:00:11 +09:00
Roman Kapustin	459a285cd8	Rename test cases to test scenes inline with the framework change	2019-05-14 22:37:25 +03:00
Dean Herbert	456e6a6601	Merge branch 'master' into remember-fps-display-state	2019-05-14 18:54:04 +09:00
Dean Herbert	4c221e43a9	Apply minimal changes to make framework compile	2019-05-14 18:39:56 +09:00
Dean Herbert	f2e5beec11	Update framework	2019-05-14 18:35:35 +09:00
Dean Herbert	5308a68103	Merge remote-tracking branch 'upstream/master' into remember-fps-display-state	2019-05-14 18:35:19 +09:00
Dean Herbert	ec5b024fa6	Define toolbarElements	2019-05-14 18:34:25 +09:00
Dean Herbert	a0c03d7fc3	Merge remote-tracking branch 'upstream/master' into exit-hide-music-controller	2019-05-14 18:14:57 +09:00
smoogipoo	77263bd56e	Linkify more user links	2019-05-14 18:11:32 +09:00
Dan Balasescu	d3d20773ee	Merge branch 'master' into fullscreen-overlay	2019-05-14 17:40:20 +09:00
Dan Balasescu	bffde7de08	Merge branch 'master' into exit-hide-music-controller	2019-05-14 17:36:38 +09:00
Dean Herbert	fad9e73999	Add null check in disposal clause	2019-05-14 17:08:54 +09:00
Dan Balasescu	d040fe9635	Merge branch 'master' into tidy-osu-game	2019-05-14 16:52:56 +09:00
Dean Herbert	a52690ed9a	Fix commented line check not working with whitespace (#4788) ... Fix commented line check not working with whitespace	2019-05-14 16:47:46 +09:00
smoogipoo	f1c9073338	Fix commented line check not working with whitespace	2019-05-14 16:16:55 +09:00
Dean Herbert	9aef4abf75	Merge pull request #4783 from smoogipoo/remove-unnecessary-allocations ... Reduce unnecessary allocations	2019-05-14 16:03:04 +09:00
Dean Herbert	c312a2e53c	Merge branch 'master' into fullscreen-overlay	2019-05-14 15:22:23 +09:00
Dean Herbert	e893925417	Move shadow fade logic	2019-05-14 15:19:23 +09:00
Dean Herbert	29bdc97ab7	Remove unnecessary DI	2019-05-14 15:07:18 +09:00
Dean Herbert	cb2b14e501	Centralise fullscreen overlay logic	2019-05-14 14:20:53 +09:00
Dean Herbert	4abe987e11	Add new colour palette	2019-05-14 13:28:16 +09:00
Dean Herbert	0d57cf6599	Remember FPS display state after changing via Ctrl+F11 hotkey	2019-05-14 13:13:51 +09:00
smoogipoo	93b26cd026	Reduce unnecessary allocations	2019-05-14 13:04:49 +09:00