Bartłomiej Dach
2b2f0321fd
Merge branch 'master' into fix-osu-hd-mod
2020-11-11 09:45:45 +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
smoogipoo
5d55af5818
Fix hitobjects sometimes not fading in completely with HD mod
2020-11-11 16:35:48 +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
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
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
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
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
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
Bartłomiej Dach
20f9759a2e
Merge branch 'master' into fix-storyboard-sprite-paths
2020-11-10 12:57:10 +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
Bartłomiej Dach
dd873dbd85
Merge branch 'master' into fix-profile-graph-crash
2020-11-10 12:17:12 +01:00
cadon0
539806e9d6
Rewrite - Add empty drawable whenever sprite not found
2020-11-10 23:52:37 +13:00
cadon0
6446074976
Fix paths for storyboard animation sprites
2020-11-10 23:52:37 +13:00
smoogipoo
88112801eb
Remove result storage from hitobject
2020-11-10 18:56:16 +09:00
Dan Balasescu
ef1036cef1
Merge pull request #10767 from peppy/fix-editor-crash-on-two-mouse-button-click
...
Fix BlueprintContainer triggering assert when left and right mouse button are pressed together
2020-11-10 18:41:58 +09:00
Dan Balasescu
d873229120
Merge pull request #10769 from peppy/fix-mod-select-keys-handle-control
...
Stop mod select overlay hotkeys handling input when control is pressed
2020-11-10 18:37:14 +09:00
smoogipoo
f5076fe3b8
Revert unnecessary change
2020-11-10 18:15:11 +09:00
Dan Balasescu
4e3f6f19f4
Merge pull request #10768 from bdach/force-import-standardised
...
Always store standardised score when populating ScoreInfo
2020-11-10 18:12:35 +09:00
Dean Herbert
833c0b223e
Clamp index to valid bounds
2020-11-10 18:08:12 +09:00
Dean Herbert
2e3dc6fc46
Merge branch 'master' into fix-profile-graph-crash
2020-11-10 18:06:51 +09:00
Dean Herbert
28daff1716
Stop mod select overlay hotkeys handling input when control is pressed
...
Closes https://github.com/ppy/osu/issues/10766 in about the best way we
can for now.
2020-11-10 17:57:59 +09:00
Dan Balasescu
601cc477e5
Merge branch 'master' into fix-editor-crash-on-two-mouse-button-click
2020-11-10 17:42:25 +09:00
Dan Balasescu
86026ad98f
Merge pull request #10764 from peppy/fix-editor-quick-delete-via-left-mouse
...
Fix editor quick delete being triggerable from left mouse button
2020-11-10 17:42:12 +09:00
Dean Herbert
de6fcd1792
Fix BlueprintContainer triggering assert when left and right mouse button are pressed together
2020-11-10 17:16:28 +09:00
Dean Herbert
a012105dac
Fix editor quick delete being triggerable from left mouse button
...
Closes https://github.com/ppy/osu/issues/10629 .
2020-11-10 16:54:37 +09:00
Bartłomiej Dach
109abc0e29
Always store standardised score when populating ScoreInfo
2020-11-10 08:41:00 +01:00
Dean Herbert
5221a34929
Only handle keys which create characters
2020-11-10 16:32:58 +09:00
Dean Herbert
a2ef3aa21a
Force beatmap listing overlay's textbox back on screen when a key is pressed
...
Not the cleanest solution, but works for now. Will eventually be
replaced after the header is updated to reflect the latest designs
(which keeps it on screen in all cases).
Closes https://github.com/ppy/osu/issues/10703 .
2020-11-10 16:26:30 +09:00
Andrei Zavatski
e464e719ef
Merge remote-tracking branch 'refs/remotes/ppy/master' into history-graph
2020-11-10 10:22:57 +03:00
Dean Herbert
6cc0bf17a9
Add explicit lock object and some xmldoc for clarity
2020-11-10 14:31:52 +09:00
