Commit Graph

38608 Commits

Author SHA1 Message Date
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
47925de7ae Merge pull request #12500 from ekrctb/drawable-object
Factor out pooling and lifetime management logic of DHO to a base class
2021-04-26 19:30:43 +09:00
6d2a5b614c Merge branch 'master' into drawable-object 2021-04-26 18:33:44 +09:00
72d9cdcdf9 Merge pull request #12580 from peppy/fix-editor-slider-repeat-animation
Fix slider repeats and tails still animating with editor hit animations disabled
2021-04-26 17:36:51 +09:00
1e0ee3cd61 Merge branch 'master' into fix-editor-slider-repeat-animation 2021-04-26 16:45:04 +09:00
0727728771 Merge pull request #12579 from peppy/rename-edit-classes
Rename "EditRuleset" and "EditPlayfield" to use full "Editor" keyword
2021-04-26 16:44:35 +09:00
8b60f6e7fb Merge pull request #12581 from smoogipoo/fix-simultaneous-slider-input
Fix simultaneous slider input not allowing both keys to be accepted
2021-04-26 16:21:48 +09:00
0d0b4ea78a Rewrite comment to hopefully be more readable 2021-04-26 15:47:37 +09:00
fd5fbaf0db Rename ruleset wrapper class 2021-04-26 15:37:42 +09:00
f70e45b199 Prevent adding null enumerable 2021-04-26 15:35:08 +09:00
d10aac851d Extract scale constant 2021-04-26 15:30:22 +09:00
8795c5f082 Update osu! editor transform logic to allow adjustments to DrawableSliderRepeat and DrawableSliderTail 2021-04-26 15:27:10 +09:00
4da964c3f3 Expose DrawableSliderRepeat's arrow and move transforms to children 2021-04-26 15:22:42 +09:00
aa7ade8186 Expose presence of MainCirclePiece via an interface 2021-04-26 15:22:17 +09:00
6182181ea1 Fix simultaneous slider input not allowing both keys 2021-04-26 15:20:29 +09:00
bda8f68da4 Add failing test 2021-04-26 15:03:43 +09:00
4898471d68 Merge branch 'master' into fix-editor-slider-repeat-animation 2021-04-26 14:43:22 +09:00
cefdf1bf98 Merge pull request #12574 from frenzibyte/animate-circle-piece-usages
Fix missing animation of slider repeat and tail circle pieces
2021-04-26 14:42:46 +09:00
e8d83f2f99 Rename "EditRuleset" and "EditPlayfield" to use full "Editor" keyword 2021-04-26 14:33:30 +09:00
2764a42824 Merge pull request #12546 from smoogipoo/gcc-change-source-on-reset
Ensure source is set on GameplayClockContainer.Reset()
2021-04-26 14:12:12 +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
0b9172a1dc Animate back slider repeat and tail circle pieces 2021-04-26 02:39:49 +03:00
6eee229a20 Merge pull request #12569 from plan-do-break-fix/Typo-correction
fix(docs): corrects typo in project README
2021-04-25 13:00:33 +09:00
fa8e8ed36f fix(docs): corrects typo in project README 2021-04-24 22:57:18 -05: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
a2215d8078 Merge pull request #12555 from PercyDan54/issue-template 2021-04-24 13:08:56 +02:00
4edf8216a4 Merge branch 'master' into issue-template 2021-04-24 12:32:20 +02:00
2e2f843e22 Refine android game logs path in contributing guidelines 2021-04-24 09:27:05 +03:00
6b6f44793b Merge pull request #12461 from LiterallyFabian/reversed-fruits
Add "Floating Fruits" mod
2021-04-24 15:11:25 +09:00
6f6d57bb02 Merge pull request #12553 from peppy/update-framework
Update framework
2021-04-24 15:11:13 +09:00
1ec99577ce Incorrect path on Android 2021-04-24 14:05:11 +08:00
2ae144be8e Update framework 2021-04-24 14:38:00 +09:00
0ccdfeea57 Fix code quality issues 2021-04-24 14:35:49 +09:00
86a361a922 Merge branch 'master' into reversed-fruits 2021-04-24 14:33:48 +09:00
5222dcf0ab Merge pull request #12552 from subfluid/patch-1
Fix Spelling Error 'passses'
2021-04-24 13:02:22 +09:00
04958a043f Fix Spelling Error 'passses'
line 20
2021-04-23 20:54:06 -07: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
d4ffd2ef4b Merge branch 'master' into reversed-fruits 2021-04-23 15:08:18 +09:00
bc0e1d8c37 Remove dead newline 2021-04-23 15:06:39 +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
8ee881b57a Merge pull request #12528 from nekodex/ruleset-switch-sounds
Add support for playing a per-ruleset sound when switching rulesets
2021-04-23 11:35:19 +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
8de885622b Merge pull request #12536 from peppy/update-framework
Update framework
2021-04-23 00:42:20 +09:00
f593d9e42c Fix playing users not being updated on room join 2021-04-22 23:23:43 +09:00