1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-09 03:37:33 +08:00
Commit Graph

34059 Commits

Author SHA1 Message Date
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
Dean Herbert
690e69bcc6 Reforamt for legibility 2020-11-09 12:22:54 +09:00
Dean Herbert
dc69eefa51 Use HashSet instead of ConcurentBag 2020-11-09 11:54:28 +09:00
Dean Herbert
90ce1bd5f0 Add missing async suffix 2020-11-09 10:40:16 +09:00
Lucas A
e4fb9b4dd3 Display room name on discord rich presence. 2020-11-08 18:42:24 +01:00
Lucas A
e44951969f Use ??= operator instead of null check. 2020-11-08 18:22:19 +01:00
Lucas A
d8d4022119 Precise XMLDoc 2020-11-08 14:39:56 +01:00
Lucas A
f1942fdb9c Fix tests not building. 2020-11-08 14:38:59 +01:00
Lucas A
48fce8c4b9 Add user activities to multi subscreens. 2020-11-08 13:21:21 +01:00
Lucas A
89b98b5388 Make multiplayer screen handle user activity updates from subscreens. 2020-11-08 13:16:27 +01:00
Lucas A
55070556a7 Move activity setup to BDL. 2020-11-08 12:53:19 +01:00
Lucas A
790a2ca97d Extract UserActivity logic to OsuGame. 2020-11-08 12:29:52 +01:00
Dean Herbert
42e4df8cc8
Merge branch 'master' into efficient-user-retrieval 2020-11-08 14:35:40 +09:00
Dean Herbert
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
Dean Herbert
58dbfce75b
Merge pull request #10735 from bdach/fix-online-difficulty-retrieval
Fix difficulty retrieval for online-sourced beatmaps
2020-11-08 11:18:59 +09:00
Bartłomiej Dach
6d4bb4316c Fix difficulty retrieval for online-sourced beatmaps 2020-11-08 00:12:25 +01:00
Bartłomiej Dach
ddbd6df24d Unbind bindable lists for general safety 2020-11-07 20:59:57 +01:00
Bartłomiej Dach
e078b78dcc Ensure callbacks don't fire when restoring default beatmap 2020-11-07 20:59:57 +01:00
Dean Herbert
b0052210b6 Add asserts of HitObjects indices 2020-11-08 00:18:38 +09:00