1
0
mirror of https://github.com/ppy/osu.git synced 2025-01-07 14:52:54 +08:00
Commit Graph

39535 Commits

Author SHA1 Message Date
Denrage
713344ebad Reorganize methods 2021-04-23 10:31:49 +02: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
smoogipoo
b25340653d Fix failing tests 2021-04-23 00:49:14 +09:00
Dan Balasescu
8de885622b
Merge pull request #12536 from peppy/update-framework
Update framework
2021-04-23 00:42:20 +09:00
smoogipoo
90ecda91af Fix exception 2021-04-23 00:06:54 +09:00
smoogipoo
4f0857f946 Xmldocs and general refactorings 2021-04-22 23:52:22 +09:00
smoogipoo
ee25949751 Rename classes 2021-04-22 23:39:02 +09:00
smoogipoo
8a0ba3a055 Merge GameplayIsolationContainer into PlayerInstance, remove track 2021-04-22 23:38:51 +09:00
smoogipoo
4aceb75eb2 Disable spectate button on closed rooms
Doesn't have an effect normally - only for safety purposes in case we
allow entering the match subscreen after a match has finished in the
future.
2021-04-22 23:37:45 +09:00
smoogipoo
fd0b030cf4 Refactor gameplay screen creation 2021-04-22 23:37:33 +09:00
smoogipoo
f8f9cf9412 Merge branch 'fix-initial-playingusers' into multiplayer-spectator-screen 2021-04-22 23:25:25 +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
smoogipoo
22a3f3ad3e Revert unnecessary BeatmapManager change 2021-04-22 23:04:54 +09:00
smoogipoo
64579d50ac Use only single PlayerInstance for hit sample playback 2021-04-22 22:59:47 +09:00
smoogipoo
6588859c32 Remove loggings 2021-04-22 22:29:18 +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
smoogipoo
6df23f1301 Merge branch 'master' into multiplayer-spectator-screen 2021-04-22 20:29:24 +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
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