4680 Commits

Author	SHA1	Message	Date
Dean Herbert	b259710a62	Merge remote-tracking branch 'upstream/master' into tournament-tools	2019-06-17 19:30:17 +09:00
smoogipoo	c1d2fff651	Use RestartPoint	2019-06-17 12:44:19 +09:00
smoogipoo	bc35a30a25	Fix audio being dimmed during multiplayer	2019-06-17 12:27:53 +09:00
Joehu	1a9efb3d7a	Fix editor play button	2019-06-15 11:05:58 -07:00
Dean Herbert	2b48f5d3e0	Tidy up updateMetrics flow	2019-06-15 14:45:51 +09:00
Dean Herbert	587edcb716	Merge branch 'master' into fix-beatmapoverlay-graphs	2019-06-15 13:42:13 +09:00
Dean Herbert	1b75fbed9a	Merge remote-tracking branch 'upstream/master' into update-scrollcontainer	2019-06-14 23:25:17 +09:00
Dean Herbert	bc574520bf	Update ScrollContainer usages in line with framework changes	2019-06-14 15:55:32 +09:00
Dean Herbert	15b9b53d35	Fix IconButtons not being scaled correctly	2019-06-14 13:40:32 +09:00
smoogipoo	f54f6e552b	Fix beatmap details potentially using the incorrect metrics	2019-06-13 18:04:42 +09:00
smoogipoo	583bb53f53	Remove GetBeatmapDetailsRequest	2019-06-13 16:57:19 +09:00
smoogipoo	0a79b444d9	Move metrics to beatmap set	2019-06-13 16:52:49 +09:00
Dean Herbert	830ddbc2de	Merge remote-tracking branch 'upstream/master' into tournament-tools	2019-06-13 12:49:52 +09:00
Dean Herbert	021d0273f9	Split out user activity from user status (#4619) ... Split out user activity from user status Co-authored-by: Dean Herbert <pe@ppy.sh>	2019-06-12 20:14:03 +09:00
Dean Herbert	f358fce9ab	Move activity (writable) bindable to APIAccess so it correctly transfers between users	2019-06-12 18:04:57 +09:00
smoogipoo	243cd517ad	Merge remote-tracking branch 'origin/master' into backgrounded-beatmap-status-lookups ... # Conflicts: # osu.Game.Tests/Visual/SongSelect/TestScenePlaySongSelect.cs	2019-06-12 17:24:16 +09:00
Dean Herbert	20b43c20c8	Rename variables to remove redundant "screen" terminology	2019-06-12 16:33:15 +09:00
smoogipoo	13234fb4a4	Adjust comments a bit	2019-06-12 16:07:35 +09:00
Dean Herbert	a9c229b1ec	Merge remote-tracking branch 'upstream/master' into user-status-wiring	2019-06-12 16:00:35 +09:00
Dean Herbert	fc1f778b82	Remove implicit null	2019-06-12 15:53:53 +09:00
smoogipoo	5d3fa51360	Merge remote-tracking branch 'origin/master' into selection-update	2019-06-12 15:10:57 +09:00
Lucas A	15893bbb75	Drop UserActivity prefix for subclasses nested in UserActivity + Change status messages.	2019-06-11 19:41:48 +02:00
Lucas A	6c74998487	Set ScreenActivity to InitialScreenActivity only when ScreenActivity hasn't been set manually before.	2019-06-11 19:24:36 +02:00
Dean Herbert	606be3d7ce	Merge branch 'master' into backgrounded-beatmap-status-lookups	2019-06-12 00:22:47 +09:00
Dean Herbert	00ee45fe46	Merge remote-tracking branch 'origin/update-visibility-container' into update-framework	2019-06-11 19:36:13 +09:00
Dean Herbert	591be33fc2	Merge branch 'master' into async-results-pages	2019-06-11 18:45:06 +09:00
Dean Herbert	609a82bc94	Update VisibilityContainer usage in line with framework	2019-06-11 15:13:58 +09:00
Lucas A	141775d98c	Merge remote-tracking branch 'upstream/master' into user-status-wiring	2019-06-10 21:41:00 +02:00
Dean Herbert	e87123342c	Load results pages asynchronously ... Reduces performance burden when first displaying pages. Closes #4977.	2019-06-10 23:51:09 +09:00
Dean Herbert	d7cb932606	Merge branch 'master' into selection-update	2019-06-10 17:51:40 +09:00
Dean Herbert	600503ec8e	Use Task.Run/Wait to avoid warnings	2019-06-10 13:42:29 +09:00
smoogipoo	f090e292c9	Move ArchiveModelManager import process to async flow	2019-06-10 13:42:22 +09:00
Lucas A	4f6978f2aa	Apply review suggestions.	2019-06-09 20:01:19 +02:00
Dean Herbert	5c2ea0b1a7	Move dispose to end of file	2019-06-10 01:14:46 +09:00
Dean Herbert	d964f6ba9e	Tween track frequency on pause	2019-06-10 00:56:35 +09:00
Dan Balasescu	346c4310c3	Merge branch 'master' into fail-animation	2019-06-07 20:48:36 +09:00
smoogipoo	90966b113b	Merge remote-tracking branch 'origin/master' into ftb-prepass	2019-06-06 20:32:38 +09:00
smoogipoo	c7d0fcd42a	Update drawnodes	2019-06-06 16:49:35 +09:00
Lucas A	a2bc5b538e	Merge remote-tracking branch 'upstream/master' into user-status-wiring	2019-06-05 16:59:38 +02:00
Lucas A	da20be9a4b	Fetch IAPIProvider via Resolved attribute	2019-06-05 16:59:08 +02:00
smoogipoo	a6dc5606bc	Allow beatmapsets to be sorted by date added	2019-06-05 18:17:43 +09:00
Dean Herbert	9c214c3f0e	Add animation on failing	2019-06-04 16:13:16 +09:00
smoogipoo	cea353975f	Update with further framework-side changes	2019-06-04 11:04:28 +09:00
smoogipoo	53a39e9142	Merge remote-tracking branch 'origin/master' into audio-refactor-update	2019-06-04 10:50:33 +09:00
Dean Herbert	2d15e02406	Merge branch 'master' into selection-update	2019-06-03 11:47:30 +09:00
Lucas A	b3f6640d11	Merge remote-tracking branch 'upstream/master' into user-status-wiring	2019-05-31 12:41:26 +02:00
David Zhao	465aa4e0f6	Prevent idle state from being updated incorrectly	2019-05-31 14:06:18 +09:00
David Zhao	4f09141718	remove extra bool	2019-05-29 12:22:34 +09:00
Dean Herbert	a20eda7b5f	Fix remaining cases to work without things	2019-05-28 23:54:42 +09:00
David Zhao	1a871af552	Fix hide selection, add test	2019-05-28 19:15:29 +09:00
Dean Herbert	4ca34bd5e8	Update osu! in line with audio subsystem refactor	2019-05-28 17:06:01 +09:00
David Zhao	e59a00ac6e	Remove excessive selection updating	2019-05-28 14:04:33 +09:00
Lucas A	a819dd764f	Merge remote-tracking branch 'upstream/master' into user-status-wiring	2019-05-25 11:02:19 +02:00
Dean Herbert	e93fea7dc3	Merge remote-tracking branch 'upstream/master' into tournament-tools	2019-05-18 19:20:44 +09:00
Dan Balasescu	553d786b94	Merge branch 'master' into fix-logo-tracking-crash	2019-05-17 19:23:14 +09:00
David Zhao	b7aed0a014	Interpolate to tracking position on from Initial button state	2019-05-17 12:21:34 +09:00
David Zhao	fcffad6553	Merge remote-tracking branch 'upstream/master' into buttonsystem-entermode	2019-05-17 11:35:35 +09:00
David Zhao	5bf513eba8	Don't track immediately when entering mode	2019-05-17 11:24:34 +09:00
Dean Herbert	359e5b71a5	Fix race condition causing player to never restart	2019-05-16 17:13:03 +09:00
Dean Herbert	958598d13b	Fix crash on switching from main menu to gameplay too fast	2019-05-15 19:39:36 +09:00
Dean Herbert	7b56180b8b	Merge remote-tracking branch 'upstream/master' into tournament-tools	2019-05-15 12:08:23 +09:00
Lucas A	2d966682dc	Merge remote-tracking branch 'upstream/master' into user-status-wiring	2019-05-14 18:09:58 +02:00
Dean Herbert	4b508915f6	Centralise caching of components at OsuGame level	2019-05-13 17:10:25 +09:00
Lucas A	55663b3576	Nest all UserActivities into UserActivity	2019-05-12 17:38:02 +02:00
Lucas A	5ac6bd8204	Merge remote-tracking branch 'upstream/master' into user-status-wiring	2019-05-12 11:53:30 +02:00
Dean Herbert	038e49701e	Move conditional to within BreakPeriod	2019-05-12 16:25:25 +09:00
Dean Herbert	1391aa342c	Merge branch 'master' into break-pause	2019-05-12 16:15:24 +09:00
Dean Herbert	3566da73cc	Merge branch 'master' into fix-more-pause-cases	2019-05-12 15:57:45 +09:00
Dean Herbert	9add2562f9	Close beatmap options when suspending (#4761) ... Close beatmap options when suspending	2019-05-12 15:50:10 +09:00
Dean Herbert	790700d8bf	Use more correct calculation	2019-05-12 15:40:58 +09:00
Joehu	175daac16a	Close beatmap options when suspending	2019-05-11 21:26:42 -07:00
Joehu	29cec54b3c	Fix beatmap carousel overlapping beatmap info wedge	2019-05-11 20:08:45 -07:00
smoogipoo	bde2d552b6	Merge remote-tracking branch 'origin/master' into fix-more-pause-cases ... # Conflicts: # osu.Game.Tests/Visual/Gameplay/TestCasePause.cs	2019-05-10 22:16:59 +09:00
smoogipoo	01eb1a34a9	Remove unused variable	2019-05-10 22:15:33 +09:00
smoogipoo	d2479acbf2	Fix incorrect value being clamped	2019-05-10 18:04:58 +09:00
Dean Herbert	fdf67aaa11	Clamp values	2019-05-10 17:18:39 +09:00
smoogipoo	6a957ad27f	Fix pause triggered when already paused	2019-05-10 15:51:12 +09:00
smoogipoo	7c105fd99f	Fix testcase players pausing on window unfocus	2019-05-10 15:39:25 +09:00
Dean Herbert	9248e6290c	Use FrameStabilityClock to denote current position on song progress	2019-05-09 18:09:26 +09:00
Dean Herbert	5942072128	Add a tween when clicking to seek	2019-05-09 18:07:38 +09:00
Dan Balasescu	22940373a0	Merge branch 'master' into zoomablescrollcontainer-fix	2019-05-09 13:54:21 +09:00
smoogipoo	5c6b4d923f	Reorder methods	2019-05-09 13:53:53 +09:00
David Zhao	d625f3c104	Private method	2019-05-09 13:21:01 +09:00
Dean Herbert	9457a6128e	Fix game pausing when made inactive while watching a replay	2019-05-09 10:57:55 +09:00
Dean Herbert	4f697e2bd5	Add licence header	2019-05-08 19:35:20 +09:00
Dean Herbert	6dea16f365	Move action and hotkey specification local	2019-05-08 19:29:43 +09:00
Dean Herbert	c91b9c6032	Add missing button	2019-05-08 19:27:53 +09:00
Dean Herbert	772eb460fb	Move button definitions to their respective classes	2019-05-08 19:03:26 +09:00
Dean Herbert	0693290ad4	Merge remote-tracking branch 'upstream/master' into refactor-select-footer	2019-05-08 18:43:21 +09:00
Dean Herbert	b33372ca62	Don't expand mods in button on hover	2019-05-08 18:43:15 +09:00
Dean Herbert	8906eb874a	Fix CI issues	2019-05-08 18:43:06 +09:00
Dean Herbert	9a9ac05cd9	Fix post-merge issues	2019-05-08 18:42:54 +09:00
Dean Herbert	bace829629	Add ability to avoid expand animation in ModDisplay	2019-05-08 18:42:26 +09:00
David Zhao	ff3c226596	Give ZoomableScrollContainer an initial width	2019-05-08 13:37:03 +09:00
Lucas A	a5f758b977	Merge remote-tracking branch 'upstream/master' into user-status-wiring	2019-05-07 18:27:14 +02:00
Lucas A	3ecfa9dcdb	Invert partialy activity logic introduced in latest commit	2019-05-07 18:26:34 +02:00
Dan Balasescu	288b3deb94	Merge branch 'master' into fix-rank-display	2019-05-07 15:00:51 +09:00
Dean Herbert	8bc313fb33	Merge branch 'master' into fix-new-inspections	2019-05-07 14:14:40 +09:00
Dean Herbert	c878d814f6	Merge branch 'master' into pause-via-inactive	2019-05-07 13:35:23 +09:00
Dean Herbert	f7a570d67a	Fix double confirmation	2019-05-07 13:34:06 +09:00
smoogipoo	d7c09e7dbd	Merge remote-tracking branch 'origin/master' into fix-new-inspections ... # Conflicts: # osu.Game.Rulesets.Catch/Judgements/CatchDropletJudgement.cs # osu.Game.Rulesets.Catch/Judgements/CatchJudgement.cs # osu.Game.Rulesets.Mania/Scoring/ManiaScoreProcessor.cs # osu.Game.Rulesets.Osu/Replays/OsuAutoGenerator.cs # osu.Game.Rulesets.Osu/UI/Cursor/CursorTrail.cs # osu.Game.Tests/Visual/SongSelect/TestCaseBeatmapScoresContainer.cs # osu.Game/Graphics/OsuFont.cs # osu.Game/Online/API/Requests/Responses/APILegacyScoreInfo.cs # osu.Game/Overlays/Profile/Header/BadgeContainer.cs # osu.Game/Overlays/Profile/ProfileHeader.cs # osu.Game/Screens/Select/PlaySongSelect.cs # osu.Game/Skinning/LegacySkinDecoder.cs	2019-05-07 13:20:17 +09:00
Dan Balasescu	a1c64d8d26	Merge branch 'master' into fix-retry-sound	2019-05-07 12:40:01 +09:00
Dan Balasescu	8b9cfadd64	Merge branch 'master' into fix-retry-sound	2019-05-07 12:37:22 +09:00
smoogipoo	f26a1cff6c	Fix beatmap import crashing during room creation	2019-05-07 12:14:57 +09:00
Lucas A	e7afaeaa4d	Merge remote-tracking branch 'upstream/master' into user-status-wiring	2019-05-06 18:39:58 +02:00
Lucas A	59b8da5c77	Move OsuScreen activity logic to setUserActivity()	2019-05-06 18:37:21 +02:00
Lucas A	a50bbf7f42	Make appveyor happy.	2019-05-05 21:32:23 +02:00
Lucas A	d5d31282e5	Rename InitialScreenStatus to InitialScreenActivity in Editor / Player classes	2019-05-05 20:55:42 +02:00
Lucas A	88b8afbb6a	Make UserPanel show current user activity when ... user status is online.	2019-05-05 20:51:55 +02:00
Lucas A	fa986bb5e9	Rework OsuScreen user activity logic	2019-05-05 20:26:56 +02:00
Dean Herbert	7fdc79dd68	Improve skip boundary logic to be closer to expectations ... Supersedes #4693. Closes #4676.	2019-05-05 20:20:41 +09:00
Dean Herbert	3e3f12f277	Use more local bindables	2019-05-04 17:53:17 +09:00
Dean Herbert	b9a39fb788	Fix instant pausing when game becomes inactive ... Resolves #4685.	2019-05-04 14:54:29 +09:00
Dean Herbert	41ab82cdc3	Merge branch 'master' into refactor-select-footer	2019-05-03 21:46:41 +09:00
LeNitrous	31341bfeb1	use SongSelect's SelectedMods property to ensure it exists	2019-05-03 16:51:33 +08:00
LeNitrous	009eaa647a	fixes to FooterButtonRandom	2019-05-03 16:38:15 +08:00
Dean Herbert	6bdaca1e3b	Fix mod equality checks not working as intended	2019-05-03 10:09:47 +09:00
Lucas A	a4a2ce5ec0	Merge remote-tracking branch 'upstream/master' into user-status-wiring	2019-05-02 21:36:28 +02:00
Lucas A	5d4aa5a12e	Add ScreenStatus property to change the OsuScreen's status + Renamed old ScreenStatus property to InitialScreenStatus	2019-05-02 20:51:19 +02:00
Lucas A	84b41b3886	Split out setUserStatus() logic to multiple lines. + ... Make UserStatusDoNotDisturb inherit from UserStatus	2019-05-02 19:44:07 +02:00
Lucas A	a3541339f5	Handle the restoring of the screen status when the user status is changed back to online after having being set to DND / offline via the login overlay	2019-04-30 21:40:44 +02:00
iiSaLMaN	3b03ca802a	Merge branch 'master' into sh-xh-grading-2	2019-04-30 18:55:35 +03:00
Lucas A	7e42068a14	Merge remote-tracking branch 'upstream/master' into user-status-wiring	2019-04-28 19:48:35 +02:00
Dean Herbert	5a9277ec0e	Merge branch 'master' into fix-retry-sound	2019-04-28 23:38:14 +09:00
Dean Herbert	fa340a9eff	Merge branch 'master' into profile-header-update	2019-04-27 23:48:23 +09:00
Dean Herbert	db75516e79	Merge branch 'master' into fix-lead-in-issues	2019-04-27 21:01:21 +09:00
Dean Herbert	d40177f97c	Merge branch 'master' into drawnode-composability	2019-04-27 18:41:19 +09:00
iiSaLMaN	b08fb5136e	Merge branch 'master' into sh-xh-grading-2	2019-04-26 10:38:10 +03:00
Dean Herbert	a680a38e81	Merge pull request #4675 from nyquillerium/playerloader-tracking ... Prevent PlayerLoader from tracking the logo after it has been exited.	2019-04-26 13:21:13 +09:00
KingLuigi4932	4e0f21102b	Merge branch 'sh-xh-grading-2' of https://github.com/iiSaLMaN/osu into sh-xh-grading-2	2019-04-25 14:04:12 +03:00
KingLuigi4932	c6b3197dd0	Add AdjustRank and use it in Hidden Mod	2019-04-25 13:56:57 +03:00
smoogipoo	3b0d4c1bad	Merge branch 'turn-on-warnings' into profile-header-update	2019-04-25 17:43:10 +09:00
smoogipoo	0bd35ab7bb	Turn on warnings, resolve issues	2019-04-25 17:36:17 +09:00
Dean Herbert	6fdcd98caa	Don't play screen "back" sample when retrying	2019-04-25 14:15:07 +09:00
Dan Balasescu	b911322c92	Merge branch 'master' into fix-lead-in-issues	2019-04-25 12:34:29 +09:00
Dan Balasescu	9fa8f62077	Merge branch 'master' into update-framework	2019-04-25 12:25:17 +09:00
David Zhao	8222923ab8	Only track logo if we're still the current screen	2019-04-24 16:20:51 +09:00
Dean Herbert	bb69330e9f	Call ProcessFrame on the userOffsetClock after a seek ... Without doing this, GameplayClock can be left in an incorrect state after a seek (due to the userOffsetClock being its own FramedClock).	2019-04-24 15:28:14 +09:00
Dean Herbert	efaedafc08	Fix (legacy) AudioLeadIn being used incorrectly. ... This lead-in is intended to specify a value before zero, not a value before the start time. Also removes an unnecessary ProcessFrame call (it happens within Seek itself).	2019-04-24 15:28:14 +09:00
Joehu	0838206ddd	Shorten multiplayer header to multi	2019-04-22 22:44:43 -07:00
Dan Balasescu	0bf17081f6	Merge branch 'master' into update-framework	2019-04-23 11:31:17 +09:00
Dean Herbert	c88a11a38f	Merge branch 'master' into fix-multiplayer-crash	2019-04-23 09:28:03 +09:00
smoogipoo	414d555484	Fix possible exit from non-current screen	2019-04-22 19:24:57 +09:00
Dean Herbert	5fe45c9bed	Merge branch 'master' into update-framework	2019-04-22 19:17:14 +09:00
Dan Balasescu	8fc0bf24c7	Merge branch 'master' into fix-hold-for-menu-icon	2019-04-22 18:57:43 +09:00
Dean Herbert	48e82d4b1c	Fix hold for menu button's icon being incorrect	2019-04-22 18:47:28 +09:00
Dean Herbert	6856571f17	Fix incorrect seek target	2019-04-22 18:45:58 +09:00
Dean Herbert	55c5ef898d	Remove delay on entering player	2019-04-22 18:29:58 +09:00
Dean Herbert	908eee9942	Fix pause tests	2019-04-22 18:29:51 +09:00
Dean Herbert	b3c496d72c	Remove delay on entering player	2019-04-22 17:06:40 +09:00
Dean Herbert	034643b835	Fix pause tests	2019-04-22 17:06:22 +09:00
Dean Herbert	6f2bc943eb	Fix rank display on break info display	2019-04-21 12:04:15 +08:00
Lucas A	fe8c705f1b	Merge remote-tracking branch 'upstream/master' into user-status-wiring	2019-04-20 09:42:32 +02:00
David Zhao	6502e26d09	Add draw size invalidation to ZoomableScrollContainer	2019-04-19 16:21:15 +09:00
Dean Herbert	2d7b3094ba	Merge branch 'master' into player-mod-reinstantiation	2019-04-17 16:42:57 +08:00
smoogipoo	12b6bc48bd	Use .With() wherever possible	2019-04-17 17:24:09 +09:00
smoogipoo	09568be270	Merge remote-tracking branch 'origin/master' into facade-container ... # Conflicts: # osu.Game/Screens/Play/PlayerLoader.cs	2019-04-17 17:17:33 +09:00
smoogipoo	897bfa60db	Fix tracking position during 150ms state change delay	2019-04-17 17:05:35 +09:00
smoogipoo	5a3d6a0258	Fix post-merge errors	2019-04-17 16:11:59 +09:00
Dean Herbert	bb539af1a0	Merge branch 'master' into player-mod-reinstantiation	2019-04-16 22:35:21 +08:00
Lucas A	5887008fb3	Merge branch 'master' into user-status-wiring	2019-04-15 11:43:53 +02:00
LeNitrous	2d227d25cc	fix appveyor warnings	2019-04-14 07:55:15 +08:00
LeNitrous	91c327a90f	use ModDisplay	2019-04-14 07:22:31 +08:00
DrabWeb	c766631ad6	Check for breaks using GameplayClock time.	2019-04-13 11:39:22 -03:00
Lucas A	361c0ec9f2	Allow UserStatusSoloGame to provide metadata such as the ruleset the current beatmap is played in	2019-04-13 13:18:44 +02:00
Lucas A	da5d6cb1d4	Add Beatmap fields to UserStatusSoloGame & UserStatusEditing so they can carry metadata about the played / edited beatmap	2019-04-12 22:54:35 +02:00
Lucas A	69dda0ffd4	OsuScreens can now set a per screen user status ... which defaults to UserStatusOnline	2019-04-12 22:36:01 +02:00
LeNitrous	01cc78108c	add random button	2019-04-11 05:47:32 +08:00
LeNitrous	b4d0755818	please appveyor	2019-04-10 22:10:09 +08:00
LeNitrous	22f9339b01	let mods button have selected mod icons	2019-04-10 21:53:13 +08:00
smoogipoo	0222424aef	Make mods IReadOnlyList<Mod> gamewide ... Prevents potential multiple evaluations of enumerable.	2019-04-10 17:20:36 +09:00
smoogipoo	85d3ff4846	Merge remote-tracking branch 'origin/master' into no-workingbeatmap-mods ... # Conflicts: # osu.Game/Screens/Play/GameplayClockContainer.cs	2019-04-10 12:06:51 +09:00
smoogipoo	4310f07a5c	Rename SelectedMods -> Mods	2019-04-10 12:03:57 +09:00
jorolf	c1db635933	Merge branch 'master' of git://github.com/ppy/osu into profile-header-update	2019-04-09 20:42:39 +02:00
Dan Balasescu	3073508a23	Merge branch 'master' into fix-offset-seek-handling	2019-04-09 15:40:48 +09:00
smoogipoo	4c571acd67	Reinstantiate mods for every player	2019-04-09 13:33:16 +09:00
smoogipoo	56496d28ba	Reset mods when exiting match	2019-04-09 12:59:32 +09:00
smoogipoo	cbb3fdaca8	Fix various crashes due to bindable being disabled	2019-04-09 12:59:32 +09:00
smoogipoo	ad124bfeec	Reimplement select mod track adjustments	2019-04-09 12:59:32 +09:00
smoogipoo	c584967eb1	Remove mods from workingbeatmap	2019-04-09 12:59:32 +09:00
smoogipoo	ca9f172a96	Use var	2019-04-09 12:58:10 +09:00
smoogipoo	93b6cc00df	Fix OsuScreenDependencies using the incorrect parent	2019-04-09 12:56:23 +09:00
smoogipoo	772bef91fa	Merge remote-tracking branch 'Joehuu/master' into drawnode-composability ... # Conflicts: # osu.Game.Rulesets.Osu/UI/Cursor/OsuCursorContainer.cs	2019-04-08 23:01:12 +09:00
David Zhao	8a01995668	Remove need for tracking bool and backing logo	2019-04-08 16:14:41 +09:00
David Zhao	a690302d00	Apply reviews	2019-04-08 15:24:09 +09:00
DrabWeb	e76897d6a7	Fix ResumeContainers appearing when resuming during breaks.	2019-04-07 16:32:55 -03:00
Lucas A	e948b11756	Merge branch 'master' into invert-login-notification-depth	2019-04-07 14:03:01 +02:00
Ferdinand Bachmann	d431ca4efc	BeatmapLeaderboard: use OrderByDescending instead of negation ... (suggested by peppy)	2019-04-07 13:26:35 +02:00
Lucas A	3f2e6a9376	Allow loginOverlay to be null if there's no cached instance in DI (for testing cases)	2019-04-06 18:52:30 +02:00
Lucas A	394f14965b	Make appveyor happy with whitespaces	2019-04-06 18:23:56 +02:00
Lucas A	59410dbe3b	Open login overlay when notification asking for signing in to play multi is clicked	2019-04-06 18:05:13 +02:00
theFerdi265	cb3532e7d4	BeatmapLeaderboard: fix local scores not being sorted	2019-04-06 00:53:02 +02:00
Dean Herbert	46ecaf3d6c	Merge branch 'master' into facade-container	2019-04-05 21:14:21 +09:00
Dean Herbert	f93504c65a	Merge branch 'master' into button_fix	2019-04-05 20:47:08 +09:00
Dean Herbert	88445647c8	Merge branch 'master' into update-beatmap-scores-design	2019-04-05 18:27:30 +09:00
David Zhao	0208526837	Fix button system visual issue	2019-04-05 18:21:54 +09:00
smoogipoo	15fbb6f176	Use common AddUserLink method	2019-04-05 14:15:36 +09:00
David Zhao	b1d74e57e5	Add checks guarding against setting tracking on multiple trackingcongtainers and setting facade size	2019-04-05 13:56:08 +09:00
David Zhao	7047f305a1	Apply reviews, add safety for multiple facades	2019-04-05 12:02:47 +09:00
David Zhao	b2857384b8	Remove unnecessary logo assignment	2019-04-04 12:08:05 +09:00
David Zhao	15b2b6af7d	Clean up remaining assignments of logo relativePositionAxes	2019-04-04 11:28:36 +09:00
jorolf	ccc804a9b2	get everything working again	2019-04-04 00:24:42 +02:00
Samuel Van Allen	bb516da5b6	Removed redundant empty argument list	2019-04-03 22:57:05 +08:00
Samuel Van Allen	3660924441	Trimmed whitespace	2019-04-03 22:40:20 +08:00
Samuel Van Allen	4d60f6fb6a	Use collection initializer and added missing blank line	2019-04-03 22:37:50 +08:00
Samuel Van Allen	73c7c6c316	Hides "Details" button when OnlineBeatmapID is null	2019-04-03 21:44:36 +08:00
David Zhao	8a40b27e8f	Remove need for logo relativePositionAxes none	2019-04-03 20:32:53 +09:00
David Zhao	2ed945605e	Fix Axes.None requirement for FacadeContainer	2019-04-03 19:57:22 +09:00
Dean Herbert	efd7bea771	Add further xmldoc	2019-04-03 17:01:11 +09:00
Dean Herbert	50f8ab3dfb	Fix gameplay offset handling on seeks	2019-04-03 16:58:20 +09:00
Dean Herbert	1ef2a4c46f	Merge remote-tracking branch 'upstream/master' into tournament-tools	2019-04-03 16:23:33 +09:00
Dean Herbert	f1952c0816	Update font awesome usage	2019-04-02 19:55:24 +09:00
smoogipoo	a56e29347f	Adjust namespaces	2019-04-02 14:51:28 +09:00
smoogipoo	d8af5e1c5a	Update in-line with drawnode changes	2019-04-02 11:56:22 +09:00
David Zhao	020be50f03	Merge remote-tracking branch 'upstream/master' into facade-container	2019-04-02 11:28:44 +09:00
Dean Herbert	184403c7e1	Merge branch 'master' into resume-cursor-2	2019-04-01 14:24:00 +09:00
Dean Herbert	2b3c70b2d2	Refactor with constants and better method names	2019-04-01 13:13:56 +09:00
Dean Herbert	c39c37a18d	Apply more missed cases	2019-04-01 12:44:46 +09:00
Dean Herbert	612db31c38	Apply newline additions	2019-04-01 12:16:32 +09:00
LeNitrous	698e38c4e0	make menu flashes and visualisation colourable by skin	2019-03-31 20:10:44 +08:00
David Zhao	952a12bb19	Return logo relativepositionaxes on content out	2019-03-29 16:54:34 +09:00
Dean Herbert	81585a8283	Merge branch 'master' into resume-cursor-2	2019-03-29 15:56:46 +09:00
Dean Herbert	4225d41a84	Merge pull request #4443 from jorolf/screen-title-class ... Add ScreenTitle class Co-authored-by: Dean Herbert <pe@ppy.sh>	2019-03-29 15:02:38 +09:00
Dean Herbert	6949c233bf	Merge remote-tracking branch 'upstream/master' into resume-cursor-2	2019-03-29 15:02:12 +09:00
Dean Herbert	de47e0a8e8	Merge remote-tracking branch 'upstream/master' into screen-title-class	2019-03-29 14:01:08 +09:00
Dean Herbert	202a0086cc	Merge branch 'master' into better-player-flags	2019-03-29 13:45:45 +09:00
Dean Herbert	d6f8dbfd5c	Merge branch 'master' into wedge-fix	2019-03-29 12:23:42 +09:00
Dean Herbert	fed58fba3a	Merge remote-tracking branch 'upstream/master' into resume-cursor-2	2019-03-29 12:14:28 +09:00
Dean Herbert	26a73b4a65	Merge branch 'master' into correct-preview-loop	2019-03-29 12:00:58 +09:00
Dan Balasescu	d410054ec8	Merge branch 'master' into key-counter-display	2019-03-29 11:22:59 +09:00
Dean Herbert	7715606188	Merge branch 'master' into sprite-icon-compatibility	2019-03-29 11:15:34 +09:00
Dan Balasescu	7ab24e35f9	Merge branch 'master' into gameplay-paused-no-update	2019-03-29 10:53:32 +09:00
Dean Herbert	759c5b3db9	Restore previous resume behaviour for the time being	2019-03-29 10:52:26 +09:00
Dean Herbert	3b1f83da1d	Merge remote-tracking branch 'upstream/master' into correct-preview-loop	2019-03-29 10:31:15 +09:00
Dean Herbert	2f5668f4e7	Fix remaining framework changes	2019-03-29 00:29:14 +09:00
David Zhao	f066bd1138	Adjust facade scale now that the size is different	2019-03-28 16:35:15 +09:00
David Zhao	9d66a5e4b2	Ensure logo stops tracking before suspend animation	2019-03-28 16:29:35 +09:00
David Zhao	039e451ab1	ensure logo is where it already needs to be on resume	2019-03-28 16:14:28 +09:00
David Zhao	bfe44eb33d	Remove SizeForFlow magic number	2019-03-28 15:40:58 +09:00
David Zhao	9b047d9b90	Add back menu logo transform	2019-03-28 12:00:50 +09:00
Dean Herbert	253b18b92f	Merge remote-tracking branch 'upstream/master' into better-player-flags	2019-03-28 11:18:54 +09:00
Dean Herbert	5c4f2cefea	Fix Loader and TestCaseLoaderAnimation	2019-03-27 22:28:25 +09:00
David Zhao	061527a260	Add new automated tests for logofacade, reset interpolation	2019-03-27 20:04:01 +09:00
Dean Herbert	de80fc0eac	Update icon usage to match framework changes	2019-03-27 19:29:27 +09:00
Unknown	fea6adbf54	fix wedge bleeding into other elements (and being misaligned)	2019-03-27 10:12:09 +01:00
David Zhao	2e3791be1c	Fix incorrect usage of LogoFacade	2019-03-27 18:11:12 +09:00
David Zhao	ca7a20585d	Apply reviews, delete playerloader test	2019-03-27 17:28:53 +09:00
David Zhao	efeed71517	Add comment	2019-03-27 11:37:16 +09:00
David Zhao	384eee3395	Remove DI requirement for the Facade in PlayerLoader	2019-03-27 11:32:26 +09:00
David Zhao	3fe52be77f	Better tests, add documentation	2019-03-26 17:22:36 +09:00
Dean Herbert	a88f23e555	Convert remaining two flags to ctor parameters	2019-03-26 16:53:44 +09:00
Dean Herbert	83863d35c3	Remove AllowLeadIn flag	2019-03-26 16:35:00 +09:00
Dean Herbert	8658de5108	Rename KeyCounterCollection -> KeyCounterDisplay ... Also fix not working	2019-03-26 13:52:48 +09:00
Dean Herbert	b4d785c76c	Don't update gameplay loop while paused	2019-03-26 13:36:17 +09:00
Dean Herbert	e512d88899	Apply required refactor	2019-03-26 13:29:26 +09:00
Dean Herbert	256a579de0	Allow player to not pause on focus loss	2019-03-26 13:17:00 +09:00
Dean Herbert	4c0121a112	Merge remote-tracking branch 'upstream/master' into resume-cursor-2	2019-03-26 11:31:23 +09:00
Dean Herbert	b75ea295db	Rename KeyCounterCollection -> KeyCounterDisplay ... Also fix not working	2019-03-26 11:28:43 +09:00
David Zhao	35bf262d19	Merge remote-tracking branch 'upstream/master' into facade-container	2019-03-26 11:11:13 +09:00
David Zhao	a0f6718145	Better tests and implementation	2019-03-26 10:48:29 +09:00
Dean Herbert	15aea7f745	Update framework	2019-03-25 21:50:28 +09:00
Dean Herbert	245f463e3f	Don't update gameplay loop while paused	2019-03-25 20:31:55 +09:00
Dean Herbert	8ad4009c33	osu! resume overlay	2019-03-25 20:31:55 +09:00
Dean Herbert	9a6576c0a1	Merge remote-tracking branch 'upstream/master' into multi-background-stack	2019-03-25 12:40:31 +09:00
Dean Herbert	371166955e	Apply a few minor refactors	2019-03-25 12:39:40 +09:00
David Zhao	5169f7a43c	Change default for null screen parallax, apply reviews	2019-03-24 16:21:43 +09:00
David Zhao	d37968d88d	Add better test for facade containers	2019-03-24 15:18:38 +09:00
Dean Herbert	11b474e194	Handle released for safety	2019-03-24 12:19:09 +09:00
Dean Herbert	0d72104235	Refactor for formatting sanity	2019-03-24 12:03:06 +09:00
Dean Herbert	8ad19fc2d4	Merge branch 'master' into menu-globalaction-select	2019-03-24 11:58:52 +09:00
Dean Herbert	9a11a08acc	Update textbox usages	2019-03-23 02:00:27 +09:00
David Zhao	6e98a8dd7c	Initial implementation	2019-03-22 20:01:58 +09:00
David Zhao	e93311fdc9	DI facade	2019-03-22 19:01:32 +09:00
Dean Herbert	db89796752	Merge remote-tracking branch 'upstream/master' into multi-background-stack	2019-03-22 16:05:39 +09:00
Dan Balasescu	b4954c5a7f	Merge branch 'master' into pause-logic-simplification	2019-03-22 15:11:34 +09:00
Dean Herbert	9e6cdd7bd5	Combine conditionals and clarify comment	2019-03-22 14:42:51 +09:00
Dean Herbert	5b8fd6822e	Move storyboard logic region down	2019-03-22 14:39:20 +09:00
Dan Balasescu	5de99f3f5b	Merge branch 'master' into fix-random-select-crash	2019-03-22 14:11:06 +09:00
David Zhao	dcae86e39a	Add a new test for OsuScreenStack, fix parallax	2019-03-22 14:10:38 +09:00
jorolf	7873022a8b	Merge branch 'master' of git://github.com/ppy/osu into screen-title-class	2019-03-21 22:18:59 +01:00
jorolf	454c82c49e	Don't go outside of the container bounds	2019-03-21 22:18:45 +01:00
Dean Herbert	37010f97d7	Fix random select crashing ... Closes #3383.	2019-03-21 21:02:54 +09:00
Dean Herbert	a10e43410a	Fix song select potentially starting play before the carousel (and bindables) have been initialised	2019-03-21 20:52:34 +09:00
Dean Herbert	4789aa81cb	Add an explicit flag for tracking song select's bindable binding ... Not required (this change does not affect logic) but improves clarity.	2019-03-21 20:52:15 +09:00
Dean Herbert	96dba6a20d	Move nested method to bottom of class	2019-03-21 20:51:21 +09:00
Dean Herbert	e2503888a4	Expose carousel's loaded flag	2019-03-21 20:51:06 +09:00
Dean Herbert	15f9a6b9df	Merge remote-tracking branch 'upstream/master' into pause-logic-simplification	2019-03-21 16:04:18 +09:00
David Zhao	ee0d7b6c6d	Merge remote-tracking branch 'upstream/master' into multi-background-stack	2019-03-21 15:35:14 +09:00
Dean Herbert	67a65b80fc	Merge branch 'master' into visual-settings-container	2019-03-20 20:48:30 +09:00
Dean Herbert	ba89bfee0c	Define explicit method to add background ... Also cleans up some redundant/misplaced comments.	2019-03-20 20:16:45 +09:00
Dean Herbert	8865d53992	Reword comment	2019-03-20 20:04:07 +09:00
David Zhao	2e9d823af4	Add comment regarding HandlePositionalInput	2019-03-20 19:59:54 +09:00
David Zhao	2ff7aa6c2e	Remove handle positional input	2019-03-20 19:49:37 +09:00
David Zhao	bc6e8ce7b4	Merge branch 'visual-settings-container' of https://github.com/nyquillerium/osu into visual-settings-container	2019-03-20 19:48:57 +09:00
Dean Herbert	01f795b046	Make restart public rather than reimplementing	2019-03-20 19:45:04 +09:00
David Zhao	8543e8c36f	Put loadcomplete next to other protected overrides	2019-03-20 19:42:39 +09:00
Dean Herbert	cda5bc28c8	Add proper comment	2019-03-20 19:41:20 +09:00
David Zhao	9013afe412	Query for input manager once	2019-03-20 19:35:40 +09:00
Dean Herbert	acbcca4462	Merge branch 'master' into multi-background-stack	2019-03-20 19:11:27 +09:00
David Zhao	fbfef844de	Add test case for resuming PlayerLoader	2019-03-20 17:18:42 +09:00
David Zhao	a5916f995e	Use the previous conditional instead	2019-03-20 16:54:42 +09:00
David Zhao	e9034c8a30	Move blurring logic into Update instead	2019-03-20 16:50:47 +09:00
Dean Herbert	f43e7a880c	Merge remote-tracking branch 'upstream/master' into pause-logic-simplification	2019-03-20 15:27:06 +09:00
David Zhao	1086688e0a	Fix variable hiding	2019-03-20 15:13:59 +09:00
Dean Herbert	6f1610be79	Merge branch 'master' into ruleset-container-refactor	2019-03-20 14:55:58 +09:00
David Zhao	86658e357b	Override add instead	2019-03-20 14:55:52 +09:00
Dean Herbert	5f288650bf	Fix misses/typos	2019-03-20 14:49:33 +09:00
David Zhao	9964644683	Fix merge	2019-03-20 14:37:32 +09:00
David Zhao	2646126d86	Merge remote-tracking branch 'upstream/master' into visual-settings-container	2019-03-20 14:29:20 +09:00
David Zhao	15637f9c4a	Rework instant blur logic such that updateVisuals doesn't need to be public	2019-03-20 14:17:35 +09:00
Dean Herbert	e59917ed03	Merge remote-tracking branch 'upstream/master' into correct-preview-loop	2019-03-20 10:58:15 +09:00
Dean Herbert	7b65d3437f	Merge branch 'master' into fix-background-loading	2019-03-20 10:33:53 +09:00
Dean Herbert	5b6ac7abdc	Merge remote-tracking branch 'upstream/master' into pause-logic-simplification	2019-03-20 10:31:42 +09:00
Dean Herbert	baea7230bc	Rename RulesetContainer to DrawableRuleset	2019-03-19 23:47:31 +09:00
Dean Herbert	68f28326a2	Refactor RulesetContainer for readability	2019-03-19 20:21:31 +09:00
David Zhao	a1000524ee	Merge branch 'master' into visual-settings-container	2019-03-19 20:17:12 +09:00
David Zhao	a8e2072286	Make blurtarget private, improve documentation	2019-03-19 20:15:28 +09:00
Dean Herbert	e36ad3eb6b	Add initial alpha in case	2019-03-19 16:11:22 +09:00
Dean Herbert	d2007cfb38	Fix weird transition	2019-03-19 16:10:28 +09:00
Dean Herbert	83f3d3abde	Merge remote-tracking branch 'upstream/master' into disclaimer-support-text	2019-03-19 16:02:34 +09:00
David Zhao	dc26e90a8d	Remove unused usings	2019-03-19 13:16:06 +09:00
David Zhao	df37973e84	Move showstoryboard into player	2019-03-19 13:13:19 +09:00
David Zhao	27a92e017c	rename back to UserDimContainer	2019-03-19 13:06:14 +09:00
David Zhao	f1b2073bf6	Merge remote-tracking branch 'upstream/master' into visual-settings-container	2019-03-19 13:01:05 +09:00
Dean Herbert	4f075f4740	Add more comprehensive testing	2019-03-18 20:33:43 +09:00
Dean Herbert	9433a97747	Add resume requesting support and fix exit scenarios	2019-03-18 20:33:43 +09:00
Dean Herbert	536b5e0dab	Remove PausableGameplayContainer	2019-03-18 20:33:43 +09:00
Dean Herbert	f13003c53b	Simplify and localise storyboard logic in Player.cs	2019-03-18 20:33:43 +09:00
Dean Herbert	bcaff9f7b4	Add basic pause tests	2019-03-18 20:33:43 +09:00
Dean Herbert	465c95e952	Refactor pause logic so GameplayClockContainer is in control	2019-03-18 20:33:43 +09:00
Dean Herbert	14df9f94e2	Merge branch 'master' into fix-background-loading	2019-03-18 14:59:35 +09:00
David Zhao	eac7672c6b	Clean up debug logging	2019-03-18 14:03:54 +09:00
Dean Herbert	392a0a1d74	Merge branch 'master' into update-framework	2019-03-18 11:34:59 +09:00
Dan Balasescu	e0b3149e32	Merge branch 'master' into api-testability	2019-03-18 10:59:06 +09:00
Dean Herbert	300cb70859	Merge branch 'master' into multi-background-stack	2019-03-18 09:54:27 +09:00
Dean Herbert	c496f6e56b	Fix usages of OnLoadComplete	2019-03-17 13:44:20 +09:00
Dean Herbert	36e5c09710	Merge pull request #4433 from nekodex/prevent-null-lookup ... Don't perform lookup of beatmap stats unless an online id is present	2019-03-15 10:39:39 +09:00
David Zhao	8fc90bb9a0	Remove unused usings	2019-03-14 16:26:34 +09:00
David Zhao	8cdfb1fd61	Remove BlurrableBackgroundScreen, rework tests	2019-03-14 16:09:17 +09:00
David Zhao	8714902349	Handle all blurring directly from background	2019-03-14 14:02:46 +09:00
Jamie Taylor	69eb4ef983	Change updateMetrics parameter to be optional	2019-03-14 13:35:49 +09:00
Dean Herbert	0042cc5337	Merge branch 'master' into mod-ramp-hotfix	2019-03-14 13:02:29 +09:00
Dean Herbert	dd6fbccb56	Slight refactoring of order for readability	2019-03-13 19:57:45 +09:00
David Zhao	de6d8fc637	Move user blurring into VIsualSettingsContainer	2019-03-13 18:25:22 +09:00
Jamie Taylor	7a2af5634c	Merge remote-tracking branch 'upstream/master' into prevent-null-lookup	2019-03-13 14:13:50 +09:00
Jamie Taylor	e6449db8e3	Null metrics on null beatmap for transition animation	2019-03-13 14:13:42 +09:00
Dean Herbert	b1f18481e0	Show text to supporters telling them they're cool ... Also adds better tests for disclaimer screen.	2019-03-13 12:58:42 +09:00
Dean Herbert	f0114d776d	Use interface to access API ... Allows for better testability.	2019-03-13 12:58:18 +09:00
Dean Herbert	c1a356161f	Allow use rate adjust to fallback to clock rate adjust	2019-03-12 18:14:01 +09:00
David Zhao	e6a55cd674	Fix TestCaseEditor as well	2019-03-12 17:45:16 +09:00
Dean Herbert	3c2d8cad0a	Add better async logic for ScreenWithBeatmapBackground	2019-03-12 17:32:40 +09:00
Dean Herbert	8230d5b52e	Ensure initial blur is set on song select background creation ... We do not want the blur transition to play here	2019-03-12 17:27:20 +09:00
Dean Herbert	ee7169a629	Use new non-immediate suspend logic in BackgroundScreenStack	2019-03-12 17:26:16 +09:00
David Zhao	e3567a5507	Make OsuGame use OsuScreenStack too	2019-03-12 16:03:25 +09:00
Dean Herbert	00feb34a3d	Perform load even if default beatmap	2019-03-12 14:02:49 +09:00
Dean Herbert	1954eaca4c	Populate an initial beatmap	2019-03-12 14:01:27 +09:00
Dean Herbert	cc41618760	Reorganise class	2019-03-12 12:56:01 +09:00
Dean Herbert	5ba8388e54	Add load check to avoid double-loading	2019-03-12 12:55:54 +09:00
Dean Herbert	cdeaa80fea	Call ResetSpeedAdjustments before adjusting clock	2019-03-12 11:35:25 +09:00
jorolf	f91e4a1fdd	make ScreenTitle abstract and properties protected	2019-03-11 19:10:37 +01:00
Dean Herbert	13b3036ec6	Fix "wind" mods adjusting rate twice ... This is a hotfix for incorrect framework behaviour. Closes #4442	2019-03-12 02:45:45 +09:00
jorolf	f3ab5070b9	apply suggestions	2019-03-11 18:37:36 +01:00
Dean Herbert	1be4c7b813	Fix excess newline	2019-03-12 02:23:23 +09:00
Dean Herbert	38e75421ab	Fix HoldForMenuButton getting stuck in a confirming state ... Closes #4446.	2019-03-12 02:21:34 +09:00
Dean Herbert	e9ab329e93	Fix backgrounds not correctly handling initial async load	2019-03-12 00:05:05 +09:00
Dean Herbert	81d9e391f4	Preload main menu background	2019-03-12 00:04:19 +09:00
David Zhao	63b9fa58ef	Cleanup	2019-03-11 19:52:28 +09:00
David Zhao	6a1e600099	Create new OsuScreenStack for use in Multiplayer	2019-03-11 19:48:07 +09:00
David Zhao	aeae6143c1	Remove unnecessary variable	2019-03-11 17:47:03 +09:00
David Zhao	0b64af5e02	Put multiplayer background inside a parallax container	2019-03-11 16:51:43 +09:00
David Zhao	0d95511222	Merge branch 'master' into multi-background-stack	2019-03-11 11:19:08 +09:00
David Zhao	2df57c3a29	Give Multiplayer its own background stack	2019-03-11 11:08:04 +09:00
Joehu	0fc6fa7245	Fix file naming on ParticipantCountDisplay	2019-03-09 20:29:56 -08:00
Dean Herbert	9df27f3a5f	Merge branch 'master' into prevent-null-lookup	2019-03-09 11:14:54 +09:00
jorolf	af1c54d995	add ScreenTitle class	2019-03-08 23:44:01 +01:00
Jamie Taylor	8e5816805c	Fix showing outdated data for non-online beatmaps	2019-03-08 18:44:35 +09:00
smoogipoo	d055b248ac	Remove blank line	2019-03-08 15:56:36 +09:00
smoogipoo	7c5ca67691	Merge remote-tracking branch 'origin/master' into gameplay-clock-container ... # Conflicts: # osu.Game/Screens/Play/Player.cs	2019-03-08 15:54:15 +09:00
Dean Herbert	ed8c9bc88a	Merge remote-tracking branch 'upstream/master' into gameplay-clock-container	2019-03-08 15:07:55 +09:00
Dean Herbert	42efea1e06	Apply review	2019-03-08 15:05:45 +09:00
Dean Herbert	3ccc76e18f	Merge remote-tracking branch 'upstream/master' into cursor-in-playfield	2019-03-08 14:50:46 +09:00
Dan Balasescu	969d5bcbd0	Merge branch 'master' into fix-roomstate-on-cancel	2019-03-08 14:10:24 +09:00
Dan Balasescu	d1c18c52ab	Merge branch 'master' into fix-cursor-in-scale-container	2019-03-08 12:43:57 +09:00
Jamie Taylor	08fc42f8e9	Merge branch 'master' into fix-roomstate-on-cancel	2019-03-08 12:39:29 +09:00
Dean Herbert	75e94eba35	Merge branch 'master' into gameplay-clock-container	2019-03-08 12:32:48 +09:00
smoogipoo	04d756524d	Adjust with shader changes	2019-03-07 18:30:18 +09:00
smoogipoo	e430b8a640	Merge remote-tracking branch 'nekodex/master' into drawnode-changes	2019-03-07 18:15:12 +09:00
Jamie Taylor	c34e110a2c	Merge remote-tracking branch 'upstream/master' into fix-roomstate-on-cancel	2019-03-07 17:01:24 +09:00
Jamie Taylor	054db48089	Move online id null check to only bypass metrics lookup	2019-03-07 16:59:43 +09:00
Jamie Taylor	50c1b3a576	Move room resetting logic from MatchSubScreen to LoungeSubScreen	2019-03-07 16:49:48 +09:00
Jamie Taylor	e5e454ddcd	Don't perform lookup of beatmap stats unless an online id is present	2019-03-07 16:17:12 +09:00
Dean Herbert	64b6eaa844	Simplify inward bindings	2019-03-07 16:04:11 +09:00
Dean Herbert	58ef397f4f	Move all clock related gameplay logic inside GameplayClockContainer	2019-03-07 16:02:24 +09:00
Dan Balasescu	7783c33398	Merge branch 'master' into fix-mp-chat-in-own-room	2019-03-07 15:59:53 +09:00
Jamie Taylor	ee076bbbe3	Fix chat channel ids not being updated on room creation	2019-03-07 15:35:57 +09:00
Jamie Taylor	e13516c2ba	Only attempt to restore CurrentItem state if present	2019-03-07 14:09:28 +09:00
Jamie Taylor	6e5ea78ca2	Fix some nullref crashes when escaping out of new room creation	2019-03-06 20:03:37 +09:00
Jamie Taylor	5de6e29294	Reset currentRoom state when cancelling room creation	2019-03-06 20:03:37 +09:00
Dean Herbert	ffe53411f6	Add back cursor proxying	2019-03-06 17:44:58 +09:00
Dean Herbert	acf518c208	Move cursor inside playfield	2019-03-06 17:41:54 +09:00
Dean Herbert	5411c63093	Fix menu cursor not displaying outside of gameplay scaling area	2019-03-06 17:14:08 +09:00
Dean Herbert	b94d080b1c	Merge branch 'master' into LobbyList	2019-03-06 12:34:36 +09:00
Dean Herbert	6b042eae94	Merge branch 'master' into fix-cursor-in-scale-container	2019-03-05 22:22:56 +09:00
Dean Herbert	8a6fa0915e	Merge branch 'master' into simplify-gameplay-clock	2019-03-05 20:22:46 +09:00
Dean Herbert	76ce3954a0	Rename PauseContainer	2019-03-05 19:30:55 +09:00
David Zhao	89987210c3	Merge remote-tracking branch 'upstream/master' into LobbyList	2019-03-05 18:59:38 +09:00
David Zhao	34b2553b95	Remove redundant boolean	2019-03-05 18:59:25 +09:00
Dan Balasescu	fafc80818c	Fix typo ... Co-Authored-By: peppy <pe@ppy.sh>	2019-03-05 18:50:46 +09:00
Dean Herbert	fc0b297232	Fix menu cursor not displaying outside of gameplay scaling area	2019-03-05 18:06:24 +09:00
smoogipoo	c06dac5b1a	Remove null check (beatmap cannot be null)	2019-03-05 17:58:30 +09:00
smoogipoo	2fee7276ae	Combine creation + assignment	2019-03-05 17:58:05 +09:00
Dan Balasescu	bb6c83ab25	Merge branch 'master' into show-mods-on-loader	2019-03-05 17:46:35 +09:00
Dan Balasescu	fd147dae21	Merge branch 'master' into fix-disabled-set-crash	2019-03-05 17:25:13 +09:00
David Zhao	166a8c8bbb	Add back fallback behavior for match creation	2019-03-05 16:41:59 +09:00
Dean Herbert	93c79023dc	Merge remote-tracking branch 'upstream/master' into simplify-gameplay-clock	2019-03-05 16:41:01 +09:00
David Zhao	11e353c152	Use local class instead of having a separate file	2019-03-05 15:55:37 +09:00
Dean Herbert	4e33a98dbc	Move gameplay clock to own class	2019-03-05 13:53:47 +09:00
Dean Herbert	c5cd9972c4	Make restart private	2019-03-05 13:37:51 +09:00
Dean Herbert	01f1018d02	Tidy up clock logic using DI and a GameplayClock	2019-03-05 13:37:51 +09:00
Dean Herbert	5bb0511f0a	Fix SquareGraph not correctly filling columns when loaded with a non-zero time	2019-03-05 13:37:28 +09:00
David Zhao	aecbc31ffa	Use BeatmapSetCoverType.List for lobby listing	2019-03-05 12:08:14 +09:00
Dean Herbert	ec7842dd5a	Merge remote-tracking branch 'upstream/master' into tournament-tools	2019-03-04 12:06:56 +09:00
Dean Herbert	08e153208d	Unbinds are automatic	2019-03-03 20:03:22 +09:00
Dean Herbert	6ffa139ea8	Adjust transition length slightly	2019-03-03 20:02:56 +09:00
jorolf	e8d568470d	use a bindable instead	2019-03-02 19:13:38 +01:00
jorolf	176cbc7f2e	Merge branch 'master' of git://github.com/ppy/osu into supporter-disclaimer	2019-03-02 19:04:48 +01:00
Dean Herbert	687d5d5ff1	Merge pull request #4387 from smoogipoo/fix-fonts ... Fix a few incorrect fonts	2019-03-02 20:07:26 +09:00
Dean Herbert	5487b011d6	Fix some inspections rider isn't able to deal with automatically	2019-03-02 14:34:56 +09:00
smoogipoo	83a02d32f7	Fix a few incorrect fonts	2019-03-02 13:25:59 +09:00
Dean Herbert	796f6c3092	Merge remote-tracking branch 'upstream/master' into tournament-tools	2019-03-02 13:13:51 +09:00
Nitrous	0be9f81310	Merge branch 'master' into show-mods-on-loader	2019-03-02 06:40:45 +08:00
Dean Herbert	1871e8bb2c	Merge branch 'master' into master	2019-03-01 21:22:34 +09:00
Dean Herbert	c01990d005	Fix callback potentially not getting fired	2019-03-01 20:52:34 +09:00
LeNitrous	cf51c8aa31	attempt to comply with appveyor	2019-03-01 19:10:32 +08:00
LeNitrous	4e081fe1fc	Merge branch 'show-mods-on-loader' of https://github.com/LeNitrous/osu into show-mods-on-loader	2019-03-01 18:41:41 +08:00
smoogipoo	bf8360636a	Adjust drawnodes to use the new shared data structure	2019-03-01 17:25:15 +09:00
Dean Herbert	19ce1f2869	Remove second conditional	2019-03-01 13:43:16 +09:00
David Zhao	f6303a2855	Fix songselect blur potentially never being applied	2019-03-01 11:52:51 +09:00
Dean Herbert	49cbaecf4c	Update licence header	2019-03-01 10:52:53 +09:00
Dean Herbert	acc2113027	Make operation run asynchronously	2019-03-01 10:09:03 +09:00
Dean Herbert	798bc1306b	Merge remote-tracking branch 'upstream/master' into m2307-master ... # Conflicts: # osu.Game/Screens/Select/SongSelect.cs	2019-03-01 10:08:35 +09:00
Dean Herbert	80b5f1c523	Fix code formatting issues	2019-03-01 09:49:36 +09:00
Dean Herbert	67928ac1fe	Remove pointless check	2019-03-01 09:49:11 +09:00
Dean Herbert	09e1e3bab6	Merge branch 'master' into UserDimLogic	2019-02-28 20:38:09 +09:00
Dean Herbert	30e820d107	Fix storyboard potentially being loaded many times	2019-02-28 20:36:00 +09:00
Dean Herbert	53eb0e7e4e	More formatting fixes	2019-02-28 20:30:23 +09:00
Dean Herbert	6861163226	Remove pointless method	2019-02-28 20:21:27 +09:00
Dean Herbert	c5270dd577	Remove unnecessary using	2019-02-28 20:17:00 +09:00
David Zhao	e3338e94d1	Make test cases more compact, add two way toggles	2019-02-28 20:01:15 +09:00
Dean Herbert	d10ad3c8a7	Fix warnings	2019-02-28 18:59:05 +09:00
Dean Herbert	5b53cf0961	Merge branch 'master' into hide-desktop-only-elements	2019-02-28 18:50:16 +09:00
Dan Balasescu	99812bd448	Apply suggestions from code review ... Co-Authored-By: nyquillerium <nyquill@ppy.sh>	2019-02-28 18:25:58 +09:00
Dan Balasescu	a37445a938	Merge branch 'master' into better-mp-songselect-deletion-handling	2019-02-28 17:35:08 +09:00
smoogipoo	921346d303	Rename a few more members	2019-02-28 17:27:28 +09:00
Dean Herbert	b2872b47d0	Merge branch 'master' into UserDimLogic	2019-02-28 17:18:04 +09:00
Jamie Taylor	4c8aa65200	private + renaming	2019-02-28 17:02:45 +09:00
David Zhao	69b1c76dce	Actually implement blurring fix	2019-02-28 16:51:17 +09:00
Dan Balasescu	3a1066ff02	Merge branch 'master' into toquantity-1	2019-02-28 15:57:51 +09:00
Jamie Taylor	6e821a426d	Fix restoration of enabled mods when cancelling song select	2019-02-28 15:06:11 +09:00
Jamie Taylor	cf2feec7df	Fix multiplayer enabled mods check	2019-02-28 15:02:22 +09:00
Joehu	2241e1af9d	Use ToQuantity for words with number prefixes	2019-02-27 21:55:45 -08:00
Dean Herbert	2dbf7d122c	Merge branch 'master' into use-pattern-matching	2019-02-28 14:53:07 +09:00
Dean Herbert	e2c6a8bc07	Use pattern matching wherever possible	2019-02-28 14:35:00 +09:00
Dean Herbert	0788a7e9f1	Merge branch 'master' into more-inspections	2019-02-28 14:32:57 +09:00
Dean Herbert	42be7857d1	Use expression body for property get/set where possible	2019-02-28 13:58:19 +09:00
Dean Herbert	26d53d06a9	Fix remaining issues	2019-02-28 13:31:40 +09:00
Shane Woolcock	ce17e37c74	Conditionally add some UI elements only on desktop ... Prevents crashes from trying to access features that are not applicable to mobile.	2019-02-28 13:10:53 +09:00
Dean Herbert	3e1f283281	Merge remote-tracking branch 'upstream/master' into more-inspections	2019-02-28 13:09:18 +09:00
Dan Balasescu	76ec5868da	Merge branch 'master' into fix-square-graph-overhead	2019-02-28 12:23:37 +09:00
Dean Herbert	c8793911a8	Enable more stringent inspectcode style inspections	2019-02-27 21:25:40 +09:00
Dean Herbert	3af7d4939c	Add debounce testing	2019-02-27 19:11:09 +09:00
Dean Herbert	43a1df6e5c	Inline cancellation token source creation	2019-02-27 18:58:53 +09:00
Dean Herbert	6f5d4ce2e2	Debounce SquareGraph some more	2019-02-27 18:58:45 +09:00
Dean Herbert	8c4a59e57e	Fix SquareGraph more	2019-02-27 18:58:34 +09:00
David Zhao	882fff1631	Assert storyboard visibilty at both steps of toggle	2019-02-27 17:56:44 +09:00
David Zhao	14ffd9efe8	Add fake storyboard to visually assess storyboard dim	2019-02-27 17:02:04 +09:00
Jamie Taylor	c59d84fd21	Add sanity check to prevent TimeshiftPlayer from starting with incorrect beatmap/ruleset/mods	2019-02-27 16:21:14 +09:00
Jamie Taylor	a3f71d69a9	Ensure ruleset and mods are set correctly when leaving MatchSongSelect	2019-02-27 16:16:13 +09:00
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
Dean Herbert	f0743ebecf	Merge remote-tracking branch 'upstream/master' into tournament-tools ... # Conflicts: # osu.Game.Tournament.Tests/TestCaseDrawings.cs # osu.Game/osu.Game.csproj	2019-02-17 17:25:09 +09: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	482a01e7ba	Merge branch 'master' into tournament-tools ... # Conflicts: # osu.Game/Online/API/Requests/Responses/APIBeatmap.cs # osu.Game/OsuGameBase.cs # osu.Game/Overlays/ChatOverlay.cs # osu.Game/Screens/Menu/MainMenu.cs # osu.Game/Screens/Tournament/Drawings.cs # osu.Game/Screens/Tournament/Teams/DrawingsTeam.cs # osu.Game/osu.Game.csproj # osu.sln	2019-02-02 19:09:48 +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
Unknown	8c1f8ee596	restart correctly when leaving player (without noises)	2019-01-31 12:33:08 +01:00
Unknown	e2347ae7bf	Merge branch 'master' into correct-preview-loop	2019-01-31 10:53:09 +01: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
Jack Scotson	6a2100ddba	Merge branch 'master' into menu-globalaction-select	2019-01-27 19:13:34 +00:00
Scotsoo	c00636d328	Removing whitespace	2019-01-27 19:09:30 +00:00
Scotsoo	29c02fbaa7	Remove redundant space	2019-01-27 18:27:11 +00:00
Scotsoo	07bb278ec0	Considering GlobalActions in GameplatMenuOverlay	2019-01-27 18:19:20 +00:00
LeNitrous	a1ce7e9a95	add ModDisplay on PlayerLoader	2019-01-26 17:14:45 +08:00
Unknown	1fa87521f6	fix restarting with a different track in the same BeatmapSet	2019-01-26 07:29:30 +01:00
Unknown	3d5520d277	correctly loop from preview point in SongSelect	2019-01-26 07:09:01 +01: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