1
0
mirror of https://github.com/ppy/osu.git synced 2024-12-15 22:22:55 +08:00
Commit Graph

38591 Commits

Author SHA1 Message Date
smoogipoo
6df23f1301 Merge branch 'master' into multiplayer-spectator-screen 2021-04-22 20:29:24 +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
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
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
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
Dean Herbert
d2ee5fcd85
Merge pull request #12438 from smoogipoo/fix-initial-spectator-state-callback
Fix OnUserBeganPlaying not being invoked if already watching
2021-04-22 17:17:02 +09:00
Dean Herbert
84a7138223 Update tests to better support stack regeneration cases 2021-04-22 17:13:19 +09:00
Dean Herbert
3e1002fbf3 Improve osu!catch caught fruit placement algorithm 2021-04-22 17:06:28 +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
5a6a6a4742
Merge pull request #12525 from peppy/update-framework
Update framework
2021-04-22 15:59:17 +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
cf1e3ea988 Add failing test covering quick shift-rightclick deletion in placement mode 2021-04-22 15:44:12 +09:00
Dean Herbert
b37c5a8749 Rollback hold note placement when length is zero 2021-04-22 14:59:57 +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
Dean Herbert
ea3bb07924 Add test that fails on incorrect system/info message ordering 2021-04-22 14:51:14 +09:00
Dean Herbert
60b702549d Update framework 2021-04-22 14:20:49 +09:00
smoogipoo
1ca2152e61 Privatise + rename to SlaveGameplayClockContainer 2021-04-21 23:22:36 +09:00
smoogipoo
2bea625613 Fix initial playback states not being correct 2021-04-21 23:22:11 +09:00
Dan Balasescu
ebfe9cbe23
Merge pull request #12516 from peppy/update-framework
Update framework
2021-04-21 18:06:00 +09:00
Dean Herbert
deeb9e3765 Update framework 2021-04-21 17:27:00 +09:00
smoogipoo
f32d00c0d9 Fix post-merge errors 2021-04-21 17:13:01 +09:00
smoogipoo
e78ef05fcf Merge branch 'gcc-abstraction' into multiplayer-spectator-screen 2021-04-21 17:11:14 +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
Dan Balasescu
452f282e2c
Merge pull request #12513 from peppy/tablet-rotated-preview
Show tablet preview with physical tablet counter-rotated for supplied user area
2021-04-21 16:46:09 +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
e3398d8f1f Implement "classic" mod for all other legacy rulesets
Currently empty, automatically handled in game to not be selectable (see `Mod.HasImplementation`)
2021-04-21 09:14:33 +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
Dean Herbert
6164902eba
Merge pull request #12510 from smoogipoo/fix-wiggle-slider-tails
Fix slider tails wiggling independently
2021-04-21 11:30:13 +09:00
smoogipoo
e454037d82 Add to comment 2021-04-21 10:32:13 +09:00
Dan Balasescu
397df41570
Merge pull request #12507 from peppy/fix-cursor-position-rotated
Fix click-to-resume cursor location being incorrect when playfield is transformed
2021-04-21 10:29:35 +09:00
smoogipoo
9d423201ed Fix slider tails wiggling independently 2021-04-21 10:29:18 +09:00
Dan Balasescu
be71b383f5
Merge pull request #12506 from peppy/fix-mod-customisation-input-blocking-padding
Fix mod settings blocking input outside its visible area
2021-04-21 10:11:35 +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
Bartłomiej Dach
881043bc5d Fix failing test after mod settings layout changes
The slight hack which was used in the test to ensure that the mod
settings overlay covered the entire width of the mod overlay broke after
adjustments to the layout in the previous commit.

Locally adjust the hack to use the parent of the `ModSettingsContainer`
rather than the container itself.
2021-04-20 19:38:25 +02:00