1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-12 01:47:24 +08:00
Commit Graph

39320 Commits

Author SHA1 Message Date
Dean Herbert
b939318922 Merge branch 'skin-serialisation' into skin-editor-default-placement-location 2021-05-13 19:09:34 +09:00
Dean Herbert
e5f765d1a8 Fix broken exception message 2021-05-13 19:06:58 +09:00
smoogipoo
2f025f1967 SkinnableTargetWrapper -> SkinnableTargetComponentsContainer 2021-05-13 18:54:30 +09:00
Dean Herbert
01bc71acd2
Improve ability to parse xmldoc of SkinnableTargetWrapper
Co-authored-by: Dan Balasescu <smoogipoo@smgi.me>
2021-05-13 18:40:28 +09:00
Dean Herbert
ebce3fd3c7 Use ScheduleAfterChildren to better match comment 2021-05-13 17:29:11 +09:00
Dean Herbert
3ea469813c Use interface in place of SkinnableTargetContainer 2021-05-13 17:25:51 +09:00
Dean Herbert
0959e7156a Remove outdated TODO 2021-05-13 17:22:05 +09:00
Dean Herbert
106fa97a11 Rename SkinnableElementTargetContainer to SkinnableTargetContainer 2021-05-13 17:07:38 +09:00
Dean Herbert
7921dc7ece Rename ISkinnableComponent to ISkinnableDrawable 2021-05-13 17:06:00 +09:00
Dean Herbert
cdcd31b546 Replace ISkinSerialisable with IsEditable property 2021-05-13 17:03:17 +09:00
Dean Herbert
dd6a06a302 Reword xmldoc to read better 2021-05-13 16:43:42 +09:00
Dean Herbert
9dfa48b22e Fix incorrect exception text 2021-05-13 16:42:43 +09:00
Dean Herbert
19223ba013 Remove left-over debug logging 2021-05-13 16:42:13 +09:00
Dean Herbert
5818ed4c8c Remove unused DI resolution 2021-05-13 16:41:36 +09:00
Dean Herbert
e0e9106921 Enable autoplay in skin editor tests 2021-05-13 14:55:11 +09:00
Dean Herbert
db19617b8b Add JsonConstructor attribute to SkinnableTargetWrapper 2021-05-13 13:16:20 +09:00
Dean Herbert
3b862798e9 Standardise naming of methods related to SkinnableInfo 2021-05-13 13:14:49 +09:00
Dean Herbert
581e7940c7 Add xmldoc to SkinnableElementTargetContainer 2021-05-13 13:13:22 +09:00
Dean Herbert
c93ed541f3 Add xmldoc and tidy up logic in Skin 2021-05-13 13:09:33 +09:00
Dean Herbert
992a052426 Remove stray comment 2021-05-13 13:07:06 +09:00
Dean Herbert
469a7f5d2a Reorder fields in SkinEditor 2021-05-13 13:04:17 +09:00
Dean Herbert
2bf8635ffd Move field upwards in class 2021-05-13 13:03:23 +09:00
Dean Herbert
a38cb61b08 Remove duplicated call to base.GetDrawableComponent 2021-05-13 13:02:55 +09:00
Dean Herbert
6caf4e3879 Add xmldoc to SkinnableInfo 2021-05-13 12:57:28 +09:00
Dean Herbert
8b9ac86d4b Merge branch 'master' into skin-serialisation 2021-05-13 12:35:06 +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
Dean Herbert
494a1b01a5 Move SkinnableElementTargetContainer out of HUD namespace 2021-05-12 15:59:33 +09:00
Dean Herbert
29e6f6b6b6 Remove public prefixes from interface type and add Components list for future use 2021-05-12 15:58:21 +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
42e6795251 Place new skin components at the centre of the screen by default 2021-05-12 14:11:40 +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
Dean Herbert
96d4011de2 Use pattern matching to tidy up instance construction 2021-05-12 14:02:24 +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