Justus Franklin Tumacder
91bf0d422d
Rename ColourCode to ColourCodedNotes
2021-04-24 20:40:30 +08:00
Justus Franklin Tumacder
a8b401522b
Remove ManiaColourCode in favor for boolean
2021-04-24 20:39:22 +08: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
Justus Franklin Tumacder
d6d81fb8e5
Move color snap logic from Note to DrawableNote
2021-04-24 19:53:21 +08:00
Justus Franklin Tumacder
f9905ebe68
Remove beatmap argument in Note
2021-04-24 19:37:10 +08:00
Bartłomiej Dach
34fa51dee9
Merge branch 'master' into gcc-change-source-on-reset
2021-04-24 13:23:02 +02:00
Bartłomiej Dach
a2215d8078
Merge pull request #12555 from PercyDan54/issue-template
2021-04-24 13:08:56 +02:00
Bartłomiej Dach
4edf8216a4
Merge branch 'master' into issue-template
2021-04-24 12:32:20 +02:00
Justus Franklin Tumacder
7e3a611f95
Add snap color option for osu!mania
2021-04-24 16:23:52 +08:00
Salman Ahmed
2e2f843e22
Refine android game logs path in contributing guidelines
2021-04-24 09:27:05 +03:00
Dean Herbert
6b6f44793b
Merge pull request #12461 from LiterallyFabian/reversed-fruits
...
Add "Floating Fruits" mod
2021-04-24 15:11:25 +09:00
Dean Herbert
6f6d57bb02
Merge pull request #12553 from peppy/update-framework
...
Update framework
2021-04-24 15:11:13 +09:00
PercyDan54
1ec99577ce
Incorrect path on Android
2021-04-24 14:05:11 +08:00
Dean Herbert
2ae144be8e
Update framework
2021-04-24 14:38:00 +09:00
Dean Herbert
0ccdfeea57
Fix code quality issues
2021-04-24 14:35:49 +09:00
Dean Herbert
86a361a922
Merge branch 'master' into reversed-fruits
2021-04-24 14:33:48 +09:00
Dean Herbert
5222dcf0ab
Merge pull request #12552 from subfluid/patch-1
...
Fix Spelling Error 'passses'
2021-04-24 13:02:22 +09:00
subfluid
04958a043f
Fix Spelling Error 'passses'
...
line 20
2021-04-23 20:54:06 -07: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
Dean Herbert
d4ffd2ef4b
Merge branch 'master' into reversed-fruits
2021-04-23 15:08:18 +09:00
Dean Herbert
bc0e1d8c37
Remove dead newline
2021-04-23 15:06:39 +09: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
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
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
Dan Balasescu
8de885622b
Merge pull request #12536 from peppy/update-framework
...
Update framework
2021-04-23 00:42:20 +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
Dean Herbert
a242df31e8
Merge pull request #12534 from smoogipoo/fix-hold-note-crash
...
Fix hold notes with 0 length crashing the game
2021-04-22 21:14:36 +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
smoogipoo
4148d473e3
Fix hold note crashing with 0 length
2021-04-22 19:51:33 +09:00
smoogipoo
30e6ea4291
Add failing test
2021-04-22 18:59:57 +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
Dan Balasescu
162948425d
Merge pull request #12527 from peppy/mania-fix-zero-length-hold-notes
...
Rollback hold note placement when length is zero
2021-04-22 18:48:32 +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
Dan Balasescu
d8e6ecc110
Merge pull request #12530 from peppy/improve-catcher-fruit-distribution
...
Improve catcher fruit distribution
2021-04-22 18:38:10 +09:00
Dean Herbert
1884c18a2c
Ignore movement operations which have no offset
2021-04-22 18:12:03 +09:00
Dean Herbert
bdf07ad59a
Limit catching towards the centre of the plate (to emulate actual gameplay)
2021-04-22 17:47:03 +09:00
Dean Herbert
2203552e9e
Add stacking test logic to TestSceneCatcherArea for skinned testing
2021-04-22 17:34:53 +09:00
Dean Herbert
dc2bc462b8
Expose internal catcher width calculation methods
2021-04-22 17:27:23 +09:00
