3819 Commits

Author	SHA1	Message	Date
Xexxar	534d1e72ce	merged sliders	2021-10-21 19:58:41 +00:00
Xexxar	ec06e53212	further rebalancing of sliders	2021-10-21 19:58:02 +00:00
Xexxar	b51a8dead5	Merge branch 'aim-refactor-velocity' into aim-refactor-ppcalc	2021-10-21 19:29:30 +00:00
Xexxar	be2f9603c9	merged slider updates	2021-10-21 19:29:06 +00:00
Xexxar	e3a0e4749e	removed excess acute anglebuff and buffed sliders to comp	2021-10-21 19:28:06 +00:00
Xexxar	55809c43ee	Merge branch 'aim-refactor-velocity' into aim-refactor-ppcalc	2021-10-21 18:38:59 +00:00
Xexxar	692c7b4be1	Merge branch 'aim-refactor-slider' into aim-refactor-velocity	2021-10-21 18:38:32 +00:00
Xexxar	b1c18d1f36	Merge branch 'aim-refactor-base' into aim-refactor-slider	2021-10-21 18:37:22 +00:00
Xexxar	2f8972b529	reverted overwritten file	2021-10-21 18:37:06 +00:00
Xexxar	ca3259d4e9	Merge branch 'aim-refactor-velocity' into aim-refactor-ppcalc	2021-10-21 17:22:33 +00:00
Xexxar	fd991296fa	Merge branch 'aim-refactor-slider' into aim-refactor-velocity	2021-10-21 17:22:09 +00:00
Xexxar	613a548583	Merge branch 'aim-refactor-base' into aim-refactor-slider	2021-10-21 17:21:52 +00:00
Xexxar	d6aa2fe6e4	identified case with spinner where / 0 could theoretically be possible	2021-10-21 17:21:34 +00:00
Xexxar	a23330c49b	removed comment	2021-10-21 17:21:03 +00:00
Xexxar	dba0ee0b1d	added ppcalc changes to build	2021-10-21 17:18:24 +00:00
Xexxar	81e817f881	updated to latest version of velchange	2021-10-21 17:07:56 +00:00
Xexxar	276b4afdb0	removed unnecessary test code	2021-10-21 16:14:31 +00:00
Xexxar	4fe007aa2e	new slider travel dist algorithm	2021-10-21 16:08:35 +00:00
Xexxar	bef6e100fa	Merge branch 'aim-refactor-base' into aim-refactor-slider	2021-10-21 16:01:38 +00:00
Xexxar	cb605f9156	removed ppCalc changes and sliderabuseChecks	2021-10-21 16:00:57 +00:00
Xexxar	750c5a0181	Merge remote-tracking branch 'ppy/master' into aim-refactor-base	2021-10-21 15:45:31 +00:00
Xexxar	c074304ec3	updated to latest version of base	2021-10-17 04:48:57 +00:00
Xexxar	14d405786e	resolved nans and added stacked slider fix	2021-10-17 03:56:53 +00:00
smoogipoo	30eb08d394	Merge branch 'master' into aim-refactor-base	2021-10-17 12:00:39 +09:00
smoogipoo	80827b741f	Merge branch 'master' into effective-miss-count	2021-10-16 21:43:34 +09:00
StanR	ccaac97794	Clamp comboBasedMissCount	2021-10-16 14:50:15 +03:00
StanR	c8d99e68a5	Remove calculation for scores with combo above threshold, avoid division by zero	2021-10-15 16:51:05 +03:00
smoogipoo	1a18d3598a	Merge branch 'master' into fix-invisible-sinners	2021-10-15 20:45:40 +09:00
Dean Herbert	30c3fcb4ea	Merge branch 'master' into slider-timeline-velcotiy-adjust-v2	2021-10-15 19:45:04 +09:00
Dean Herbert	4cba1fce07	Merge pull request #15111 from jaswon/ghost-mod ... Add "no scope" mod for osu	2021-10-15 15:44:05 +09:00
Dean Herbert	3a7eb7dd25	Make const private	2021-10-15 14:27:20 +09:00
Dean Herbert	6a80a417bd	Use Interpolation.Lerp instead of transforms ... Better handles cases where the combo may be changing faster than the transition length.	2021-10-15 14:25:51 +09:00
Jason Won	538d980072	Rename Mod	2021-10-15 00:22:57 -04:00
Jason Won	2dfc42dd53	revert interpolation changes + fix cursor trail	2021-10-14 23:34:43 -04:00
Jason Won	23b50a054b	address comments	2021-10-14 20:50:47 -04:00
Jason Won	6b1534f5a6	Add "ghost" mod for osu	2021-10-14 18:30:55 -04:00
smoogipoo	901f107b2e	Merge branch 'master' into slider-timeline-velcotiy-adjust-v2	2021-10-14 17:25:51 +09:00
StanR	205d95e8c6	Approximate amount of effective misses using combo	2021-10-13 20:04:34 +03:00
Xexxar	4edf559408	adjusted constant to 1.5 from 2.0 for acute	2021-10-13 16:45:58 +00:00
Xexxar	cde4b0b17c	forgot to add double delcaration, remember to test	2021-10-13 16:25:16 +00:00
Xexxar	0b794728ea	updated to latest version with slider calc	2021-10-13 16:17:49 +00:00
Xexxar	0292fe1c83	removed residual code leftover	2021-10-13 16:04:39 +00:00
Xexxar	200149c9d7	updated to newly refactored aim	2021-10-13 15:41:24 +00:00
Dan Balasescu	e49f1f6e6b	Merge branch 'master' into no-more-difficulty-control-points-info	2021-10-13 20:17:57 +09:00
Xexxar	56daac73f2	merged ppy/master	2021-10-10 17:12:49 +00:00
Dean Herbert	b8fe744d2b	Merge pull request #15008 from stanriders/remove-int-casts ... Remove int casts in difficulty calculation	2021-10-10 16:48:37 +09:00
smoogipoo	e7a3467655	Merge branch 'master' into skillsrework	2021-10-10 16:16:54 +09:00
StanR	abd32e30f1	Update osu.Game.Rulesets.Osu/Difficulty/Preprocessing/OsuDifficultyHitObject.cs ... Co-authored-by: Liam DeVoe <orionldevoe@gmail.com>	2021-10-09 21:11:24 +03:00
StanR	3b0b8707fe	Reduce nesting, check all objects for spinners	2021-10-09 20:28:42 +03:00
StanR	b72b071c25	Fix instant spinners giving insane amounts of strain	2021-10-09 12:35:17 +03:00
StanR	37632fe4dc	Remove int casts in difficulty calculation, fixup some comments	2021-10-09 12:08:57 +03:00
smoogipoo	f0affa9f5a	Don't refer to BeatmapInfo	2021-10-08 19:50:31 +09:00
smoogipoo	3a4807a032	Merge branch 'master' into blinds-pp	2021-10-08 19:45:59 +09:00
smoogipoo	bc37cb6f43	Merge branch 'master' into no-more-difficulty-control-points-info	2021-10-08 18:41:17 +09:00
smoogipoo	cefef81cdf	Merge branch 'master' into skillsrework	2021-10-08 18:21:51 +09:00
Dan Balasescu	5b89293fa3	Merge pull request #14942 from apollo-dw/relax-osu-pp ... Implement Relax difficulty calculation in osu!	2021-10-08 16:47:43 +09:00
apollo-dw	57c069e0e1	Remove unused strings	2021-10-06 23:50:23 +01:00
apollo-dw	d6eab02d92	Return 0 for speed with relax	2021-10-06 16:53:33 +01:00
apollo-dw	34269d48e5	Use global multipliers instead of multiplying skill values	2021-10-06 12:25:19 +01:00
Dean Herbert	b339c149d8	Copy BaseDifficulty to Beatmap<T> and move all write operations across	2021-10-06 15:10:45 +09:00
emu1337	d17beb9bbe	improved overall balance	2021-10-06 01:39:01 +02:00
emu1337	3cb816b6cd	fixed some nerfs not carrying to the next iteration	2021-10-05 21:19:00 +02:00
Dean Herbert	bd84a8b749	Merge branch 'new-interfaces' into beatmap-difficulty-more-interface-usage	2021-10-05 18:21:21 +09:00
Dean Herbert	1d99bc280f	Merge branch 'master' into new-interfaces	2021-10-04 20:42:40 +09:00
Dan Balasescu	aa1bfc16d2	Merge pull request #14929 from peppy/gameplay-state ... Replace `GameplayBeatmap` with `GameplayState`	2021-10-04 15:56:44 +09:00
Xexxar	94f8692b00	removed acc changes to put in seperate PR	2021-10-03 17:42:49 +00:00
Xexxar	bc3ae4c4f8	changed function names to be consistent	2021-10-03 17:36:34 +00:00
Xexxar	6d134b2a83	resolved code cleanliness issues	2021-10-03 17:32:03 +00:00
Xexxar	ba2c44a2f4	reworked strain to fix issue with overlapping hitwindo	2021-10-03 17:31:56 +00:00
Bartłomiej Dach	5e5cdaab5e	Privatise setter ... Co-authored-by: Dean Herbert <pe@ppy.sh>	2021-10-03 19:14:01 +02:00
Bartłomiej Dach	abe0ced48c	Proxy slider head circle number along with overlay	2021-10-03 15:53:49 +02:00
apollo-dw	03f0a36589	additional balancing	2021-10-03 11:53:14 +01:00
apollo-dw	bc1ff019da	Implement relax checks	2021-10-03 11:27:17 +01:00
apollo-dw	a5025dc8b8	Buff base multiplier	2021-10-01 22:23:16 +01:00
Dean Herbert	32afd3f426	Replace all basic usages	2021-10-02 02:22:23 +09:00
apollo-dw	310bf3e580	more code quality (oops)	2021-10-01 15:29:20 +01:00
apollo-dw	7d77c279e1	Merge branch 'blinds-pp' of https://github.com/mrowswares/osu into blinds-pp	2021-10-01 15:27:17 +01:00
apollo-dw	57b9a91cba	trim whitespace cuz code quality	2021-10-01 15:26:59 +01:00
apollo	d13e8c0354	Merge branch 'ppy:master' into blinds-pp	2021-10-01 15:24:13 +01:00
apollo-dw	7884dbbd11	adjust formulae	2021-10-01 15:04:44 +01:00
Dean Herbert	ac471a0ec1	Merge branch 'no-more-difficulty-control-points-info' into slider-timeline-velcotiy-adjust-v2	2021-10-01 17:46:58 +09:00
Dean Herbert	05996cc2e9	Add changes that got forgotted in branch surgery	2021-10-01 17:04:53 +09:00
Dean Herbert	a92d499d7a	Convert usages of BeatmapDifficulty to IBeatmapDifficultyInfo	2021-10-01 16:55:50 +09:00
Xexxar	d14eed88fd	final clean up before PR	2021-09-29 19:14:54 +00:00
Dean Herbert	46bafb6252	Merge branch 'master' into no-more-difficulty-control-points-info	2021-09-28 13:53:56 +09:00
Bartłomiej Dach	5bd09a4a30	Rename inner lambda parameter	2021-09-27 22:21:14 +02:00
Bartłomiej Dach	7a0499ad07	Fix repeat arrow texture not falling back to default legacy skin	2021-09-27 21:45:26 +02:00
Xexxar	7001578045	Update osu.Game.Rulesets.Osu/Difficulty/Preprocessing/OsuDifficultyHitObject.cs ... Co-authored-by: Bartłomiej Dach <dach.bartlomiej@gmail.com>	2021-09-26 20:39:57 -05:00
Xexxar	e4fb5a01c9	readded missing aim nerf for low acc	2021-09-26 21:58:26 +00:00
Xexxar	c4430182dd	used new slider bonus alg to not overbuff slider jumps	2021-09-26 21:32:36 +00:00
Xexxar	81921bee11	updated rhythmbonus to be OD sensitive	2021-09-26 19:46:24 +00:00
apollo-dw	b6f494cbb7	accuracy and speed changes pt 1	2021-09-25 17:34:24 +01:00
Xexxar	b7444ee9eb	replaced original velocity alg	2021-09-25 04:20:35 +00:00
Xexxar	ffa0fac5eb	refactored to clean up issues with streams	2021-09-25 04:08:05 +00:00
Xexxar	2508171d41	nerfed rhythm further to attempt to balance	2021-09-25 03:52:05 +00:00
Xexxar	9802f4fc90	added wide angle buff to velchange	2021-09-25 03:37:19 +00:00
Xexxar	010078778e	velocity buff isolation + small refactor	2021-09-25 03:27:07 +00:00
Xexxar	8c6a035369	added slider calc bonus	2021-09-25 03:04:22 +00:00
Xexxar	587cf09d2a	base change of aim refactor, isolated	2021-09-25 03:02:33 +00:00
Xexxar	0129762104	merged in strainTime change and augmented rhythm calc	2021-09-25 02:52:10 +00:00
apollo-dw	70119d3a43	add drain rate term	2021-09-24 15:02:19 +01:00
apollo-dw	c62e429cea	buff miss factor	2021-09-22 19:02:25 +01:00
apollo-dw	857ce721da	share BlindsMultiplier everywhere, make it completely negate HD pp	2021-09-22 16:48:11 +01:00
apollo-dw	e52621c60f	basically disable HD pp when blinds enabled	2021-09-22 16:38:50 +01:00
apollo-dw	85fd4bdbf8	add accuracy nerf	2021-09-22 16:19:41 +01:00
apollo-dw	2bac15ca1a	base formula implementation	2021-09-22 14:17:27 +01:00
Dan Balasescu	512af8809e	Merge pull request #14617 from apollo-dw/speedpp ... Remove speed caps in osu! difficulty calculation	2021-09-22 12:10:16 +09:00
Dean Herbert	60c9e9f704	Merge pull request #14805 from bdach/rectangular-snap-grid ... Add rectangular snap grid to osu! editor composer	2021-09-22 00:12:03 +09:00
Dean Herbert	59d6a718d6	Fix value not being loaded from beatmap in case of most dense grid setting	2021-09-21 20:09:34 +09:00
smoogipoo	e3b6c15a73	Merge branch 'master' into speedpp	2021-09-21 18:41:27 +09:00
smoogipoo	6c91d39c15	Remove GameplayClock dependency	2021-09-21 14:48:46 +09:00
smoogipoo	f0971cb90c	Fix kiai spawner using wrong current time	2021-09-21 14:40:33 +09:00
smoogipoo	b9c91111d2	Add some whitespace	2021-09-21 12:43:29 +09:00
Dan Balasescu	6d6ad126a4	Merge branch 'master' into fl-total-sr	2021-09-21 12:31:40 +09:00
Dan Balasescu	204ee2e281	Merge branch 'master' into fl-skill	2021-09-21 12:06:28 +09:00
Bartłomiej Dach	c911332540	Merge branch 'master' into correct-reverse-arrow-depth	2021-09-20 22:32:28 +02:00
Bartłomiej Dach	d15bd5a15e	Store grid size back to beatmap on change	2021-09-20 20:39:39 +02:00
Bartłomiej Dach	0d7dac03f4	Start with largest grid size	2021-09-20 20:34:22 +02:00
Bartłomiej Dach	52542374e8	Fix rectangular grid snap being always active	2021-09-20 20:14:28 +02:00
Bartłomiej Dach	b5af01f456	Always show rectangular grid in osu! composer	2021-09-20 20:13:06 +02:00
Dean Herbert	20eeb36567	Avoid AliveObject enumeration when not in kiai section	2021-09-20 18:49:36 +09:00
Dean Herbert	cdef6d0cf5	Add key binding support for grid mode cycle	2021-09-20 16:43:15 +09:00
Bartłomiej Dach	4e094b2127	Implement grid size toggling matching stable	2021-09-19 20:26:02 +02:00
Bartłomiej Dach	e1738025d4	Add basic integration of rectangular grid to osu! composer	2021-09-19 18:07:20 +02:00
Opelkuh	761da45f6a	Revert af4c3727d77a16e2534df9bbf452336b5c544342	2021-09-19 14:00:56 +02:00
Opelkuh	af4c3727d7	Fix build errors	2021-09-19 04:39:35 +02:00
Opelkuh	1d7d779f66	Merge branch 'master' into add-legacy-star-particles	2021-09-19 04:34:35 +02:00
Opelkuh	3f8454cb76	Remove abstract from ParticleSpewer	2021-09-19 03:19:16 +02:00
Bartłomiej Dach	36237398fa	Remove accidental leftover nullable BDL spec	2021-09-18 18:24:36 +02:00
Bartłomiej Dach	c23354bb67	Remove unused setter	2021-09-18 16:28:44 +02:00
Bartłomiej Dach	59657aca9a	Remove redundant qualifier	2021-09-18 16:28:25 +02:00
Bartłomiej Dach	79438c19a4	Fix slider parts not reproxying after first hitobject freed	2021-09-18 16:27:30 +02:00
Xexxar	cdd813926b	nerf to high bpm rhythm changes, nerf to 1/3->1/4	2021-09-17 00:27:42 +00:00
Dean Herbert	fde7c88999	Merge branch 'master' into update-framework	2021-09-16 22:49:02 +09:00
smoogipoo	bcbd0e0961	Revert ctor param	2021-09-16 20:06:20 +09:00
smoogipoo	d8f27633a4	Fix legacy approach circles accepting alpha	2021-09-16 19:35:15 +09:00
smoogipoo	f9d5abff8a	Update with keybinding changes	2021-09-16 18:26:12 +09:00
Dean Herbert	2df4073946	SpawnParticle -> CreateParticle (and set time outside of virtual call) ... Allows easier overriding (no need to call the `base.CreateParticle` call and worry about overwriting the time value.	2021-09-16 16:52:46 +09:00
Dean Herbert	29ce2f05bd	Remove implied defaults	2021-09-16 16:44:46 +09:00
smoogipoo	7976442aec	Fix CI issues	2021-09-16 14:20:42 +09:00
smoogipoo	2dd9d457e8	Merge branch 'master' into speedpp	2021-09-16 14:18:47 +09:00
Opelkuh	32d65adb35	Fix cursor particle scale	2021-09-15 21:22:37 +02:00
apollo-dw	2637c063a9	forgot a deltatime	2021-09-15 15:40:26 +01:00
apollo-dw	2c3e7bfd2d	moved 2b straintime cap up to 25ms	2021-09-15 15:27:36 +01:00
apollo-dw	463b92fcca	remove unused strings	2021-09-15 12:41:29 +01:00
apollo-dw	cf63a45f32	swap speedwindowratio in cap so values are correct	2021-09-15 12:36:15 +01:00
apollo-dw	2fe0681310	elaborate comment	2021-09-15 12:03:47 +01:00
apollo-dw	7f6722e43f	throw math.max(N, 1) into straintime	2021-09-15 11:24:48 +01:00
apollo-dw	4017598af0	simplify algebra down	2021-09-15 11:15:05 +01:00
apollo-dw	3a16ec277a	refactor speed window ratios	2021-09-15 11:12:36 +01:00
apollo-dw	a0bd73c356	refactor hit window calc	2021-09-15 10:52:50 +01:00
apollo-dw	49658b6f82	set greatWindow to readonly	2021-09-15 10:29:30 +01:00
apollo-dw	6d254fba0a	digestify speed return	2021-09-15 10:27:18 +01:00
MBmasher	a8539bc75b	Add newline to end of file	2021-09-15 19:04:36 +10:00
MBmasher	33e1273df8	Include Flashlight in total SR calculation	2021-09-15 19:03:42 +10:00
MBmasher	31baac5879	Merge branch 'master' into fl-skill	2021-09-15 11:50:25 +10:00
apollo-dw	8796e45f63	prevent 2B objects from dividing by zero	2021-09-14 15:22:03 +01:00
Dean Herbert	2114a4729c	Set a sane default for new slider blueprints	2021-09-14 18:28:27 +09:00
smoogipoo	81ced68f89	Merge branch 'master' into display-sr-changes	2021-09-14 13:32:58 +09:00
MBmasher	c4fbae136a	Rename FlashlightStrain to FlashlightRating	2021-09-14 10:34:21 +10:00
MBmasher	453d63cd5c	Merge branch 'fl-skill' of https://github.com/mbmasher/osu into fl-skill	2021-09-14 10:23:41 +10:00
MBmasher	178a3d1132	Remove redundant check	2021-09-14 10:23:11 +10:00
Opelkuh	d13ff12a3e	Remove hardcoded particle scale	2021-09-14 00:36:52 +02:00
Opelkuh	c4886be7e1	Add StarBreakAdditive config support	2021-09-14 00:36:01 +02:00
Opelkuh	9fd616c578	Tiny refactor	2021-09-14 00:16:42 +02:00
Opelkuh	224244801f	Remove Particles namespace	2021-09-13 21:44:27 +02:00
Opelkuh	16f98357e6	Add cursor particles tests	2021-09-13 21:44:25 +02:00
Opelkuh	82d16ab394	Fix LegacyCursorParticles texture null reference	2021-09-13 21:44:24 +02:00
Opelkuh	a688e69859	Scale down cursor particles	2021-09-13 21:44:24 +02:00
Opelkuh	911282234e	Rename legacy cursor particle classes	2021-09-13 21:44:23 +02:00
Opelkuh	8862d3fa1e	Add OsuSkinComponents.CursorParticles	2021-09-13 21:44:23 +02:00
Opelkuh	99eff4f41f	Move cursor particles under OsuCursorContainer	2021-09-13 21:44:22 +02:00
Opelkuh	c2f7b01ca4	Change particle AngularVelocity into StartAngle and EndAngle	2021-09-13 21:44:21 +02:00
Opelkuh	6d68da8ff0	Remove StartScale from ParticleSpewer particles	2021-09-13 21:44:20 +02:00
Opelkuh	db662f8c5c	Add ParticleParent option to ParticleSpewer	2021-09-13 21:44:20 +02:00
Opelkuh	5b1b36436f	Add cursor velocity to star particles	2021-09-13 21:44:19 +02:00
Opelkuh	ee4006f3d7	Add legacy cursor star particles	2021-09-13 21:44:18 +02:00
apollo-dw	68050a4073	Merge branch 'speedpp' of https://github.com/mrowswares/osu into speedpp	2021-09-13 14:51:19 +01:00
apollo-dw	e9f7258f2b	adjust hitwindow nerf to be harsher	2021-09-13 14:50:40 +01:00
smoogipoo	0dc31a476f	Invert condition to reduce nesting	2021-09-13 16:39:05 +09:00
Xexxar	44163dc9ec	updated to use deltaTime not stainTime for more accuracy	2021-09-12 18:14:05 +00:00
Xexxar	b05963cc50	update to fix review issues	2021-09-12 16:08:17 +00:00
Xexxar	a6c3798491	Merge remote-tracking branch 'ppy/master' into skillsrework	2021-09-12 12:45:59 +00:00
smoogipoo	aafbc3e0e4	Merge branch 'master' into fl-skill	2021-09-10 16:39:39 +09:00
Dean Herbert	714f55b6bc	Clone control points when copying to HitObjects	2021-09-10 14:36:39 +09:00
Dan Balasescu	ceca229dbc	Merge branch 'master' into speedpp	2021-09-07 18:54:49 +09:00
Dean Herbert	0500cd578a	Merge branch 'master' into no-more-difficulty-control-points-info	2021-09-06 21:06:12 +09:00
Dean Herbert	25420af078	Rename method to drop redundant ruleset suffix	2021-09-05 13:34:23 +09:00
apollo-dw	3fce3f620f	use OsuHitWindows, amend comment	2021-09-04 16:56:15 +01:00
Dean Herbert	d4e5a612ea	Update IPositionalSnapProvider to take a HitObject as reference, rather than raw time ... This allows fetching the correct `DifficultyControlPoint` from the hitobject. Nothing more.	2021-09-03 17:11:12 +09:00
Dean Herbert	a3d9ab1e2e	Move approach rate to EffectControlPoint	2021-09-03 16:58:16 +09:00
Dean Herbert	071c56e90b	Update usages of DifficultyPointAt	2021-09-03 16:58:16 +09:00
apollo-dw	8654a0af05	remove unnecessary min & renamed variable so its more descriptive	2021-09-03 03:01:25 +01:00
apollo-dw	bf87a4b2d3	interpolate the doubletap cheese nerf instead	2021-09-03 02:39:21 +01:00
apollo-dw	0beef9c1e7	made double cheese detection stricter	2021-09-03 02:20:22 +01:00
Bartłomiej Dach	a2d2ed2ef6	Add stack leniency setting for osu!	2021-09-02 23:29:14 +02:00
apollo-dw	57a2ba9aa8	remove "straintime"	2021-09-02 18:29:55 +01:00
apollo-dw	0d60076f34	fix doubletap cheese detect (base on hitwindow)	2021-09-02 17:14:23 +01:00
apollo-dw	d9cc497801	refactoring	2021-09-02 17:02:23 +01:00
apollo-dw	3e98c71ece	cap deltatime to hitwindow sorta	2021-09-02 16:48:34 +01:00