10349 Commits

Author	SHA1	Message	Date
smoogipoo	bdaff27575	Fix nullref due to screens now being removed from parent	2019-01-31 15:02:07 +09:00
smoogipoo	b90207fa54	Give ScreenTestCase a background stack	2019-01-31 14:55:48 +09:00
smoogipoo	255b4a30e0	Allow logo to be null	2019-01-31 13:50:37 +09:00
smoogipoo	58d744e5dc	Remove manual overlay/toolbar logic from multiplayer	2019-01-31 13:38:21 +09:00
Dean Herbert	aac921c298	Update framework again	2019-01-31 13:33:21 +09:00
Dean Herbert	e8c39b9c37	Fix test screen loading	2019-01-31 11:00:44 +09:00
Dean Herbert	beab367e6d	Add null checks/allowances	2019-01-31 11:00:33 +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	a8a34f8f20	Update framework	2019-01-30 23:56:14 +09:00
smoogipoo	5e78f51e24	Fix multiplayer crashing when exiting from lounge	2019-01-30 23:56:03 +09:00
Aergwyn	c2297b0c3b	Fix incorrect param doc ... Co-Authored-By: peppy <pe@ppy.sh>	2019-01-29 23:04:48 +09:00
smoogipoo	82dc7f39a3	Update licenses	2019-01-29 21:48:35 +09:00
smoogipoo	b5d187c4af	Fix post-merge errors	2019-01-29 21:27:32 +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
Dean Herbert	baea9691cc	Fix baetmap downloads using too much memory	2019-01-29 18:34:10 +09:00
smoogipoo	7b1c1f3728	Move toolbar showing and overlay activation to OsuGame ... Now exposed through IOsuScreen.	2019-01-28 15:42:06 +09:00
Dean Herbert	354a99f5e1	Merge branch 'master' into samah-ios	2019-01-28 15:34:46 +09:00
Dan Balasescu	47f35c423b	Merge branch 'master' into carousel-wedge-level	2019-01-28 13:49:12 +09:00
Dan Balasescu	610c2df2d4	Merge branch 'master' into dont-always-focus-textboxes	2019-01-28 13:40:08 +09:00
Shane Woolcock	a14ad4f53f	Merge branch 'master' into samah-ios	2019-01-25 22:43:21 +10:30
smoogipoo	117703374e	Fix logo animations	2019-01-25 21:02:35 +09:00
smoogipoo	60cc2314ef	Fix ruleset + beatmap being changeable in match	2019-01-25 21:02:30 +09:00
phosphene47	5c70be07ab	Display carousel over beatmap info wedge	2019-01-25 22:58:55 +11:00
smoogipoo	b3403c78da	Fix a few potential crashes	2019-01-25 20:47:37 +09:00
smoogipoo	e2891ab1e9	Fix anchors + origins	2019-01-25 20:47:31 +09:00
smoogipoo	95e6785968	Make Multiplayer not an OsuScreen	2019-01-25 20:25:55 +09:00
Dean Herbert	28f529ca19	Rename to host	2019-01-25 20:24:32 +09:00
Dean Herbert	0b587baab8	Merge remote-tracking branch 'upstream/master' into fix-texture-loader-stores	2019-01-25 20:23:51 +09:00
Dean Herbert	4d032af26d	Merge pull request #3919 from peppy/fix-idle-weirdness ... Fix global idle state being entered when overlays are visible	2019-01-25 20:18:33 +09:00
Dean Herbert	a110569f56	Merge pull request #4151 from peppy/fix-sensitivity-tooltip ... Fix cursor sensitivity tooltip not updating instantly	2019-01-25 20:17:56 +09:00
Dean Herbert	4d982adf69	Merge branch 'master' into fix-idle-weirdness	2019-01-25 19:48:52 +09:00
Aergwyn	c8c375636f	Use lambda ... Co-Authored-By: peppy <pe@ppy.sh>	2019-01-25 19:34:25 +09:00
smoogipoo	e1e7759e0f	Re-implement MultiplayerSubScreen	2019-01-25 19:32:37 +09:00
smoogipoo	3fb17ead06	Fix breadcrumbs crash when last screen exits	2019-01-25 19:31:58 +09:00
Dean Herbert	49051a359f	Merge branch 'dont-always-focus-textboxes' into samah-ios	2019-01-25 19:22:26 +09:00
Dean Herbert	260034a80e	Don't auto-focus textboxes when on screen keyboard would cause inconvenience	2019-01-25 19:20:29 +09:00
Dean Herbert	82d944dc89	Fix textbox colours not always being set corrrectly	2019-01-25 19:20:29 +09:00
Dean Herbert	9e8347413b	Merge remote-tracking branch 'origin/fix-texture-loader-stores' into samah-ios ... # Conflicts: # osu.Game/Beatmaps/BeatmapManager.cs	2019-01-25 18:59:22 +09:00
Dean Herbert	159ac7359e	Merge branch 'update-framework' into samah-ios	2019-01-25 18:52:17 +09:00
Dean Herbert	144533706e	Update framework	2019-01-25 18:51:29 +09:00
Dean Herbert	e3fde56780	Merge remote-tracking branch 'origin/fix-idle-weirdness' into samah-ios	2019-01-25 18:49:41 +09:00
Dean Herbert	f4729d41f3	Merge branch 'master' into samah-ios	2019-01-25 18:49:08 +09:00
smoogipoo	da135346b2	Fix screen titles	2019-01-25 18:38:48 +09:00
smoogipoo	15100632f1	Remove MultiplayerSubScreen and fix multiplayer crashes	2019-01-25 18:26:04 +09:00
Dean Herbert	4a59ccb81d	Merge branch 'master' into fix-idle-weirdness	2019-01-25 17:52:59 +09:00
Dean Herbert	a5f1aa644b	Fix cursor sensitivity tooltip not updating instantly	2019-01-25 17:30:35 +09:00
smoogipoo	f0e0088f43	Create a custom background stack to fix various background issues	2019-01-25 15:36:22 +09:00
Dean Herbert	a25dce53cd	Fix logical regression	2019-01-25 15:03:32 +09:00
Dean Herbert	e88d36ed38	Merge branch 'master' into fix-multiplayer-parallax-overflow	2019-01-25 14:55:28 +09:00