1
0
mirror of https://github.com/ppy/osu.git synced 2024-09-21 22:07:25 +08:00
Commit Graph

34227 Commits

Author SHA1 Message Date
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
Dan Balasescu
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
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
c8917d1236
Merge pull request #10751 from smoogipoo/fix-bdc-threadsafety 2020-11-10 15:43:21 +09:00
Dean Herbert
b1367acf74
Merge pull request #10722 from nbvdkamp/fix-vscode-build-tasks-for-git-bash 2020-11-10 14:37:00 +09:00
Dean Herbert
6cc0bf17a9 Add explicit lock object and some xmldoc for clarity 2020-11-10 14:31:52 +09:00
Dean Herbert
dc21aebdc7 Merge branch 'master' into fix-bdc-threadsafety 2020-11-10 14:31:51 +09:00
Dean Herbert
85d641c630
Merge pull request #10740 from Game4all/add-multi-statuses 2020-11-10 14:23:26 +09:00
Dean Herbert
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
Dean Herbert
73c2638b3b
Merge pull request #10757 from Joehuu/simplify-input-buttons/keys-in-tests
Simplify input buttons/keys in tests
2020-11-10 14:03:22 +09:00
Dean Herbert
582b5454ed
Merge pull request #10759 from Joehuu/disable-watching-yourself 2020-11-10 13:10:54 +09:00
Dean Herbert
4af390a168 Move hierarchy init to load and remove unnecessary field storage 2020-11-10 12:33:07 +09:00
Dean Herbert
de554f9091
Merge pull request #10742 from Morilli/fix-ki-texture-positioning 2020-11-10 12:27:40 +09:00
Joehu
670d6d8719 Make button field readonly 2020-11-09 18:59:54 -08:00
Joehu
c671d97e6f Disable watch button on the local user 2020-11-09 18:39:35 -08:00
kamp
4303a24a6f Replace rankHistory in JsonProperty with rank_history 2020-11-10 00:53:24 +01:00
Dean Herbert
37feedae7a Fix potential crash due to stale index 2020-11-10 07:27:38 +09:00
Dean Herbert
1548c0dc25 Ensure graph hover state is updated after data changes 2020-11-10 07:27:27 +09:00
Joehu
ef3c918a3c Simplify input buttons/keys in tests 2020-11-09 14:18:20 -08:00
smoogipoo
0bab5605d1 Merge branch 'master' into dho-apply 2020-11-10 01:30:45 +09:00
smoogipoo
d4d3a6621e Disable automatic lifetime management 2020-11-10 01:30:25 +09:00
smoogipoo
66ea1572c7 Fix unsafe list manipulation in BeatmapDifficultyCache 2020-11-10 01:10:00 +09:00
smoogipoo
ac47399e6e Update state after OnApply() 2020-11-10 00:30:23 +09:00
smoogipoo
ec8b726ea8 Re-privatise start time bindable 2020-11-09 21:51:58 +09:00
Lucas A
b8c63e7944 Apply review suggestions. 2020-11-09 13:39:50 +01:00
Dean Herbert
d7c30f9b42
Merge pull request #10746 from peppy/update-framework
Update framework
2020-11-09 21:26:40 +09:00
Dean Herbert
2e3fdf8116 Update reference to TK game window class 2020-11-09 20:50:36 +09:00
Dean Herbert
ba137aadc8 Update framework 2020-11-09 20:44:12 +09:00
Dan Balasescu
b463bdd34f
Merge pull request #10713 from peppy/efficient-user-retrieval
Add user caching / lookup component and consume in the currently playing display
2020-11-09 20:20:17 +09:00
Dean Herbert
4d6f0a8ea7 Fix API request error handling 2020-11-09 19:42:00 +09:00
Dean Herbert
d99e1ba8dd Merge branch 'master' into efficient-user-retrieval 2020-11-09 19:41:44 +09:00
Dan Balasescu
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
Dan Balasescu
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
Morilli
7b0e387dfc apply different offset based on whether the marker is newStyle or not 2020-11-09 08:20:19 +01:00
Morilli
490fbd1dd8 Fix ki* textures having an incorrect vertical position 2020-11-09 05:54:48 +01:00
Dean Herbert
cfb42037cf Refactor request string logic to avoid linq usage 2020-11-09 12:23:29 +09:00