3670 Commits

Author	SHA1	Message	Date
Jamie Taylor	7c2ffb1826	Fix MatchSongSelect not handling beatmapset deletions	2019-02-27 14:34:39 +09:00
Joehu	5b4319a80f	Fix home button being cancelled by mod select again	2019-02-26 21:01:28 -08:00
Dean Herbert	56697339b3	Merge branch 'master' into fix-disabled-set-crash	2019-02-27 11:14:42 +09:00
jorolf	4c10185f5b	Fade out text instead of removing it immediately	2019-02-26 15:26:00 +01:00
jorolf	cacef7421d	Merge branch 'master' of git://github.com/ppy/osu into supporter-disclaimer	2019-02-26 14:09:12 +01:00
Dean Herbert	d9872dda12	Use fade instead of negative margin	2019-02-26 16:10:06 +09:00
Dean Herbert	2d6d9dd723	Add better easing	2019-02-26 16:09:45 +09:00
Dean Herbert	c1432b2ed5	Add back newline	2019-02-26 15:48:34 +09:00
Dean Herbert	2fc34496fd	Merge branch 'master' into MissingSource	2019-02-26 15:38:51 +09:00
Shane Woolcock	e91c07209f	Move MainMenu initialisation from ctor to load	2019-02-26 09:54:42 +09:00
jorolf	796044ee7d	*I should've rechecked the code after the master merge*	2019-02-25 23:53:44 +01:00
jorolf	501dab7b32	Merge branch 'master' of git://github.com/ppy/osu into supporter-disclaimer	2019-02-25 23:49:01 +01:00
jorolf	c680d63694	Don't show the supporter text if the user already has supporter status	2019-02-25 23:44:43 +01:00
Dean Herbert	568e90c70b	Merge branch 'master' into UserDimLogic	2019-02-25 22:35:48 +09:00
David Zhao	d750023c52	Fix TestCasePlayerLoader not having a background stack	2019-02-25 22:05:49 +09:00
Shane Woolcock	bebb635ca1	Merge branch 'master' into hide-exit-button ... # Conflicts: # osu.Game/Screens/Menu/MainMenu.cs	2019-02-25 21:48:42 +09:00
Shane Woolcock	2bd5bb3f69	Move all MainMenu button creation into load	2019-02-25 21:41:41 +09:00
Dean Herbert	97dc7f9819	Merge branch 'master' into MissingSource	2019-02-25 19:35:44 +09:00
Dean Herbert	a4e119786f	Fix some weird formatting	2019-02-25 19:19:28 +09:00
Dean Herbert	6881563346	Merge branch 'master' into ScrollingExitFix	2019-02-25 19:11:05 +09:00
David Zhao	59ad470eed	Clean up test code	2019-02-25 18:41:13 +09:00
David Zhao	ad1bce3585	Fix song select backround not being exited in time	2019-02-25 18:40:19 +09:00
Dean Herbert	80737b9ef8	Remove "silent" parameter; consolidate import logic	2019-02-25 18:24:06 +09:00
Dean Herbert	706da017d7	Add target screen support and user bypass	2019-02-25 14:01:51 +09:00
David Zhao	16fa30f71e	Fix bindable	2019-02-25 13:27:44 +09:00
David Zhao	ccc86b66fa	Use local private bindable in Player.cs	2019-02-25 13:15:37 +09:00
David Zhao	af4606f3d2	Create new test for StoryboardReplacesBackground	2019-02-25 12:35:01 +09:00
Shane Woolcock	61be4f2695	Conditionally add ExitConfirmOverlay and disable back action	2019-02-25 10:43:47 +09:00
Shane Woolcock	add8b8e9c4	Only add Exit button if the GameHost supports it	2019-02-25 09:56:00 +09:00
David Zhao	24f5bc7a75	Add documentation and move storyboard init logic	2019-02-24 20:03:24 +09:00
David Zhao	3a9835fcdd	Merge branch 'UserDimLogic' of https://github.com/nyquillerium/osu into UserDimLogic	2019-02-24 18:11:08 +09:00
David Zhao	f4acd6e48f	Move PlayerLoader tests out of constructor, Improve Documentation	2019-02-24 18:10:59 +09:00
Dean Herbert	b140fc973a	Merge branch 'master' into UserDimLogic	2019-02-24 17:48:59 +09:00
Dean Herbert	2281a0235d	Fix regression causing playback rate to display incorrectly	2019-02-24 15:27:06 +09:00
David Zhao	f8d18285a8	Fix backgrounds not properly being faded in song select	2019-02-23 14:59:54 +09:00
David Zhao	bb01948283	Use .Value with new bindable changes	2019-02-22 20:44:02 +09:00
David Zhao	ab3fa91a2f	Merge branch 'master' into UserDimLogic	2019-02-22 20:38:10 +09:00
David Zhao	76de39a344	Put user dim logic in yet another container inside UserDimContainer	2019-02-22 20:34:51 +09:00
Dean Herbert	367bc53a06	Revert some more instances of 'e' variable names	2019-02-22 20:15:25 +09:00
smoogipoo	d61dfe888e	Fix venera fonts not being correctly specified	2019-02-22 19:42:09 +09:00
Dean Herbert	3015d40f8f	Merge branch 'master' into osu-fontusage	2019-02-22 18:09:23 +09:00
David Zhao	a4162a69fb	Remove leftover usage of dimlevel in BackgroundScreenBeatmap	2019-02-22 18:01:50 +09:00
Dean Herbert	0431582959	Remove excess new line	2019-02-22 17:57:49 +09:00
Dean Herbert	3fe4b8fd1c	Update variable names ... Also cleans up some weird code	2019-02-22 17:51:39 +09:00
Dean Herbert	452caabd40	Apply suggestions from code review ... Co-Authored-By: smoogipoo <1329837+smoogipoo@users.noreply.github.com>	2019-02-22 17:06:49 +09:00
David Zhao	263972a048	Remove DimLevel bindable from ScreenWithBeatmapBackground	2019-02-22 17:00:00 +09:00
David Zhao	918a60ebbf	Create a new player every time a test is performed.	2019-02-22 16:56:03 +09:00
David Zhao	65cdac60c3	Add tests to make sure the background is always the same through screen transitions	2019-02-22 14:43:05 +09:00
smoogipoo	8853f7ad76	Explicitly set exo typeface in a few places	2019-02-21 19:26:02 +09:00
smoogipoo	d8c55bc729	Adjust namespaces	2019-02-21 19:05:52 +09:00
smoogipoo	bca347427f	Update with framework bindable changes	2019-02-21 18:56:34 +09:00
David Zhao	97db8abd59	Remove unused includes	2019-02-21 18:34:11 +09:00
David Zhao	0677194f46	Move all storyboard show logic into UserDimContainer	2019-02-21 18:14:58 +09:00
David Zhao	ad5e81f0cd	Add test case for background preview, fix unit tests	2019-02-21 15:24:26 +09:00
smoogipoo	cc33f230b4	Merge remote-tracking branch 'origin/master' into osu-fontusage	2019-02-20 20:37:48 +09:00
Jamie Taylor	9b3f2fdd24	Change RelativePositionAxes default on osu! logo to be both	2019-02-20 19:34:55 +09:00
smoogipoo	4db5531e4b	Replace copy-constructor/method with extension method	2019-02-20 19:32:30 +09:00
David Zhao	f5d8700920	Merge branch 'UserDimLogic' of https://github.com/nyquillerium/osu into UserDimLogic	2019-02-20 17:40:13 +09:00
David Zhao	25e7dcb375	Remove unused includes	2019-02-20 17:39:35 +09:00
David Zhao	49c5a9fc30	Merge branch 'master' into UserDimLogic	2019-02-20 17:30:34 +09:00
David Zhao	d703a9511a	Fix background dim previews	2019-02-20 17:20:45 +09:00
David Zhao	1bd1b6b099	Move user dim logic into UserDimContainer instead	2019-02-20 16:53:57 +09:00
smoogipoo	dbfa95b9e7	Made medium the default font weight	2019-02-20 16:52:36 +09:00
smoogipoo	0693ab8e7d	Merge remote-tracking branch 'origin/master' into osu-fontusage ... # Conflicts: # osu.Game/Screens/Multi/Components/BeatmapTitle.cs	2019-02-20 15:04:08 +09:00
smoogipoo	a2aa3ec5cb	Adjust sprite texts in-line with framework changes	2019-02-20 15:03:20 +09:00
smoogipoo	703df77000	Update in-line with framework IsActive changes	2019-02-19 19:16:03 +09:00
David Zhao	af049004dd	Add test cases for transitioning into pause overlay and into results	2019-02-18 19:53:55 +09:00
David Zhao	4e07aba548	Make it so visual tests only load the osu ruleset	2019-02-18 18:12:45 +09:00
David Zhao	1d80674fbd	Fix fadecontainer being added to multiple containers	2019-02-18 17:11:38 +09:00
David Zhao	af30aefe77	Merge branch 'master' into UserDimLogic	2019-02-18 16:56:16 +09:00
David Zhao	80800f2931	Match up fade behavior with current master	2019-02-18 16:34:11 +09:00
David Zhao	9be25c3758	Fix unit tests	2019-02-18 16:00:59 +09:00
David Zhao	f241d67e5f	Use conditional operator isntead of if	2019-02-18 15:23:03 +09:00
David Zhao	df148f8787	Fix background dim not being disabled on playerloader exit	2019-02-18 12:55:42 +09:00
Dean Herbert	0a265c6d35	Update osu.Game/Screens/Backgrounds/BackgroundScreenBeatmap.cs ... Co-Authored-By: nyquillerium <nyquill@ppy.sh>	2019-02-18 11:54:25 +09:00
ThePyrotechnic	7bb56a198a	Merge branch 'master' into MissingSource	2019-02-17 19:54:43 +00:00
smoogipoo	134840f118	Fix nullref	2019-02-16 11:18:17 +09:00
David Zhao	8693d6a76b	Merge branch 'master' into UserDimLogic	2019-02-15 17:11:21 +09:00
David Zhao	53b7fdd834	Clean up test code and unused includes	2019-02-15 16:57:53 +09:00
Jamie Taylor	3ea13b1ade	Fix mouse cursor appearing prematurely during startup	2019-02-15 16:55:39 +09:00
David Zhao	0a60f6dacd	Documentation for tests and changes	2019-02-15 16:50:37 +09:00
David Zhao	6da9f94ae3	Fix regression with background dim	2019-02-15 16:17:01 +09:00
David Zhao	3a74ad678a	clean up unused includes	2019-02-14 18:41:10 +09:00
David Zhao	a09e0790e1	Fix storyboards not dimming	2019-02-14 18:07:28 +09:00
David Zhao	e2a312a663	Move user dimming logic into its own container	2019-02-14 17:47:53 +09:00
Dean Herbert	777a606b2d	Don't revert beatmap on exiting leased state	2019-02-14 17:14:58 +09:00
Dean Herbert	94ceb1e32b	Move screen change allowance to local usage	2019-02-14 13:28:21 +09:00
Dean Herbert	e604806398	Fix regression in screen change allowance logic	2019-02-13 19:43:01 +09:00
Dean Herbert	1373e0fad0	Fix BeatmapTitle not always displaying	2019-02-13 14:57:40 +09:00
Dean Herbert	166cdab2e8	Remove unnecessary null check	2019-02-13 14:14:57 +09:00
Dean Herbert	ab3adafafd	Fix crashes after entering player	2019-02-13 14:13:54 +09:00
Dan Balasescu	c3ae4d7b14	Improve comment ... Co-Authored-By: peppy <pe@ppy.sh>	2019-02-13 11:34:48 +09:00
Michael Manis	5fbdbcf209	removed 'unknown source' line	2019-02-12 15:30:42 -05:00
Dean Herbert	2ea839c475	Fix crashes on beatmap not being set correctly in player	2019-02-12 19:18:22 +09:00
Dean Herbert	d5cce850a8	Revert some unnecessary complications in logo logic	2019-02-12 13:29:41 +09:00
Dean Herbert	272584eb79	Improve file layouts	2019-02-12 13:02:33 +09:00
Dean Herbert	78b47f9fe3	Fix starting matches not working	2019-02-12 11:19:42 +09:00
Dean Herbert	e4422167b6	Fix starting gameplay	2019-02-11 19:13:57 +09:00
Dean Herbert	88ffc78103	Restructure	2019-02-11 19:11:34 +09:00
Dean Herbert	e2e615cc5c	Merge branch 'master' into leased-bindables-dont-work	2019-02-11 16:30:12 +09:00
ThePyrotechnic	450fa0075f	Merge branch 'master' into MissingSource	2019-02-10 23:44:47 +00:00
Michael Manis	cfe14dcdb1	Options for handing unknown beatmap source	2019-02-10 18:31:39 -05:00
Dean Herbert	a30d3739cf	Merge remote-tracking branch 'upstream/master' into cmc-rooms	2019-02-08 18:45:39 +09:00
Dean Herbert	f52cac966b	Fix multiple blank lines	2019-02-08 18:45:32 +09:00
Dean Herbert	6c4d289901	Pass item rather than ID	2019-02-08 18:33:49 +09:00
Dan Balasescu	7ec0b4ba77	Fix nullref during room creation (#4228)	2019-02-08 17:53:01 +09:00
Dan Balasescu	959b1ac845	Fix potential nullref when exiting multiplayer (#4227) ... Fixes https://github.com/ppy/osu/issues/3954	2019-02-08 17:28:00 +09:00
smoogipoo	febcd7d7c0	Remove currentRoom from RoomManager	2019-02-08 15:46:16 +09:00
smoogipoo	fdd37dbc4b	Merge remote-tracking branch 'origin/master' into cmc-rooms	2019-02-08 15:44:33 +09:00
smoogipoo	5643dc2e99	Remove redundant qualifiers	2019-02-08 15:44:05 +09:00
smoogipoo	6fe1f57236	Fix crash when start button is repeatedly pressed	2019-02-08 15:39:11 +09:00
smoogipoo	99a7ccc01a	Slight cleanup in multiplayer	2019-02-08 15:38:05 +09:00
smoogipoo	43240ea85e	Fix playlist issues with room creation	2019-02-08 15:23:03 +09:00
smoogipoo	42cd55e0d7	Move current room to multiplayer	2019-02-08 14:57:51 +09:00
smoogipoo	7f13e3c5f7	Directly resolve the filter bindable	2019-02-08 13:02:17 +09:00
smoogipoo	990bd44ca2	Combine roommanager and roompollingcomponent	2019-02-08 13:01:10 +09:00
smoogipoo	17fdfc15d9	Fix room title in the breadcrumbs	2019-02-07 20:09:49 +09:00
smoogipoo	1c2450a95a	Fix up room inspector status	2019-02-07 17:59:14 +09:00
smoogipoo	1e0135af6f	Move StatusColouredContainer into a more public location	2019-02-07 17:52:40 +09:00
smoogipoo	2d61548251	Fix room name being coloured	2019-02-07 16:45:36 +09:00
smoogipoo	4f86fe92ea	Fix match settings not showing	2019-02-06 18:50:43 +09:00
ProgrammaticNajel	9f8e724a76	Fix background being cut off at the top of the screen (#4207) ... Fix background being cut off at the top of the screen	2019-02-06 18:14:33 +09:00
smoogipoo	3207983a1c	Fix current room being set to null when parted	2019-02-06 15:12:40 +09:00
smoogipoo	a9aa22c97b	Remove ShadowModel requirement	2019-02-06 13:52:48 +09:00
smoogipoo	594dffba41	Fix a few cases of missed instant invocation	2019-02-05 19:11:20 +09:00
smoogipoo	aac371ba6e	Use CMC for all of multiplayer	2019-02-05 19:00:08 +09:00
smoogipoo	be51ee4ed5	Implement MultiplayerComposite, replaces RoomBindings	2019-02-05 16:14:37 +09:00
smoogipoo	d9537017c8	Use CMC in the Multiplayer screen	2019-02-05 16:03:05 +09:00
smoogipoo	37c1f5a824	Split polling logic from RoomManager, now a container	2019-02-05 15:38:19 +09:00
smoogipoo	065b0c9076	Fix background not being faded correctly	2019-02-04 17:04:52 +09:00
Dean Herbert	e01f342ab0	wip	2019-02-02 17:11:25 +09:00
Dean Herbert	ca5c8d37d1	Use leased bindables	2019-02-01 16:44:06 +09:00
Dean Herbert	3da851d93e	Merge branch 'master' into fix-replay-multiplier-text	2019-01-31 21:17:40 +09:00
Dean Herbert	f85518b175	Don't expose padding	2019-01-31 18:16:28 +09:00
Dean Herbert	b48bb5b792	Move parallax logic out of BackgroundScreenStack	2019-01-31 18:10:33 +09:00
smoogipoo	bdaff27575	Fix nullref due to screens now being removed from parent	2019-01-31 15:02:07 +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	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	5e78f51e24	Fix multiplayer crashing when exiting from lounge	2019-01-30 23:56:03 +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
smoogipoo	7b1c1f3728	Move toolbar showing and overlay activation to OsuGame ... Now exposed through IOsuScreen.	2019-01-28 15:42:06 +09:00
Dean Herbert	8118b649d8	Merge branch 'master' into show-mods-on-loader	2019-01-28 14:11:54 +09:00
Dan Balasescu	47f35c423b	Merge branch 'master' into carousel-wedge-level	2019-01-28 13:49:12 +09:00
LeNitrous	a1ce7e9a95	add ModDisplay on PlayerLoader	2019-01-26 17:14:45 +08:00
smoogipoo	117703374e	Fix logo animations	2019-01-25 21:02:35 +09:00