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
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
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
582b5454ed
Merge pull request #10759 from Joehuu/disable-watching-yourself
2020-11-10 13:10:54 +09:00
4af390a168
Move hierarchy init to load and remove unnecessary field storage
2020-11-10 12:33:07 +09:00
de554f9091
Merge pull request #10742 from Morilli/fix-ki-texture-positioning
2020-11-10 12:27:40 +09:00
670d6d8719
Make button field readonly
2020-11-09 18:59:54 -08:00
c671d97e6f
Disable watch button on the local user
2020-11-09 18:39:35 -08:00
4303a24a6f
Replace rankHistory in JsonProperty with rank_history
2020-11-10 00:53:24 +01:00
37feedae7a
Fix potential crash due to stale index
2020-11-10 07:27:38 +09:00
1548c0dc25
Ensure graph hover state is updated after data changes
2020-11-10 07:27:27 +09:00
0bab5605d1
Merge branch 'master' into dho-apply
2020-11-10 01:30:45 +09:00
d4d3a6621e
Disable automatic lifetime management
2020-11-10 01:30:25 +09:00
66ea1572c7
Fix unsafe list manipulation in BeatmapDifficultyCache
2020-11-10 01:10:00 +09:00
ac47399e6e
Update state after OnApply()
2020-11-10 00:30:23 +09:00
ec8b726ea8
Re-privatise start time bindable
2020-11-09 21:51:58 +09:00
b8c63e7944
Apply review suggestions.
2020-11-09 13:39:50 +01:00
ba137aadc8
Update framework
2020-11-09 20:44:12 +09:00
4d6f0a8ea7
Fix API request error handling
2020-11-09 19:42:00 +09:00
d99e1ba8dd
Merge branch 'master' into efficient-user-retrieval
2020-11-09 19:41:44 +09:00
33c3b07101
Fix events not being bound correctly
...
Co-authored-by: Bartłomiej Dach <dach.bartlomiej@gmail.com >
2020-11-09 19:06:48 +09:00
a2877fb00a
Merge pull request #10730 from peppy/fix-patcher-no-object-crash
...
Fix legacy patcher crash on no objects present
2020-11-09 18:51:00 +09:00
7b0e387dfc
apply different offset based on whether the marker is newStyle or not
2020-11-09 08:20:19 +01:00
490fbd1dd8
Fix ki* textures having an incorrect vertical position
2020-11-09 05:54:48 +01:00
cfb42037cf
Refactor request string logic to avoid linq usage
2020-11-09 12:23:29 +09:00
690e69bcc6
Reforamt for legibility
2020-11-09 12:22:54 +09:00
dc69eefa51
Use HashSet instead of ConcurentBag
2020-11-09 11:54:28 +09:00
90ce1bd5f0
Add missing async suffix
2020-11-09 10:40:16 +09:00
e44951969f
Use ??= operator instead of null check.
2020-11-08 18:22:19 +01:00
d8d4022119
Precise XMLDoc
2020-11-08 14:39:56 +01:00
48fce8c4b9
Add user activities to multi subscreens.
2020-11-08 13:21:21 +01:00
89b98b5388
Make multiplayer screen handle user activity updates from subscreens.
2020-11-08 13:16:27 +01:00
55070556a7
Move activity setup to BDL.
2020-11-08 12:53:19 +01:00
790a2ca97d
Extract UserActivity logic to OsuGame.
2020-11-08 12:29:52 +01:00
42e4df8cc8
Merge branch 'master' into efficient-user-retrieval
2020-11-08 14:35:40 +09:00
567cf932f1
Merge pull request #10732 from bdach/editor-exit-stack-overflow
...
Fix crash upon exiting the editor without saving from new beatmap
2020-11-08 12:12:24 +09:00
6d4bb4316c
Fix difficulty retrieval for online-sourced beatmaps
2020-11-08 00:12:25 +01:00
ddbd6df24d
Unbind bindable lists for general safety
2020-11-07 20:59:57 +01:00
e078b78dcc
Ensure callbacks don't fire when restoring default beatmap
2020-11-07 20:59:57 +01:00
b0052210b6
Add asserts of HitObjects indices
2020-11-08 00:18:38 +09:00
c5b6908e71
Always write [HitObjects] to file
...
I think this is expected. If not, there's an alternative solution.
2020-11-08 00:18:27 +09:00
