3530 Commits

Author	SHA1	Message	Date
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
Dan Balasescu	47f35c423b	Merge branch 'master' into carousel-wedge-level	2019-01-28 13:49:12 +09:00
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
smoogipoo	e1e7759e0f	Re-implement MultiplayerSubScreen	2019-01-25 19:32:37 +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
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
smoogipoo	f0e0088f43	Create a custom background stack to fix various background issues	2019-01-25 15:36:22 +09:00
Dean Herbert	7ed215c521	Make InternalPadding a bit simpler	2019-01-25 14:46:45 +09:00
Dean Herbert	787d4da153	Combine constant	2019-01-25 14:10:59 +09:00
ProgrammaticNajel	4cae9bae83	Merge branch 'master' into fix-multiplayer-parallax-overflow	2019-01-24 20:41:10 +08:00
ProgrammaticNajel	593e0b36f5	Add overflow padding in other multiplayer screen components ... Added padding to Room Creation and Beatmap Selection in Multiplayer.	2019-01-24 19:42:35 +08:00
smoogipoo	50a384e19c	Fix game not exiting	2019-01-24 20:13:19 +09:00
smoogipoo	28f5c950ec	Fix player never completing load	2019-01-24 19:55:42 +09:00
smoogipoo	8ea7ec6445	Convert everything to use IScreen	2019-01-24 19:47:44 +09:00
ProgrammaticNajel	9fcefa7d69	Typo fix	2019-01-24 18:18:32 +08:00
ProgrammaticNajel	e4084b7d5d	Add overflow padding in other multiplayer screen components ... Added overflow padding in room selection screen (Header, Room Info, Leaderboards, and Room Chat)	2019-01-24 17:40:48 +08:00
Dean Herbert	8617aaa2a7	Update licence header (and remove year)	2019-01-24 17:43:03 +09:00
ProgrammaticNajel	7ac20c3545	Add overflow padding to account for parallax shifting ... Added overflow padding in the Multiplayer screen, and adjusting content (LoungeSubScreen, FilterControl, Header, "Create Room" button) to account for this padding.	2019-01-24 16:11:24 +08:00
Dean Herbert	1730ad143f	Merge branch 'master' into fix-key-counter	2019-01-23 18:22:08 +09:00
chrisny286	76700ad20f	Merge branch 'fix-transparent-background-on-screen-scale-modes' of https://github.com/chrisny286/osu into fix-transparent-background-on-screen-scale-modes	2019-01-23 09:40:44 +01:00
chrisny286	03e3247baf	replace FadeTo in PlayerLoader ... didnt notice that interaction yet. yes this makes it neccessary.	2019-01-23 09:40:38 +01:00
Dean Herbert	4180ca75bc	Fix typo in comment	2019-01-23 17:14:08 +09:00
chrisny286	bb56c4a1a7	use Color4.Black and White + using osuTK.Graphics	2019-01-23 09:08:34 +01:00
chrisny286	5d2b2ecf06	Merge remote-tracking branch 'upstream/master' into fix-transparent-background-on-screen-scale-modes	2019-01-23 08:52:46 +01:00
chrisny286	f4ebab2d3a	Fix backgrounds being transparent in some scaling modes ... by replacing `.FadeTo` at the necessary places with `.FadeColour`. restoring the `.FadeColour` in `fadeOut` of the Player Screen which is ran in every exit scenario.	2019-01-23 08:52:25 +01:00
Dean Herbert	c18ce2c23a	Formatting fixes	2019-01-23 14:51:25 +09:00
Dean Herbert	f107a922b4	Add tests for key counter inside player heirarchy	2019-01-23 14:51:25 +09:00
chrisny286	13ba9d64d0	revert empty line	2019-01-23 02:56:00 +01:00
chrisny286	12503b4d07	revert and make VisibilityContainer not AlwaysPresent	2019-01-23 02:37:17 +01:00
chrisny286	f01ba17d1f	add check if replay is loaded before allowseeking can be overwitten	2019-01-23 02:12:40 +01:00
chrisny286	cabcfffdeb	Fix autoplay rewind/skip usable when UI hidden	2019-01-23 01:16:37 +01:00
Dean Herbert	5ea6e8e247	Allow full osu!direct usage regardless of supporter status for now	2019-01-22 14:22:38 +09:00
Dean Herbert	c58fe4f4ff	Fix nullref	2019-01-22 13:18:01 +09:00
Dean Herbert	cebeb0a219	Fix replay playback speed not being displayed initially	2019-01-22 11:40:57 +09:00
Dean Herbert	21317806c9	Merge remote-tracking branch 'upstream/master' into nwabear-master	2019-01-22 10:07:35 +09:00
Dean Herbert	7baff750de	Consolidate layout, wording and ordering with VisualSettings	2019-01-22 10:06:30 +09:00
Dean Herbert	b373d78143	Add slight easing	2019-01-22 09:47:51 +09:00
Dean Herbert	25b5bbcd8f	Merge branch 'master' into score-panel-layout	2019-01-22 09:43:37 +09:00
Christian Kamphausen	86581feb4a	Merge branch 'master' into fix-playersettingsoverlay-not-coming-back-ctrl+H	2019-01-22 01:29:58 +01:00
chrisny286	d7d2e2fe44	trimmed whitespace	2019-01-21 19:22:19 +01:00
chrisny286	65fd69c817	Update HUDOverlay.cs ... separate PlayerSettingsOverlay from the other HUD elements in the Visibility Container	2019-01-21 19:10:29 +01:00
chrisny286	fb51578df3	Update PlayerSettingsOverlay.cs ... Framework renamed this variable so it needs to be renamed here too.	2019-01-21 17:19:40 +01:00
ekrctb	e74f0057bd	Automatically layout based on score display width	2019-01-21 17:07:56 +09:00
Shane Woolcock	fa6dd8c99e	Code sanity	2019-01-20 19:03:06 +10:30
Shane Woolcock	521b11dfcb	Use QuadBatch rather than LinearBatch of quads for LogoVisualisation ... GL_QUADS is deprecated, and is not supported at all on OpenGL ES. This fixes the logo visualisation not drawing on iOS.	2019-01-20 18:51:17 +10:30
Dean Herbert	5269ca31be	Merge branch 'master' into fix-room-inspector-cover	2019-01-17 21:49:25 +09:00
Dean Herbert	1d40d88f82	Merge branch 'master' into add-room-null-check	2019-01-17 21:34:25 +09:00
Dean Herbert	59f7c5a26e	Fix room inspector cover not resetting when no room selected	2019-01-17 18:44:22 +09:00
Dean Herbert	ba9cdf2ce2	Add null check to fix crash on deselecting multiplayer room	2019-01-17 18:17:47 +09:00
Dean Herbert	491537b8ba	Add fade duration ... Not really visible in the existing usage, but once we enable the settings tab it will be required. Tested by manually enabling it.	2019-01-17 18:13:05 +09:00
Dean Herbert	c1f5c0edc9	Merge branch 'master' into hide-multiplayer-match-room-tab	2019-01-17 18:02:17 +09:00
ekrctb	2bc3464802	Hide Room tab when Settings tab is active	2019-01-17 17:27:34 +09:00
ekrctb	f982b6da55	Don't hide 'hold for menu' even hud is hidden	2019-01-17 16:49:04 +09:00
Dean Herbert	99c963c56a	Merge branch 'master' into cancel-request-on-disposal	2019-01-17 15:29:49 +09:00
ekrctb	b6fb3a5c05	Cancel request on disposal for RoomInspector	2019-01-17 15:14:30 +09:00
Dean Herbert	2ab0c4632e	Merge branch 'master' into menu-background-skinning	2019-01-17 14:23:03 +09:00
Dan Balasescu	75113db438	Merge branch 'master' into fix-skip-button-scaling	2019-01-16 16:37:37 +09:00
Unknown	6eff79913b	remove blank lines	2019-01-11 10:34:56 +01:00
Dean Herbert	e2dd025225	Fix scaling of SkipOverlay when UI scale is adjusted ... Closes #4040.	2019-01-11 16:54:42 +09:00
Min	29e8c21c46	Merge branch 'master' into menu-background-skinning	2019-01-11 11:36:20 +09:00
Dean Herbert	aa68bbc1d9	Merge branch 'master' into fix-match-select-crash	2019-01-10 15:40:03 +09:00
Dean Herbert	2dc185f249	Display avatars rather than full scores	2019-01-09 15:27:08 +09:00
Dean Herbert	0bf9e9b86b	Merge branch 'master' into lounge-leaderboard	2019-01-09 10:28:55 +09:00
Dean Herbert	958840fe17	Merge branch 'master' into fix-sliderbar	2019-01-08 21:23:34 +09:00
Dean Herbert	6ce08312b2	Merge branch 'master' into fix-match-select-crash	2019-01-08 20:29:55 +09:00
smoogipoo	2a4c91a6ab	Remove unused using	2019-01-08 19:26:24 +09:00
smoogipoo	122fc2de58	Show room leaderboard instead in the lounge	2019-01-08 19:24:55 +09:00
smoogipoo	b17b88d071	Fix null beatmap possibly being selected	2019-01-08 18:06:46 +09:00
smoogipoo	38a3ccc817	Use value where applicable	2019-01-08 16:31:44 +09:00
smoogipoo	8692be9de3	Fix sliderbar not working correctly with TransferValueOnCommit = true	2019-01-08 16:07:54 +09:00
Dean Herbert	70d644406f	Merge remote-tracking branch 'origin/update-framework' into letterboxing ... # Conflicts: # osu.Game/Overlays/Settings/Sections/Graphics/LayoutSettings.cs	2019-01-07 18:53:53 +09:00
Dean Herbert	74539b5e5c	Merge remote-tracking branch 'upstream/master' into letterboxing	2019-01-07 18:52:48 +09:00
Dean Herbert	49ba4e5a14	Merge branch 'master' into update-framework	2019-01-07 18:51:54 +09:00
Dean Herbert	f6018294b5	Update framework	2019-01-07 18:50:27 +09:00
Roman Kapustin	4b5fc85875	Use Find instead of FirstOrDefault	2019-01-05 19:35:33 +03:00
Dean Herbert	7d1163a7d2	Remove unnecessary null check	2019-01-04 15:49:23 +09:00
Dean Herbert	c528a3896d	Formatting and naming	2019-01-04 15:34:32 +09:00
Dean Herbert	3953f829c8	Add letterbox/screen scaling support	2019-01-04 13:36:02 +09:00
Dean Herbert	b6dc6c4a74	Merge branch 'master' into do_not_use_local_user_for_autoplay_score	2019-01-04 13:11:17 +09:00
Dean Herbert	2d405bfc43	Add back options for 3 and 7 day long rooms	2019-01-02 16:33:52 +09:00
smoogipoo	72482aff8d	Whoops	2018-12-28 01:48:13 +09:00
smoogipoo	a7db0bbb91	Sort rooms based on their API position	2018-12-28 01:45:19 +09:00
Dean Herbert	12a93af156	Merge pull request #3939 from smoogipoo/fix-multi-mods ... Fix plays with mods not submitting	2018-12-27 22:20:10 +09:00
smoogipoo	a62405d82d	Fix plays with mods not submitting	2018-12-27 22:17:03 +09:00
Dean Herbert	2d1736e477	Merge pull request #3936 from smoogipoo/fix-multi-mods ... Ensure mods are set prior to starting play	2018-12-27 22:04:35 +09:00
smoogipoo	101fdf993e	Ensure mods are set prior to starting play	2018-12-27 21:59:43 +09:00
Dean Herbert	5977fc838f	Limit available durations for the time being	2018-12-27 21:59:08 +09:00
smoogipoo	50b51a168e	Always submit standardised scores	2018-12-27 21:12:32 +09:00
Dean Herbert	31baf0086f	Optional idle tracker	2018-12-27 20:17:27 +09:00
Dean Herbert	1ce33cb6da	Adjust polling rate based on current screen and idle state	2018-12-27 20:06:07 +09:00
smoogipoo	eaba9e1378	Fix mode icon not being updated for correct ruleset	2018-12-27 18:16:30 +09:00
smoogipoo	9a5630b3d5	Fix working beatmap not being updated	2018-12-27 18:16:30 +09:00
Dean Herbert	d6c53e3851	Cancel old web requests when changing filter modes	2018-12-27 18:09:42 +09:00
smoogipoo	b0e8561ad3	Fix ruleset not changing correctly	2018-12-27 17:48:10 +09:00
smoogipoo	dae710f9a6	Make leaderboard top not fade by default	2018-12-27 17:29:55 +09:00
phosphene47	3c677970cd	Add menu background skinning for supporters	2018-12-27 17:25:28 +09:00
smoogipoo	ea1309e768	Fix missing bind	2018-12-27 17:15:43 +09:00
smoogipoo	bd0576537e	Forcefully exit multiplayer if API loses connectivity	2018-12-27 17:12:58 +09:00
smoogipoo	f70e60747f	Remove option for 1-minute duration	2018-12-27 16:54:14 +09:00
smoogipoo	8e031325dd	CI fixes	2018-12-27 16:28:17 +09:00
smoogipoo	50201e602e	Combine implementations of status + end date info	2018-12-27 16:19:00 +09:00
Dean Herbert	67e200e1b2	Leaderboard design updates	2018-12-27 15:52:40 +09:00
smoogipoo	1e71c5c9c4	Add + set ended room status	2018-12-27 13:32:44 +09:00
Dean Herbert	cc1f3d54b0	Fix looping failure	2018-12-26 22:37:09 +09:00
Dean Herbert	f6aa6e6b3c	Merge remote-tracking branch 'smoogipoo/timeshift-wip' into timeshift-wip	2018-12-26 22:16:41 +09:00
Dean Herbert	8cf30bdb6a	Play with delegate	2018-12-26 22:16:35 +09:00
smoogipoo	e7310a16c7	Fix playlist not updating correcly	2018-12-26 22:14:49 +09:00
Dean Herbert	a1fa914c66	Participants	2018-12-26 21:58:14 +09:00
Dean Herbert	bf9954aede	Merge remote-tracking branch 'smoogipoo/timeshift-wip' into timeshift-wip ... # Conflicts: # osu.Game.Tests/Visual/TestCaseLoungeRoomsContainer.cs # osu.Game.Tests/Visual/TestCaseMatchSettingsOverlay.cs # osu.Game/Screens/Multi/IRoomManager.cs # osu.Game/Screens/Multi/Lounge/LoungeSubScreen.cs # osu.Game/Screens/Multi/Match/Components/MatchSettingsOverlay.cs # osu.Game/Screens/Multi/RoomManager.cs	2018-12-26 21:32:12 +09:00
smoogipoo	2d19436456	Open -> Push	2018-12-26 21:21:26 +09:00
smoogipoo	152f3b1da3	Add processing overlay to lounge screen	2018-12-26 21:20:53 +09:00
smoogipoo	0c384417f1	Add processing overlay to room creation process	2018-12-26 21:19:02 +09:00
Dean Herbert	26834abd33	Fade and no schedule	2018-12-26 21:18:55 +09:00
smoogipoo	5af29f8384	Reduce code duplication	2018-12-26 21:18:44 +09:00
smoogipoo	940d4a16bb	Add error message when creation fails	2018-12-26 21:18:44 +09:00
smoogipoo	9901b11600	Display room join errors as notifications	2018-12-26 21:18:11 +09:00
Dean Herbert	8386e206c3	Update ParticipantInfo	2018-12-26 20:35:54 +09:00
Dean Herbert	5bd3ab51dd	Open -> Push	2018-12-26 20:35:54 +09:00
Dean Herbert	6f0d13e36b	Move PartRoom calls	2018-12-26 20:35:54 +09:00
smoogipoo	9d305ba024	Reduce code duplication	2018-12-26 20:33:19 +09:00
smoogipoo	be9ba78d47	Add error message when creation fails	2018-12-26 20:33:19 +09:00
smoogipoo	052ab4763a	Display room join errors as notifications	2018-12-26 20:32:36 +09:00
Dean Herbert	7a431ed87f	Update ParticipantInfo	2018-12-26 20:31:04 +09:00
Dean Herbert	869081ce9c	Open -> Push	2018-12-26 20:21:30 +09:00
Dean Herbert	692f5c289d	Move PartRoom calls	2018-12-26 20:12:51 +09:00
Dean Herbert	2353c204ee	Renaming	2018-12-26 20:05:57 +09:00
Dean Herbert	532a970c0f	Give leaderboard and chat more breathing room	2018-12-26 19:20:54 +09:00
Dean Herbert	0cefd4b21d	Improve room padding	2018-12-26 19:14:15 +09:00
Dean Herbert	f442e59620	Icon and beatmap title visual pass	2018-12-26 18:01:53 +09:00
Dean Herbert	c6c8c472bb	Split class out	2018-12-26 16:50:50 +09:00
Dean Herbert	9b2575cc20	RoomSettingsOverlay -> MatchSettingOverlay	2018-12-26 16:50:50 +09:00