8ad84d6640
Merge branch 'master' into osd-custom-bindings-display
2020-11-11 15:12:31 +09:00
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
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
324626e097
Move default config tracking calls out of OnScreenDisplay itself
2020-11-11 13:53:09 +09:00
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
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
9caa56c64f
Display skin changes via on-screen display overlay
2020-11-11 12:19:01 +09:00
6593aac3f2
Merge pull request #7762 from EVAST9919/history-graph
2020-11-11 11:35:34 +09:00
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
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
89c4e3d3b2
Merge branch 'master' into history-graph
2020-11-11 11:01:48 +09:00
8706b51b77
Merge pull request #10717 from smoogipoo/dho-apply
2020-11-11 10:54:24 +09:00
53c968e137
Fix user profile best performance weighting being out of order
2020-11-11 10:19:59 +09:00
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
6c428d8b11
Merge master with conflicts resolved
2020-11-11 01:37:01 +03:00
546249b071
Temporarily fix crash on deleting control point groups
2020-11-10 21:32:47 +01:00
81844878b0
Fix possible nullref with non-attached hitobjects
2020-11-11 00:29:34 +09:00
4ea823e4dc
Fix test failures
2020-11-10 22:02:33 +09:00
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
20f9759a2e
Merge branch 'master' into fix-storyboard-sprite-paths
2020-11-10 12:57:10 +01:00
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
e1dcac4d8b
Update framework
2020-11-10 20:29:29 +09:00
61093030ee
Remove redundant class name qualifier
2020-11-10 12:20:49 +01:00
ce837eaba0
Rename variables
2020-11-10 12:20:26 +01:00
dd873dbd85
Merge branch 'master' into fix-profile-graph-crash
2020-11-10 12:17:12 +01:00
539806e9d6
Rewrite - Add empty drawable whenever sprite not found
2020-11-10 23:52:37 +13:00
6446074976
Fix paths for storyboard animation sprites
2020-11-10 23:52:37 +13:00
88112801eb
Remove result storage from hitobject
2020-11-10 18:56:16 +09:00
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
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
f5076fe3b8
Revert unnecessary change
2020-11-10 18:15:11 +09:00
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
833c0b223e
Clamp index to valid bounds
2020-11-10 18:08:12 +09:00
2e3dc6fc46
Merge branch 'master' into fix-profile-graph-crash
2020-11-10 18:06:51 +09:00
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
601cc477e5
Merge branch 'master' into fix-editor-crash-on-two-mouse-button-click
2020-11-10 17:42:25 +09:00
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
de6fcd1792
Fix BlueprintContainer triggering assert when left and right mouse button are pressed together
2020-11-10 17:16:28 +09:00
3f49077620
Merge pull request #10763 from peppy/fix-offscreen-textbox-direct-overlay
...
Force beatmap listing overlay's textbox back on screen when a key is pressed
2020-11-10 17:16:28 +09:00
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
109abc0e29
Always store standardised score when populating ScoreInfo
2020-11-10 08:41:00 +01:00
5221a34929
Only handle keys which create characters
2020-11-10 16:32:58 +09:00
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
e464e719ef
Merge remote-tracking branch 'refs/remotes/ppy/master' into history-graph
2020-11-10 10:22:57 +03:00
c8917d1236
Merge pull request #10751 from smoogipoo/fix-bdc-threadsafety
2020-11-10 15:43:21 +09:00
b1367acf74
Merge pull request #10722 from nbvdkamp/fix-vscode-build-tasks-for-git-bash
2020-11-10 14:37:00 +09:00
6cc0bf17a9
Add explicit lock object and some xmldoc for clarity
2020-11-10 14:31:52 +09:00
dc21aebdc7
Merge branch 'master' into fix-bdc-threadsafety
2020-11-10 14:31:51 +09:00
85d641c630
Merge pull request #10740 from Game4all/add-multi-statuses
2020-11-10 14:23:26 +09:00
4855e43764
Merge pull request #10758 from nbvdkamp/rank-history-json-property-fix
...
Replace rankHistory in JsonProperty with rank_history for consistency
2020-11-10 14:05:25 +09:00
