1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-08 02:59:48 +08:00
Commit Graph

39252 Commits

Author SHA1 Message Date
Dean Herbert
23e284b8b3 Change default skin editor shortcut to Ctrl+Shift+S
Avoids a conflict with song select's random rewind functionality. As
mentioned in #12776.
2021-05-13 13:34:04 +09:00
Dean Herbert
8bf05e142b
Merge pull request #12754 from peppy/skin-instantiation-info
Add `SkinInfo.InstantiationInfo` to allow creating different skin types
2021-05-13 12:34:14 +09:00
Dean Herbert
fb13ed52f7
Merge pull request #12777 from smoogipoo/fix-test-failure
Fix possible multiplayer test failure
2021-05-13 12:33:59 +09:00
smoogipoo
5b03092968 Fix possible test failure 2021-05-13 11:53:50 +09:00
Bartłomiej Dach
27ca7d0f4f Actually annotate the correct ctor 2021-05-12 23:53:39 +02:00
Bartłomiej Dach
a6aec6e007 Fix missed InstantiationInfo setter usages 2021-05-12 23:34:25 +02:00
Bartłomiej Dach
d31fa20e92 Merge branch 'master' into skin-instantiation-info 2021-05-12 23:23:57 +02:00
Bartłomiej Dach
1b579dd838 Extract invariant instantiation info extension method 2021-05-12 23:23:51 +02:00
Bartłomiej Dach
4464204e33 Mark all skin ctors used via reflection in SkinInfo.CreateInstance() 2021-05-12 23:23:42 +02:00
Dan Balasescu
4e7c079560
Merge pull request #12753 from peppy/health-bar-hud-overlay-dependency
Remove downwards dependency from `HUDOverlay` to `HealthDisplay`
2021-05-12 19:27:02 +09:00
Dean Herbert
c6f0a6aed3
Merge pull request #12538 from smoogipoo/multiplayer-spectator-screen
Implement the multiplayer spectator screen
2021-05-12 17:24:35 +09:00
smoogipoo
e1dacde314 Add combo to test streaming client 2021-05-12 14:22:15 +09:00
smoogipoo
273cd18b8a Use test streaming client in gameplay leaderboard test 2021-05-12 14:19:36 +09:00
Dean Herbert
87dfd9672d
Merge pull request #12748 from smoogipoo/fix-mania-sample-crash
Fix mania crashing on playing samples after skin change
2021-05-12 14:10:08 +09:00
Dean Herbert
90affa62cc
Merge pull request #12761 from smoogipoo/mania-hp-lenience
Increase mania HP lenience
2021-05-12 14:09:09 +09:00
smoogipoo
05c21fb5b3 Increase mania HP lenience 2021-05-12 13:27:30 +09:00
smoogipoo
672108edcf Use container instead of array for field 2021-05-12 13:27:12 +09:00
smoogipoo
f4c96b2675 Only update playing user states when users are watched 2021-05-12 13:10:59 +09:00
smoogipoo
e0e8f5ab80 Fix ordering + threading issues 2021-05-12 13:06:28 +09:00
smoogipoo
ad11818868 Remove watched users on stop watching 2021-05-12 13:05:02 +09:00
smoogipoo
21fc0ba43b Combine test spectator streaming client implementations 2021-05-12 13:05:02 +09:00
Dean Herbert
3428056113 Remove unnecessary usage of ChildrenEnumerable for array assignment 2021-05-12 13:00:02 +09:00
Dean Herbert
bf44c09a91 Add name identifying container and rename index variable 2021-05-12 12:59:46 +09:00
Dean Herbert
7f015ee1d0 Merge branch 'master' into fix-mania-sample-crash 2021-05-12 12:56:53 +09:00
Dean Herbert
184dbaf202 Improve safety of bindings in HealthDisplay 2021-05-12 12:53:30 +09:00
smoogipoo
9b09361cc9 Add testable spectator streaming client 2021-05-12 12:16:41 +09:00
Bartłomiej Dach
d706073e01 Trim empty remarks xmldoc tag 2021-05-11 23:08:50 +02:00
Bartłomiej Dach
f13ef09f1f
Merge pull request #12752 from peppy/health-display-composite 2021-05-11 22:18:25 +02:00
Dean Herbert
77e422409c Add SkinInfo.InstantiationInfo to allow creating different skin types 2021-05-11 23:37:06 +09:00
Dean Herbert
8e226319e2 Remove downwards dependency from HUDOverlay to HealthDisplay 2021-05-11 23:18:23 +09:00
Dean Herbert
048677846b Change HealthDisplay to be a CompositeDrawable 2021-05-11 23:10:30 +09:00
smoogipoo
f5bc389998 Fix flaky tests 2021-05-11 19:31:32 +09:00
smoogipoo
bc4213eea1 Add test for changing back to idle on deletion 2021-05-11 19:26:58 +09:00
smoogipoo
9ad1e5067e Fix spectate being entered while not having the beatmap 2021-05-11 19:22:09 +09:00
smoogipoo
7fe8737d94 Add failing tests 2021-05-11 19:21:44 +09:00
smoogipoo
811282a975 Add failing test 2021-05-11 19:01:41 +09:00
Dan Balasescu
4be15cfc5a
Merge pull request #12636 from peppy/skin-components-list
Add initial implementation of skin editor component list
2021-05-11 18:03:28 +09:00
smoogipoo
10a4a5decb Merge branch 'master' into multiplayer-spectator-screen 2021-05-11 17:33:09 +09:00
Dan Balasescu
7d9cdd3bc2
Merge branch 'master' into skin-components-list 2021-05-11 17:27:48 +09:00
smoogipoo
713c169332 Fix mania crashing on playing samples after skin change 2021-05-11 16:21:21 +09:00
Dan Balasescu
a8be7499e9
Merge pull request #12744 from Joehuu/global-actions-idle-tracker
Fix idle tracker not accounting global actions
2021-05-11 15:17:12 +09:00
Joseph Madamba
4bee8c23f0 Fix idle tracker not accounting global actions 2021-05-10 21:40:29 -07:00
Dean Herbert
9c970a9eaf
Merge pull request #12743 from smoogipoo/fix-submission-failure-autoplay
Fix autoplay scores being submitted
2021-05-11 12:16:58 +09:00
smoogipoo
0f00ee8640 Change failure text
Although this is not visible anywhere.
2021-05-11 11:35:08 +09:00
smoogipoo
8c9390dc75 Remove replay condition 2021-05-11 11:33:21 +09:00
smoogipoo
6db9e26d48 Fix score submission failures with autoplay 2021-05-11 11:28:09 +09:00
smoogipoo
32f7691349 Fix token failure preventing base.LoadAsyncComplete() 2021-05-11 11:24:35 +09:00
Dean Herbert
d4d1706330
Merge pull request #12742 from smoogipoo/rename-test
Rename test to better match tested class
2021-05-11 10:19:52 +09:00
smoogipoo
7c8dd91674 Rename test to better match tested class 2021-05-11 09:29:15 +09:00
Bartłomiej Dach
3a11d9e102
Merge pull request #12738 from gagahpangeran/text-flow-md 2021-05-10 23:36:42 +02:00