12370 Commits

Author	SHA1	Message	Date
David Zhao	a1a0a9ee6b	Merge branch 'master' into selector-hiding	2019-06-26 17:45:05 +09:00
David Zhao	6c8cc9728f	fix channel selector not being closed	2019-06-26 12:00:58 +09:00
Dan Balasescu	6063e7a69f	Merge branch 'master' into one-hit-screen	2019-06-26 11:34:54 +09:00
Dean Herbert	446fbce81c	Add base class for startup screens ... Avoids missing adding changes to screens like Disclaimer, which may not be shown in debug builds.	2019-06-26 01:36:17 +09:00
Dean Herbert	40cf573368	Fix pause not correctly showing pause screen	2019-06-25 23:15:58 +09:00
Dean Herbert	983cabdb98	Disallow back button on disclaimer screen	2019-06-25 22:27:50 +09:00
Dean Herbert	7d5554c2ac	Re-use the back button game-wide (#5149) ... Re-use the back button game-wide Co-authored-by: Dean Herbert <pe@ppy.sh>	2019-06-25 20:50:28 +09:00
Dean Herbert	f9dad0f640	Merge remote-tracking branch 'upstream/master' into gamewide-backbutton	2019-06-25 20:23:49 +09:00
Dean Herbert	f51be4c4fe	Adjust transitions a tad	2019-06-25 20:23:34 +09:00
Dean Herbert	75b78d5e27	Reduce size of dropdown chevron (#5150) ... Reduce size of dropdown chevron Co-authored-by: Dan Balasescu <1329837+smoogipoo@users.noreply.github.com>	2019-06-25 20:05:52 +09:00
Dean Herbert	28cfccbd64	Use OsuScrollContainer for osu menus (#5094) ... Use OsuScrollContainer for osu menus Co-authored-by: Dean Herbert <pe@ppy.sh>	2019-06-25 20:05:09 +09:00
Dan Balasescu	7794fab7c9	Merge branch 'master' into reduce-dropdown-chevron-size	2019-06-25 19:58:37 +09:00
Dan Balasescu	0f31d17129	Merge branch 'master' into reduce-background-brightness	2019-06-25 19:45:15 +09:00
Dean Herbert	a3de369c20	Reduce size of dropdown chevron	2019-06-25 19:32:00 +09:00
Dean Herbert	8c02709d74	Merge branch 'master' into fix-dropdown-styling	2019-06-25 19:28:37 +09:00
Dean Herbert	445660d066	Merge pull request #5148 from peppy/update-framework ... Update framework	2019-06-25 19:28:17 +09:00
Dan Balasescu	c6965a40dc	Merge branch 'master' into reduce-background-brightness	2019-06-25 19:18:28 +09:00
Dan Balasescu	47974ca854	Merge branch 'master' into beatmap-overlay-load	2019-06-25 19:05:17 +09:00
Dan Balasescu	ffcd3529a6	Merge branch 'master' into cancel-api-callback	2019-06-25 18:43:33 +09:00
smoogipoo	aa81c95f30	Remove unnecessary extra property	2019-06-25 18:38:14 +09:00
Dean Herbert	fe290ead63	Update framework	2019-06-25 18:38:11 +09:00
smoogipoo	5b294ba419	Adjust backbutton animation	2019-06-25 18:33:35 +09:00
smoogipoo	531b107a98	Exit match before exiting multiplayer	2019-06-25 18:33:26 +09:00
smoogipoo	1a26608ba9	Close mod select before exiting song selection	2019-06-25 18:33:21 +09:00
smoogipoo	d9927204f8	Relieve OsuScreen of back button input duties	2019-06-25 18:33:18 +09:00
smoogipoo	f53d2fbe76	Scale backbutton along with screens	2019-06-25 18:33:13 +09:00
smoogipoo	8c96e4c1fa	Move back button to OsuGame	2019-06-25 18:33:08 +09:00
Dean Herbert	7bc7df2249	Reduce background brightness at PlayerLoader	2019-06-25 17:22:10 +09:00
Dean Herbert	93b6d5b7e3	Fix keybindings being offset	2019-06-25 17:16:19 +09:00
Dean Herbert	ba2f22be47	Improve loading state of BeatmapSet header	2019-06-25 14:47:29 +09:00
Dean Herbert	90acc9b6ca	Avoid calling api request callback after user cancel	2019-06-25 13:52:43 +09:00
smoogipoo	fb94cd43a4	Remove unnecessary local item storage in SettingsDropdown	2019-06-25 12:00:05 +09:00
Dean Herbert	cc1e67dc6c	Merge branch 'master' into fix-avatar-display-update-2	2019-06-25 10:18:46 +09:00
HoLLy	236d5a9abc	Remove leftover TransformDuration overrides	2019-06-24 18:26:25 +02:00
HoLLy	739077ef4f	Only hide UpdateableAvatar/Flag immediately	2019-06-24 18:24:31 +02:00
HoLLy	7734c4b41a	Fix code style	2019-06-24 18:09:42 +02:00
Dean Herbert	c0b5153094	Merge branch 'master' into music-effect-arrow-keys-hover	2019-06-24 21:49:45 +09:00
Dean Herbert	f91467eddc	Fix licence header	2019-06-24 18:34:23 +09:00
Dean Herbert	bd2f34a102	Merge branch 'master' into quickEscape	2019-06-24 18:21:39 +09:00
Dean Herbert	2ea5165803	Change case to match; change hotkey to be more globally usable (previous has conflict on macOS)	2019-06-24 18:19:17 +09:00
Dean Herbert	fad1ced1b5	Add correct conditionals to allow exit	2019-06-24 18:15:27 +09:00
Dean Herbert	d70248338d	Merge remote-tracking branch 'upstream/master' into quickEscape	2019-06-24 18:14:48 +09:00
HoLLy	aed83471f4	Replace Reset with overridden TransformImmediately/TransformDuration	2019-06-24 10:51:45 +02:00
Dean Herbert	2473a9487a	Add missing using	2019-06-24 17:38:11 +09:00
Dean Herbert	6e2138491b	Merge branch 'master' into useroverlay-tabs	2019-06-24 17:27:47 +09:00
Dean Herbert	36d54fdbfc	Merge branch 'master' into skinnable-sprite	2019-06-24 16:33:17 +09:00
Dean Herbert	06eaba766b	Move method below ctor	2019-06-24 15:27:46 +09:00
Dean Herbert	9593e66a96	Add some more xmldoc	2019-06-24 15:25:01 +09:00
Dan Balasescu	18d64df0c4	Merge branch 'master' into add-numberbox	2019-06-24 15:22:30 +09:00
Dean Herbert	3f22c0a311	Add SkinnableSprite implementation	2019-06-24 15:17:35 +09:00