106 Commits

Author	SHA1	Message	Date
Dean Herbert	7f579850dd	Merge branch 'master' into fix-editor-silence-on-seek	2020-09-30 17:03:23 +09:00
Dean Herbert	c5f6b77bba	Add missing cached type	2020-09-29 13:42:17 +09:00
Dean Herbert	26ba7d3100	Remove unused method (was moved to a more local location)	2020-09-25 13:20:19 +09:00
Dean Herbert	508278505f	Make local clock private	2020-09-21 19:40:57 +09:00
Dean Herbert	3f788da06d	Fix SPM changing incorrectly with playback rate changes	2020-09-21 19:39:54 +09:00
Dean Herbert	93a8bc3d5a	Remove local reset method in GameplayClockContainer	2020-08-17 22:36:09 +09:00
Dean Herbert	d9debef156	Add explicit LoadTrack method	2020-08-17 15:38:16 +09:00
smoogipoo	c0031955c9	Update with further framework changes	2020-08-12 01:50:18 +09:00
smoogipoo	e47a1eb313	Use adjustable ITrack	2020-08-12 01:41:21 +09:00
smoogipoo	eec94e1f53	Make track not-null in GameplayClockContainer/FailAnimation	2020-08-12 00:51:43 +09:00
smoogipoo	2e3ecf71c7	Pass track from Player to components	2020-08-06 18:31:08 +09:00
smoogipoo	5c05fe3988	Expose track from MusicController	2020-08-06 16:24:14 +09:00
smoogipoo	6e42b8219c	Move track to MusicController, compiles	2020-08-06 16:24:14 +09:00
Dean Herbert	0d53d0ffc8	Fix back-to-front math	2020-06-15 00:46:20 +09:00
Dean Herbert	7b95c55afb	Fix HardwareCorrectionOffsetClock breaking ElapsedTime readings	2020-06-14 11:33:59 +09:00
Dean Herbert	9b6525bb03	Fix applied platform/user offsets being incorrect when rate adjust mods are active	2020-05-15 18:44:47 +09:00
smoogipoo	2e4adc056f	Fix potential deadlock during gameplay tests	2020-03-03 13:42:05 +09:00
Dean Herbert	b7996f91fc	Update the windows platform offset to match stable	2020-02-07 17:51:38 +09:00
Dean Herbert	7fd52c21f5	Update mods and user adjust to use adjustments	2019-12-09 19:41:31 +09:00
Dean Herbert	d650bfb6d6	Remove unnecessary cast	2019-12-09 18:05:14 +09:00
Dean Herbert	eb074b7058	Allow mods to apply to track, not clock	2019-12-09 17:44:45 +09:00
Dean Herbert	48c6279e8b	Only undo adjustments in GameplayClockContainer if applied at least once	2019-12-06 13:49:22 +09:00
Huo Yaoyuan	eba8657d38	Remove newly introduced redundant this.	2019-11-26 18:41:19 +08:00
Dean Herbert	83080c3b5f	Fix merge regression	2019-11-22 14:14:18 +09:00
Dean Herbert	ffd0e17826	Merge branch 'skip-multiple-times' into lead-in-fixes	2019-11-21 19:01:28 +09:00
Dean Herbert	46a94821d4	Add support for consecutive skips	2019-11-21 18:59:55 +09:00
Dean Herbert	2dd2e3d861	Add correct AudioLeadIn support	2019-11-21 16:55:18 +09:00
Dean Herbert	8369be90f2	Allow skip button to actuate more than once	2019-11-21 15:19:06 +09:00
Dean Herbert	eee5902851	Merge remote-tracking branch 'upstream/master' into lead-in-fixes	2019-11-15 14:05:31 +09:00
Dean Herbert	cd1dd0f898	Fix adjustments not being removed correctly on retry from pause	2019-11-06 10:38:04 +09:00
Dean Herbert	ac02bb005d	Fix GameplayClockContainer operating on beatmap's track after scren exited	2019-11-01 14:11:18 +09: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
Dean Herbert	a2fbcb2bd3	Fix rebase regressions	2019-05-31 15:58:46 +09:00
Dean Herbert	e03a664970	Fix lead-in logic to match stable ... Also adds storyboard event priority support.	2019-05-31 15:51:19 +09:00
Dean Herbert	651706b10e	Account for user/system offsets when deciding on an initial seek time ... Closes #3043 Remove "AllowLeadIn" flag	2019-05-31 15:50:46 +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
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
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	c584967eb1	Remove mods from workingbeatmap	2019-04-09 12:59:32 +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	202a0086cc	Merge branch 'master' into better-player-flags	2019-03-29 13:45:45 +09:00
Dean Herbert	83863d35c3	Remove AllowLeadIn flag	2019-03-26 16:35:00 +09:00
Dean Herbert	b4d785c76c	Don't update gameplay loop while paused	2019-03-26 13:36:17 +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	c1a356161f	Allow use rate adjust to fallback to clock rate adjust	2019-03-12 18:14:01 +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	42efea1e06	Apply review	2019-03-08 15:05:45 +09:00
Dean Herbert	58ef397f4f	Move all clock related gameplay logic inside GameplayClockContainer	2019-03-07 16:02:24 +09:00