Dean Herbert
3b6619a360
Flip direction to avoid breaking other usages
2020-05-29 16:45:47 +09:00
Dean Herbert
590931b17c
Pass hitobjects as a parameter to CreateBlueprintContainer
2020-05-29 16:45:47 +09:00
Dean Herbert
597f284805
Tidy up and complete xmldoc for HitObjectComposer
2020-05-29 16:45:47 +09:00
Dean Herbert
b2fad91589
Add swell and drumroll blueprints
2020-05-29 16:45:47 +09:00
Dean Herbert
dd7dbfd548
Rename to IHasDuration
2020-05-29 16:45:47 +09:00
Dean Herbert
534dccc0c3
Move sett from EndTime to Duration
2020-05-29 16:45:47 +09:00
Dean Herbert
280b0adb1d
Split out IHasPath from IHasCurve to better define hitobjects
2020-05-29 16:45:47 +09:00
Dean Herbert
f9883373bb
Flip direction to avoid breaking other usages
2020-05-29 16:11:26 +09:00
Dean Herbert
e8b43e8e1f
Merge branch 'master' into move-setter-to-duration
2020-05-29 16:04:23 +09:00
Dean Herbert
8fa8c561e7
Pass hitobjects as a parameter to CreateBlueprintContainer
2020-05-29 12:20:50 +09:00
Dean Herbert
46689a2fbc
Tidy up and complete xmldoc for HitObjectComposer
2020-05-29 11:46:32 +09:00
Dan Balasescu
1a2392aa83
Merge branch 'master' into remove-unused-mania-rprop
2020-05-28 14:57:10 +09:00
Dean Herbert
6be5917eb0
Remove necessity for custom mania interface caching
2020-05-27 23:15:16 +09:00
Dan Balasescu
0891c47d09
Merge pull request #9124 from peppy/editor-hide-non-alive-blueprints-default
...
Hide non-alive selection blueprints by default
2020-05-27 21:29:53 +09:00
Dean Herbert
9a060cfb3a
Allow drag selections to occur from outside the playfield
2020-05-27 20:44:15 +09:00
Dean Herbert
f5c974dd89
Hide non-alive selection blueprints by default
2020-05-27 13:40:16 +09:00
Dean Herbert
cbd563e80b
Rename to IHasDuration
2020-05-27 12:38:39 +09:00
Dean Herbert
b8e0a6f127
Move sett from EndTime to Duration
2020-05-27 12:37:44 +09:00
Dean Herbert
6b5b215299
Split out IHasPath from IHasCurve to better define hitobjects
2020-05-26 17:44:47 +09:00
Dan Balasescu
b5de30ef3d
Merge branch 'master' into editor-scrolling-playfield-support
2020-05-26 14:46:58 +09:00
Dean Herbert
0cc6d6d97c
Merge pull request #9033 from smoogipoo/applydefaults-cancellation
...
Add cancellation token support to CreateNestedHitObjects()
2020-05-26 12:04:06 +09:00
Dean Herbert
417e31d77f
Rename function for consistency
2020-05-26 10:17:56 +09:00
Dean Herbert
d69111c665
Fix spelling of breadth
2020-05-26 10:17:34 +09:00
Dan Balasescu
98f3d790df
Merge pull request #9107 from peppy/editor-remove-size-propagation
...
Remove unnecessary size propagation in HitObjectComposer
2020-05-25 23:55:26 +09:00
Dean Herbert
8fc60d12c9
Add back comments
2020-05-25 22:09:09 +09:00
Dean Herbert
e7442ec3a2
Remove need for ManiaSnapResult
2020-05-25 19:33:03 +09:00
Dean Herbert
2c16619ecd
Move time to position conversion to ScrollingHitObjectContainer
2020-05-25 19:32:39 +09:00
Dean Herbert
af5fac471e
Remove unnecessary size propagation in HitObjectComposer
2020-05-25 19:29:46 +09:00
smoogipoo
ebe2e97372
Merge branch 'master' into editor-clock-transform
2020-05-25 19:01:04 +09:00
smoogipoo
6f4cd6111c
Drop obsoletion status for now
2020-05-25 16:50:49 +09:00
smoogipoo
bc35bc5efb
Merge branch 'master' into applydefaults-cancellation
2020-05-25 16:45:30 +09:00
smoogipoo
cd65fc860b
Remove extra default application
2020-05-25 16:15:55 +09:00
Dean Herbert
b44beb4137
Remove double resolution of EditorClock
2020-05-25 15:40:45 +09:00
Dean Herbert
ed83ef202a
Merge branch 'master' into editor-clock-cache
2020-05-25 15:39:42 +09:00
Dan Balasescu
2f9cc0c15a
Merge pull request #9078 from peppy/editor-move-distance-snap-grid
...
Move distance snap grid to osu! HitObjectComposer
2020-05-25 15:05:30 +09:00
Dan Balasescu
b732ea6763
Merge branch 'master' into fix-placement-default-application
2020-05-25 14:17:28 +09:00
Dean Herbert
decdc58de5
Merge branch 'editor-clock-cache' into editor-clock-transform
2020-05-24 12:55:47 +09:00
Dean Herbert
a3a9810344
Merge branch 'master' into editor-clock-cache
2020-05-23 00:44:04 +09:00
Dean Herbert
1311fd2f64
Merge branch 'master' into editor-move-distance-snap-grid
2020-05-23 00:42:43 +09:00
Dean Herbert
83f4ba107f
Fix defaults not being applied correctly to blueprints after StartTime is changed
2020-05-22 22:42:17 +09:00
Dan Balasescu
7846445b45
Merge branch 'master' into mania-distance-snap-grid
2020-05-22 21:17:25 +09:00
Dan Balasescu
9ede390c60
Merge branch 'master' into editor-position-snap
2020-05-22 20:05:18 +09:00
Dean Herbert
1486a44b55
Merge branch 'editor-clock-cache' into editor-clock-transform
2020-05-22 19:51:02 +09:00
Dean Herbert
ffaec9f9f7
Merge branch 'master' into editor-clock-cache
2020-05-22 19:35:05 +09:00
Dean Herbert
3e0ee310d0
Remove now incorrect comment
2020-05-22 18:30:39 +09:00
Dean Herbert
d18eb663b1
Add tweening seek support to EditorClock
2020-05-22 16:47:52 +09:00
Dean Herbert
dd09d7830d
Cache and resolve editor clock as EditorClock in all cases
2020-05-22 16:44:06 +09:00
Dean Herbert
eefff6cc49
Merge branch 'mania-distance-snap-grid' into editor-clock-cache
2020-05-22 16:44:02 +09:00
Dean Herbert
a0fe03b68f
Merge branch 'editor-move-distance-snap-grid' into editor-clock-cache
2020-05-22 16:43:59 +09:00
Dean Herbert
f395ef24a4
Merge branch 'master' into editor-position-snap
2020-05-22 16:42:09 +09:00
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