2476 Commits

Author	SHA1	Message	Date
Dan Balasescu	648fc3af41	Merge branch 'master' into bar-line-floating-point	2020-05-22 16:32:25 +09:00
Dean Herbert	ce35d09e7d	Fix incorrect alpha application to lines on rewinding	2020-05-22 12:45:37 +09:00
Bartłomiej Dach	6f388b731e	Fix display start time in sequential scroll algorithm	2020-05-21 21:56:59 +02:00
Dean Herbert	8a47e2431b	Move distance snap grid implementation to OsuHitObjectComposer	2020-05-21 17:13:22 +09:00
Dean Herbert	b1fd7da824	Merge branch 'master' into editor-position-snap	2020-05-21 15:47:20 +09:00
Dean Herbert	776b842fdb	Remove unused using	2020-05-21 14:53:36 +09:00
Dean Herbert	a9a1c00cf1	Move responsibility placement blueprint's StartTime set to within	2020-05-21 14:50:33 +09:00
Dan Balasescu	eb2e8e50b9	Merge pull request #9071 from peppy/seek-to-start-not-end ... Seek to start of placed object, not end	2020-05-21 14:30:14 +09:00
Dan Balasescu	669d9231db	Merge branch 'master' into seek-to-start-not-end	2020-05-21 13:41:57 +09:00
Dean Herbert	5ad7842b91	Move ScreenSpacePositionAtTime to inside Column implementation	2020-05-21 13:33:02 +09:00
Dean Herbert	ce223a2bd8	Silence hit sounds while seeking	2020-05-21 11:08:06 +09:00
Dean Herbert	e09a1bf546	Only seek forwards if not already beyond the placed object	2020-05-20 21:50:52 +09:00
Dean Herbert	b5a7023312	Seek to start time after placement, not end	2020-05-20 21:46:52 +09:00
Dean Herbert	7c9fbb6fcf	Split out classes	2020-05-20 21:03:03 +09:00
Dean Herbert	82d6549161	Pass down snap result and remove local TimeAt usage	2020-05-20 21:01:29 +09:00
Dean Herbert	970bd86d2e	Remove local TimeAt usage in mania placement	2020-05-20 21:01:29 +09:00
Dean Herbert	23bf0d000e	Implement mania beat snapping support	2020-05-20 21:01:19 +09:00
Dean Herbert	ffb8d48fc3	Fix osu!mania editor placement regressions	2020-05-20 21:01:03 +09:00
Dean Herbert	c46bfc2532	Create SnapResult class to hold various snapping results	2020-05-20 21:00:47 +09:00
Dean Herbert	3354d48a38	Change snapping to be screen space coordinate based	2020-05-20 21:00:29 +09:00
Dean Herbert	c2697d3907	Use DrawableSample in SkinnableSound class	2020-05-20 20:49:01 +09:00
Dean Herbert	db4e3047dd	Add test for final sample output	2020-05-19 23:28:13 +09:00
Bartłomiej Dach	17ae392a75	Apply rounding to bar line start times	2020-05-17 22:11:13 +02:00
smoogipoo	6cd1753459	Add overload to prevent crashes (bosu)	2020-05-15 18:51:44 +09:00
smoogipoo	4719fcc291	Actually use the cancellation token	2020-05-15 18:17:39 +09:00
smoogipoo	98125102a7	Add cancellation token support to CreateNestedHitObjects()	2020-05-15 18:07:41 +09:00
Dean Herbert	de50b725d5	Fix mod failure checks executing actual game logic	2020-05-12 20:08:35 +09:00
Bartłomiej Dach	848a3fb6d7	Take hitobject start/end times into account in drain	2020-05-11 19:06:36 +02:00
Bartłomiej Dach	1d999bb634	Integrate PeriodTracker changes	2020-05-10 18:32:38 +02:00
Bartłomiej Dach	ee2ff77b89	Merge branch 'master' into fix-draining-in-between-break-sections	2020-05-10 17:57:44 +02:00
Dean Herbert	44fdf1e6b0	Reword xmldoc	2020-05-10 20:09:41 +09:00
Dean Herbert	c712e98f2b	Merge branch 'master' into publicly-expose-hud	2020-05-10 20:06:28 +09:00
Dean Herbert	729585e151	Merge branch 'master' into mania-holdnote-selection-fix	2020-05-10 15:07:30 +09:00
Dan Balasescu	2f12c4126a	Apply suggestions from code review ... Co-authored-by: Bartłomiej Dach <dach.bartlomiej@gmail.com>	2020-05-10 13:49:08 +09:00
Dean Herbert	5c2778d5f0	Change comparison direction	2020-05-08 20:33:02 +09:00
smoogipoo	be3b77cf25	Fix potentially skipping hitobject updates	2020-05-08 20:09:59 +09:00
smoogipoo	22dda3fe02	Make ScrollingHitObjectContainer respond to defaults applied events	2020-05-08 18:49:58 +09:00
smoogipoo	efff2bf15d	Add HitObject to DefaultsApplied event	2020-05-08 18:49:19 +09:00
Dean Herbert	a59db976d6	Fix loading a ruleset with a new version specification causing a crash	2020-05-08 18:05:06 +09:00
Lucas A	30dd158c33	Rename property to AllowGameplayOverlays and update XMLDoc accordingly.	2020-05-08 09:37:50 +02:00
Lucas A	83998d5ba5	Trim whitespace.	2020-05-07 09:39:14 +02:00
Lucas A	83be5455d3	Disable the display of HUD through DisplayHud property.	2020-05-07 08:52:36 +02:00
Dean Herbert	c8134162b5	Merge pull request #8934 from smoogipoo/sorcerer-catch-changes ... Implement Sorcerer's osu!catch difficulty calculation adjustments	2020-05-06 18:10:33 +09:00
alex	0e2ccac33b	Add spaces to comments	2020-05-04 18:36:24 -07:00
smoogipoo	6d3a24ff01	Reorder tick hit results	2020-05-04 15:55:42 +09:00
smoogipoo	f42be7a6d7	Merge branch 'master' into sorcerer-catch-changes	2020-05-04 15:25:09 +09:00
Dean Herbert	064e5004ed	Merge branch 'master' into fix-mania-selection	2020-04-29 17:15:48 +09:00
smoogipoo	1aaab40228	Fix mods affecting mania scroll speed	2020-04-28 19:34:02 +09:00
smoogipoo	da30eafa30	Prevent potential exception	2020-04-28 14:47:45 +09:00
smoogipoo	86ef73aa27	Implement HitObjectContainer.Clear()	2020-04-23 11:16:59 +09:00
smoogipoo	93151f7612	Add back necessary events + addition to list	2020-04-22 18:32:59 +09:00
smoogipoo	8b0274fedd	Remove obsolete methods	2020-04-22 17:55:50 +09:00
smoogipoo	07a73ba83c	Merge branch 'master' into rulesetstore-ruleset-dir	2020-04-22 10:23:04 +09:00
Dean Herbert	af32f51116	Merge pull request #8800 from iiSaLMaN/allow-cancelling-completion ... Fix results screen pushed after rewinding in-between push delay	2020-04-21 12:49:49 +09:00
Dean Herbert	5a2129da7c	Merge branch 'master' into allow-cancelling-completion	2020-04-21 11:22:37 +09:00
Lucas A	a541f92682	Resolve ruleset dependencies on game core / framework assemblies by checking already loaded assemblies in AppDomain.	2020-04-20 13:56:15 +02:00
Dean Herbert	a842f17630	Merge branch 'master' into taiko-drumroll-skinning	2020-04-20 20:48:41 +09:00
Dean Herbert	8ebc2ae03d	Never run subtree masking	2020-04-20 20:48:35 +09:00
Salman Ahmed	6f233917b1	Centralize updating HasCompleted bindable logic	2020-04-20 06:40:51 +03:00
Bartłomiej Dach	1dcb0f53a2	Fix whitespace formatting	2020-04-19 16:29:32 +02:00
Lucas A	ba1c465edf	Add comment in regards to the attaching of event handler to the assembly lookup event before call to loadUserRulesets().	2020-04-19 15:26:00 +02:00
Lucas A	a7179d1c87	Fix comment wording ... Co-Authored-By: Bartłomiej Dach <dach.bartlomiej@gmail.com>	2020-04-19 15:15:04 +02:00
Salman Ahmed	fc6c245de5	Replace all judged event logic with HasCompleted bindable	2020-04-19 05:36:04 +03:00
smoogipoo	ae210d567d	Add temporary solution for tick hit/miss count	2020-04-16 18:16:08 +09:00
Dean Herbert	9dda7da489	Fix spinners being considered the "first object" for increased visibility in hidden	2020-04-16 14:11:38 +09:00
Dean Herbert	4eefe47ce3	Merge branch 'master' into fix-0-customsampleset	2020-04-16 11:20:31 +09:00
smoogipoo	44981431c5	Remove suffix hackery	2020-04-14 21:33:32 +09:00
smoogipoo	6935221463	Improve logic for CSB transfer	2020-04-14 21:05:07 +09:00
Bartłomiej Dach	06407a1081	Merge branch 'master' into fix-classic-scoring	2020-04-14 02:13:45 +02:00
Bartłomiej Dach	13c81db0cf	Fix incorrect classic score formula ... Upon closer inspection the classic score formula was subtly wrong. The version given in the wiki is: Score = Hit Value + (Hit Value * ((Combo multiplier * Difficulty multiplier * Mod multiplier) / 25)) The code previously used: bonusScore + baseScore * ((1 + Math.Max(0, HighestCombo.Value - 1) * scoreMultiplier) / 25); which is not equivalent to the version on the wiki. The error is in the 1 factor, as in the above version it is being divided by 25, while it should be outside the division to keep parity with the previous formula. The tests attached in the previous commit demonstrate that this change causes a single hit without combo to increase total score by its exact numeric value.	2020-04-14 01:09:58 +02:00
Dean Herbert	63de493c85	Merge branch 'master' into fix-red-point-placement	2020-04-13 20:56:50 +09:00
smoogipoo	58a7313091	Fix fallback for file hit samples	2020-04-13 20:09:17 +09:00
smoogipoo	cee4b005e6	Fix custom sample set 0 not falling back to default samples	2020-04-13 20:00:06 +09:00
smoogipoo	f38b64d201	Fix placement blueprints handling double clicks	2020-04-13 13:57:15 +09:00
Dean Herbert	c51bad0e35	Cache ManiaPlayfield instead	2020-04-13 13:42:21 +09:00
Dean Herbert	cdff6060d3	Remove recursive hierarchy traversal for mania sample balance	2020-04-13 13:01:27 +09:00
Dean Herbert	65b96079a0	Move dampening to base implementation and change range to 0..1	2020-04-13 13:01:02 +09:00
Fire937	22d89dbff7	Merge branch 'master' of https://github.com/ppy/osu into stereo-shifted-playback	2020-04-12 01:46:32 +02:00
Fire937	f274ec297c	Add positional sound support for all rulesets ... The SamplePlaybackBalance is calculated in a way that the balance remains between -0.4 and 0.4. Positional sound is not supported in osu!taiko.	2020-04-12 01:33:25 +02:00
Salman Ahmed	97340da2f2	Add null-conditional to acesses in dispose methods ... Such a terrible mistake, the finalizer may be called while the dependencies have an instance but the local itself doesn't have a value yet.	2020-04-12 02:24:36 +03:00
Salman Ahmed	31b494b0b7	Merge branch 'master' into cache-ruleset-dependencies-for-tests	2020-04-11 22:56:47 +03:00
smoogipoo	a84fe2525b	Fix nested hitobjects potentially indirectly masked away	2020-04-11 16:53:45 +09:00
Salman Ahmed	a314a6119a	Fix CI issues	2020-04-11 05:13:04 +03:00
Salman Ahmed	2b4208bebf	Cache ruleset dependencies if the scene tests ruleset-specific components	2020-04-11 04:23:31 +03:00
Salman Ahmed	235d3046c6	Move ruleset dependencies caching to its own container	2020-04-11 04:22:23 +03:00
Fire937	c17e470266	Fix PositionalSound calculation implementation ... The position used to calculate the stereo balance is now the position of the drawable (as opposed to the position specified in the beatmap file previously).	2020-04-10 00:01:35 +02:00
Fire937	2201e9b4ae	Add stereo shifted hitsound playback support ... There is now a setting in the general settings called "Positional hitsounds". If the setting is enabled, the hitsounds playback will be shifted according to their position on the beatmap.	2020-04-09 18:12:15 +02:00
smoogipoo	ee6ea08cf8	Cleanup handling of hitobject updates	2020-04-09 20:16:44 +09:00
Lucas A	2087d8d09e	Don't search for user rulesets if rulesetsStorage isn't set (Testing environnment)	2020-04-07 16:01:47 +02:00
Lucas A	08308e07e7	Apply review suggestions	2020-04-07 12:22:09 +02:00
Salman Ahmed	7fab07670e	Remove no longer necessary usage of IsBreakTime	2020-04-05 21:35:09 +03:00
Salman Ahmed	e71a9668a5	Disallow draining in non-draining sections	2020-04-05 21:34:53 +03:00
Lucas A	0e45a4d54e	Add back cached ruleset assembly lookup	2020-04-04 20:13:46 +02:00
Lucas A	8cdae790c3	Load user rulesets from the game data directory	2020-04-03 21:40:09 +02:00
Dean Herbert	7b2144a1a7	Fix merge mishap	2020-04-03 23:31:46 +09:00
Dean Herbert	3289fa7c66	Merge branch 'master' into better-mania-scrollspeed	2020-04-03 23:25:14 +09:00
Dean Herbert	eacbb20d87	Merge branch 'master' into fix-convert-scroll-speed	2020-04-03 22:47:53 +09:00
smoogipoo	d90db5649d	Improve comment slightly	2020-04-03 18:32:07 +09:00
smoogipoo	1ff2cc31d1	Implement more familiar scroll speed options in mania	2020-04-03 18:25:01 +09:00
smoogipoo	b42d1104b7	Fix mania converts scrolling at incorrect speeds	2020-04-03 13:16:01 +09:00
smoogipoo	1f797207f7	Rework lookups to not require total playfield columns	2020-04-03 12:31:05 +09:00
smoogipoo	66486b094c	Remove unnecessary dependency, allow null mods	2020-04-01 13:31:17 +09:00
Dan Balasescu	03cd9aa060	Merge branch 'master' into spun-out	2020-03-30 12:31:53 +09:00
Dean Herbert	7db9bd798c	Remove handle overrides	2020-03-30 11:59:51 +09:00
Dean Herbert	2abb8a37df	Merge branch 'master' into show-mod-settings-tooltip	2020-03-29 14:35:04 +09:00
Dean Herbert	a2b3fe180e	Add the ability to disable user input on specific DrawableHitObjects	2020-03-29 14:30:45 +09:00
Dan Balasescu	005a818f32	Merge branch 'master' into fix-slider-end-sounds	2020-03-27 19:26:32 +09:00
Dean Herbert	f80efd10c2	Avoid using a miss judgement	2020-03-26 19:54:17 +09:00
Dean Herbert	07462120e4	Split break tracking into its own component	2020-03-26 15:30:23 +09:00
Dean Herbert	2b1245f63a	Improve xmldoc in a couple of places	2020-03-26 12:50:00 +09:00
Dean Herbert	8a2aac5f83	Rename conversion methods for clarity	2020-03-25 20:21:34 +09:00
Dean Herbert	800e395bc8	Merge branch 'master' into replay-recording	2020-03-25 20:20:59 +09:00
Dean Herbert	6d81da5419	Merge branch 'master' into video-offset	2020-03-25 11:28:59 +09:00
Dean Herbert	448961b330	Rename incorrect variable	2020-03-24 15:39:01 +09:00
Dean Herbert	388cf5c83a	Fix catch positional data being incorrectly recorded	2020-03-24 15:38:54 +09:00
Dean Herbert	022465f546	Add encoding and import support	2020-03-24 14:51:52 +09:00
Dean Herbert	546772192c	Add helper method to convert to legacy mods enums	2020-03-24 13:07:51 +09:00
Liam DeVoe	2fa42ed644	use N2 for ModTimeRamp, add x text	2020-03-23 12:54:08 -04:00
Dean Herbert	617149fb27	Implement in player	2020-03-23 20:06:18 +09:00
Dean Herbert	14a85a84bf	Add proper screen space - gamefield mapping	2020-03-23 20:06:18 +09:00
Dean Herbert	6d48068061	Move replay recorder to final location	2020-03-23 20:04:15 +09:00
Dean Herbert	232c255986	Basic test scene setup	2020-03-23 17:33:02 +09:00
Dean Herbert	2dbcf9e346	Merge branch 'master' into taiko-random-mod	2020-03-23 16:33:59 +09:00
Dean Herbert	205f4dcb54	Simplify string construction logic	2020-03-23 15:20:56 +09:00
Dean Herbert	a6b153673e	Fix icons not updating tooltip text correctly	2020-03-23 14:58:02 +09:00
Dean Herbert	4f9ac7b81e	Merge branch 'master' into show-mod-settings-tooltip	2020-03-23 14:57:54 +09:00
smoogipoo	e3a5be71cc	Implement random mod for taiko	2020-03-23 12:09:30 +09:00
Liam DeVoe	64fc116d67	use two decimal points for ModRateAdjust format	2020-03-22 23:08:00 -04:00
Liam DeVoe	5cc626d37b	move SettingDescription override to ModRateAdjust	2020-03-22 22:57:46 -04:00
Liam DeVoe	1da590c63f	use N1 format instead of 0.#	2020-03-22 22:54:21 -04:00
Liam DeVoe	889608a408	remove redundant ToString call	2020-03-22 22:51:29 -04:00
Liam DeVoe	98b8f82810	simplify SettingDescription default definition	2020-03-22 22:07:09 -04:00
Liam DeVoe	ea87afd577	use string.Empty in IconTooltip	2020-03-22 22:06:54 -04:00
Liam DeVoe	cb6e602556	enforce single signficiant digit precision for other mods	2020-03-22 22:06:35 -04:00
Liam DeVoe	67667b3d22	enforce precision for ModDifficultyAdjust and derived classes	2020-03-22 21:22:46 -04:00
Liam DeVoe	63e9b2a299	use string.Empty, use base SettingDescription for [Osu/Catch]ModDifficultyAdjust	2020-03-22 18:50:09 -04:00
Dean Herbert	d8041a0dcb	Increase sample concurrency to better match stable	2020-03-22 02:16:28 +09:00
Dean Herbert	729e006c3a	Merge branch 'master' into video-offset	2020-03-21 20:03:46 +09:00
Liam DeVoe	4907fb8fd1	remove another ToString statement	2020-03-20 17:04:22 -04:00
Liam DeVoe	eab705a9b6	remove another ToString statement	2020-03-20 17:00:36 -04:00
Liam DeVoe	ac202ba7ea	remove unused using directive	2020-03-20 16:57:37 -04:00
Liam DeVoe	55568ee6a5	remove extra parentheses	2020-03-20 16:44:38 -04:00
Liam DeVoe	6a63ba1bb8	use humanizer for ModEasy lives setting	2020-03-20 16:42:35 -04:00
Liam DeVoe	cda1efef0b	move overridability to SettingDescription method	2020-03-20 16:34:36 -04:00
Liam DeVoe	7bdbdd25f8	Revert "use SettingSource to define IconTooltip format" ... This reverts commit 5a6d8f1932.	2020-03-20 16:05:12 -04:00
Liam DeVoe	3d95592130	use var for list declaration ... Co-Authored-By: Bartłomiej Dach <dach.bartlomiej@gmail.com>	2020-03-20 14:37:31 -04:00
Liam DeVoe	9e3bff3b97	oops, missed a newline	2020-03-20 13:36:16 -04:00
Liam DeVoe	9dc8146811	fix style issues	2020-03-20 13:21:44 -04:00
Liam DeVoe	5a6d8f1932	use SettingSource to define IconTooltip format	2020-03-20 12:47:17 -04:00
Liam DeVoe	18bf7c913b	show mod settings in ModIcon tooltip	2020-03-18 23:43:26 -04:00
Liam DeVoe	e59d7fee26	fix comment grammar	2020-03-18 23:42:14 -04:00
smoogipoo	5f09c70f75	Move judgement colours to OsuColour	2020-03-18 17:21:36 +09:00
smoogipoo	758bb3711f	Add more sane limit for maximum slider length	2020-03-11 18:07:11 +09:00
Dan Balasescu	1d556bfc5f	Merge branch 'master' into video-offset	2020-03-11 15:13:18 +09:00
voidedWarranties	76c832518f	Render video as a part of the storyboard	2020-03-07 21:32:03 -08:00
Dean Herbert	5b8aaba4a6	Merge branch 'master' into fix-perfect-judgements	2020-03-06 00:18:05 +09:00
Dean Herbert	dc79c11b6a	Merge branch 'master' into layout-rework	2020-03-02 16:36:48 +09:00
smoogipoo	6d051d9e42	Fix perfect mod failure cases	2020-03-02 13:25:56 +09:00
Dean Herbert	c06db5a54a	Remove legacy DrawableHitObject state management	2020-02-27 11:28:29 +09:00
smoogipoo	da89798765	Merge remote-tracking branch 'origin/master' into layout-rework	2020-02-26 15:06:40 +09:00
smoogipoo	fab49fb1ba	Slightly increase HP awarded for 100s	2020-02-26 12:18:46 +09:00
Dean Herbert	d564440fe7	Merge branch 'master' into fix-barline-lifetimes	2020-02-25 20:41:04 +09:00
Dean Herbert	36079236e6	Remove pointless comment ... Co-Authored-By: Dan Balasescu <smoogipoo@smgi.me>	2020-02-25 19:22:51 +09:00
Dean Herbert	a047456354	Revert changes to make HitObject abstract	2020-02-25 19:07:15 +09:00
smoogipoo	6c28fd21c7	osu-side changes	2020-02-24 20:52:15 +09:00
Dean Herbert	be08e69862	Merge branch 'fix-dho-lifetimes-via-judgements' into fix-barline-lifetimes	2020-02-23 14:30:23 +09:00
Dean Herbert	401bf1c928	Remove unnecessary checks on NotNull attributes	2020-02-23 14:30:08 +09:00
Dean Herbert	0e29d3c4a2	Correctly expire bar lines in osu!taiko and osu!mania	2020-02-23 13:50:05 +09:00
Dean Herbert	ffc7eaa3f2	Fix hitobjects with unknown lifetimes by enforcing non-null judgement ... We've seen multiple cases where DrawableHitObject are stuck in the lifetime management container due to not implementing a judgement (meaning they are never "hit" or "missed"). To avoid this going forward CreateJudgement() must be implemented and return a non-null judgement. This fixes BananaShower and JuiceStreams in osu!catch. This also makes HitObject abstract and cleans up convert HitObject implementations.	2020-02-23 13:49:06 +09:00
Dean Herbert	5970c102b4	Change API to be easier to understand	2020-02-20 15:17:49 +09:00
Dean Herbert	5340d1de59	Move combo colour update logic to osu! ruleset	2020-02-19 16:07:00 +09:00
Dean Herbert	a1bfb18ce0	Fix accessing incorrect items list in event	2020-02-18 19:00:02 +09:00
Dean Herbert	b18f9e195e	Merge branch 'master' into bindable-list-events	2020-02-18 18:47:06 +09:00
Andrei Zavatski	316c6b2a94	Simplify RulesetInfo string presentation	2020-02-18 01:17:12 +03:00
smoogipoo	958c891d15	Update with framework-side bindable list changes	2020-02-17 15:06:14 +09:00
recapitalverb	7c9569c9a3	Merge branch 'master' into remove-duplicated-load	2020-02-15 12:10:34 +07:00
recapitalverb	c753cb46c5	Use [Resolved] wherever possible	2020-02-14 20:14:00 +07:00
Dean Herbert	61a7f04efb	Add a sane key up delay to relax mod	2020-02-14 17:13:50 +09:00
Dean Herbert	5b3f0bbb0a	Merge branch 'master' into fix-editor-time-change-display	2020-02-13 23:55:52 +09:00
Dan Balasescu	5a90e6f9b5	Merge branch 'master' into fix-blueprint-outside-container	2020-02-13 17:32:49 +09:00
Dean Herbert	53b62816f8	Add index constants for cross-class safety	2020-02-13 14:07:37 +09:00
Dean Herbert	b65e839bd2	Simplify blueprints by removing visible state	2020-02-13 10:00:09 +09:00
Dean Herbert	0fe41fd50a	Fix blueprint showing even when mouse outside of container	2020-02-13 09:03:48 +09:00
Dean Herbert	f7ee675102	Clear and revert to negative infinity, avoiding transforms getting left behind on StartTime change	2020-02-12 19:02:54 +09:00
Dean Herbert	c386589cc0	Reapply current state, not idle	2020-02-12 19:02:25 +09:00
voidedWarranties	3d1183eea0	Merge branch 'master' into difficultyadjust-order	2020-02-10 16:46:24 -08:00
voidedWarranties	ca237fd987	Simplify ordering by using only numbers, add xmldoc	2020-02-10 16:21:49 -08:00
Dan Balasescu	f3c47dc8c9	Merge branch 'master' into seek-to-endtime-on-placement	2020-02-10 14:53:11 +09:00
voidedWarranties	ea521b466f	Switch numerical consts to an enum	2020-02-09 21:37:40 -08:00
voidedWarranties	137181017b	Naming consistency with osu!web	2020-02-09 20:36:54 -08:00
voidedWarranties	88a56d00bf	Allow specifying order to SettingSource	2020-02-09 20:11:37 -08:00
Dean Herbert	91203c2b12	Merge branch 'master' into placement-display-in-timeline	2020-02-08 01:50:24 +09:00
Dean Herbert	51ae741fc7	Merge pull request #7755 from peppy/fix-spinner-placement ... Fix spinner placement blueprint in multiple ways	2020-02-08 01:49:48 +09:00
Dean Herbert	678eb8ec31	Reduce accessibility to set ... Co-Authored-By: Dan Balasescu <smoogipoo@smgi.me>	2020-02-08 00:12:23 +09:00
Dan Balasescu	7c715937ca	Merge branch 'master' into skin-animation-frame-rate	2020-02-07 23:52:45 +09:00
Dean Herbert	2e50e56d7c	Seek to previous object endtime after successful placement	2020-02-07 19:12:09 +09:00
Dean Herbert	a6531bf73e	Don't show distance snap grid for spinners (for now)	2020-02-07 19:09:23 +09:00
Dean Herbert	e08437c5dc	Track placement object in EditorBeatmap	2020-02-07 18:03:14 +09:00
Dean Herbert	e31d69c749	Add commit status to EndPlacement; call BeginPlacement on initial movement	2020-02-07 18:02:48 +09:00
Dan Balasescu	a6a285bc09	Merge branch 'master' into fix-editor-snapping-inaccuracy	2020-02-07 17:20:42 +09:00