1
0
mirror of https://github.com/ppy/osu.git synced 2024-12-15 04:53:21 +08:00
Commit Graph

39872 Commits

Author SHA1 Message Date
Dean Herbert
a8acbbe69c
Merge pull request #12779 from Game4all/import-from-stable-select-location
Add ability to manually locate a stable location when importing from stable
2021-05-21 18:17:30 +09:00
Dean Herbert
abc00b3b01
Merge pull request #12885 from smoogipoo/fix-spectator-playing-state-5
Fix crash when re-spectating a multiplayer room
2021-05-21 18:02:45 +09:00
Dean Herbert
b0a113a36b Merge branch 'master' into localisation-proof-of-concept 2021-05-21 17:57:54 +09:00
Dean Herbert
abc96057b2 Remove relative height specification and use constant height 2021-05-21 17:55:46 +09:00
Dean Herbert
41c4afb3d5 Restore path specification to "." for consistency 2021-05-21 17:46:27 +09:00
Dean Herbert
2958b9adf4 Merge branch 'master' into import-from-stable-select-location 2021-05-21 17:37:34 +09:00
Dean Herbert
1ca563e831 Merge branch 'master' into applause-stops-on-score-switch 2021-05-21 17:28:28 +09:00
Dean Herbert
8085a54205 Add test coverage of different grade types to TestSceneResultsScreen 2021-05-21 17:28:25 +09:00
Dean Herbert
0c504c3b7d Update framework 2021-05-21 17:24:22 +09:00
Dean Herbert
20f890cfd0
Merge branch 'master' into fix-spectator-playing-state-5 2021-05-21 16:49:22 +09:00
Dean Herbert
6471ce902d Run RecreatePieces using AddOnce to avoid multiple unnecessary calls 2021-05-21 16:45:28 +09:00
Dean Herbert
0bcd0cda6b Fix taiko drawable hit content not correctly being removed on regeneration 2021-05-21 16:41:40 +09:00
Dean Herbert
1c560a9490
Merge pull request #12869 from EVAST9919/sidebar
Add sidebar to news overlay
2021-05-21 16:21:18 +09:00
Dean Herbert
7bc8a4bb5f Apply same logic changes to IsStrong status 2021-05-21 16:15:27 +09:00
Dean Herbert
a5ca736e37 Fix RecreatePieces being called more than once 2021-05-21 16:10:48 +09:00
smoogipoo
7c59fb37f1 Move check into callback 2021-05-21 16:00:58 +09:00
smoogipoo
36aa186c6e Merge branch 'thread-safe-spectator-client' 2021-05-21 16:00:24 +09:00
smoogipoo
7f712a4d04 Fix EndPlaying potentially doing cross-thread mutation 2021-05-21 15:57:39 +09:00
smoogipoo
2fdf8aa1aa Add update thread assertions 2021-05-21 15:57:31 +09:00
Dean Herbert
fbe4d7e03c Improve code quality around cursor and upwards passing of response data 2021-05-21 15:41:31 +09:00
Dean Herbert
0d575f5728 Remove incorrect (and unintended) modulus logic 2021-05-21 15:06:53 +09:00
Dean Herbert
f9d51656b6 Fix scaling of rotated items not behaving in an understandable way 2021-05-21 15:02:36 +09:00
Dean Herbert
a37520d5ba
Merge pull request #12892 from smoogipoo/force-end-playing
Forcefully trigger EndPlaying() to fix test failures
2021-05-21 14:50:42 +09:00
Dean Herbert
40c8378d81 Fix type-to-sample mapping being applied too late 2021-05-21 14:37:22 +09:00
Dean Herbert
c00e6e29a6 Remove static usage 2021-05-21 14:21:56 +09:00
smoogipoo
895eb14c5a Forcefully end playing to fix test failures 2021-05-21 14:09:30 +09:00
Dean Herbert
7ad6a1d5ff
Merge branch 'master' into thread-safe-spectator-client 2021-05-21 11:47:58 +09:00
Bartłomiej Dach
07221c55b2
Merge pull request #12890 from gagahpangeran/breadcrumb-item-colour 2021-05-20 21:31:05 +02:00
Bartłomiej Dach
f35a07fee7 Rename method for better comprehension 2021-05-20 20:47:50 +02:00
Bartłomiej Dach
b521405ec8 Trim redundant string interpolation 2021-05-20 20:46:18 +02:00
Gagah Pangeran Rosfatiputra
236124496d
add missing accent colour in control tab item 2021-05-21 01:21:32 +07:00
Gagah Pangeran Rosfatiputra
092d0f9b76
add breadcrumb header test scene 2021-05-21 01:21:31 +07:00
Andrei Zavatski
40ca94cd7b Fix incorrect year being passed on first load 2021-05-20 16:04:51 +03:00
Andrei Zavatski
c48b5eebdd Don't reload the context when clicking selected year button 2021-05-20 15:45:39 +03:00
Andrei Zavatski
bd80cf656a Merge remote-tracking branch 'refs/remotes/ppy/master' into sidebar 2021-05-20 15:41:08 +03:00
Dan Balasescu
7845d07dd5
Merge pull request #12886 from peppy/fix-skin-editor-context-menu-sticking
Fix skin editor context menus not dismissing when clicking away
2021-05-20 21:03:35 +09:00
Dan Balasescu
527847596e
Merge pull request #12884 from peppy/ternary-menu-item-refactor
Create base implementations of the two most common `TernaryStateMenuItem`s
2021-05-20 21:02:15 +09:00
Dean Herbert
0f4b502fdf Add missing xmldoc 2021-05-20 20:09:22 +09:00
Dean Herbert
09b1d58f82
Merge branch 'master' into thread-safe-spectator-client 2021-05-20 19:54:11 +09:00
Dean Herbert
46f5498935
Merge pull request #12881 from smoogipoo/restructure-spectator-client
Restructure and rename spectator client classes
2021-05-20 19:53:57 +09:00
Dean Herbert
1848bd902d Fix skin editor context menus not dismissing when clicking away 2021-05-20 19:51:07 +09:00
smoogipoo
e3284b976d Merge branch 'thread-safe-spectator-client' into fix-spectator-playing-state-5 2021-05-20 19:46:26 +09:00
smoogipoo
06c99e8c7c Fix race due to StopWatchingUser() being called asynchronously 2021-05-20 19:45:31 +09:00
smoogipoo
5a8b8782d3 Fix WatchUser being called asynchronously in BDL 2021-05-20 19:44:43 +09:00
smoogipoo
ee4bca9ed1 Handle collection changed event 2021-05-20 19:37:43 +09:00
Dean Herbert
df5970fab4 Create base implementations of the two most common TernaryStateMenuItems 2021-05-20 19:34:53 +09:00
smoogipoo
7ee81669f7 Remove bind helpers from SpectatorClient 2021-05-20 19:27:43 +09:00
smoogipoo
b515fe3cb1 Fix playing user state not removed on stop watching 2021-05-20 19:20:09 +09:00
smoogipoo
89b4f69588 Expose playing user states as bindable dictionary 2021-05-20 19:19:39 +09:00
smoogipoo
2896da499d Merge branch 'restructure-spectator-client' into thread-safe-spectator-client 2021-05-20 18:53:54 +09:00