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

34233 Commits

Author SHA1 Message Date
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
smoogipoo
626231d906 Completely remove check as it can occur for hits too 2020-11-11 12:53:32 +09:00
smoogipoo
1173ef0890 Fix mania notelock crashing with overlapping hitwindows 2020-11-11 12:37:00 +09:00
Dean Herbert
9caa56c64f Display skin changes via on-screen display overlay 2020-11-11 12:19:01 +09:00
Dean Herbert
6674628bc7 Only include user skins in random choices 2020-11-11 12:03:38 +09:00
Dean Herbert
6b548ef5e4 Split out SkinInfo ID constants and fix random logic 2020-11-11 11:54:40 +09:00
Dean Herbert
6593aac3f2
Merge pull request #7762 from EVAST9919/history-graph 2020-11-11 11:35:34 +09:00
Dean Herbert
a5e13e4d2c Merge branch 'master' into shuffle-skin 2020-11-11 11:34:48 +09:00
Dan Balasescu
451f0a29c6
Merge pull request #10784 from peppy/fix-best-performance-weighting
Fix user profile best performance weighting being out of order
2020-11-11 11:21:43 +09:00
Dean Herbert
a82291f31f
Merge pull request #10776 from smoogipoo/fix-possible-nullref
Fix possible nullref with non-attached hitobjects
2020-11-11 11:14:57 +09:00
Dean Herbert
89c4e3d3b2
Merge branch 'master' into history-graph 2020-11-11 11:01:48 +09:00
Dean Herbert
8706b51b77
Merge pull request #10717 from smoogipoo/dho-apply 2020-11-11 10:54:24 +09:00
Dean Herbert
53c968e137 Fix user profile best performance weighting being out of order 2020-11-11 10:19:59 +09:00
Dean Herbert
390f7644d4
Merge pull request #10782 from bdach/bandaid-editor-timing-point-crash
Temporarily fix crash on deleting control point groups
2020-11-11 09:22:40 +09:00
Andrei Zavatski
6c428d8b11 Merge master with conflicts resolved 2020-11-11 01:37:01 +03:00
Bartłomiej Dach
546249b071 Temporarily fix crash on deleting control point groups 2020-11-10 21:32:47 +01:00
smoogipoo
81844878b0 Fix possible nullref with non-attached hitobjects 2020-11-11 00:29:34 +09:00
smoogipoo
b725c9cce9 Fix possible nullrefs 2020-11-11 00:24:28 +09:00
smoogipoo
e525784cb2 Clear lifetimeEntry after use 2020-11-11 00:24:14 +09:00
smoogipoo
99e5450af3 Cache DrawableRuleset 2020-11-11 00:22:36 +09:00
smoogipoo
66213f2ed0 Add pooling support to DrawableRuleset + Playfield 2020-11-10 23:56:32 +09:00
Bartłomiej Dach
be4735cd2b Explicitly set lifetime to ensure empty drawables are cleaned up 2020-11-10 14:57:51 +01:00
smoogipoo
31e4d71852 Rewrite HitObjectContainer with pooling support 2020-11-10 22:49:02 +09:00
smoogipoo
5354ef1699 Merge branch 'dho-apply' into hitobject-pooling-base 2020-11-10 22:30:08 +09:00
Bartłomiej Dach
0387d994bd Do not lookup default kiai explosion if skin has own 2020-11-10 14:18:43 +01:00
Bartłomiej Dach
35763a74fd Add test scene 2020-11-10 14:08:13 +01:00
Bartłomiej Dach
ed01d37966 Reintroduce KiaiHitExplosion as skinnable 2020-11-10 14:08:10 +01:00
smoogipoo
4ea823e4dc Fix test failures 2020-11-10 22:02:33 +09:00
Bartłomiej Dach
8788ef74aa
Merge pull request #10770 from cadon0/fix-storyboard-sprite-paths
Fix crashes if animation sprite path does not match a file
2020-11-10 13:32:19 +01:00
Bartłomiej Dach
f245696947 Move {-> Default}KiaiHitExplosion 2020-11-10 13:24:32 +01:00
Bartłomiej Dach
20f9759a2e
Merge branch 'master' into fix-storyboard-sprite-paths 2020-11-10 12:57:10 +01:00
Bartłomiej Dach
9b3f7e8d5c
Merge pull request #10760 from peppy/fix-profile-graph-crash
Fix crash and edge cases of user profile graph implementation
2020-11-10 12:56:48 +01:00
Dean Herbert
e1dcac4d8b Update framework 2020-11-10 20:29:29 +09:00
Bartłomiej Dach
61093030ee Remove redundant class name qualifier 2020-11-10 12:20:49 +01:00
Bartłomiej Dach
ce837eaba0 Rename variables 2020-11-10 12:20:26 +01:00