4260 Commits

Author	SHA1	Message	Date
Dean Herbert	446fbce81c	Add base class for startup screens ... Avoids missing adding changes to screens like Disclaimer, which may not be shown in debug builds.	2019-06-26 01:36:17 +09:00
Dean Herbert	40cf573368	Fix pause not correctly showing pause screen	2019-06-25 23:15:58 +09:00
Dean Herbert	983cabdb98	Disallow back button on disclaimer screen	2019-06-25 22:27:50 +09:00
Dean Herbert	f9dad0f640	Merge remote-tracking branch 'upstream/master' into gamewide-backbutton	2019-06-25 20:23:49 +09:00
Andrei Zavatski	bae0258d8d	Merge remote-tracking branch 'refs/remotes/ppy/master' into toolbar-rulesets-refactor	2019-06-25 14:16:05 +03:00
smoogipoo	aa81c95f30	Remove unnecessary extra property	2019-06-25 18:38:14 +09:00
smoogipoo	531b107a98	Exit match before exiting multiplayer	2019-06-25 18:33:26 +09:00
smoogipoo	1a26608ba9	Close mod select before exiting song selection	2019-06-25 18:33:21 +09:00
smoogipoo	d9927204f8	Relieve OsuScreen of back button input duties	2019-06-25 18:33:18 +09:00
smoogipoo	8c96e4c1fa	Move back button to OsuGame	2019-06-25 18:33:08 +09:00
Dean Herbert	7bc7df2249	Reduce background brightness at PlayerLoader	2019-06-25 17:22:10 +09:00
Andrei Zavatski	9dedd62d9a	Revert a hotfix in multi screen ... since it's been fixed in a framework	2019-06-24 22:57:18 +03:00
Andrei Zavatski	35516e7304	Merge remote-tracking branch 'refs/remotes/ppy/master' into toolbar-rulesets-refactor	2019-06-24 22:52:24 +03:00
Dean Herbert	f91467eddc	Fix licence header	2019-06-24 18:34:23 +09:00
Dean Herbert	fad1ced1b5	Add correct conditionals to allow exit	2019-06-24 18:15:27 +09:00
Dean Herbert	d70248338d	Merge remote-tracking branch 'upstream/master' into quickEscape	2019-06-24 18:14:48 +09:00
smoogipoo	8d6fc3edf0	Fix multiplayer create button appearing in match song selection	2019-06-24 11:54:41 +09:00
Andrei Zavatski	bbdb114f04	Add missing blank line	2019-06-24 02:09:00 +03:00
Andrei Zavatski	94e819578e	Finally fix the problem when we can't apply a ruleset in the multi screen ... because it's disabled	2019-06-24 01:55:35 +03:00
Dean Herbert	f766068e17	Remove local implementation of bindable in OsuCheckbox (#5046) ... Remove local implementation of bindable in OsuCheckbox	2019-06-21 21:08:09 +09:00
Dean Herbert	6627cdefd2	Merge branch 'master' into tournament-tools	2019-06-21 15:52:47 +09:00
Dan Balasescu	c79c4641f3	Merge branch 'master' into use-modelbackeddrawable	2019-06-21 14:26:07 +09:00
Dan Balasescu	8ab7a8641b	Add comment for why it's not a fill flow	2019-06-21 12:42:35 +09:00
Dan Balasescu	0571bbd555	Merge branch 'master' into carousel-gradient	2019-06-21 12:40:24 +09:00
David Zhao	65c84428cc	Fix position of gradient in beatmap carousel	2019-06-20 15:05:15 +09:00
Joehu	ca919f02e6	Remove bad words on code comments	2019-06-19 21:33:58 -07:00
Dean Herbert	133c1fc0f1	Merge branch 'master' into remove-osu-checkbox-bindable	2019-06-20 11:33:39 +09:00
Dean Herbert	dd926f55bd	Merge remote-tracking branch 'upstream/master' into tournament-tools	2019-06-19 14:55:34 +09:00
Dean Herbert	3043f42eb5	Merge branch 'master' into fix-multiplayer-audio	2019-06-19 14:36:05 +09:00
Dean Herbert	f26fe53feb	Fix startup crash if main menu does not load fast enough	2019-06-19 13:16:19 +09:00
Dean Herbert	6426983de0	Move logic out of update (and simplify, hopefully)	2019-06-19 13:15:58 +09:00
KingLuigi4932	fec0db8fe1	Merge UpdateableAvatar.cs and Avatar.cs + Rename Avatar to DrawableAvatar	2019-06-17 21:55:07 +03:00
KingLuigi4932	d665f1fe4b	Seperate drawable and updateable flag from Country + Use UpdateableFlag	2019-06-17 20:57:57 +03:00
KingLuigi4932	794ba17a2f	Seperate UpdateableRank from DrawableRank and use it	2019-06-17 20:04:09 +03:00
Dean Herbert	26d5c2d85a	Remove local implementation of bindable in OsuCheckbox	2019-06-17 19:37:24 +09:00
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