Commit Graph

24229 Commits

Author SHA1 Message Date
61d4eb1777 Remove unnecessary and out-of-place xmldoc 2021-04-28 11:44:19 +09:00
aa1cb65eaa Rename region to be more inclusive 2021-04-28 11:42:22 +09:00
42255f8d33 Rename and xmldoc selection completed method 2021-04-27 19:01:29 +09:00
7ec5ea1eb5 Remove hitobject terminology from base classes 2021-04-27 19:01:29 +09:00
ff06a27a12 Revert changes to OnBlueprint methods and handle select-on-addition locally 2021-04-27 19:01:29 +09:00
f97b14a20a Fix binding direction of selected items 2021-04-27 19:01:29 +09:00
dd3d8e5d03 Make SelectionHandler abstract to ensure things get implemented 2021-04-27 19:01:29 +09:00
32416e4e31 Move model selection handling to base SelectionHandler class 2021-04-27 19:01:29 +09:00
eac139ca0e Allow BlueprintContainer to perform movement without an ISnapProvider 2021-04-27 19:01:29 +09:00
f2e56bd306 Refactor editor selection/blueprint components to be generic 2021-04-27 19:01:29 +09:00
ec1c336b0a Fix a couple of inspections 2021-04-27 13:23:14 +09:00
6d2a5b614c Merge branch 'master' into drawable-object 2021-04-26 18:33:44 +09:00
fd5fbaf0db Rename ruleset wrapper class 2021-04-26 15:37:42 +09:00
6561a7c7d6 Rename DrawableObject -> PoolableDrawableWithLifetime 2021-04-26 12:06:21 +09:00
20e3cadd30 freeIfInUse -> free, and add comments 2021-04-26 12:04:59 +09:00
e6474e6ff7 Remove redundant statement (lifetime is set in base) 2021-04-26 11:47:38 +09:00
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
34fa51dee9 Merge branch 'master' into gcc-change-source-on-reset 2021-04-24 13:23:02 +02:00
2ae144be8e Update framework 2021-04-24 14:38:00 +09:00
fdb5490e51 Attempt to explain source initialisation better 2021-04-23 21:56:08 +02:00
ae2fd2f2e1 Ensure source is set on reset 2021-04-23 18:46:59 +09:00
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
fbb9cb3f6f Fix broken merge resolution 2021-04-23 11:01:48 +09:00
a9a24bd481 Merge branch 'master' into ruleset-switch-sounds 2021-04-23 10:50:41 +09:00
f593d9e42c Fix playing users not being updated on room join 2021-04-22 23:23:43 +09:00
0ee73b8e53 Add failing test 2021-04-22 23:22:44 +09:00
b4f492ca4c Update framework 2021-04-22 23:06:46 +09:00
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
50f37ef09c Merge pull request #12519 from peppy/editor-hit-animation-toggle
Add editor hit animation toggle
2021-04-22 20:49:21 +09:00
be8fe47f2c Merge branch 'master' into editor-add-nudge-shortcuts 2021-04-22 20:38:34 +09:00
891a6a83d2 Merge branch 'master' into ruleset-switch-sounds 2021-04-22 20:17:21 +09:00
d20a8694e4 Update resources 2021-04-22 19:55:06 +09:00
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
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
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
a5364b224f Add simple key based time nudging support to editor 2021-04-22 18:47:04 +09:00
d4d78f7434 Merge branch 'master' into legacy-scores-classic-mod 2021-04-22 18:44:20 +09:00
8a6267580a Fix nullref 2021-04-22 18:44:14 +09:00
1884c18a2c Ignore movement operations which have no offset 2021-04-22 18:12:03 +09:00
daafa41dc1 Merge branch 'master' into fix-initial-spectator-state-callback 2021-04-22 16:22:04 +09:00
68807a90ec Merge pull request #12448 from smoogipoo/gcc-abstraction
Make GameplayClockContainer abstract and add MasterGameplayClockContainer
2021-04-22 16:20:52 +09:00
9a7bf8109f Allow certain mouse input to pass through PlacementBlueprints to the selection logic 2021-04-22 15:44:12 +09:00
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
21f34be19f Add support for per-ruleset sample playback when switching rulesets (via toolbar) 2021-04-22 14:43:36 +09:00
60b702549d Update framework 2021-04-22 14:20:49 +09:00
9d8f0c854d Setup configuration item for editor hit animations 2021-04-21 18:05:40 +09:00
c6c91cd9a5 Refactor WaveformOpacityMenuItem to not receive whole config 2021-04-21 18:05:26 +09:00
b877a29737 Factor out pooling and lifetime management logic of DHO to a base class 2021-04-21 17:37:42 +09:00
bbf2ec369b Remove SkinReloadableDrawable inheritance from DHO 2021-04-21 17:34:57 +09:00
deeb9e3765 Update framework 2021-04-21 17:27:00 +09:00