Commit Graph

24242 Commits

Author SHA1 Message Date
cfbf95b433 Add HasPerformancePoints extension method 2021-04-29 14:11:35 -07:00
243605728d Fix approved maps not displaying pp column on score table 2021-04-28 11:44:05 -07:00
6cadbd48dc Merge pull request #12603 from smoogipoo/fix-score-processor-base-score
Fix bonus-only maps having only 700K base score
2021-04-28 17:30:58 +09:00
53d93fecd1 Merge branch 'master' into fix-download-button-import-cancel-state 2021-04-28 16:51:31 +09:00
74bf4323d1 Merge pull request #12602 from smoogipoo/setting-source-custom-control
Add support for custom controls to SettingSourceAttribute
2021-04-28 16:39:17 +09:00
05e3a73a7d Fix import cancellation not correctly being forwarded to import notification 2021-04-28 16:09:50 +09:00
05bd6ee50c Add back ctor doc 2021-04-28 03:54:42 +09:00
04454062b7 Fix up xmldoc 2021-04-28 03:52:59 +09:00
61b7dc1e06 Fix bonus-only maps having 700K base score 2021-04-28 03:42:29 +09:00
4e3ee77396 Add support for custom controls to SettingSourceAttribute 2021-04-28 02:51:24 +09:00
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
1281993f1f Fix bonus score not calculated from the correct statistics 2021-04-27 22:42:58 +09:00
5dadfd04e7 Update framework 2021-04-27 22:36:25 +09:00
b87446a577 Simplify HitObjectLifetimeEntry logic a bit 2021-04-27 19:37:01 +09:00
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
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
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
c9e6ca5378 Use now-public Entry.SetLifetime method 2021-04-27 15:25:05 +09:00
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
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
ec1c336b0a Fix a couple of inspections 2021-04-27 13:23:14 +09:00
08a232f7fa Add method to safely refresh DrawableHitObject transforms 2021-04-26 20:08:40 +02:00
213ac88a8b Fix exported scores not being compatible with osu-stable 2021-04-26 20:52:20 +09:00
6560dc2d1f Fix exported replays being wrapped in zip packages 2021-04-26 20:46:44 +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