Dean Herbert
5129716612
Merge branch 'master' into kps
2022-08-24 18:18:45 +09:00
Dean Herbert
ec61a94dc9
Merge branch 'master' into no-gameplay-clock-gameplay-offset
2022-08-23 17:36:06 +09:00
Dean Herbert
19bba143ee
Fix editor crashing on mobile releases
2022-08-22 15:57:24 +09:00
Dean Herbert
da407aa827
Merge branch 'master' into kps
2022-08-20 15:24:58 +09:00
Dean Herbert
2c6fd1ec6e
Fix `GameplayClockContainer potentially resetting external seeks
2022-08-18 18:54:10 +09:00
Dean Herbert
43442dbf65
Merge branch 'even-less-gameplay-clock' into even-nicer-frame-stability-clock
2022-08-15 20:22:30 +09:00
Dean Herbert
87760bbc06
Fix IsCatchingUp not being in correct state
2022-08-15 20:17:48 +09:00
Dean Herbert
1fc3d005c0
Seal FrameStabilityContainer
...
No one should ever derive from this class. It is already too complex.
2022-08-15 19:31:02 +09:00
Dean Herbert
fff2b57905
Tidy up and document FrameStabilityContainer
2022-08-15 19:28:12 +09:00
Dean Herbert
9bc2e91de0
Fix incorrect handling of reference clocks when no parent IGameplayClock is available
2022-08-15 19:19:19 +09:00
Dean Herbert
828b6f2c30
Remove unnecessary setClock shenanigans
2022-08-15 19:19:19 +09:00
Dean Herbert
27569e2ed5
Remove FrameStableClock (and redirect usages to FrameStabilityContainer)
2022-08-15 19:19:19 +09:00
Dean Herbert
c8764cb333
Move all usage of GameplayClock to IGameplayClock
2022-08-15 18:30:53 +09:00
Dean Herbert
95c1b488a7
Add non-null assertion to FrameStabilityContainer
2022-08-15 18:08:49 +09:00
Ryuki
2aa3a1b50d
Rename all "KeysPerSecond" usages to "ClicksPerSecond"
2022-08-14 20:12:11 +02:00
Ryuki
9dc806506e
Make ActionListener and KeysPerSecondCalculator not rely on events to add timestamps
2022-08-14 19:31:14 +02:00
Ryuki
9b252b1d81
Make KeysPerSecondCalculator dependency in HUDOverlay nullable
2022-08-11 11:58:30 +02:00
Ryuki
3c6461b9e4
Remove KPS acronym usage
2022-08-11 10:01:39 +02:00
its5Q
abca3d1b2a
Prefix common strings for context
2022-08-10 00:35:19 +10:00
Ryuki
b52a07c16a
Use DI to provide dependencies for KPS Calculator and improve input
...
gathering
KPS Calculator now uses DI to retrieve the clocks. Using `HUDOverlay` it
is now cached for `KeysPerSecondCounter`s to resolve it. This also
allows to make an "Attach" flow like `KeyCounter`.
2022-08-08 21:54:06 +02:00
its5Q
5080d62e77
Add missing localisation for settings enums
2022-08-08 21:51:23 +10:00
Dan Balasescu
b4e55f7309
Apply IRenderer changes
2022-08-02 19:50:57 +09:00
Dan Balasescu
e06f39a69f
Apply IRenderer shader changes
2022-07-30 01:29:11 +09:00
Dan Balasescu
ce694123eb
Move spectator begin/end playing to SubmittingPlayer
2022-07-28 20:44:04 +09:00
Dean Herbert
ef10145d6f
Rename MenuCursorContainer and clean up code
2022-07-26 14:11:52 +09:00
Dean Herbert
8dbe24fd7c
Simplify colour assigning logic and remove system mod colour for now
2022-07-12 14:36:50 +09:00
Adam Baker
7ced84b7ef
Replace switch statement with ForModType
...
In order to make `highlightedColour` dependent on the mod type color, the color is converted to an `osu.Framework.Graphics.Colour4` and calls `Lighten`.
2022-07-08 03:23:58 -05:00
Adam Baker
89f1c75f7a
Update mod icon colors
2022-07-07 21:57:18 -05:00
Dean Herbert
31a447fda0
Update parameter discards
2022-06-24 21:26:19 +09:00
Dan Balasescu
f8830c6850
Automated #nullable processing
2022-06-17 16:37:17 +09:00
Dean Herbert
ec53d87c30
Fix unsafe sample playback in GameplaySampleTriggerSource
...
Resolves https://github.com/ppy/osu/issues/18727 .
Added delay from `Schedule` should be minimal as it is always called
from the `Update` thread (input propagation) anyway.
2022-06-16 16:04:57 +09:00
Dan Balasescu
132c94c1b5
Remove Ruleset parameter from ResetFromReplayFrame()
2022-05-31 17:16:23 +09:00
Dean Herbert
f7e055dbfe
Move mania note height offset application to a much more suitable location
2022-05-12 16:19:07 +09:00
Dean Herbert
6f529cf7a4
Merge branch 'master' into fix-spectator-seeks
2022-03-24 14:24:20 +09:00
Dan Balasescu
36772ec652
Merge pull request #17356 from apollo-dw/strict-tracking
...
Implement "Strict Tracking" mod in osu!
2022-03-22 07:32:36 +09:00
apollo-dw
149cfd338d
Use new mod-related object types for Strict Tracking
2022-03-19 18:29:44 +00:00
Dean Herbert
0988c2b0fa
Move DrawableRuleset binding to LoadComplete to avoid exceptions on InputManager access
2022-03-18 15:28:48 +09:00
Dean Herbert
39d95aa8cf
Add automatic preloading of sample pools at a Playfield level
2022-03-14 17:19:48 +09:00
Henry Lin
464be6e64c
Only call IUpdatableByPlayfield.Update if the playfield isn't nested
2022-03-03 14:37:39 +08:00
Bartłomiej Dach
d8fa443ea0
Extract default mod switch measurements to constants
...
For use later when specific sizes/scales of the mod switches are
desired.
2022-02-22 23:22:11 +01:00
Bartłomiej Dach
cfc41a0a36
Implement small mod switch
2022-02-22 00:26:35 +01:00
Bartłomiej Dach
5186693dad
Implement tiny mod switch
2022-02-22 00:26:35 +01:00
Dan Balasescu
ebd105422f
Remove unused using
2022-02-10 14:22:08 +09:00
Dan Balasescu
f7fb7825cc
Simplify disposal
2022-02-10 14:21:51 +09:00
Dan Balasescu
a3896a8ebd
Remove allowance of null dependency
2022-02-10 14:21:50 +09:00
Dan Balasescu
6d3bc005ea
Merge branch 'master' into spectator-state-rework
2022-02-02 18:57:04 +09:00
Dan Balasescu
41007169f7
Give SpectatorState a user state
2022-02-01 21:51:05 +09:00
Dan Balasescu
0641264a11
Merge branch 'master' into spectator-consistency-frames
2022-02-01 14:35:30 +09:00
Dan Balasescu
4fb565e15f
Reset ScoreProcessor from statistics replay frames
2022-01-31 21:32:56 +09:00
Dean Herbert
0e764538e0
Retrieve KeyBindingContainer via DI rather than traversal lookup
2022-01-31 17:05:04 +09:00
Dean Herbert
a84fd2e20c
Merge branch 'master' into master
2022-01-31 16:30:08 +09:00
Susko3
19467e58c1
Remove unused params from BDL methods
2022-01-15 01:06:39 +01:00
Dan Balasescu
52e240230b
Merge branch 'master' into mouse-button-disable-disables-touch
2022-01-12 17:14:39 +09:00
Dan Balasescu
a09563a7d9
Fix calculation of most common beat length for mania scroll speed
2022-01-11 11:00:30 +09:00
Dean Herbert
88602ec1b4
Fix mouse button disable not disabling touch input mappings
2022-01-05 18:29:32 +09:00
pikokr
dec1f31749
Make KeyBindingContainer public
2021-12-28 22:43:07 +09:00
pikokr
d629305002
Remove Cached attribute from DrawableRuleset.KeyBindingInputManager
2021-12-28 21:47:58 +09:00
pikokr
58994b790c
Get key binding container once instead of getting on every touch
2021-12-27 21:20:52 +09:00
Bartłomiej Dach
5cbaa028eb
Use extracted ruleset config cache implementation in DI
2021-12-23 19:02:10 +01:00
Bartłomiej Dach
1040590844
Add cancellation support to game-side IResourceStores
2021-12-23 10:33:17 +01:00
Dean Herbert
1eed2436e6
Clean up unused resolved properties
2021-12-03 18:49:49 +09:00
Dean Herbert
cdb2a92f86
Disable key repeat for all ruleset handling cases
2021-11-18 13:13:36 +09:00
Dean Herbert
66c307e0ee
Remove usage of key repeat helper method
2021-11-18 13:13:36 +09:00
Dean Herbert
6944151486
Apply batch fixing of built-in types using var
2021-10-27 13:04:41 +09:00
Dan Balasescu
e49f1f6e6b
Merge branch 'master' into no-more-difficulty-control-points-info
2021-10-13 20:17:57 +09:00
Bartłomiej Dach
56eae703fe
Avoid changing frame stable clock direction if time hasn't changed between frames
2021-10-11 21:39:48 +02:00
smoogipoo
bc37cb6f43
Merge branch 'master' into no-more-difficulty-control-points-info
2021-10-08 18:41:17 +09:00
Dean Herbert
b339c149d8
Copy BaseDifficulty to Beatmap<T> and move all write operations across
2021-10-06 15:10:45 +09:00
Dean Herbert
32afd3f426
Replace all basic usages
2021-10-02 02:22:23 +09:00
Dean Herbert
46bafb6252
Merge branch 'master' into no-more-difficulty-control-points-info
2021-09-28 13:53:56 +09:00
smoogipoo
f9d5abff8a
Update with keybinding changes
2021-09-16 18:26:12 +09:00
Dean Herbert
464797fecf
Allow ModIcon to be constructed using an IMod
2021-09-10 12:43:12 +09:00
Dean Herbert
3c7a34bdbd
Move mania-specific conversion to converter
2021-09-06 21:06:13 +09:00
Dean Herbert
d587dc6203
Populate new approach rate where required
2021-09-03 17:11:12 +09: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
15aa0458bc
Use PausableSkinnableSound instead
2021-08-26 17:15:36 +09:00
Dean Herbert
fd78d0440b
Update missed conditional
2021-08-25 17:00:32 +09:00
Dean Herbert
ccfff50c6f
Apply fixes in line with issues found during testing
...
I was trying to be too smart with caching, but if the `Play` method was
not called often enough it would have a recent reference. Unfortunately
this requires a separate query to `Entries`, but is also a special case
(no future hitobjects).
This also removes the time-based checks (result status alone should be
all we care about).
2021-08-25 16:56:44 +09:00
Dean Herbert
ef2b5e1c51
Tidy up variable names and unused resolved properties
2021-08-25 16:56:44 +09:00
Dean Herbert
a1936b141b
Refactor base class to allow correct usage in taiko drum
2021-08-25 16:56:44 +09:00
Dean Herbert
681215e5b5
Rewrite object lookup to use previous entry regardless
...
This changes the fallback logic to always prefer the previous resolved
lifetime entry rather than fallback to the first entry ever. I think
this is more correct in all cases.
Also rewrites the inline comments to hopefully be easier to parse.
2021-08-25 16:56:44 +09:00
Dean Herbert
4a294d4de4
Optimise fallback logic to reduce lookups to bare minimum
2021-08-25 16:56:44 +09:00
Dean Herbert
6aa894e55e
Split out separate component
2021-08-25 16:56:44 +09:00
smoogipoo
2af827f913
Increase TimeRange max value
2021-08-02 19:37:45 +09:00
Dean Herbert
53c901bfa8
Expose DrawableRuleset audio adjustments as non-container
2021-07-31 15:47:54 +09:00
Dean Herbert
0c3f1195e9
Allow audio adjustments to be applied to DrawableRulesets
2021-07-30 17:25:01 +09:00
Dan Balasescu
d2722f1523
Merge branch 'master' into ruleset-shaders
2021-07-07 15:44:30 +09:00
Derrick Timmermans
216e52d6d0
Avoid using single letter variable names
2021-07-04 23:24:17 +02:00
Derrick Timmermans
32b068fbdc
Fix typo causing nested windows to be ignored
2021-07-04 21:50:58 +02:00
Bartłomiej Dach
50c27d2635
Update usages of IHasTooltip in line with framework localisation changes
2021-06-25 19:10:04 +02:00
Salman Ahmed
2b1f461d79
Pass empty resource store for FallbackShaderManager base constructor
2021-06-22 12:36:45 +03:00
Salman Ahmed
67f0344c0c
Add support for loading shaders from ruleset resources
2021-06-20 23:07:44 +03:00
Dean Herbert
c369beeaaa
Merge branch 'master' into realm-key-binding-store
2021-06-18 16:52:35 +09:00
ekrctb
b6a9fa9999
Merge branch 'master' into applicable-to-dho
2021-06-16 22:04:10 +09:00
ekrctb
67d8e0059f
Use singular IApplicableToDrawableHitObject for consumers
2021-06-16 18:47:04 +09:00
Dean Herbert
66efc3c4de
Merge branch 'master' into realm-key-binding-store
2021-06-16 13:23:13 +09:00
ekrctb
bbf0022689
Use natural anchor for TimeAtPosition and PositionAtTime
...
The natural anchor is the end of the scrolling direction (e.g. Bottom for Down scrolling).
2021-06-15 13:15:20 +09:00
Bartłomiej Dach
cb1e2e3d97
Improve xmldoc
2021-06-14 21:54:55 +02:00
ekrctb
660bf50dc7
Clarify multiple coordinate systems
...
- Fix wrong position is set for DHOs for down/right scrolling direction.
2021-06-14 13:13:27 +09:00
ekrctb
09f1cbde7e
Fix TimeAtPosition doc comment
2021-06-14 13:13:27 +09:00
ekrctb
fdb09ef4d7
Simplify flipPositionIfRequired using scrollLength
2021-06-14 13:13:27 +09:00
ekrctb
8cf4454780
Use Direction enum instead of int
...
The property is named `scrollingAxis` to distinguish from `direction`, which is of `ScrollingDirection` type (unfortunate name crash).
2021-06-14 13:13:27 +09:00
ekrctb
af3f253b21
Refactor ScrollingHitObjectContainer and expose more useful methods
2021-06-11 18:28:48 +09:00
Dean Herbert
9044a20120
Merge branch 'master' into realm-key-binding-store
2021-06-10 13:58:08 +09:00
Dan Balasescu
57a38374db
Merge branch 'master' into fix-spectator-frame-conversion
2021-06-04 21:17:40 +09:00
Dan Balasescu
b283c48abb
Merge branch 'master' into factor-out-hoc
2021-06-04 15:31:35 +09:00
Dean Herbert
23096c58bb
Merge branch 'master' into fix-spectator-frame-conversion
2021-06-04 15:06:15 +09:00
Dean Herbert
d444fed46f
Detach gameplay score from replay recorder before importing
...
Closes #13320 .
2021-06-04 02:00:02 +09:00
smoogipoo
e887807ae7
Apply review fixes
2021-06-03 18:32:05 +09:00
smoogipoo
c3280083a2
Merge branch 'master' into fix-spectator-frame-conversion
2021-06-03 17:42:01 +09:00
smoogipoo
420df124b5
Add framestable-bypassing seek for spectator
2021-06-03 17:27:21 +09:00
ekrctb
b321b20e9d
Remove OnAdd/OnRemove of HitObjectContainer
...
Instead, override `AddDrawable`/`RemoveDrawable`.
2021-06-03 15:00:16 +09:00
ekrctb
0ce7baa3f3
Make HitObjectContainer.Clear non-virtual
...
It just call `Remove` for all entries.
2021-06-03 15:00:16 +09:00
ekrctb
2c9e5b6c7e
Replace EntryCrossedBoundary with more useful RemoveRewoundEntry property
...
It can be used for dynamically added entries.
2021-06-03 15:00:16 +09:00
ekrctb
fe2934db1d
Factor out lifetime management logic of HitObjectContainer
2021-06-03 14:57:28 +09:00
Dan Balasescu
44b1102241
Merge branch 'master' into autoplay-pause-support
2021-06-03 13:26:00 +09:00
smoogipoo
8ee2b3a2d2
Merge branch 'master' into fix-scrolling-lifetime
2021-06-02 11:08:28 +09:00
Dean Herbert
8a76d97b63
Remove replay logic from DrawableRuleset (and implement in DrawableEditorRulesetWrapper)
2021-06-02 11:06:30 +09:00
Dean Herbert
f14c0eae99
Fix editor no longer creating autoplay frames
2021-06-01 17:28:41 +09:00
ekrctb
ff04942295
Change timing of HitObjectContainer.OnAdd/OnRemove
...
Now, `OnAdd` is always invoked after the DHO is added to the container.
This change is required by `ScrollingHitObjectContainer` to compute origin adjusted lifetime when origin position is relative to the parent drawable size.
2021-05-31 20:56:25 +09:00
ekrctb
948a14a627
Merge branch 'simplify-shoc' into fix-scrolling-lifetime
...
# Conflicts:
# osu.Game/Rulesets/UI/Scrolling/ScrollingHitObjectContainer.cs
2021-05-31 16:50:47 +09:00
ekrctb
86d1225aad
Reset lifetime to initial lifetime when layout is invalidated
2021-05-31 16:47:10 +09:00
ekrctb
6d96846776
Remove scrollLength caching field
...
It was not clear when the field is updated.
2021-05-31 16:28:02 +09:00
ekrctb
742c5b442b
Remove delay of lifetime update
...
The scheduling is no longer necessary because `OnAdd` is changed to not invoked immediately for non-pooled DHOs.
2021-05-31 16:24:13 +09:00
ekrctb
3cedc0824d
Don't add nested hit objects to the sets
...
Only top-level hit objects are checked for layout computation caching.
Also, lifetime of nested hit objects are not managed by the HitObjectContainer.
2021-05-31 16:20:35 +09:00
Dean Herbert
a249bb9e69
Merge branch 'master' into realm-key-binding-store
2021-05-25 17:18:33 +09:00
Dean Herbert
57640810b5
Ignore certain banned InputKeys for gameplay purposes
2021-05-24 18:40:40 +09:00
smoogipoo
6beeb7f7c4
Rename SpectatorStreamingClient -> SpectatorClient
2021-05-20 15:55:07 +09:00
Dan Balasescu
ef81bdf63f
Merge branch 'master' into always-use-lifetime-entry
2021-05-18 20:10:12 +09:00
ekrctb
84a1a86c63
Revert "Use entry to calculate lifetime in ScrollingHOC"
...
This reverts commit 632bb70e
2021-05-18 19:55:31 +09:00
ekrctb
2c65b8fa93
Revert "Fix uninitialized scrollLength value is used"
...
This reverts commit 73dfb04d
2021-05-18 19:55:25 +09:00
ekrctb
913fc8c3bc
Revert the change of not adding non-pooled DHO to HOC until alive
2021-05-04 16:44:48 +09:00
Dean Herbert
a551958eeb
Move caching of IBeatmap to base DrawableRuleset
2021-05-01 21:32:45 +09:00
ekrctb
73dfb04df8
Fix uninitialized scrollLength value is used
2021-04-29 15:17:30 +09:00
ekrctb
632bb70e0f
Use entry to calculate lifetime in ScrollingHOC
...
DHOs cannot be used to calculate lifetime, it is not created before the entry became alive.
2021-04-29 15:04:32 +09:00
ekrctb
c83c804057
Expose lifetime entries from HOC
2021-04-29 14:42:41 +09:00
ekrctb
799d2a3300
Replace failed mania test (pooling not accounted) with a more robust test
...
Also fix null reference in Playfield
2021-04-29 14:38:01 +09:00
ekrctb
d262956146
Always use LifetimeEntry to manage hit objects in HitObjectContainer
...
Previously, non-pooled DHOs were immediately added as children of the HOC when Add is called. Also, non-pooled DHOs were always attached to the HOC as children.
New behavior is that non-pooled DHOs are only added after CheckChildLifetime, and only attached to the HOC while the DHOs are alive.
- LifetimeManagementContainer inheritance of HOC is removed, as it is now all DHOs are "unmanaged" (previously `AddInternal(false)`).
- The signature of `Clear` is changed, and it is now always not disposing the children immediately.
2021-04-29 14:38:01 +09:00
Dan Balasescu
cf55383fff
Merge pull request #12486 from ekrctb/unmanaged-hit-object-entry
...
Associate DrawableHitObject with HitObjectLifetimeEntry rather than HitObject
2021-04-21 17:08:21 +09:00
ekrctb
3fbeadf318
Deprecate old overload of Apply
2021-04-21 14:32:37 +09:00
smoogipoo
d26fa46ef2
Record every 60fps interval
2021-04-16 19:42:44 +09:00
ekrctb
936bde28a3
Remove manual handling of IsActive in RulesetInputManager
...
Now it is supported in framework
2021-04-16 14:13:41 +09:00
Dan Balasescu
ac8e462d32
Merge branch 'master' into refactor-framed-replay-input-hander
2021-04-15 21:48:58 +09:00
ekrctb
d8aa436e81
Remove usage of Lazy<List<...>> in NestedPlayfields
2021-04-15 18:26:01 +09:00
Dean Herbert
ba325de595
Merge conditionals for readability
2021-04-15 14:19:59 +09:00
ekrctb
6d18b3db00
Avoid empty list allocation
2021-04-12 18:49:38 +09:00
ekrctb
d6d8ea5b6b
Throw when getting a frame of an empty replay
2021-04-12 11:17:56 +09:00
Bartłomiej Dach
aec859b4d1
Merge branch 'master' into fix-unsafe-skinnable-sample-play
2021-03-18 19:51:46 +01:00
Dean Herbert
c4ba045df1
Add note about finalizers required for audio store clean-up
2021-03-02 16:07:51 +09:00
Dean Herbert
ec4b770cba
Remove unused using statement
2021-02-23 14:56:03 +09:00
