1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-11 14:17:26 +08:00
Commit Graph

34058 Commits

Author SHA1 Message Date
Dean Herbert
030df8234a
Merge pull request #10805 from bdach/fix-osu-hd-mod-part-2
Fix slider ends not fading out after a rewind with hidden mod
2020-11-13 11:27:15 +09:00
Bartłomiej Dach
967aeddf8a
Merge pull request #10810 from nbvdkamp/fix-editor-circle-stack-scale-crash
Prevent SelectionBox handles from appearing for stacks
2020-11-13 00:29:17 +01:00
kamp
1439c0f392 Prevent SelectionBox handles from appearing when a stack of circles is selected 2020-11-12 23:19:29 +01:00
Bartłomiej Dach
db5541d914
Merge pull request #10799 from nbvdkamp/add-accuracyheatmap-test
Add test for accuracy heatmap
2020-11-12 16:40:12 +01:00
Bartłomiej Dach
9e467f8812
Merge branch 'master' into add-accuracyheatmap-test 2020-11-12 15:50:48 +01:00
Bartłomiej Dach
73326d794c
Merge pull request #10793 from peppy/perform-from-menu-dialog-aware
Refactor "perform from menu" logic to be aware of dialog prompts
2020-11-12 15:50:08 +01:00
Bartłomiej Dach
96fbfc33fa
Merge branch 'master' into perform-from-menu-dialog-aware 2020-11-12 15:05:45 +01:00
Bartłomiej Dach
aaad506b98
Merge pull request #10802 from smoogipoo/fix-dodgy-test
Fix skin fallback test crashing on repeats
2020-11-12 12:15:36 +01:00
Dan Balasescu
10c78459ab
Merge branch 'master' into fix-dodgy-test 2020-11-12 19:40:37 +09:00
Dan Balasescu
e804fe5458
Merge pull request #10801 from peppy/fix-legacy-legacy-storyboard-frame-delays
Fix storyboard animations of very old beatmaps playing too slow
2020-11-12 19:06:57 +09:00
smoogipoo
de31c1ea0c Fix skinfallback test crashing on repeats 2020-11-12 17:58:39 +09:00
Bartłomiej Dach
0ae6f82291 Fix incorrect fade of slider ends after a rewind 2020-11-12 09:33:39 +01:00
Dean Herbert
41a1730927
Merge pull request #10794 from smoogipoo/fix-osu-hd-mod 2020-11-12 17:06:04 +09:00
Dean Herbert
25af091409 Fix storyboard animations of very old beatmaps playing too slow
Closes https://github.com/ppy/osu/issues/10772.
2020-11-12 17:03:43 +09:00
Dean Herbert
ad79c2bc62 Avoid multiple enumeration by converting to array at construction time 2020-11-12 10:55:22 +09:00
Dean Herbert
ffad1b3d94
Merge pull request #10800 from EVAST9919/profile-most-played-count 2020-11-12 09:59:02 +09:00
Andrei Zavatski
f753f138c6 Add counter to most played beatmaps section in user overlay 2020-11-12 03:11:29 +03:00
Bartłomiej Dach
1426530496 Make method private 2020-11-11 22:41:25 +01:00
Bartłomiej Dach
1984a9f70d Reduce amount of casting 2020-11-11 22:40:52 +01:00
Bartłomiej Dach
423f0fbda7 Reference constant through base class 2020-11-11 22:37:15 +01:00
kamp
8341d3ad74 Fix formatting 2020-11-11 21:52:43 +01:00
kamp
85017a0094 Add test for accuracy heatmap to TestCaseStatisticsPanel 2020-11-11 20:20:29 +01:00
Dean Herbert
ef5e3d5ab8
Merge pull request #10796 from smoogipoo/fix-incorrect-framestability-value
Fix frame stable playback not being set correctly
2020-11-11 19:54:45 +09:00
Dan Balasescu
9ddd310758
Merge pull request #10795 from peppy/update-framework
Update framework
2020-11-11 19:35:44 +09:00
smoogipoo
90499329bd Fix frame stable playback not being set correctly 2020-11-11 18:50:38 +09:00
Dean Herbert
e0dea4c941
Merge pull request #10775 from bdach/disable-kiai-explosion-on-legacy 2020-11-11 18:06:31 +09:00
Dean Herbert
a08833f3b3 Update framework 2020-11-11 18:03:04 +09:00
Bartłomiej Dach
2b2f0321fd
Merge branch 'master' into fix-osu-hd-mod 2020-11-11 09:45:45 +01:00
Bartłomiej Dach
891218ec6b Inline empty explosion in legacy transformer 2020-11-11 09:11:33 +01:00
Dean Herbert
6fa0cc9bda
Merge pull request #10792 from peppy/remove-double-external-link-opener
Remove duplicate instantiation of externalLinkOpener
2020-11-11 16:58:35 +09:00
Dean Herbert
1106de7356
Merge pull request #10788 from smoogipoo/fix-mania-crash 2020-11-11 16:38:15 +09:00
smoogipoo
5d55af5818 Fix hitobjects sometimes not fading in completely with HD mod 2020-11-11 16:35:48 +09:00
Dan Balasescu
31dcdb4427
Merge pull request #10789 from peppy/add-random-skin-hotkey
Add hotkey to select a new random skin
2020-11-11 16:25:12 +09:00
Dean Herbert
b28a0d5cd5 Add test coverage 2020-11-11 16:05:44 +09:00
Dean Herbert
804450e707 Remove duplicate instantiation of externalLinkOpener 2020-11-11 15:49:45 +09:00
smoogipoo
7df9484458 Merge branch 'master' into add-random-skin-hotkey 2020-11-11 15:48:12 +09:00
Dan Balasescu
09324c4598
Merge pull request #3652 from WebFreak001/shuffle-skin
Add "random skin" option to skin setting dropdown
2020-11-11 15:47:00 +09:00
Dan Balasescu
1008750bfc
Merge pull request #10787 from peppy/osd-custom-bindings-display
Add the ability for the game OSD to display user bindings
2020-11-11 15:44:45 +09:00
Dan Balasescu
8ad84d6640
Merge branch 'master' into osd-custom-bindings-display 2020-11-11 15:12:31 +09:00
Dan Balasescu
b446f21c68
Merge pull request #10786 from peppy/osd-skin-display
Display skin changes via on-screen display overlay
2020-11-11 15:12:19 +09:00
Dan Balasescu
acee24e4fd
Merge pull request #10790 from peppy/fix-spectator-replay-thread-safety
Fix frames potentially getting added to spectator replay in wrong format
2020-11-11 15:02:28 +09:00
Dean Herbert
c308eb75d9 Move logic for performing actions from specific screen to its own component 2020-11-11 14:45:50 +09:00
Dean Herbert
f78f2fb59e Merge branch 'osd-custom-bindings-display' into add-random-skin-hotkey 2020-11-11 13:53:49 +09:00
Dean Herbert
324626e097 Move default config tracking calls out of OnScreenDisplay itself 2020-11-11 13:53:09 +09:00
Dean Herbert
11cf04eed1 Fix frames potentially getting added to spectator replay in wrong format
The way spectator currently works, the `Spectator` screen is responsible
for adding new frames to the replay, even when it has a child
(`SpectatorPlayer`) present.

There was a possibility that a new play had already started, and on
returning to the Spectator screen (to initialise the new play) there
would be a brief period where the Player instance is still reading from
the replay, the `userBeganPlaying` call had not yet finished
initialising the new target replay, and `userSentFrames` is run
(asynchronously), writing frames to the previous replay using the
incorrect ruleset instance).

To make this work, it doesn't `Schedule` frame addition to the replay
(making things a bit unsafe). Changing this itself isn't such a simple
one to do, so I instead opted to fix this via locking.

Closes https://github.com/ppy/osu/issues/10777.
2020-11-11 13:39:43 +09:00
Dean Herbert
8d38d9cc93 Add hotkey to select random skin 2020-11-11 13:05:03 +09:00
Dean Herbert
df00a4ab9b Merge branch 'osd-custom-bindings-display' into shuffle-skin 2020-11-11 13:00:32 +09:00
Dean Herbert
3364648fe2 Merge branch 'osd-skin-display' into shuffle-skin 2020-11-11 13:00:31 +09:00
Dean Herbert
6014751e29 Add the ability for the game OSD to display user bindings
Adds binding display for mouse button toggle / HUD toggle keys.

- [ ] Depends on #10786 for ease-of-merge
2020-11-11 12:56:10 +09:00
smoogipoo
508ae91a97 Revert unnecessary change 2020-11-11 12:54:36 +09:00