Dean Herbert
a9a5809e94
Fix incorrect xmldoc in MoveSelectionEvent
2021-04-28 11:46:52 +09:00
Dean Herbert
d0be8f9fb3
Remove one more out-of-date comment
2021-04-28 11:45:36 +09:00
Dean Herbert
bc455005a5
Fix incorrect coordinate space mention in xmldoc
2021-04-28 11:44:50 +09:00
Dean Herbert
61d4eb1777
Remove unnecessary and out-of-place xmldoc
2021-04-28 11:44:19 +09:00
Dean Herbert
aa1cb65eaa
Rename region to be more inclusive
2021-04-28 11:42:22 +09:00
Gagah Pangeran Rosfatiputra
6a921af085
add OsuMarkdownSeparator
...
Reference
d56352aeef/resources/assets/less/bem/osu-md.less (L19-L21)
2021-04-28 09:23:05 +07:00
smoogipoo
05bd6ee50c
Add back ctor doc
2021-04-28 03:54:42 +09:00
smoogipoo
04454062b7
Fix up xmldoc
2021-04-28 03:52:59 +09:00
smoogipoo
61b7dc1e06
Fix bonus-only maps having 700K base score
2021-04-28 03:42:29 +09:00
smoogipoo
4e3ee77396
Add support for custom controls to SettingSourceAttribute
2021-04-28 02:51:24 +09:00
Dan Balasescu
5fc731967b
Merge pull request #12592 from ekrctb/fix-entry-lifetime
...
Fix Setting DHO's lifetime doesn't update its entry lifetime
2021-04-28 01:38:19 +09:00
smoogipoo
1281993f1f
Fix bonus score not calculated from the correct statistics
2021-04-27 22:42:58 +09:00
Dean Herbert
5dadfd04e7
Update framework
2021-04-27 22:36:25 +09:00
Naxess
200352b750
Rename unsnap check templates
2021-04-27 13:56:05 +02:00
ekrctb
b87446a577
Simplify HitObjectLifetimeEntry logic a bit
2021-04-27 19:37:01 +09:00
Dean Herbert
2adc751e04
Merge pull request #12585 from LumpBloom7/Reset-DHO-Transforms-method
...
Add method to safely refresh DrawableHitObject transforms
2021-04-27 19:15:12 +09:00
Dean Herbert
42255f8d33
Rename and xmldoc selection completed method
2021-04-27 19:01:29 +09:00
Dean Herbert
7ec5ea1eb5
Remove hitobject terminology from base classes
2021-04-27 19:01:29 +09:00
Dean Herbert
ff06a27a12
Revert changes to OnBlueprint methods and handle select-on-addition locally
2021-04-27 19:01:29 +09:00
Dean Herbert
f97b14a20a
Fix binding direction of selected items
2021-04-27 19:01:29 +09:00
Dean Herbert
dd3d8e5d03
Make SelectionHandler abstract to ensure things get implemented
2021-04-27 19:01:29 +09:00
Dean Herbert
32416e4e31
Move model selection handling to base SelectionHandler class
2021-04-27 19:01:29 +09:00
Dean Herbert
eac139ca0e
Allow BlueprintContainer to perform movement without an ISnapProvider
2021-04-27 19:01:29 +09:00
Dean Herbert
f2e56bd306
Refactor editor selection/blueprint components to be generic
2021-04-27 19:01:29 +09:00
Derrick Timmermans
3ea55314f2
Update osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
...
Co-authored-by: Dan Balasescu <smoogipoo@smgi.me>
2021-04-27 11:29:16 +02:00
Gagah Pangeran Rosfatiputra
6959f2a8cc
add OsuMarkdownFencedCodeBlock
...
Reference :
d56352aeef/resources/assets/less/bem/osu-md.less (L41-L45)
2021-04-27 16:01:32 +07:00
ekrctb
3899e500d3
Adopt framework change of LifetimeEntry
...
Override SetLifetimeStart/SetLifetimeEnd separately to track individual assignment. It is necessary to ensure real lifetime is not lost when lifetime is partially updated.
2021-04-27 17:54:18 +09:00
Gagah Pangeran Rosfatiputra
6cccbabad8
override CreateTextFlow in OsuMarkdownContainer
2021-04-27 14:19:16 +07:00
Gagah Pangeran Rosfatiputra
c686c5224b
add OsuMarkdownTextFlowContainer
2021-04-27 14:17:51 +07:00
Gagah Pangeran Rosfatiputra
aa07482cbb
Add OsuMarkdownLinkText
...
Color from
d56352aeef/resources/assets/less/functions.less (L159-L165)
2021-04-27 14:15:19 +07:00
Gagah Pangeran Rosfatiputra
b75b9a97ed
add OsuMarkdownContainer
...
All of the markdown file in osu-wiki have YAML frontmatter. This YAML is
parsed as common markdown paragraph. So we add `UseYamlFrontMatter()` in
markdown pipeline builder to parse YAML as `YamlFrontMatterBlock`.
2021-04-27 14:09:58 +07:00
ekrctb
c9e6ca5378
Use now-public Entry.SetLifetime method
2021-04-27 15:25:05 +09:00
ekrctb
a2c0951d94
Use overriding instead of hiding in HitObjectLifetimeEntry
...
Hidden properties are used when the type is the base class. It caused issues when `DrawableHitObject` logic is factored out to `PoolableDrawableWithLifetime` because it is using the base `LifetimeEntry`, not `HitObjectLifetimeEntry`.
2021-04-27 15:23:33 +09:00
Dan Balasescu
ea3c5aed2f
Merge pull request #12590 from peppy/editor-minor-refactors
...
Fix a couple of inspections in editor code
2021-04-27 14:09:36 +09:00
Dean Herbert
ec1c336b0a
Fix a couple of inspections
2021-04-27 13:23:14 +09:00
Naxess
7a6e9e5070
Change category of unsnap check to timing
...
Makes more sense, as this is typically the result of timing changes.
2021-04-27 02:32:57 +02:00
Naxess
9e49ecb573
Remove unused virtual keywords
...
Added these in a previous iteration, where I had the mania variant inherit this class.
No longer necessary as `IHasColumn` was used to make this check more generic.
2021-04-27 02:23:06 +02:00
Naxess
a3c1b1fd52
Fix accessibility of areConcurrent
2021-04-27 01:24:38 +02:00
Naxess
217ff8238e
Add snapping time comment
2021-04-27 01:23:03 +02:00
Naxess
6d5883abcb
Return result of local variable instead
2021-04-27 01:19:38 +02:00
Naxess
ce258febf6
Rename CheckUnsnaps -> CheckUnsnappedObjects
...
Will potentially have `CheckUnsnappedKiai` or similar later, so this is worth specifying.
Also consistent with `CheckConcurrentObjects`, which will likely have a `CheckConcurrentLines` later.
2021-04-26 20:32:44 +02:00
Naxess
b9e4f73f78
Add concurrent objects check to BeatmapVerifier
2021-04-26 20:28:59 +02:00
Naxess
a3570e18dd
Add concurrent objects check
...
Here we use `IHasColumn` to support rulesets with columns, and so I moved that interface out into `osu.Game` from `osu.Game.Rulesets.Mania`.
We also use the same threshold as the unsnap check to ensure that no problems slip through. Specifically where an object is simultaneously not concurrent and not unsnapped but still on the same tick.
2021-04-26 20:17:18 +02:00
Derrick Timmermans
08a232f7fa
Add method to safely refresh DrawableHitObject transforms
2021-04-26 20:08:40 +02:00
Naxess
9b9c473616
Remove redundant string formatting
2021-04-26 16:17:38 +02:00
Naxess
7b9ed924be
Rename snapping methods
...
Further separates them from `IBeatSnapProvider`'s `SnapTime`, and groups them together more, to prevent confusion between the two interfaces.
Also changes the xmldoc of the reference time to that of `IBeatSnapProvider` for consistency.
2021-04-26 16:07:30 +02:00
smoogipoo
213ac88a8b
Fix exported scores not being compatible with osu-stable
2021-04-26 20:52:20 +09:00
smoogipoo
6560dc2d1f
Fix exported replays being wrapped in zip packages
2021-04-26 20:46:44 +09:00
Dan Balasescu
6d2a5b614c
Merge branch 'master' into drawable-object
2021-04-26 18:33:44 +09:00
smoogipoo
fd5fbaf0db
Rename ruleset wrapper class
2021-04-26 15:37:42 +09:00
Naxess
049e42fa85
Move snapping responsibility to IBeatmap
...
Seems `EditorBeatmap` already implements a different kind of `SnapTime` from `IBeatSnapProvider`, so method names here aren't great.
This is very similar to what https://github.com/ppy/osu/pull/12558 is doing, so may need to do some duplicate resolution later, especially surrounding `ClosestBeatSnapDivisor`.
Worth noting that this change makes 1/7, 1/5, etc unsupported for now, as we now rely on `BindableBeatDivisor.VALID_DIVISORS`.
2021-04-26 05:07:24 +02:00
ekrctb
6561a7c7d6
Rename DrawableObject -> PoolableDrawableWithLifetime
2021-04-26 12:06:21 +09:00
ekrctb
20e3cadd30
freeIfInUse -> free, and add comments
2021-04-26 12:04:59 +09:00
ekrctb
e6474e6ff7
Remove redundant statement (lifetime is set in base)
2021-04-26 11:47:38 +09:00
Justus Franklin Tumacder
8bb1fcd39b
Add tests for BeatDivisorFinder
2021-04-26 07:07:32 +08:00
Bartłomiej Dach
33a5c156a1
Use existing snap list from BindableBeatDivisor
2021-04-25 17:52:11 +02:00
Bartłomiej Dach
e14255f395
Rename {Snap -> BeatDivisor}Finder
2021-04-25 17:44:26 +02:00
Naxess
6fd77e536d
Add unsnap check
2021-04-25 05:34:54 +02:00
Justus Franklin Tumacder
211bff6a8f
Fix cake errors
2021-04-25 09:21:25 +08:00
Justus Franklin Tumacder
1f48378ce7
Add xmldoc to SnapFinder
2021-04-25 08:53:45 +08:00
Justus Franklin Tumacder
e0ca44c908
Move SnapFinder from mania ruleset to osu.Game
2021-04-25 07:35:53 +08:00
Joseph Madamba
c9967f7b74
Fix button being recreated on importing state
2021-04-24 08:37:37 -07:00
Joseph Madamba
46c44c576d
Fix beatmap info download button content not scaling on mouse down
2021-04-24 08:23:27 -07:00
Bartłomiej Dach
e937b778f6
Fix potential failure in ensureSourceClockSet()
...
`ensureSourceClockSet()` was intended to only run when the adjustable
source hasn't been set at all yet. As it turns out permitting it to run
unconditionally can break the state of the underlying interpolated
clock. This is caused by the following factors:
* While the decoupleable clock is running, its `CurrentTime` does not
come from either the source clock, or the internal stopwatch; it is
instead calculated using the base `InterpolatingFramedClock` logic.
* A source change of a decoupleable clock seeks the provided source
clock to the decoupleable's current time.
* When an interpolating clock is seeked (decoupleable clock is also
an interpolating one), its interpolation state
(`{Last,Current}InterpolatedTime`) are reset to 0.
* If the interpolating clock determines that its current time is too
far away from the source's time (which was set when the source is
changed), it will ignore the source and instead continue to use
its current time until the source clock has caught up.
Overall, the source change is not really necessary if a source is
already there. The only reason to ensure it was set was to make sure
the first seek of the gameplay clock wasn't performed in decoupled
mode. Therefore, add a guard to make sure the source is only set if
there isn't one already.
2021-04-24 14:19:39 +02:00
Denrage
59ae5ab913
Added transition in StarRatingDisplay
2021-04-24 13:25:29 +02:00
Bartłomiej Dach
34fa51dee9
Merge branch 'master' into gcc-change-source-on-reset
2021-04-24 13:23:02 +02:00
Dean Herbert
2ae144be8e
Update framework
2021-04-24 14:38:00 +09:00
Bartłomiej Dach
fdb5490e51
Attempt to explain source initialisation better
2021-04-23 21:56:08 +02:00
smoogipoo
ae2fd2f2e1
Ensure source is set on reset
2021-04-23 18:46:59 +09:00
Denrage
713344ebad
Reorganize methods
2021-04-23 10:31:49 +02:00
Dean Herbert
3b77d02752
Merge pull request #12537 from smoogipoo/fix-initial-playingusers
...
Fix current match playing users not updated on room join
2021-04-23 12:00:33 +09:00
Dean Herbert
fbb9cb3f6f
Fix broken merge resolution
2021-04-23 11:01:48 +09:00
Dean Herbert
a9a24bd481
Merge branch 'master' into ruleset-switch-sounds
2021-04-23 10:50:41 +09:00
smoogipoo
f593d9e42c
Fix playing users not being updated on room join
2021-04-22 23:23:43 +09:00
smoogipoo
0ee73b8e53
Add failing test
2021-04-22 23:22:44 +09:00
Dean Herbert
b4f492ca4c
Update framework
2021-04-22 23:06:46 +09:00
Dan Balasescu
93b53f54fa
Merge pull request #12531 from peppy/editor-add-nudge-shortcuts
...
Add simple key based time nudging support to editor
2021-04-22 21:14:51 +09:00
Dan Balasescu
50f37ef09c
Merge pull request #12519 from peppy/editor-hit-animation-toggle
...
Add editor hit animation toggle
2021-04-22 20:49:21 +09:00
Dan Balasescu
be8fe47f2c
Merge branch 'master' into editor-add-nudge-shortcuts
2021-04-22 20:38:34 +09:00
Dean Herbert
891a6a83d2
Merge branch 'master' into ruleset-switch-sounds
2021-04-22 20:17:21 +09:00
Dean Herbert
d20a8694e4
Update resources
2021-04-22 19:55:06 +09:00
Dan Balasescu
739d83da2a
Merge pull request #12515 from frenzibyte/legacy-scores-classic-mod
...
Apply "classic" mod to all legacy scores
2021-04-22 19:52:09 +09:00
Dan Balasescu
b774f5b72b
Merge pull request #12526 from peppy/fix-system-message-ordering
...
Fix system messages always being displayed above standard messages
2021-04-22 18:51:25 +09:00
Dan Balasescu
0e24f2eb59
Merge pull request #12529 from peppy/editor-placement-right-click-delete
...
Allow shift+right-click deletion when in placement mode
2021-04-22 18:50:20 +09:00
Dean Herbert
a5364b224f
Add simple key based time nudging support to editor
2021-04-22 18:47:04 +09:00
smoogipoo
d4d78f7434
Merge branch 'master' into legacy-scores-classic-mod
2021-04-22 18:44:20 +09:00
smoogipoo
8a6267580a
Fix nullref
2021-04-22 18:44:14 +09:00
Dean Herbert
1884c18a2c
Ignore movement operations which have no offset
2021-04-22 18:12:03 +09:00
Dean Herbert
daafa41dc1
Merge branch 'master' into fix-initial-spectator-state-callback
2021-04-22 16:22:04 +09:00
Dean Herbert
68807a90ec
Merge pull request #12448 from smoogipoo/gcc-abstraction
...
Make GameplayClockContainer abstract and add MasterGameplayClockContainer
2021-04-22 16:20:52 +09:00
Dean Herbert
9a7bf8109f
Allow certain mouse input to pass through PlacementBlueprints to the selection logic
2021-04-22 15:44:12 +09:00
Dean Herbert
3befb49ea9
Fix system messages always being displayed above standard messages
...
Closes https://github.com/ppy/osu/issues/12509 .
2021-04-22 14:52:01 +09:00
Jamie Taylor
21f34be19f
Add support for per-ruleset sample playback when switching rulesets (via toolbar)
2021-04-22 14:43:36 +09:00
Dean Herbert
60b702549d
Update framework
2021-04-22 14:20:49 +09:00
Denrage
56a69ed956
Codestyle fixes
2021-04-21 15:53:28 +02:00
Denrage
0dfd0bb59d
Refactored background of BeatmapInfoWedge
2021-04-21 15:46:11 +02:00
Denrage
d6928e91fd
Removed BeatmapInfo in StarRatingDisplay
2021-04-21 15:43:48 +02:00
Denrage
9fba87f67a
Moved Info and Background into own container
2021-04-21 15:43:29 +02:00
Denrage
de04caeace
Fixed race condition in StarRatingDisplay
2021-04-21 13:53:08 +02:00
Dean Herbert
9d8f0c854d
Setup configuration item for editor hit animations
2021-04-21 18:05:40 +09:00
Dean Herbert
c6c91cd9a5
Refactor WaveformOpacityMenuItem to not receive whole config
2021-04-21 18:05:26 +09:00
ekrctb
b877a29737
Factor out pooling and lifetime management logic of DHO to a base class
2021-04-21 17:37:42 +09:00
ekrctb
bbf2ec369b
Remove SkinReloadableDrawable inheritance from DHO
2021-04-21 17:34:57 +09:00
Dean Herbert
deeb9e3765
Update framework
2021-04-21 17:27:00 +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
smoogipoo
31c5fb350f
Merge branch 'master' into gcc-abstraction
2021-04-21 16:33:36 +09:00
smoogipoo
fb848f7544
Rename to MasterGameplayClock
2021-04-21 16:33:14 +09:00
Dean Herbert
ab2a8b5c89
Fix initial rotation not being set
2021-04-21 16:12:09 +09:00
Dean Herbert
eb20865c02
Show tablet preview with physical tablet counter-rotated for supplied user area selection
...
Closes https://github.com/ppy/osu/issues/12399 .
Rotation animation is intentionally delayed slightly to give a better sense of what is going on (or maybe just look cool).
2021-04-21 15:55:15 +09:00
Salman Ahmed
1a715b2926
Append "classic" mod to legacy scores
2021-04-21 09:16:28 +03:00
Salman Ahmed
e90d791754
Add base "classic" mod
2021-04-21 09:14:19 +03:00
ekrctb
3fbeadf318
Deprecate old overload of Apply
2021-04-21 14:32:37 +09:00
ekrctb
73d3da1687
Fix wrong InitialLifetimeOffset is used for a non-pooled DHO.
...
HitObjectLifetimeEntry's InitialLifetimeOffset is different from DrawableHitObject's InitialLifetimeOffset.
2021-04-21 11:32:01 +09:00
ekrctb
44ff08cce4
Revert "Fix wrong InitialLifetimeOffset is used for a non-pooled DHO."
...
This reverts commit 67fcfd9d
2021-04-21 10:02:50 +09:00
ekrctb
67fcfd9dbc
Fix wrong InitialLifetimeOffset is used for a non-pooled DHO.
...
HitObjectLifetimeEntry's InitialLifetimeOffset is different from DrawableHitObject's InitialLifetimeOffset.
2021-04-21 09:48:16 +09:00
ekrctb
e80c3c317a
Rename UnmanagedHitObjectEntry -> SyntheticHitObjectEntry
...
"Unmanaged" was confusing because its lifetime is still managed by the HitObjectContainer.
2021-04-21 09:23:23 +09:00
Bartłomiej Dach
a2afa38a3f
Merge branch 'master' into fix-mod-customisation-input-blocking-padding
2021-04-20 19:41:25 +02:00
Dean Herbert
26430e3cb5
Merge pull request #12492 from Naxesss/bg-audio-quality-checks
...
Add background and audio checks
2021-04-21 00:10:32 +09:00
Dean Herbert
7fc450c620
Fix mod settings blocking input outside its visible area
...
Closes #12502 .
2021-04-20 23:42:56 +09:00
Denrage
e9571b72cf
Fixed InspectCode
2021-04-20 14:53:35 +02:00
Denrage
583754b22a
Removed unnecessary whitespaces
2021-04-20 14:29:53 +02:00
Denrage
df29e61147
Fix CodeFactor error
2021-04-20 14:22:49 +02:00
smoogipoo
4cc3321d54
Fix potential doubling of events
2021-04-20 21:20:08 +09:00
smoogipoo
a9e4a0ed50
Fix potentially starting play when finished
...
The UserFinishedPlaying event may trigger before the event is subscribed
to by SpectatorScreen. For such cases, an extra check is done to make
sure the user is _actually_ playing.
2021-04-20 21:19:08 +09:00
Denrage
f799a6e733
Removed StarDifficulty binding passthrough
2021-04-20 14:18:41 +02:00
smoogipoo
156a518068
Merge branch 'master' into fix-initial-spectator-state-callback
2021-04-20 21:16:05 +09:00
Naxess
e9dfa2860a
Add xmldoc note about path being relative
2021-04-20 13:44:06 +02:00
Naxess
d7a81471c8
Add xmldoc to GetPathForFile
2021-04-20 13:40:38 +02:00
Naxess
3e1b6b3b34
Simplify verifier run call args
...
Uses the resolved working beatmap instead of resolving it every time.
Also uses the EditorBeatmap itself as playable beatmap, as it is of type `IBeatmap` already, and `.PlayableBeatmap` forwards everything anyway.
2021-04-20 13:34:12 +02:00
Denrage
c5d35ab787
removed mods binding passthrough
2021-04-20 12:40:22 +02:00
Denrage
4e6cd8082e
WIP refresh BPM-Label on mod change
2021-04-20 12:00:04 +02:00
smoogipoo
ec080fcb32
Move seekOffset back to MasterGameplayClockContainer
2021-04-20 18:25:46 +09:00
smoogipoo
a683e5ec34
Seek using local method
2021-04-20 17:40:11 +09:00
Denrage
6e72ee5f76
Added bindable stardifficulty to StarRatingDisplay
2021-04-20 10:37:53 +02:00
Denrage
505a117862
splitted updateable part of wedge
2021-04-20 10:37:52 +02:00
smoogipoo
97fb90d9f4
Move clock processing to base.Seek()
2021-04-20 17:35:59 +09:00
smoogipoo
80473a356e
Merge branch 'fix-pre-seek-sample-lifetime' into gcc-abstraction
2021-04-20 17:27:01 +09:00
smoogipoo
d28eb399a4
Fix storyboard sample lifetimes not set if seeked past
2021-04-20 17:14:48 +09:00
smoogipoo
281c2041b2
Add failing test
2021-04-20 16:51:00 +09:00
ekrctb
c6ee4e900e
Ensure a non-null hitobject entry has a non-null Result
2021-04-20 15:18:36 +09:00
smoogipoo
3d6d26039a
Remove unused usings
2021-04-20 14:09:54 +09:00
smoogipoo
88ded95e75
Ensure clock is set in GCC.Start()
2021-04-20 13:56:13 +09:00
smoogipoo
8dd9134e3d
Move source clock adjustment application to Start()
2021-04-20 13:09:49 +09:00
smoogipoo
a92ae8ce76
Fix Reset() potentially not resetting to the intended start position
2021-04-20 13:01:42 +09:00
ekrctb
8a8b9084ef
Make single-argument overloead of DHO.Apply public
2021-04-20 10:11:36 +09:00
Naxess
496df411a7
Remove now unused import
2021-04-20 02:39:11 +02:00
Naxess
0e6b66f457
Merge branch 'master' into bg-audio-quality-checks
2021-04-20 02:36:13 +02:00
Naxess
1478bcfa8e
Improve xmldoc consistency
2021-04-20 02:30:27 +02:00
Naxess
67e4fe4284
Add xmldoc to GetStream
2021-04-20 02:28:38 +02:00
ekrctb
1bc63a4c61
Now, DHO.lifetimeEntry can be non-null even it is not fully applied
2021-04-20 09:22:16 +09:00
Naxess
4510e795e1
Fix category of audio quality check
2021-04-20 02:13:26 +02:00
ekrctb
c1b4aaaa03
Add doc comment
2021-04-20 08:38:02 +09:00
Naxess
c633f15565
Add audio quality check
2021-04-20 01:36:03 +02:00
Naxess
f168247254
Add Track as a property to IWorkingBeatmap
...
This is implemented by `WorkingBeatmap` already, and is much better to use than loading the track every time we need it.
2021-04-20 01:35:41 +02:00
Naxess
40ae856dfc
Show 2 decimals for background filesize
2021-04-20 01:34:05 +02:00
Naxess
14c626ffcb
Use the playable beatmap for file presence checks
2021-04-20 01:33:19 +02:00
Naxess
8656176ab8
Add the playable beatmap as check argument
...
This is different from the working beatmap's `.Beatmap` property in that it is mutated by the ruleset/editor.
So hit objects, for example, are actually of type `Slider` and such instead of the legacy `ConvertSlider`.
This should be preferred over `workingBeatmap.Beatmap`.
2021-04-20 01:31:51 +02:00
Denrage
6bf6084ae9
fixed according to suggestions
2021-04-19 19:24:46 +02:00
Bartłomiej Dach
0825fc57a9
Move foreground colour helper into OsuColour
2021-04-19 18:24:48 +02:00
Bartłomiej Dach
97573fb11d
Merge branch 'master' into combo-colours-display
2021-04-19 18:21:57 +02:00
Denrage
eb977312ed
Added Author link in BeatmapSet Overlay
2021-04-19 16:54:29 +02:00
Denrage
9f24cdb355
Added Author Link in BeatmapInfoWedge
2021-04-19 16:54:09 +02:00
Dean Herbert
510e54ff54
Update framework
2021-04-19 23:41:21 +09:00
Dean Herbert
fc41ad65f8
Merge pull request #12447 from smoogipoo/fix-non-60fps-recording
...
Record every 60fps interval
2021-04-19 23:26:58 +09:00
ekrctb
2c487ddb70
Create synthetic LifetimeEntry for a DHO when not supplied
...
Now, a DHO is always associated with a HitObjectLifetimeEntry while used.
Result is always stored in the entry, and not in the DHO.
2021-04-19 21:54:19 +09:00
smoogipoo
acbf4580a4
Only set initial source in Reset()
2021-04-19 19:57:00 +09:00
smoogipoo
c7183f92f7
Rename Restart() -> Reset()
2021-04-19 19:57:00 +09:00
ekrctb
5afdc3ff66
Make DHO application logic clearer with Entry/HitObject separation
2021-04-19 19:56:17 +09:00
Dean Herbert
a40dcd4b8d
Add a touch more space in the timing column
2021-04-19 18:53:06 +09:00
Dean Herbert
097a347533
Adjust Add different background colour for timing area
2021-04-19 18:25:30 +09:00
Dean Herbert
5bce5d2057
Update design logic
2021-04-19 18:25:20 +09:00
smoogipoo
5397f4faba
Merge branch 'master' into fix-initial-spectator-state-callback
2021-04-19 16:49:06 +09:00
smoogipoo
c50b526ba0
Remove local state dictionary from SpectatorScreen
2021-04-19 16:48:55 +09:00
Dean Herbert
8fcfac7ddc
Merge branch 'master' into timing-screen-ux
2021-04-19 16:44:32 +09:00
Dean Herbert
1ebc5ac5cc
Remove unused legacy class
2021-04-19 16:36:00 +09:00
Dean Herbert
8da561a2a6
Soften colours and adjust padding slightly
2021-04-19 16:35:36 +09:00
Dean Herbert
f8b20ca8aa
Add new display for effect row attribute
2021-04-19 16:35:36 +09:00
Dean Herbert
ec249a0edb
Add new display for sample row attribute
2021-04-19 16:23:28 +09:00
Dean Herbert
6465a72060
Add bubbled word class for use in attribute rows
2021-04-19 16:23:28 +09:00
Dean Herbert
3aad0a8b9c
Add new display for difficulty row attribute
2021-04-19 16:23:06 +09:00
Dean Herbert
d3cebfb6fb
Use explicit label
2021-04-19 16:23:06 +09:00
Dean Herbert
a10a8680d0
Add new display for timing row attributes
2021-04-19 16:23:06 +09:00
smoogipoo
83716ddb08
Rename currentUserStates -> playingUserStates
2021-04-19 16:07:00 +09:00
smoogipoo
de9e37857e
Lock around playingUsers
2021-04-19 16:06:40 +09:00
smoogipoo
5885c24e00
Clear current user states on disconnect
2021-04-19 16:00:56 +09:00
Christine Chen
abfa6aec87
Remove completionState parameter
2021-04-19 01:58:19 -04:00
Dean Herbert
f4baff9e04
Make TimingScreen use rounded screen and adjust spacing/padding
2021-04-19 14:35:35 +09:00
Dean Herbert
e143afb598
Split out rounded content screen from SetupScreen for use in other places
2021-04-19 14:28:32 +09:00
Christine Chen
0b36dd9bce
Skip outro overlay and PerformExit() call updateCompletionState() instead of scheduleCompletion()
...
Co-Authored-By: Marlina José <marlina@umich.edu>
2021-04-19 01:23:21 -04:00
jvyden
ffc1e841e0
Fix sessionIdleTracker not being properly added to OsuGame
2021-04-19 01:06:26 -04:00
Dean Herbert
513e470b52
Adjust grid spacing to allow attributes to use more width
2021-04-19 13:24:53 +09:00
Dean Herbert
0c918410d0
Make "add" button more visible
2021-04-19 13:15:24 +09:00
Dean Herbert
658c23c925
Give more space to the parameter adjustment area
2021-04-19 13:15:17 +09:00
Dean Herbert
f9f514ffec
Add basic xmldoc to show how the two colour classes interact
2021-04-19 12:37:56 +09:00
Christine Chen
99fab456b5
Storyboard completion calls updateCompletionState
...
- If the storyboard ends after the beatmap, call updateCompletionState as if the score processor has completed at that time. (completionProgressDelegate is null here since earlier when the score processor actually completed, updateCompletionState returned after showing the skip overlay.)
- If the storyboard ends before the beatmap does, updateCompletionState simply returns and waits until the score processor is completed.
- If the storyboard and beatmap end at the exact same time, make sure updateCompletionState() is called only once by the score processor completion.
Co-Authored-By: Marlina José <marlina@umich.edu>
2021-04-18 23:25:20 -04:00
jvyden
e44d11667c
Merge remote-tracking branch 'upstream'
2021-04-18 23:04:35 -04:00
Dean Herbert
dbb8f7f4a9
Tidy up initialisation code and avoid using DI on inherited class
2021-04-19 11:30:55 +09:00
Dean Herbert
2b6caf9b65
Fix duplicate code in setting default logic
2021-04-19 11:25:43 +09:00
Joseph Madamba
89940e7bb9
Fix download button check icon not scaling on mouse down
2021-04-18 19:05:33 -07:00
Christine Chen
98460c8feb
Rename IStoryboardElementHasDuration, remove unnecessary step in tests, add Duration field
2021-04-18 20:20:14 -04:00
Bartłomiej Dach
6f2ebb20a7
Fix test failing due to null beatmap skin
...
Also annotate the field on `EditorBeatmap` as nullable for future
travelers.
2021-04-18 20:46:42 +02:00
Bartłomiej Dach
07a00cd681
Add colours section with combo colour display
2021-04-18 20:46:42 +02:00
Bartłomiej Dach
577755ee19
Add placeholder when no colours are visible
...
Will be removed once combo colours are mutable.
2021-04-18 20:46:42 +02:00
Bartłomiej Dach
0cd1aa8c1c
Add support for custom colour prefixes
2021-04-18 20:44:55 +02:00
Bartłomiej Dach
a8027d87b6
Fix unreadable colour hex code text due to low contrast
...
Logic is shared with the timeline blueprints which also have the same
problem of displaying text on top of a combo colour.
Slightly modified the formula. Seems to yield better results on a
subjective check.
2021-04-18 20:44:55 +02:00
Bartłomiej Dach
1b2c43b92c
Add basic structure of colour palette
2021-04-18 19:29:04 +02:00
Bartłomiej Dach
91b3a7ccf9
Merge branch 'master' into fix-volume-sideways-scroll
2021-04-18 17:52:40 +02:00
Dean Herbert
af79ad537c
Avoid unnecessary debounce triggers on zero-delta scrolls
2021-04-19 00:05:44 +09:00
Dean Herbert
e63edf5b49
Fix volume control displaying on non-vertical scroll events
...
Closes #12475 .
2021-04-19 00:05:44 +09:00
Dean Herbert
cfc7664094
Use full path
2021-04-18 21:05:23 +09:00
Dean Herbert
e76565dbc5
Fix selection box not displaying after pasting a selection in the editor
...
Closes #12471 .
2021-04-18 20:28:39 +09:00
Salman Ahmed
f45aed1259
Remove new line between skip overlay fields
2021-04-18 07:25:52 +03:00
Salman Ahmed
f6a09be62d
Add further xmldoc
2021-04-18 07:25:49 +03:00
Salman Ahmed
a73bae7a66
Schedule completion when storyboard has actually ended
2021-04-18 07:25:33 +03:00
Salman Ahmed
2847dd7e05
Merge branch 'master' into play-storyboard-outro
2021-04-18 06:40:22 +03:00
Christine Chen
c77f838fb0
HasStoryboardEnded doesn't trigger updateCompletionState()
...
Scores won't be shown prematurely if the storyboard ends before the playable portion of the beatmap.
2021-04-17 21:49:07 -04:00
Naxess
9a69ca34a6
Add audio presence check
2021-04-18 02:07:57 +02:00
Naxess
010720de74
Factor out general file presence checking
...
This allows us to use the same method of checking for other files that should exist, for example the audio file.
By using the same method, they all share test cases too.
2021-04-18 02:07:33 +02:00
Naxess
56bf49c85c
Take IWorkingBeatmap instead of WorkingBeatmap
...
This makes testing much easier, and allows for checking of any class deriving from that interface, including `WorkingBeatmap`.
2021-04-18 01:21:20 +02:00
Naxess
abf512532e
Clean up check logic
...
Makes use of the new `BeatmapSet.GetPathForFile` method and removes dependency on `WorkingBeatmap` specifically, allowing us to switch to `IWorkingBeatmap` later.
2021-04-18 01:19:25 +02:00
Naxess
ef65c8910f
Fix resolved fields
2021-04-18 01:15:13 +02:00
Naxess
bf8789528a
Add GetStream to IWorkingBeatmap
2021-04-18 01:13:57 +02:00
Christine Chen
97bacbdc76
Show score after the end of the storyboard after it was toggled
2021-04-17 18:10:21 -04:00
Christine Chen
fdcb5e924c
Initialize skipOutroOverlay with alpha 0, other small changes
2021-04-17 17:45:38 -04:00
Christine Chen
e40cb6797d
Use GetEndTime() to get storyboard endtime
2021-04-17 15:27:48 -04:00
Naxess
cb41c89935
Don't return low res and too low res at the same time
2021-04-17 20:10:07 +02:00
Christine Chen
5a015290b9
Add remarks back to LatestEventTime
2021-04-17 12:34:38 -04:00
Christine Chen
81be562379
Read StoryboardEndTime directly from Beatmap
2021-04-17 12:28:31 -04:00
Naxess
62c54e00cb
Add check for background resolution and filesize
2021-04-17 18:01:04 +02:00
Naxess
b36da2664c
Add GetPathForFile to BeatmapSetInfo
...
This is used in several places, and so should probably have a function rather than remaining as duplicated code.
Also applies this together with the previous commit to `BeatmapManagerWorkingBeatmap`.
2021-04-17 17:49:10 +02:00
Naxess
400f8b3938
Add GetStream to IWorkingBeatmap
...
This is necessary to obtain the filesize of the audio and background files.
2021-04-17 17:47:13 +02:00
Naxess
448574e7e6
Use WorkingBeatmap instead of IBeatmap
...
This lets us access things like the background, track, etc. which are necessary for quality and filesize checks.
Also improves the structure of the `CheckBackgroundTest` class in the process.
2021-04-17 17:33:53 +02:00
jvyden
1e56f14f5b
Merge remote-tracking branch 'upstream'
2021-04-17 09:35:24 -04:00
jvyden
6773162f17
Implicitly set defaults when resetting values
2021-04-17 08:47:27 -04:00
Bartłomiej Dach
250c7403e8
Fix idle tracker assuming time starts at 0
...
`IdleTracker` in its construction quietly assumed that the clock it
receives from its parent starts ticking from 0 at the point at which it
is passed down. This is not necessarily the case when headless
executions are involved, which means that the initial state of the
tracker could be computed as idle incorrectly.
Resolve by explicitly reading the clock time at the point of
`LoadComplete()`.
2021-04-17 13:50:00 +02:00
jvyden
854d88bfb9
Merge branch 'master' into master
2021-04-16 10:04:04 -04:00
smoogipoo
314b1646bd
Add xmldoc to MasterGameplayClockContainer
2021-04-16 20:47:09 +09:00
smoogipoo
3a78c19f96
More refactoring/xmldocs
2021-04-16 20:33:29 +09:00
smoogipoo
6301111fa3
Remove ClockToProcess, always process underlying clock
2021-04-16 20:17:21 +09:00
smoogipoo
5e82f40d67
Merge branch 'master' into gcc-abstraction
2021-04-16 20:14:53 +09:00
smoogipoo
d26fa46ef2
Record every 60fps interval
2021-04-16 19:42:44 +09:00
jvyden
a4e3e53a63
Revert back to hardcoded SessionStatics reset values
2021-04-16 06:34:57 -04:00
Dan Balasescu
1f577ce566
Merge pull request #12444 from peppy/fix-slider-zero-length
...
Avoid all scenarios where sliders can become zero length
2021-04-16 19:33:35 +09:00
jvyden
9c6914d29d
Fix redundant lambda parentheses
2021-04-16 06:26:45 -04:00
Dan Balasescu
a1787d3819
Merge pull request #12445 from peppy/show-selected-objects-in-timeline
...
Add border showing selected blueprints in timeline
2021-04-16 19:22:04 +09:00
jvyden
ec0211809f
Apply peppy's suggestions
2021-04-16 05:53:27 -04:00
Dean Herbert
f824105075
Merge branch 'master' into fix-slider-zero-length
2021-04-16 18:47:22 +09:00
smoogipoo
274e33184b
Fix SpectatorScreen potentially missing user playing callbacks
2021-04-16 18:22:22 +09:00
Dean Herbert
d9d50f0e88
Add border showing selected blueprints in timeline
2021-04-16 18:16:22 +09:00
jvyden
43e6e5e049
increase GameIdleTracker time to 5 minutes
2021-04-16 05:15:58 -04:00
jvyden
471b8e3c74
Merge branch 'master' of https://github.com/ppy/osu
2021-04-16 05:02:40 -04:00
jvyden
7d23973ef8
Reset SessionStatics on activity
...
Closes #12424
2021-04-16 05:01:58 -04:00
smoogipoo
ca74f413cd
Change to explicit method instead
2021-04-16 17:31:02 +09:00
Dean Herbert
fbf7d838da
Update framework
2021-04-16 17:30:39 +09:00
Dean Herbert
9b95cf227e
Merge branch 'master' into apply-ibindable-interface-change
2021-04-16 17:30:35 +09:00
Dan Balasescu
5ad2d0e759
Merge pull request #12439 from ekrctb/further-refactor-framed-replay
...
Further refactor FrameReplayInputHandler, simplify the template code
2021-04-16 17:16:09 +09:00
Dan Balasescu
3c8e2b8b32
Merge branch 'master' into fix-potential-deselection-crash
2021-04-16 16:27:47 +09:00
Dan Balasescu
d3acbcced7
Merge pull request #12437 from peppy/fix-editor-placement-commit-false
...
Fix placement blueprints not being correctly removed after a rolled back placement
2021-04-16 16:25:05 +09:00
Dean Herbert
c59906e925
Fix an occasional crash when deleting a HitObject via internal means
2021-04-16 15:55:33 +09:00
Dean Herbert
d38e294d96
Centralise length validation function
2021-04-16 15:45:24 +09:00
smoogipoo
8c4804dd7a
Use nameof
2021-04-16 15:40:06 +09:00
smoogipoo
d1c72f5e13
Apply changes resulting from IBindable interface updates
2021-04-16 15:10:53 +09:00
Dean Herbert
af20863799
Merge branch 'fix-editor-placement-commit-false' into fix-slider-zero-length
2021-04-16 14:30:46 +09:00
ekrctb
91c7d8d26c
Introduce StartFrame and EndFrame to simplify the replay interpolation code
2021-04-16 14:13:41 +09:00
ekrctb
84bc81a6de
Make FramedReplayInputHandler.CurrentTime non-null
2021-04-16 14:13:41 +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
smoogipoo
5652490d61
Fix OnUserBeganPlaying not being invoked if already watching
2021-04-16 14:11:55 +09:00
Dean Herbert
119c9b4294
Fix placement blueprints not being correctly removed after a rolled back placement
2021-04-16 14:11:33 +09:00
Christine Chen
33a665224e
Clean up skipOutroOverlay if skipping is disabled
2021-04-16 01:03:15 -04:00
Christine Chen
b15838b220
Move storyboard outro logic to DrawableStoryboard
2021-04-16 00:59:10 -04:00
Dean Herbert
42c066e6f2
Fix slider not displaying in timeline during zero-duration placement
2021-04-16 13:38:55 +09:00
Christine Chen
0e545e1ed9
Add IHasDuration interface with EndTime for storyboard elements to implement
2021-04-15 17:17:02 -04:00
Christine Chen
45c2b72a25
Merge branch 'master' into play-storyboard-outro
2021-04-15 15:11:35 -04:00
Christine Chen
25b8c2f257
Allow skipping storyboard outro
...
Reuses SkipOverlay by calculating the endtime of the storyboard and using that as a "start point". Upon skipping the outro the score is instantly shown.
When the end of the storyboard is reached the score screen automatically shows up. If the player holds ESC (pause) during the outro, the score is displayed
The storyboard endtime is calculated by getting the latest endtime of the storyboard's elements, or simply returning 0 if there is no storyboard.
Co-Authored-By: Marlina José <marlina@umich.edu>
2021-04-15 13:20:40 -04:00
Dean Herbert
c2340f1fe8
Move zoom settings back to run in a non-loaded state
2021-04-16 01:01:03 +09:00
Dean Herbert
15d48a924b
Set the timeline's height to a sane non-zero default
...
This isn't required but makes the initial appearance animation nicer.
2021-04-16 00:58:32 +09:00
Dan Balasescu
215ad78045
Merge pull request #12404 from peppy/volume-control-acceleration
...
Add simple acceleration to volume metre adjustments
2021-04-16 00:31:26 +09:00
Dan Balasescu
a19f3bac35
Merge pull request #12408 from peppy/hide-top-right-elements-as-part-of-hud
...
Hide top-right HUD overlay elements as part of HUD visibility
2021-04-15 23:29:55 +09:00
smoogipoo
6f3158e8c8
Increase multiplier to 1.8
2021-04-15 23:24:13 +09:00
smoogipoo
cc84ffe228
Merge branch 'master' into volume-control-acceleration
2021-04-15 23:23:23 +09:00
Dan Balasescu
1e0045ae31
Merge pull request #12406 from peppy/volume-control-key-repeat
...
Fix volume controls not supporting key repeat
2021-04-15 22:47:13 +09:00
Dean Herbert
7cf15fe729
Merge pull request #12412 from peppy/timeline-adjustments
...
Update timeline control point display
2021-04-15 22:43:26 +09:00
Dean Herbert
6bfde9c1cb
Merge pull request #12429 from EVAST9919/editor-fix
...
Simplify ExtendableCircle even more
2021-04-15 22:36:32 +09:00
Andrei Zavatski
71b06d7e61
Simplify ExtendableCircle even more
2021-04-15 15:53:21 +03:00
Dan Balasescu
7beaf0ce55
Merge branch 'master' into timeline-adjustments
2021-04-15 21:51:00 +09:00
Dan Balasescu
ac8e462d32
Merge branch 'master' into refactor-framed-replay-input-hander
2021-04-15 21:48:58 +09:00
Dean Herbert
ad671ee07a
Merge branch 'master' into timeline-adjustments
2021-04-15 20:42:38 +09:00
Dan Balasescu
e3bf5f1bbb
Merge branch 'master' into summary-timeline-kiai-display
2021-04-15 20:41:31 +09:00
Dan Balasescu
6f17c19a48
Merge branch 'master' into summary-timeline-design-refactors
2021-04-15 20:11:39 +09:00
Dan Balasescu
b70dae7cf1
Merge pull request #12420 from peppy/round-timeline-ticks
...
Add rounded corners to timeline ticks display
2021-04-15 20:11:20 +09:00
Dan Balasescu
98e2245d83
Merge pull request #12422 from ekrctb/no-lazy-list
...
Remove usage of Lazy<List<...>> by always allocating an empty list
2021-04-15 20:09:39 +09:00
Dean Herbert
5b06a68b93
Merge pull request #12330 from Cublibre/master
...
Send a warning notification if device is unplugged and at low battery
2021-04-15 19:21:04 +09:00
Dean Herbert
17e021c549
Update framework
2021-04-15 18:45:52 +09:00
Dean Herbert
0dc1577f68
Split out control point visualisation logic and add special kiai duration handling
2021-04-15 18:42:30 +09:00
Dean Herbert
153ee25510
Update base specifications to a more sane default
2021-04-15 18:42:07 +09:00
ekrctb
d8aa436e81
Remove usage of Lazy<List<...>> in NestedPlayfields
2021-04-15 18:26:01 +09:00
ekrctb
50fad47ebc
Remove usage of Lazy<List<...>> for NestedHitObjects
2021-04-15 18:26:01 +09:00
Dean Herbert
bf5af3310a
Update break colour to not look like kiai time
2021-04-15 17:04:11 +09:00
Dean Herbert
18e8682f39
Remove unused using statements
2021-04-15 17:01:25 +09:00
Dean Herbert
757475e6d4
Use correct representation colours
2021-04-15 16:39:20 +09:00
