Dan Balasescu
2840fd0f8f
Merge branch 'master' into hitobject-pooling-base
2020-11-12 23:17:36 +09: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
261ddd2b4a
Fix samples not being disposed
2020-11-12 18:48:25 +09:00
smoogipoo
de31c1ea0c
Fix skinfallback test crashing on repeats
2020-11-12 17:58:39 +09:00
smoogipoo
e44a8b3934
Resort as early as possible
2020-11-12 17:07:20 +09: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
smoogipoo
cf91962865
Fix test failures due to on-the-fly starttime changes
2020-11-12 16:58:40 +09:00
smoogipoo
974390bda7
Make Add() + Remove() virtual
2020-11-12 15:36:02 +09:00
smoogipoo
72a6b75626
Add back removed event
2020-11-12 15:34:51 +09:00
smoogipoo
4e43235955
Fix double bind leading to test failures
2020-11-12 15:33:49 +09:00
smoogipoo
653f5bce67
Reword xmldocs
2020-11-12 15:00:58 +09:00
smoogipoo
16e4e8d032
Fix possible nullref
2020-11-12 14:54:33 +09:00
smoogipoo
1f8d376b85
Replace CreatePool() with non-virtual RegisterPool() overload
2020-11-12 14:17:33 +09:00
smoogipoo
5dbbe11fc6
Remove PoolHitObjects, use return value of CreateDrawableRepresentation() instead
2020-11-12 14:04:16 +09:00
smoogipoo
f652eb9982
Remove GetDrawableRepresentation() override, add null hinting
2020-11-12 13:18:44 +09:00
smoogipoo
d7d77460fb
Small refactorings
2020-11-12 12:55:42 +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
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
a8929b0764
Revert unnecessary change of casting
2020-11-11 19:27:07 +09:00
smoogipoo
7fdaf69903
Add some more xmldocs
2020-11-11 19:12:12 +09:00
smoogipoo
606cfacedf
Fix state update exception in a better way
2020-11-11 19:01:12 +09:00
smoogipoo
7d02018134
Remove some unnecessary implementations for now
2020-11-11 18:54:40 +09:00
smoogipoo
d7bee80d4e
Merge branch 'fix-incorrect-framestability-value' into hitobject-pooling-base
2020-11-11 18:52:51 +09:00
smoogipoo
90499329bd
Fix frame stable playback not being set correctly
2020-11-11 18:50:38 +09:00
smoogipoo
3401b099d4
Add some tests
2020-11-11 18:50:08 +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
smoogipoo
6f7a1dd57d
Merge branch 'master' into hitobject-pooling-base
2020-11-11 17:09:18 +09: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
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
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
