1993 Commits

Author	SHA1	Message	Date
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
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
Dean Herbert	9457a6128e	Fix game pausing when made inactive while watching a replay	2019-05-09 10:57:55 +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	bace829629	Add ability to avoid expand animation in ModDisplay	2019-05-08 18:42:26 +09:00
Lucas A	a5f758b977	Merge remote-tracking branch 'upstream/master' into user-status-wiring	2019-05-07 18:27:14 +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	8b9cfadd64	Merge branch 'master' into fix-retry-sound	2019-05-07 12:37:22 +09:00
Lucas A	d5d31282e5	Rename InitialScreenStatus to InitialScreenActivity in Editor / Player classes	2019-05-05 20:55:42 +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
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
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	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	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
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
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	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
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	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
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
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
smoogipoo	4c571acd67	Reinstantiate mods for every player	2019-04-09 13:33:16 +09:00
smoogipoo	c584967eb1	Remove mods from workingbeatmap	2019-04-09 12:59:32 +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	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
Dean Herbert	46ecaf3d6c	Merge branch 'master' into facade-container	2019-04-05 21:14:21 +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
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	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
David Zhao	020be50f03	Merge remote-tracking branch 'upstream/master' into facade-container	2019-04-02 11:28:44 +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
David Zhao	952a12bb19	Return logo relativepositionaxes on content out	2019-03-29 16:54:34 +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	202a0086cc	Merge branch 'master' into better-player-flags	2019-03-29 13:45:45 +09:00
Dean Herbert	fed58fba3a	Merge remote-tracking branch 'upstream/master' into resume-cursor-2	2019-03-29 12:14:28 +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
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	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
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	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	256a579de0	Allow player to not pause on focus loss	2019-03-26 13:17:00 +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	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
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
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	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
Dean Herbert	15f9a6b9df	Merge remote-tracking branch 'upstream/master' into pause-logic-simplification	2019-03-21 16:04:18 +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
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
Dean Herbert	6f1610be79	Merge branch 'master' into ruleset-container-refactor	2019-03-20 14:55:58 +09:00
Dean Herbert	5f288650bf	Fix misses/typos	2019-03-20 14:49:33 +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	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	a8e2072286	Make blurtarget private, improve documentation	2019-03-19 20:15:28 +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
Dan Balasescu	e0b3149e32	Merge branch 'master' into api-testability	2019-03-18 10:59:06 +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
Dean Herbert	0042cc5337	Merge branch 'master' into mod-ramp-hotfix	2019-03-14 13:02:29 +09:00
David Zhao	de6d8fc637	Move user blurring into VIsualSettingsContainer	2019-03-13 18:25:22 +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
Dean Herbert	3c2d8cad0a	Add better async logic for ScreenWithBeatmapBackground	2019-03-12 17:32:40 +09:00
Dean Herbert	cdeaa80fea	Call ResetSpeedAdjustments before adjusting clock	2019-03-12 11:35:25 +09: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
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
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	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
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	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
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
Dean Herbert	93c79023dc	Merge remote-tracking branch 'upstream/master' into simplify-gameplay-clock	2019-03-05 16:41:01 +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
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
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
David Zhao	e3338e94d1	Make test cases more compact, add two way toggles	2019-02-28 20:01:15 +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
Dean Herbert	b2872b47d0	Merge branch 'master' into UserDimLogic	2019-02-28 17:18:04 +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
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
Dean Herbert	3e1f283281	Merge remote-tracking branch 'upstream/master' into more-inspections	2019-02-28 13:09:18 +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
Dean Herbert	56697339b3	Merge branch 'master' into fix-disabled-set-crash	2019-02-27 11:14:42 +09:00
David Zhao	d750023c52	Fix TestCasePlayerLoader not having a background stack	2019-02-25 22:05:49 +09:00
Dean Herbert	80737b9ef8	Remove "silent" parameter; consolidate import logic	2019-02-25 18:24:06 +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
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	ab3fa91a2f	Merge branch 'master' into UserDimLogic	2019-02-22 20:38:10 +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
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
David Zhao	263972a048	Remove DimLevel bindable from ScreenWithBeatmapBackground	2019-02-22 17:00:00 +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	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	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	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
David Zhao	8693d6a76b	Merge branch 'master' into UserDimLogic	2019-02-15 17:11:21 +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	166cdab2e8	Remove unnecessary null check	2019-02-13 14:14:57 +09:00
Dean Herbert	2ea839c475	Fix crashes on beatmap not being set correctly in player	2019-02-12 19:18:22 +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
smoogipoo	bdaff27575	Fix nullref due to screens now being removed from parent	2019-01-31 15:02:07 +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
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
smoogipoo	b3403c78da	Fix a few potential crashes	2019-01-25 20:47:37 +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
Dean Herbert	8617aaa2a7	Update licence header (and remove year)	2019-01-24 17:43:03 +09: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	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
ekrctb	f982b6da55	Don't hide 'hold for menu' even hud is hidden	2019-01-17 16:49:04 +09:00
Dean Herbert	e2dd025225	Fix scaling of SkipOverlay when UI scale is adjusted ... Closes #4040.	2019-01-11 16:54:42 +09:00
Dean Herbert	958840fe17	Merge branch 'master' into fix-sliderbar	2019-01-08 21:23:34 +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	74539b5e5c	Merge remote-tracking branch 'upstream/master' into letterboxing	2019-01-07 18:52:48 +09: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
smoogipoo	a62405d82d	Fix plays with mods not submitting	2018-12-27 22:17:03 +09:00
Dean Herbert	67e200e1b2	Leaderboard design updates	2018-12-27 15:52:40 +09:00
Dean Herbert	8cf30bdb6a	Play with delegate	2018-12-26 22:16:35 +09:00
smoogipoo	bb08bf10a0	Fix post-merge issues	2018-12-22 16:26:27 +09:00
smoogipoo	c2a00b84c7	Merge remote-tracking branch 'peppy/modular-results-screen' into timeshift-wip ... # Conflicts: # osu.Game/Screens/Multi/IMultiplayerScreen.cs # osu.Game/Screens/Play/Player.cs # osu.Game/Screens/Play/SoloResults.cs # osu.Game/Screens/Ranking/IResultPageInfo.cs # osu.Game/Screens/Ranking/ResultMode.cs # osu.Game/Screens/Ranking/ResultModeButton.cs # osu.Game/Screens/Ranking/ResultModeTabControl.cs # osu.Game/Screens/Ranking/Results.cs	2018-12-22 16:22:02 +09:00
Dean Herbert	a35d9178f0	Quick rename	2018-12-22 16:20:29 +09:00
Dean Herbert	e404a0bc20	Clean-ups and renames	2018-12-22 15:51:00 +09:00
smoogipoo	daa6292e08	Split results screen to allow for extensibility	2018-12-22 15:39:06 +09:00
smoogipoo	d93421b796	Merge remote-tracking branch 'Joehuu/master' into timeshift-wip ... # Conflicts: # osu.Game/Screens/Play/HUD/ModDisplay.cs	2018-12-22 14:02:45 +09:00
smoogipoo	4149734f89	Add room leaderboard to results	2018-12-21 18:22:13 +09:00
smoogipoo	8a2cc64bfa	Split results screen to allow for extensibility	2018-12-21 16:34:03 +09:00
smoogipoo	5d59a1ffca	Merge remote-tracking branch 'origin/master' into timeshift-wip ... # Conflicts: # osu.Game.Tests/Visual/TestCasePollingComponent.cs # osu.Game/Online/API/APIRequest.cs # osu.Game/osu.Game.csproj	2018-12-21 12:51:31 +09:00
Dean Herbert	aaac45ab8c	Add ability to select chat tabs with alt-1-9	2018-12-20 21:50:47 +09:00
Dean Herbert	71e5ce59da	Fix crash on exiting player during results transition	2018-12-13 16:23:51 +09:00
smoogipoo	170955110f	Add mods to the match info	2018-12-12 14:38:03 +09:00
smoogipoo	ca91dfa091	Make hudoverlay always present	2018-12-04 19:20:32 +09:00
Roman Kapustin	c6c255718b	Handle ModAutoplay during score construction in the Player	2018-12-03 22:37:26 +03:00
smoogipoo	795933d1a1	CreateScoreInfo -> CreateScore	2018-11-30 18:32:08 +09:00
smoogipoo	a6b0e35b2d	Fix post-rebase issues	2018-11-30 18:31:54 +09:00
smoogipoo	a8ad7d4670	Add silent import parameter	2018-11-30 18:27:13 +09:00
smoogipoo	4c1abdcd8c	Save score upon map completion	2018-11-30 18:25:14 +09:00
smoogipoo	8eff49bccd	Remove User from Replay	2018-11-30 18:25:14 +09:00
Dean Herbert	3727955911	Refactors/renames	2018-11-30 16:35:45 +09:00
smoogipoo	219929eb47	Score -> ScoreInfo	2018-11-28 18:33:01 +09:00
smoogipoo	ed02847752	Beatmap -> BeatmapInfo + add foreign key	2018-11-28 17:26:39 +09:00
smoogipoo	2ee181daf7	Re-namespace replay-related classes	2018-11-28 17:20:37 +09:00
smoogipoo	5fd6e6ca77	Re-namespacing	2018-11-28 16:12:57 +09:00
smoogipoo	f27bd3ef3e	OpenTK -> osuTK	2018-11-20 17:14:59 +09:00
Dean Herbert	970ea928ae	Fix hold for menu button occasionally disappearing	2018-11-19 12:06:47 +09:00
Roman Kapustin	ecf8a89f26	Set AccentColour and GlowColour in StandardHealthDisplay	2018-11-16 19:30:58 +03:00
Roman Kapustin	37b19f78ae	Set AccentColour in concrete counters	2018-11-15 23:37:21 +03:00
Dean Herbert	30547ac064	Merge remote-tracking branch 'upstream/master' into dropdown-updates	2018-11-14 20:03:45 +09:00
smoogipoo	aff5fa6169	Update with osu!-side dropdown changes	2018-11-14 18:02:38 +09:00
Dean Herbert	7f73fc2d39	Require holding back button to quit gameplay ... Avoids accidental presses and streamlines logic with on-screen element.	2018-11-07 01:49:21 +09:00
Paul Teng	d8f97a32c7	Make sure restart on fail actually fails	2018-10-31 07:03:37 -04:00
Dean Herbert	6dde5e3b4a	Merge branch 'master' into auto-restart-mod-perfect	2018-10-31 03:56:08 +09:00
Dean Herbert	6f1ef3243d	Proportionally adjust width in line with change	2018-10-31 02:56:25 +09:00
Paul Teng	4bc9161cd1	Leave bigger gap if replaying	2018-10-30 08:32:12 -04:00
Paul Teng	007dfedbb7	Combine RestartOnFail into FailOverride	2018-10-30 07:12:06 -04:00
Paul Teng	b351aae93f	Reduce height of song progress handle	2018-10-18 07:02:18 -04:00
Paul Teng	fd774c6a09	Allow restarts in ModPerfect	2018-10-14 11:18:52 -04:00
Dean Herbert	841b2e8692	Merge branch 'master' into consistent-terminology-format	2018-10-10 19:19:36 +09:00
ekrctb	68980fc477	Adjust usage of Handle(Non)PositionalInput to follow framework update	2018-10-02 14:45:33 +09:00
ekrctb	b7a2ad1aa5	Use UIEvent level getters for modifier keys.	2018-10-02 13:26:36 +09:00
ekrctb	50091252e2	Adapt signature change of event handlers	2018-10-02 12:02:55 +09:00
ekrctb	99fc04c8af	Change signature to new event handler	2018-10-02 12:02:47 +09:00
smoogipoo	a8f156584b	Update framework with positional/non-positional changes	2018-09-26 14:01:15 +09:00
Dean Herbert	ae4c371bec	Merge branch 'update-framework-event-handling' into update-framework	2018-09-20 00:29:42 +09:00
smoogipoo	28f31540c4	Apply changes in-line with framework localisation changes	2018-09-19 14:07:46 +09:00
ekrctb	b790e16217	Use Click instead of now removed TriggerOnClick	2018-09-19 11:42:32 +09:00
ekrctb	a3e6973b41	Replace usage of now removed TriggerKeyPress and similar methods.	2018-09-19 11:36:55 +09:00
Joehu	f99eff1192	Use consistent terminology format	2018-09-15 07:30:11 -07:00
Dean Herbert	79b56cb35c	Make saveState private	2018-09-15 16:34:08 +09:00
Dean Herbert	65b2bceef2	Simplify implementation	2018-09-15 14:51:04 +09:00
Roman Kapustin	125b569ccb	Change AudioClock type to IFrameBasedClock and comment its usage	2018-09-07 21:39:41 +03:00
Roman Kapustin	dae54d252d	Remove redundant checks in RestoreState	2018-09-07 21:35:32 +03:00
Roman Kapustin	7a1fdd9dc8	Reset KeyCounter if targetState was not found	2018-09-06 01:01:36 +03:00
Dean Herbert	5aff19eaea	Merge branch 'master' into replay_keycounter	2018-09-05 08:53:02 +09:00
Dean Herbert	03084aa04b	Revert async changes	2018-08-31 07:07:10 +09:00
smoogipoo	e7a5816d27	Use GetAsync for all samples	2018-08-27 17:30:16 +09:00
smoogipoo	1b279d383f	Use GetAsync on all textures	2018-08-27 17:26:44 +09:00
Dean Herbert	9cbead55d6	Add a second parallax layer to break overlay arrows	2018-08-22 17:41:13 +09:00
smoogipoo	2fb62827e2	Soft-handle errors when beatmap contains no objects	2018-08-22 16:01:58 +09:00
Dean Herbert	4a68b14447	Fix crash when selecting mods after entering play mode ... Closes #3260.	2018-08-21 00:15:51 +09:00
Roman Kapustin	8a9b3f6459	Remove rewinded keycounter states	2018-08-15 22:18:48 +03:00
Dean Herbert	70ce9da321	Merge branch 'master' into judgement-rework	2018-08-07 18:09:06 +09:00
Dan Balasescu	12b99acb2b	Merge branch 'master' into add-loading-animation	2018-08-06 13:06:51 +09:00
Dan Balasescu	c1517e1521	Merge branch 'master' into judgement-rework	2018-08-06 12:30:46 +09:00
Dean Herbert	808754a191	Merge branch 'master' into fix-fade-discrepancies	2018-08-03 21:50:03 +09:00
Dean Herbert	042e4e3966	Merge branch 'master' into add-loading-animation	2018-08-03 21:50:02 +09:00
smoogipoo	3619290c34	Split out judgement definition from judgement result	2018-08-02 20:35:54 +09:00
Dean Herbert	b1afcf0e5d	Add loading animation to player loader to make it more obvious when loading is complete	2018-08-02 19:47:50 +09:00
Dean Herbert	7097ecb740	Fix discrepancies in how elements of play mode fade when restarting/exiting	2018-08-02 19:08:23 +09:00
Dean Herbert	4a11f2ec2a	Improve UX when adjusting visual settings at loading screen	2018-08-02 18:18:55 +09:00
ekrctb	ecc6d55380	Fix player loader not gets ready when multiple mouse button is down	2018-08-01 16:20:29 +09:00
Dan Balasescu	090bc592b5	Merge branch 'master' into add-skip-button-sound	2018-07-30 17:56:08 +09:00
Dean Herbert	8c3583ac54	Remove newline	2018-07-30 14:55:03 +09:00
Roman Kapustin	3134e14b37	Test KeyCounter.RestoreState	2018-07-28 23:24:03 +03:00
Roman Kapustin	8bb83a8fd9	Fix nullref in KeyCounterCollection	2018-07-28 22:16:14 +03:00
Roman Kapustin	1e6220e3c0	Call KeyCounter.RestoreState itself	2018-07-28 13:22:52 +03:00
phosphene47	d32a3ff052	Esc at the end of play should push to result screen ... Closes #3060	2018-07-28 08:34:51 +10:00
Dan Balasescu	ceaa23fbbb	Merge branch 'master' into fix-turkish-i	2018-07-26 18:06:58 +09:00
Dean Herbert	5364a6148a	Use ToUpperInvariant	2018-07-24 14:42:06 +02:00
Dean Herbert	ab9340f4be	Fix usage of culture local ToUpper causing incorrect display on Turkish machines ... Closes #3098.	2018-07-24 11:37:43 +02:00
Dean Herbert	44a2ae5f9a	Fix incorrect variable usage	2018-07-23 08:33:47 +02:00
Roman Kapustin	332ad5bb67	Move states to KeyCounter	2018-07-22 23:58:21 +03:00
Dean Herbert	479fe98335	Add more prominent sound when skipping	2018-07-22 22:57:55 +02:00
Dean Herbert	3c59ccadd0	Fix gameplay always skipping to first hitobject time ... Regresssed with previous build	2018-07-22 22:19:58 +02:00
Roman Kapustin	ecd51d70f9	Rename Memento class	2018-07-22 23:13:06 +03:00
Roman Kapustin	d387048057	Resolve KeyCounterCollection merge conflict	2018-07-22 21:15:53 +03:00
Roman Kapustin	7f3ad37ede	Restore keycounter state on replay seek	2018-07-22 19:42:18 +03:00
Roman Kapustin	1d9bf42082	Fix clock assigning during KeyCounterCollection creation	2018-07-22 18:38:10 +03:00
Roman Kapustin	0632c59e60	Save KeyCounter state when keypress happens	2018-07-22 17:35:42 +03:00
Roman Kapustin	72959691e9	Introduce KeyCounterMemento	2018-07-22 17:16:17 +03:00
Dean Herbert	0f37758314	Update framework	2018-07-21 16:21:53 +09:00
Dean Herbert	241437c819	Remove unnecessary counting change logic	2018-07-20 17:08:25 +09:00
Dean Herbert	82ddbb3f5d	Delay key count stop	2018-07-19 01:18:07 +09:00
Dean Herbert	8414fe9d05	Add key counter exceptions for paused state	2018-07-18 22:19:32 +09:00
Dean Herbert	a01361f833	Set restart count	2018-07-18 22:05:24 +09:00
Dean Herbert	c2cdf12986	Better pause logic	2018-07-18 19:59:04 +09:00
Dean Herbert	b967fe714b	Fix lead-in time now being long enough in many cases	2018-07-17 14:29:22 +09:00
Dean Herbert	da300baff1	Update hide logic	2018-07-17 00:06:51 +09:00
Dean Herbert	ca7b61367f	Merge branch 'master' into correctQuickFade	2018-07-17 00:02:15 +09:00
HoutarouOreki	453d58bcbd	Hide Content instead of particular overlays	2018-07-15 01:10:05 +02:00
HoutarouOreki	07183c0069	Hide Content instead of particular overlays	2018-07-15 00:52:15 +02:00
Berkan Diler	c8697e1743	Fix KeyCounter counting clicks when game is paused	2018-07-14 03:08:28 +02:00
HoutarouOreki	fde9df3938	Same as #3006 + hide gameplay instantly	2018-07-11 14:47:34 +02:00
HoutarouOreki	1e48582dc2	Instantly hide pause menu for quick retry	2018-07-11 13:49:37 +02:00
HoutarouOreki	4c6286a3ca	Fix license header	2018-07-10 22:16:08 +02:00
HoutarouOreki	ffe82aad25	Add basic quick exit functionality	2018-07-10 21:57:09 +02:00
Dean Herbert	8cf1553fd5	Merge remote-tracking branch 'upstream/master' into Aergwyn-allow-back-in-player	2018-06-29 20:30:42 +09:00
Dean Herbert	750f5a86c3	Fix catch test failing due to disabled bindable	2018-06-29 16:49:11 +09:00
Dean Herbert	0866dd11bd	DefaultBackAction -> BackAction, defaults to last button ... The last button is more commonly the escape condition.	2018-06-27 12:57:26 +09:00
Dean Herbert	d7ce4ab6fd	Merge remote-tracking branch 'upstream/master' into Aergwyn-allow-back-in-player	2018-06-27 12:36:10 +09:00
ekrctb	d6084c0b30	Adapt to new input handling changes	2018-06-22 18:10:27 +09:00
Dean Herbert	a7ed3ea80b	Rename alwaysVisible to explain where it comes from	2018-06-13 11:38:15 +09:00
Dean Herbert	d9e7a324c0	Revert HudOverlay to private field	2018-06-13 11:30:22 +09:00
smoogipoo	67aa52fb1d	Use bindable binding	2018-06-12 19:34:49 +09:00
smoogipoo	c70c7a476b	Always display the key counter during replay/autoplay	2018-06-12 17:59:59 +09:00
smoogipoo	b9391b3c6b	Fix bindable not working under non-debug due to weak references	2018-06-11 18:18:24 +09:00
Aergwyn	b9b04c1b6e	move back logic into GameplayMenuOverlay	2018-06-09 09:28:02 +02:00
Aergwyn	792d3b8215	allow "go back" keybind in play	2018-06-09 09:14:58 +02:00
Dean Herbert	0b4f5af52e	Add setting to toggle standardised or exponential scoring display ... Also adjusts exponential scoring to be closer to stable. Log wasn't cutting it.	2018-06-08 03:17:12 +09:00
Dean Herbert	f3c9049660	Merge branch 'master' into disallow-beatmap-change	2018-06-07 15:34:19 +09:00
smoogipoo	d516a0a05c	Store platform offset clock in variable for visibility	2018-06-07 13:42:31 +09:00
smoogipoo	3745f9000b	Merge remote-tracking branch 'origin/master' into remove-decoder-offset	2018-06-07 13:37:19 +09:00
Dan Balasescu	c30861186b	Merge branch 'master' into disallow-beatmap-change	2018-06-06 20:26:17 +09:00
smoogipoo	4086ff7313	Merge remote-tracking branch 'origin/master' into disallow-beatmap-change ... # Conflicts: # osu.Game.Tests/Visual/TestCaseBeatmapInfoWedge.cs # osu.Game/Screens/Menu/Intro.cs # osu.Game/Screens/Menu/MenuSideFlashes.cs	2018-06-06 18:26:51 +09:00
Dean Herbert	55921efffb	Rewrite much state logic	2018-06-06 16:17:51 +09:00
Dean Herbert	86be1bef6b	Use UserTriggered in Player	2018-06-06 15:10:15 +09:00
Thomas Müller	88b23d4e66	Merge branch 'master' into netcoreapp2.1	2018-06-04 05:30:25 +02:00
Dean Herbert	4b604bf055	Merge branch 'master' into disallow-beatmap-change	2018-06-04 10:53:04 +09:00
Dean Herbert	7ca437aa8e	Merge branch 'master' into fix-expand-button-colour	2018-06-04 02:16:27 +09:00
Joehu	0f13acf67e	Use updateExpanded method	2018-06-02 12:52:31 -07:00
Dean Herbert	652e2ccaf5	Merge branch 'master' into netcoreapp2.1	2018-06-03 03:55:33 +09:00
Dean Herbert	64eda27547	Update framework	2018-06-03 03:05:53 +09:00
FreezyLemon	a0c643fae5	Fix SongProgressInfo timespan formatting	2018-06-02 11:25:49 +02:00
Joehu	8d3de3affb	Use '?:' expression instead	2018-06-01 15:58:05 -07:00
Joehu	5d1421c0e9	Fix visual settings expand button colour	2018-06-01 15:31:25 -07:00
Dean Herbert	5872b61988	Fix potential double-disposal of player if PlayerLoader is finalised	2018-05-30 15:48:26 +09:00
smoogipoo	a3470f9ec3	Merge remote-tracking branch 'origin/master' into disallow-beatmap-change ... # Conflicts: # osu.Game/Overlays/Music/PlaylistOverlay.cs # osu.Game/Screens/OsuScreen.cs	2018-05-28 18:01:15 +09:00
smoogipoo	3abfd4711d	Fix wrong clock being seeked when unpausing	2018-05-28 03:42:53 +09:00
smoogipoo	8ae2a3696f	Apply platform universal offset at player level	2018-05-28 03:31:46 +09:00
Dean Herbert	975ce82177	Ensure autoplay tests actually increase score above zero	2018-05-26 14:46:05 +09:00
Dean Herbert	28aa6faef9	Merge branch 'master' into player_loader_input_toggles	2018-05-25 18:38:12 +09:00
smoogipoo	8004b8af4d	Privatise the OsuGame beatmap, add local beatmap to OsuTestCase	2018-05-23 17:38:02 +09:00
smoogipoo	0e122468db	Fix progress easing to 0 if aborting after confirmation	2018-05-22 18:06:40 +09:00
Dean Herbert	d43e4af8ea	Fix overlap between quit button at key input overlay	2018-05-22 16:45:42 +09:00
Dean Herbert	436067c01f	Handle scale back in a nicer way	2018-05-22 16:44:37 +09:00
Dean Herbert	7b770d03c5	Use OnMouseMove instead of Update logic	2018-05-22 16:26:59 +09:00
Dean Herbert	babb7d5158	Fix white ring flash when holding button post-confirmation	2018-05-22 16:23:05 +09:00
Dean Herbert	5f8eb6d823	Fix class name	2018-05-22 16:04:36 +09:00
Dean Herbert	8fbda9d57e	Improve comment	2018-05-22 16:04:07 +09:00
Dean Herbert	58ae545747	innerCircle -> overlayCircle	2018-05-22 15:59:53 +09:00
Dean Herbert	ef55c3c197	Fix icon scale not resetting due to no implicit triggering	2018-05-22 15:58:17 +09:00
Dean Herbert	2ce2bd9788	Add comment for pendingAnimation	2018-05-22 15:58:00 +09:00
Dean Herbert	5a892e4d08	This quit button don't quit	2018-05-22 02:09:52 +09:00
Dean Herbert	323aa189b6	Make on-confirmation animation more robust	2018-05-22 02:08:44 +09:00
Dean Herbert	156d7fb25a	Change depth of HUD ... Yes, this is intentional.	2018-05-22 02:08:21 +09:00
Dean Herbert	946a75ddb2	Block hover to use UI cursor instead of gameplay cursor	2018-05-22 02:05:08 +09:00
Dean Herbert	ebda287e81	Share code with HoldToConfirm implementations elsewhere	2018-05-22 01:44:06 +09:00
Roman Kapustin	30956b64aa	Do not change Margin for player settings groups on the PlayerLoader screen	2018-05-21 18:57:01 +03:00
Dean Herbert	f9c162dee9	Adjust design and feel	2018-05-22 00:49:33 +09:00
Dean Herbert	d5afccd610	Make hint text display briefly at initial display, then on hover	2018-05-22 00:02:03 +09:00
Dean Herbert	3d9d40448d	Fix incorrect syntax	2018-05-22 00:01:40 +09:00
Dean Herbert	841336a181	Merge branch 'master' into exit_replay_button	2018-05-21 23:45:06 +09:00
Aergwyn	b7e3ea348b	expose two Bindables with split logic instead of one with mixed logic	2018-05-21 15:53:55 +02:00
Aergwyn	1482bca147	Rename for better understanding ... ShowOverlays -> AllowOverlays ShowOverlaysOnEnter -> HideOverlaysOnEnter	2018-05-21 09:42:29 +02:00
Dean Herbert	c48c62ea04	Merge branch 'master' into player_loader_input_toggles	2018-05-21 16:20:08 +09:00
Dean Herbert	e2389ad7a4	Allow using back button on PlayerLoader and Replay	2018-05-18 13:32:05 +09:00
Roman Kapustin	81d7e8a393	Resolve merge conflict	2018-05-18 00:25:47 +03:00
Roman Kapustin	f2f2fb8c73	Use both OnKeyDown and GlobalAction.Back	2018-05-14 22:09:09 +03:00
Roman Kapustin	e802b722f0	Revert "Handle mouse back button using OnMouseDown override instead of using GlobalAction" ... This reverts commit 44bbb8700e.	2018-05-14 20:27:05 +03:00
Dean Herbert	28edf3bce7	Merge branch 'master' into hud-above-letterbox	2018-05-14 19:31:39 +09:00
Dean Herbert	0234bbc37f	Move definition inline	2018-05-14 19:14:17 +09:00
Dean Herbert	f14948c022	Merge branch 'master' into exit-hold-confirmation	2018-05-14 18:13:40 +09:00
smoogipoo	115c2dc239	Move hud below the skip button	2018-05-14 18:02:18 +09:00
smoogipoo	64fba5f6d1	Proxy the ruleset cursor above the break overlay	2018-05-14 15:36:56 +09:00
smoogipoo	43409127b7	Place break overlay underneath the hud	2018-05-14 15:36:42 +09:00
Dean Herbert	cfa18bdf1f	Fix song progress time counters wrapping after an hour ... Resolves #2466. Supersedes and closes #2487.	2018-05-11 22:10:26 +09:00
Roman Kapustin	86430da6d6	Update CircularProgress.FillTo calls	2018-05-10 21:08:02 +03:00
Roman Kapustin	93029fd548	Remove mouseWheelCheckbox from InputSettings player overlay	2018-05-10 20:38:55 +03:00
Dean Herbert	5df9f126d1	Implement a hold-to-confirm screen when exiting game using escape key	2018-05-10 17:07:19 +09:00
Roman Kapustin	ccf82cacb0	Show InputSettings on the PlayerLoader screen	2018-05-09 17:31:52 +03:00
Roman Kapustin	6676c55fe0	Introduce InputSettings	2018-05-09 17:22:37 +03:00
Roman Kapustin	44bbb8700e	Handle mouse back button using OnMouseDown override instead of using GlobalAction	2018-05-08 00:22:11 +03:00
smoogipoo	9128e64c9a	Rename OriginalBeatmap back to Beatmap	2018-05-07 10:29:38 +09:00
smoogipoo	4ecdea8b2e	Remove now-unnecessary IsForCurrentRuleset property of RulesetContainer	2018-05-07 10:17:54 +09:00
smoogipoo	77e661489d	Merge branch 'i-beatmap' into beatmap-conversion-rework	2018-05-07 10:00:24 +09:00
smoogipoo	1aefd71b65	Merge remote-tracking branch 'origin/master' into i-beatmap	2018-05-07 09:58:53 +09:00
Roman Kapustin	b08b24b6da	Introduce OsuScreen.AllowBackButton property	2018-05-04 21:18:48 +03:00
Roman Kapustin	39db1e8cbb	Rename HoldToQuit to QuitButton	2018-05-03 23:50:30 +03:00
Roman Kapustin	f8630115d6	Do not expose HoldToQuit.HoldToQuitButton	2018-05-03 23:29:58 +03:00
UselessToucan	d18a8ec9f5	Merge branch 'master' into exit_replay_button	2018-04-28 20:48:16 +03:00
TocoToucan	c78c5195f3	HoldToQuitButton cleanup	2018-04-28 20:43:41 +03:00
Dean Herbert	4f53185d43	Invert logic to match existing toggles	2018-04-25 16:18:55 +09:00
Dean Herbert	45810e6220	Merge branch 'master' into ignore_beatmap_skin	2018-04-24 17:15:39 +09:00
TocoToucan	630980255e	Convert HoldToQuit.text to local variable	2018-04-21 20:35:24 +03:00
TocoToucan	e6d7136a92	Fix HoldToQuit appearance and set HoldToQuitButton.ExitAction	2018-04-21 20:21:09 +03:00
TocoToucan	21454d1f10	Revert "Add 'End replay' button" ... This reverts commit c34ef42f00.	2018-04-21 19:27:17 +03:00
TocoToucan	3b621db460	Implement CircularProgress filling	2018-04-21 19:25:21 +03:00
TocoToucan	633c775306	Initial HoldToQuit commit	2018-04-21 18:24:31 +03:00
TocoToucan	1ce38c7fc6	Visual settings: Ignore beatmap hitsounds	2018-04-20 18:30:41 +03:00
TocoToucan	606e088713	Visual settings: Ignore beatmap skin	2018-04-20 18:17:57 +03:00
TocoToucan	c34ef42f00	Add 'End replay' button	2018-04-20 12:50:19 +03:00
Dean Herbert	8bf25542cb	Add PlayerLoader TestCase and fix dummy beatmap load procedure	2018-04-20 17:30:27 +09:00
Dean Herbert	de85436534	Merge remote-tracking branch 'upstream/master' into peppy-async-screens	2018-04-20 16:52:58 +09:00
smoogipoo	03a5df84c6	Initial rework of beatmap conversion process	2018-04-19 22:04:12 +09:00
smoogipoo	66b3b295e7	Use IBeatmap wherever possible	2018-04-19 20:44:38 +09:00
smoogipoo	7a550e3f07	Revert unnecessary change for now	2018-04-19 20:20:56 +09:00
smoogipoo	b5a55a0dce	Make an interface for beatmaps	2018-04-19 18:58:40 +09:00
Dean Herbert	32a74f95a5	Normalize all the line endings	2018-04-13 18:26:38 +09:00
Joehu	128446e51d	Remove composer from player loader	2018-04-12 16:46:46 -07:00
Dan Balasescu	32832304a7	Merge branch 'master' into fix-songselect-exit-notimplemented	2018-04-02 13:53:41 +09:00
Dean Herbert	31ade986a7	Scren async changes in line with framework changes ... Makes editor not stutter on load, amongst other screens.	2018-03-30 14:58:11 +09:00
FreezyLemon	46d859a660	exit player earlier if a dummy map is loaded	2018-03-25 13:25:48 +02:00
Dean Herbert	e47aa0edc0	Merge branch 'master' into fix-background-fade	2018-03-24 03:40:13 +09:00
smoogipoo	afdab7895a	Fix beatmap background fade not being updated on retry ... Fixes #2287	2018-03-23 20:41:38 +09:00
Dean Herbert	b56eee1927	Fix background loaded player never being disposed if early exit occurs	2018-03-23 15:04:40 +09:00
FreezyLemon	a3d8048aca	abort loading and exit player for dummy maps	2018-03-22 21:46:35 +01:00
smoogipoo	090c78bf10	Merge remote-tracking branch 'origin/master' into fix-player-loader	2018-03-22 20:00:21 +09:00
Dean Herbert	917334a39a	Move cancel code to exit paths for screen	2018-03-22 13:01:40 +09:00
Dean Herbert	8f71d53c17	Fix retry not allowing continuing beyond PlayerLoader ... Resolves #2265.	2018-03-22 02:10:31 +09:00
Dean Herbert	9ad4e9284a	Add skin source fallback chain	2018-03-20 16:40:11 +09:00
smoogipoo	b27b6c7eb7	Merge branch 'master' into cursor-trail	2018-03-16 14:43:27 +09:00
Dean Herbert	ea649f9650	Avoid scheduling during non-current screen	2018-03-14 12:09:19 +09:00
Dean Herbert	ef8d595914	Apply formatting changes	2018-03-14 11:44:19 +09:00
Dean Herbert	c3a3d76b88	Merge remote-tracking branch 'upstream/master' into DoNotMoveToPlayerWhileDragging	2018-03-14 11:43:33 +09:00
Dean Herbert	13f64a1d12	Merge branch 'master' into cursor-trail	2018-03-14 11:42:40 +09:00
smoogipoo	33c721bcbb	Fix post-merge errors	2018-03-12 09:51:32 +09:00
smoogipoo	6e51b74890	Merge remote-tracking branch 'origin/master' into rewrite-break-overlay	2018-03-12 09:47:05 +09:00
Dean Herbert	487a03d0d7	Merge branch 'master' into cursor-trail	2018-03-11 02:07:05 +09:00
Dean Herbert	6d91889ca6	Move player-specific configuration bindables back to player	2018-03-08 22:16:47 +09:00
Dean Herbert	94ed4ab01b	Add debouncing to player loading ... Allows the mouse to temporarily exit and re-enter overlay elements without triggering a load	2018-03-08 20:28:55 +09:00
Dean Herbert	d3e91024a7	Block player enter when a drag initiates from an overlaying container	2018-03-08 18:16:23 +09:00
TocoToucan	2cb197d0c4	Replace ConfigureBackgroundUpdate with OnEntering	2018-03-08 11:35:00 +03:00
Dean Herbert	8f3f886805	Merge branch 'master' into PlayerBase	2018-03-08 16:12:12 +09:00
Dean Herbert	91c984ed97	Merge branch 'master' into rewrite-break-overlay	2018-03-08 09:31:59 +09:00
Dean Herbert	81b778fdcf	Merge branch 'master' into cursor-trail	2018-03-08 09:31:42 +09:00
pdrapoport	3731cbe5eb	Removing "mouse wheel disabled" checkbox from visual settings gameplay menu	2018-03-07 14:20:59 +01:00
Dean Herbert	6a768e378a	Merge branch 'master' into rewrite-break-overlay	2018-03-07 17:00:34 +09:00
TocoToucan	697ad63d72	Resolve merge conflicts	2018-03-05 22:24:25 +03:00
Dean Herbert	4aafc2228e	Improve skip button behaviour when mouse buttons are down	2018-03-06 00:53:40 +09:00
Dean Herbert	d115c56742	Avoid using input blocking	2018-03-06 00:27:55 +09:00
Dean Herbert	792a3ac469	SkipButton -> SkipOverlay	2018-03-06 00:10:53 +09:00
Dean Herbert	53edfedfc8	Remove unneeded HighFrequencyMousePosition from GameplayMenuOverlay	2018-03-05 19:43:57 +09:00
Dean Herbert	7d11e55d06	Only block mouse input when the shaded portion of the SkipButton is hovered	2018-03-05 19:43:33 +09:00
Dean Herbert	c6c55c40ed	Rewrite BreakOverlay ... No longer relies on Schedule calls (could not be rewound). Also no longer sucks.	2018-03-04 00:51:24 +09:00
Dean Herbert	bd510e5356	Merge remote-tracking branch 'upstream/master' into clock-fixes	2018-03-02 21:01:53 +09:00
Dean Herbert	bda673e6fe	Merge branch 'master' into player-reduced-parallax	2018-02-28 23:15:25 +09:00
Dan Balasescu	25c748ed45	Merge branch 'master' into fix-player-exit	2018-02-28 22:05:44 +09:00
Dean Herbert	f9faf8e3d8	Localise offset clock usage out of Player as much as possible	2018-02-28 22:01:52 +09:00
Dean Herbert	01fcf9c813	Update in line with framework changes	2018-02-28 22:01:48 +09:00
Dean Herbert	dd6cf1379e	Reduce parallax effect during gameplay ... This also cleans up some shared code in OsuScreen.	2018-02-28 11:42:47 +09:00
Dean Herbert	0cd049c6b0	Rely less on zero-duration transform helpers ... They have huge overheads. See ppy/osu-framework#1411.	2018-02-28 11:00:54 +09:00
Dean Herbert	f64afc738d	Fix incorrect exit block conditional ... Resolves #2130.	2018-02-27 23:59:34 +09:00
Dean Herbert	cff17f1864	Update in line with inverse ShoudProcessClock default	2018-02-27 17:23:38 +09:00
Dean Herbert	8e78a7b114	Fix HUD using incorrect clock for time display	2018-02-27 17:23:38 +09:00
Dean Herbert	37d2a2c3cc	Rename clock types to match across classes	2018-02-27 17:23:38 +09:00
Dean Herbert	3d52ead213	Rename sourceClock	2018-02-27 17:23:38 +09:00
Dean Herbert	fee258f2f2	Rework PauseContainer to better pause	2018-02-27 17:23:38 +09:00
Dean Herbert	d4f1723ae6	Remove unnecessary secondary argument from HUDOverlay	2018-02-27 17:23:38 +09:00
Dean Herbert	0635ae2293	Include missing offset	2018-02-27 17:23:38 +09:00
Dean Herbert	9c0dfb7c8c	Avoid creating an extra framed clock in SkipButton	2018-02-27 17:23:38 +09:00
Dean Herbert	c0d983bbdf	Merge branch 'master' into PlayerBase	2018-02-23 13:51:11 +09:00
Dean Herbert	7c43a3b4c0	Merge branch 'master' into storyboard-improvements	2018-02-19 14:54:12 +09:00
Dean Herbert	e0faf14a3e	Actually consume ReplacesBackground	2018-02-19 12:33:07 +09:00
Dean Herbert	29adedfa96	Collapse visual settings by default in player	2018-02-16 12:47:32 +09:00
Dean Herbert	9760f30ce9	Tidy things up to make more sense	2018-02-16 12:08:36 +09:00
Dean Herbert	f22f9b5de0	Merge branch 'master' into PlayerBase	2018-02-16 11:26:57 +09:00
TocoToucan	c57e8785e2	Move all storyboard loading to Player itself	2018-02-15 23:57:53 +03:00
TocoToucan	86f200e257	Fix possible nullref	2018-02-09 22:04:39 +03:00
TocoToucan	a86a4f49cf	Resolve "Pressing escape on continuing causes the game to return to song select" problem without removing Delay	2018-02-09 21:20:49 +03:00
TocoToucan	4535e09607	Add missing license header	2018-02-09 00:36:31 +03:00
TocoToucan	a860dd7208	Preview visual settings at the “loading” screen	2018-02-09 00:06:24 +03:00
TocoToucan	d437c1d7ec	Introduce PlayerBase class	2018-02-08 23:28:42 +03:00
TocoToucan	77a8b36529	Schedule Resume method call without delay	2018-02-08 22:30:15 +03:00
Dean Herbert	a70989cb70	Rely on bindable's formatting rather than setting a default	2018-02-08 11:12:05 +09:00
smoogipoo	8e280b6b0c	Use 0.1 precision for playback speed	2018-02-07 13:28:10 +09:00
smoogipoo	bd5db6fc8d	Make playback speed sliderbar use the tooltip text as its display	2018-02-07 13:26:41 +09:00
Dean Herbert	9bfec9b233	Tidy up state change logic	2018-02-06 14:30:01 +09:00
Dean Herbert	dd8955cd90	Fix skip button not receiving screen-wide input	2018-02-06 14:29:03 +09:00
tgi74000	b0fbae9dfc	Fix PlayerSettingsOverlay not reappearing when Hidden	2018-02-01 16:07:49 +01:00
Dan Balasescu	c1d5a68e4d	Merge branch 'master' into VisualSettingsOverlay	2018-02-01 16:37:04 +09:00
Dean Herbert	df65443f07	Merge branch 'master' ... Conflicts: osu-framework osu.Game/Screens/Play/Player.cs	2018-01-30 18:31:03 +09:00
TocoToucan	ce4122b3c4	Display visual settings overlay on PlayerLoader screen	2018-01-26 23:29:54 +03:00
TocoToucan	d82835107c	Remove autohide and clock related logic from Visual settings overlay	2018-01-26 22:20:24 +03:00
TocoToucan	615c831069	Merge from ppy/master	2018-01-26 21:56:17 +03:00
smoogipoo	8d11596b2f	Minor cleanups	2018-01-24 17:48:42 +09:00
smoogipoo	7f299b2533	Merge remote-tracking branch 'origin/master' into RefactorPlayerOverlaysInitialization	2018-01-24 17:44:28 +09:00
Dean Herbert	fa1f4304f6	Remove usings	2018-01-23 13:24:04 +09:00
Dean Herbert	f823650b10	Allow user choice of the quick retry hotkey	2018-01-23 13:05:07 +09:00
Michael Manis	794ae5380a	Intverted conditionals.	2018-01-22 01:06:27 -05:00
Michael Manis	530e0afa2c	Use IsCurrentScreen instead of a bool for both checks now.	2018-01-21 22:27:15 -05:00
Michael Manis	964c6da9a4	Use IsCurrentScreen instead of a bool	2018-01-21 22:00:18 -05:00
Michael Manis	806da21760	Removed rreduntant initialization.	2018-01-21 20:24:19 -05:00
Michael Manis	ad2df8d8df	Fixed tilde-key crash at end of beatmap.	2018-01-21 20:09:44 -05:00
TocoToucan	e88f514cf4	Resolve merge conflicts	2018-01-21 18:32:21 +03:00
TocoToucan	4875443e12	Resolve merge conflicts	2018-01-21 18:11:43 +03:00
smoogipoo	a05032779f	Remove unneeded event binding	2018-01-18 00:04:33 +09:00
smoogipoo	c79603290d	Move TriggerChange to LoadComplete()	2018-01-17 21:52:57 +09:00
Dan Balasescu	be225eff90	Merge branch 'master' into fix-replays	2018-01-17 18:01:41 +09:00
smoogipoo	2ebb3d6e0e	Fix ReplayLoader not being treated as having a replay loaded ... Player checks for HasReplayLoaded in Player.load(), but the replay is attached in ReplayPlayer.LoadComplete(), which is too late.	2018-01-17 17:37:14 +09:00
Dean Herbert	5e1cd8ddc4	Apply conditionals directly rather than using an in-between property	2018-01-16 20:34:40 +09:00
Dean Herbert	39af9321cf	Remove unnecessary overrides	2018-01-16 20:34:40 +09:00
Dean Herbert	9b33499fe7	Merge remote-tracking branch 'upstream/master' into RefactorInputQueues	2018-01-16 20:04:34 +09:00
TocoToucan	a81f32a388	PlayerGroup -> PlayerSettingsGroup	2018-01-15 20:52:52 +03:00
Dean Herbert	0796d33e66	Merge branch 'master' into fix-skipbutton-ordering	2018-01-15 15:54:18 +09:00
smoogipoo	7c41925144	ProvidesUserCursor -> ProvidingUserCursor, and update xmldoc	2018-01-15 14:07:09 +09:00
TocoToucan	d3afbdaac6	Resolve merge conflict	2018-01-13 22:32:56 +03:00
TocoToucan	43d2ae348a	Rename ReplaySomething -> PlayerSomething	2018-01-13 22:25:09 +03:00
TocoToucan	0c4fcdf6d8	Remove not used breakOverlay field	2018-01-12 23:59:36 +03:00
TocoToucan	3795411fd1	Do not assign hudOverlay's and breakOverlay's members in Player class	2018-01-12 23:33:24 +03:00
smoogipoo	d0b177e233	Proxying isn't needed anymore	2018-01-12 19:50:09 +09:00
smoogipoo	16d739580b	IProvideLocalCursor -> IProvideCursor	2018-01-12 19:37:03 +09:00
Dean Herbert	188b26472c	Merge remote-tracking branch 'upstream/master' into sliderbar-tooltip-precision	2018-01-12 18:54:36 +09:00
smoogipoo	a6c6523a86	Make SkipButton an OverlayContainer to use the menu cursor	2018-01-12 18:21:17 +09:00
smoogipoo	512e4d2c9f	Rewrite the way that cursor overrides are done game-wide	2018-01-12 18:13:17 +09:00
smoogipoo	2e235660ad	Fix skip button appearing below osu!mania's stage	2018-01-12 13:25:49 +09:00
james58899	1985e5bdb2	fix background dim	2018-01-12 12:21:37 +08:00
TocoToucan	affbb7a847	Fix license header	2018-01-12 00:37:28 +03:00
TocoToucan	c1f756b16e	Support background blur in visual settings	2018-01-12 00:03:55 +03:00
TocoToucan	3ec93966a0	Implement VisualSettings autohiding	2018-01-11 23:39:23 +03:00
TocoToucan	98851e4a78	Stop time whenever visual settings are expanded	2018-01-11 01:24:34 +03:00
smoogipoo	d147683361	Cleanup	2018-01-10 17:39:15 +09:00
smoogipoo	c010b48b29	Remove number format specified from OsuSliderBar, override ToolTipText ... Better/cleaner solution.	2018-01-10 17:29:16 +09:00
smoogipoo	17e7f75aca	More osu!-side bindable fixes	2018-01-10 15:41:13 +09:00
Dean Herbert	9ec8f130a6	Ensure changes are only applied when we are the current screen	2018-01-10 13:24:26 +09:00
TocoToucan	c48c7b085c	Visual settings initial commit	2018-01-10 02:24:51 +03:00
Dean Herbert	fcb197f7b6	Simplify logic	2018-01-09 22:21:15 +09:00
Dean Herbert	2518d16a77	Denote unused variable	2018-01-09 21:34:31 +09:00
Dean Herbert	c2fadcfc1f	Merge branch 'master' into background-blur	2018-01-09 21:20:05 +09:00
Aergwyn	f6c168be27	add skip cutscene as "in game" keybinding	2018-01-08 18:22:43 +01:00
TocoToucan	ae032cbf23	Support HandleKeyboardInput, HandleMouseInput, CanReceiveKeyboardInput, CanReceiveMouseInput properties	2018-01-07 23:40:00 +03:00
Dean Herbert	a1d94d7adf	Merge branch 'master' into sliderbar-tooltip-precision	2018-01-05 20:48:30 +09:00
Dean Herbert	37d393bca0	Update licence headers	2018-01-05 20:21:19 +09:00
smoogipoo	1571c10c42	Fix up replay settings sliderbar formatting	2018-01-05 14:37:32 +09:00
Dean Herbert	c0dd812a4c	Merge remote-tracking branch 'upstream/master' into disable-unimplemented-mods	2018-01-02 15:33:08 +09:00
Aergwyn	ccb69d16d9	move HitResult in Scoring namespace to replace HitCount	2017-12-30 21:23:18 +01:00
Dean Herbert	d9a80dae5d	Male NoFail use an applicable interface	2017-12-31 04:10:29 +09:00
ColdVolcano	df62ca14b7	Don't unbind when not necessary	2017-12-29 23:41:36 -06:00
ColdVolcano	3845c7ac7d	Remove bluring of storyboard	2017-12-28 14:31:34 -06:00
FreezyLemon	998f9c090d	select pause buttons after mouse move only	2017-12-28 01:56:10 +01:00
Dan Balasescu	3bfa6bd9fd	Merge branch 'master' into better-notification-delays	2017-12-27 23:26:57 +09:00
Dean Herbert	324a7d6377	Merge remote-tracking branch 'upstream/master' into better-testcase-player	2017-12-27 20:26:38 +09:00
Dan Balasescu	1af7f71c97	Merge branch 'master' into notification-verbosity	2017-12-27 15:01:28 +09:00
Dean Herbert	d17f6cb564	Fix crash when starting play mode with no beatmap ... Closes #1767	2017-12-27 11:46:44 +09:00
Dean Herbert	9fb958eadc	Make TestCasePlayer more usable ... No results screen crash, no unnecessary leadin time.	2017-12-26 14:23:14 +09:00
ColdVolcano	044e4d0acd	Add blur to background in Player	2017-12-25 19:11:49 -06:00
Dean Herbert	71a94d6b44	Add a bindable Enabled flag to NotificationManager ... Also better handles delays before notifications are displayed.	2017-12-25 20:53:23 +09:00
Dean Herbert	6f5f4f76e5	Use Logger.Error when exceptions are involved	2017-12-25 18:21:15 +09:00
Dean Herbert	13fee5402a	Remove unnecessary using ... visual studio doesn't save	2017-12-21 23:20:11 +09:00
Dean Herbert	87e790080b	Remove manual audio thread synchronisation logic ... No longer required as calls are blocking.	2017-12-21 22:22:28 +09:00
Dean Herbert	abe465358c	Fix formatting	2017-12-21 21:46:57 +09:00
Dean Herbert	5b596765c8	Merge branch 'master' into dev-overlay-counter	2017-12-21 21:09:40 +09:00
Seokho Song	6fbd06f967	Fix Not update retry counter on PauseOverlay ... I've find "You've retried xx time(s)" message that something weird. That is not displayed pause overlay and only see count on FailOverlay I change code that PauseContainer.Retries property can be set call-back function. Signed-off-by: Seokho Song <0xdevssh@gmail.com>	2017-12-21 20:40:31 +09:00
Dean Herbert	b6fd5b0f17	Fix keyboard and mouse input not properly getting blocked by GameplayMenuOverlay	2017-12-21 19:19:08 +09:00
smoogipoo	5e111e14db	Make it possible to change the overlay actions beyond instantiation	2017-12-18 19:13:25 +09:00
smoogipoo	a17b2e4c18	Expose buttons for test cases	2017-12-18 19:13:08 +09:00
smoogipoo	918e7c9a4b	MenuOverlay -> GameplayMenuOverlay	2017-12-18 16:40:50 +09:00
smoogipoo	5f538f03ea	Comments	2017-12-18 16:34:25 +09:00
smoogipoo	59365bbdce	Make MenuOverlay support key selections	2017-12-18 16:34:17 +09:00
smoogipoo	f3a5258c5b	Reorder file (ctor + bdl)	2017-12-18 14:05:12 +09:00
smoogipoo	ed81ed7c54	Add back HandleInput disable overrides	2017-12-11 15:19:00 +09:00
TocoToucan	219bdbc4e1	Populate HandleInput automatically	2017-12-09 22:21:17 +03:00
Aergwyn	016057ab01	readd storyboard to beatmap + minor cleanup	2017-11-30 16:49:53 +01:00
Dan Balasescu	a574b092f6	Merge branch 'master' into change-transition-blur-rate	2017-11-27 10:42:32 +09:00
Dean Herbert	69e388dd52	Adjust background blur rate	2017-11-26 17:08:14 +09:00
Unknown	7be55df790	fix being stuck in gameplay if exit is pressed too fast ... The reliance on `pauseOverlay.Alpha == 1` created a race condition that, when you pressed Exit while the pauseoverlay is still fading in, could get you stuck in gameplay. The game wants to show the pause overlay but also thinks it's already paused and returns early.	2017-11-25 19:09:05 +01:00
Dean Herbert	9565a9c352	Fix TestCasePlayer not working as expected	2017-11-23 20:42:07 +09:00
FreezyLemon	18b0b77f0a	Added requested changes. Mainly changing lambdas to direct function references.	2017-11-22 21:41:50 +01:00
FreezyLemon	a033eb46d3	Changed to LoadComponentAsync call instead of adding an AsyncLoadWrapper instance.	2017-11-21 16:12:23 +01:00
smoogipoo	c30d31e037	Remove extra alternateFailConditions function in Player	2017-11-21 17:30:19 +09:00
Brayzure	da30d76f9b	Implement Score Processor Mod Interface ... - Add a delegate whenever we want to register an additional fail condition	2017-11-20 02:15:29 -05:00
Brayzure	de4d8eb196	Implement Sudden Death and Perfect ... - Two additional fail conditions	2017-11-18 01:28:09 -05:00
Dean Herbert	62358c0b53	Merge branch 'master' into beatmap_scores	2017-11-16 00:45:17 +09:00
Dean Herbert	f912744acc	Fix sizing of ModIcon	2017-11-16 00:15:27 +09:00
Dean Herbert	8011048540	Fix hard crash when clicking play button with no map selected ... Resolves #1507.	2017-11-15 20:03:18 +09:00
Dean Herbert	a2cb9d4086	Fix audio not playing during player loading ... Regression due to changed audio initialisation logic.	2017-11-13 19:43:00 +09:00
Dean Herbert	49a5af60e2	Fix multiple order-of-execution issues with osu! logo ... Also sets better defaults.	2017-11-13 18:43:16 +09:00
EVAST9919	51adea2a60	Convert text to a local variable	2017-11-13 05:58:19 +03:00
EVAST9919	89e9f84753	Add padding to the text container	2017-11-13 05:52:05 +03:00
EVAST9919	ec75837965	Replay speed setting visual improvements	2017-11-13 05:04:21 +03:00
Dean Herbert	7d4e1b6f22	Don't require a local storage variable for restoring playback speed	2017-11-11 13:03:46 +09:00
Dean Herbert	3142832693	Add precision to playback speed	2017-11-11 13:00:29 +09:00
Dean Herbert	3d1d66d886	Merge branch 'master' into replay_speed	2017-11-11 10:41:38 +09:00
EVAST9919	4b21c83f35	Merge remote-tracking branch 'refs/remotes/ppy/master' into replay_speed	2017-11-10 17:24:26 +03:00
smoogipoo	5816d25358	Merge remote-tracking branch 'origin/master' into replay-rewinding	2017-11-10 22:19:17 +09:00
Dean Herbert	49731f4c05	Remove unused parmeter	2017-11-10 19:32:09 +09:00
Dean Herbert	bd2de89918	Why weren't these fixed previously	2017-11-10 19:26:25 +09:00
Dean Herbert	4a5a293376	Merge branch 'master' into replay-rewinding	2017-11-10 19:08:13 +09:00
Dean Herbert	bc54d4dd4f	Ensure we wait for audio track reset before proceeding with player execution	2017-11-10 18:32:15 +09:00
Dean Herbert	4874371dbf	Rename methods back	2017-11-09 17:38:20 +09:00
Dean Herbert	c2d4a213b1	Rename logo-related methods	2017-11-08 16:34:03 +09:00
smoogipoo	2fbd490626	Make RemainingTimeCounter into a Counter	2017-11-06 14:58:05 +09:00
smoogipoo	3b189c1ffe	Fix BreakOverlay not properly working with rewinding ... In various ways: * It wouldn't show up if rewound after the break was complete. * The time would increase backwards if rewind happened during a break. * Etc. * Basically the fix is to use transformations everywhere. BreakOverlay could be refactored further, but this is enough to make it work for now.	2017-11-03 21:20:36 +09:00
Dean Herbert	9b2d41f4eb	Fix quick retry looking bad	2017-11-02 21:52:01 +09:00
Dean Herbert	b8b05fe8d2	Make the osu! logo shared game-wide ... There should only ever be one osu! logo. It is now passed around between screens in a superfluous manner.	2017-11-02 20:38:02 +09:00
Dean Herbert	6fa02ce9bb	Use internal less ... Allows for more dynamic compilation to succeed. No reason for using internal here anyways.	2017-11-01 17:10:54 +09:00
EVAST9919	a7bcae4869	Add startup value for the slider	2017-10-26 15:18:06 +03:00
EVAST9919	08637253df	Merge remote-tracking branch 'refs/remotes/ppy/master' into replay_speed	2017-10-26 15:04:44 +03:00
Shane Woolcock	ea2934d92c	Add KeyboardStep values for configuration options	2017-10-23 16:06:08 +10:30
EVAST9919	bae91d7de7	Simplify gradient usage in Letterbox Overlay	2017-10-18 05:06:17 +03:00
EVAST9919	f4428980a6	Merge remote-tracking branch 'refs/remotes/ppy/master' into replay_speed	2017-10-15 00:10:15 +03:00
Dean Herbert	cd722e4abb	Fix beatmap author being stored in two different places	2017-10-14 11:39:55 +09:00
EVAST9919	7a72f2e3f5	Make sure we restore the clock rate on exiting	2017-10-14 05:15:18 +03:00
EVAST9919	0ec7d2dcf6	Merge remote-tracking branch 'refs/remotes/ppy/master' into replay_speed	2017-10-06 15:56:08 +03:00
EVAST9919	95ac4e9265	Remove useless using	2017-10-06 04:57:46 +03:00
EVAST9919	96fcc095eb	Apply suggested shrinking bar changes	2017-10-06 04:49:16 +03:00
EVAST9919	5caca1d328	Don't use '#' in RankDisplay for now	2017-10-05 05:27:52 +03:00
EVAST9919	cb0dbc6d9e	Fix shrinking bar lingering on the screen for too long	2017-10-05 05:23:18 +03:00
EVAST9919	cc99678a96	Remove useless usings	2017-10-05 05:09:23 +03:00
Dean Herbert	20bf0502ab	Use scheduling rather than raw transform delays	2017-10-05 10:03:48 +08:00
EVAST9919	22a59d753b	Make all the overlays IStateful	2017-10-05 04:38:13 +03:00
EVAST9919	1c132938df	Allow visibility can be toggled only if replay is loaded	2017-10-03 20:26:53 +03:00
EVAST9919	feb0b1852f	Remove the dangerous function	2017-10-03 20:05:50 +03:00
EVAST9919	b94c78e993	Hide/Show Replay settings on pressing Ctrl+H	2017-10-02 19:33:58 +03:00
EVAST9919	4a298098c5	CI fixes	2017-10-02 18:19:55 +03:00
EVAST9919	c34cc07fda	Remove default bindable from the config manager	2017-10-02 18:09:00 +03:00
EVAST9919	b6ed977e1e	Fix hard crash and fix breaks have been initialized twice	2017-10-02 09:04:03 +03:00
EVAST9919	7052462863	Update inline with framework	2017-10-02 08:51:00 +03:00
EVAST9919	c2f487aa3e	Add Rank as a property to the Score Processor	2017-10-02 05:56:38 +03:00
EVAST9919	5ce2723719	Don't use linq query	2017-10-02 05:12:56 +03:00
EVAST9919	6d97da8b19	Add replay speed adjustment	2017-10-02 04:42:38 +03:00
EVAST9919	ac6c323f93	Clear all tasks and transforms when resetting Breaks	2017-10-02 00:44:57 +03:00
EVAST9919	b62f2437ac	Don't allow counter became 0	2017-10-01 23:38:11 +03:00
EVAST9919	c696f74578	Fix broken testcase and apply suggested changes	2017-09-27 01:10:48 +03:00
EVAST9919	3cd6319ffa	Merge remote-tracking branch 'refs/remotes/ppy/master' into break_overlay_take_three	2017-09-27 00:32:38 +03:00
Damnae	2d4616fd43	Apply beatmap settings when creating the DrawableStoryboard.	2017-09-25 11:03:57 +02:00
Damnae	0996867112	Move StoryboardReplacesBackground and StoryboardAspect properties to Storyboard.	2017-09-25 10:40:22 +02:00
EVAST9919	94269e119e	Reset text only if it has been changed	2017-09-23 19:59:34 +03:00
EVAST9919	0615f375e1	Show current grade	2017-09-23 19:52:44 +03:00
EVAST9919	a69bef8ec0	Use existing enum instead of my own	2017-09-23 16:51:31 +03:00
EVAST9919	2da3ea00b6	Bind break overlay to accuracy	2017-09-23 16:42:18 +03:00
EVAST9919	ced6204219	oops	2017-09-22 22:10:05 +03:00
EVAST9919	d73b40768e	More arrow adjustments to match the design	2017-09-22 21:12:58 +03:00
EVAST9919	92eb8e4fa9	Move blurred icons to a parallax container	2017-09-22 21:00:45 +03:00
EVAST9919	6fe2b64abd	Start breakOut animation a bit earlier	2017-09-22 20:50:00 +03:00
EVAST9919	d58e5a6130	Arrows improvements	2017-09-22 20:43:51 +03:00
EVAST9919	56bde64839	Add arrows overlay	2017-09-22 01:16:05 +03:00
EVAST9919	5383e33f3d	Remove useless clock assignment	2017-09-21 22:58:49 +03:00
EVAST9919	22ab2c5e5d	Apply suggested changes	2017-09-21 22:54:46 +03:00
EVAST9919	9667270336	Remove using	2017-09-21 01:56:50 +03:00
EVAST9919	e051bcc6df	Fix wrong arrows position on startup	2017-09-21 01:51:40 +03:00
EVAST9919	c79568135a	Add arrows	2017-09-21 01:44:30 +03:00
EVAST9919	18a714df74	Move every class to it's own file	2017-09-20 22:33:07 +03:00
EVAST9919	581689a84d	CI fixes	2017-09-20 20:58:20 +03:00
EVAST9919	4699a44608	Add info container	2017-09-20 20:50:14 +03:00
EVAST9919	8d7db52200	Add remaining time counter	2017-09-20 19:45:38 +03:00
EVAST9919	0f04d8c6a7	Add remaining time container	2017-09-20 15:58:28 +03:00
EVAST9919	429e7723b3	Merge remote-tracking branch 'refs/remotes/ppy/master' into break_overlay_take_three	2017-09-15 19:40:30 +03:00
EVAST9919	740e766201	BreakOverlay and LetterboxOverlay implementation	2017-09-15 19:39:55 +03:00
Damnae	757a159516	Display a non-parallax background at the appropriate size when storyboards do not replace it.	2017-09-15 14:31:54 +02:00