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

39699 Commits

Author SHA1 Message Date
Dean Herbert
c80e736712 Change SkinBlueprint to use the origin point as the selection point
Not sure how this feels, but it makes using the same point throughout
the editor possible, which I think is the correct way forward for now.
2021-05-18 18:33:06 +09:00
smoogipoo
61a41d97a4 Add some xmldocs + comments 2021-05-18 17:39:45 +09:00
Dean Herbert
ed957df162 Add simple xmldoc to TransferBlueprintFor method 2021-05-18 16:40:56 +09:00
Dean Herbert
55cc533a37
Merge branch 'master' into hoc-event-queue 2021-05-18 16:31:20 +09:00
Dean Herbert
a96603f025
Merge pull request #12782 from smoogipoo/rework-hitobject-blueprints
Rename hitobject blueprints and tie them to HitObjects
2021-05-18 16:30:58 +09:00
Salman Ahmed
4e12a2734c Remove ignore attribute from now fixed test scene 2021-05-18 09:51:58 +03:00
Dean Herbert
10c730b37d Add new default locations for hit bar error displays 2021-05-18 15:50:50 +09:00
Dean Herbert
5acb708939 Remove customisation of hit error via standard settings 2021-05-18 15:50:50 +09:00
Salman Ahmed
380d004683 Merge branch 'fix-legacy-skin-test' into catch-hide-combo-workaround 2021-05-18 09:45:43 +03:00
Salman Ahmed
265a89e5cc Fix LegacySkinPlayerTestScene overriden by default beatmap skin 2021-05-18 09:45:32 +03:00
Dean Herbert
c885ad87d5 Update HitErrorDisplay tests 2021-05-18 15:12:29 +09:00
Salman Ahmed
ff419af512 Hide the combo counter content rather than full death 2021-05-18 09:10:15 +03:00
Dean Herbert
829d326e36 Remove alignment logic completely for the time being
This was overly complex and does not play well with the new layout
customisation system. We can add it back as required.
2021-05-18 14:55:34 +09:00
smoogipoo
562ac73e96 Merge branch 'hoc-event-queue' into mania-pooling 2021-05-18 14:54:00 +09:00
smoogipoo
75c0d4d972 Merge branch 'rework-hitobject-blueprints' into hoc-event-queue 2021-05-18 14:33:52 +09:00
smoogipoo
882d54a8f8 Remove now unnecessary Apply() method 2021-05-18 14:26:26 +09:00
smoogipoo
72beddaadc Remove nested blueprints from hold notes 2021-05-18 14:25:07 +09:00
smoogipoo
532c41c82e Remove nested blueprints from sliders 2021-05-18 14:19:11 +09:00
smoogipoo
e621cfc4ea Add Apply() method for applying new DHOs 2021-05-18 14:14:10 +09:00
smoogipoo
f1f3606fd0 Fix unresolved xmldocs 2021-05-18 13:11:58 +09:00
Dean Herbert
06389c08dc Add basic test to show data how one would expect it to be displayed 2021-05-18 13:11:22 +09:00
Dan Balasescu
9d423245d8
Fix up xmldocs
Co-authored-by: Bartłomiej Dach <dach.bartlomiej@gmail.com>
2021-05-18 13:02:23 +09:00
Bartłomiej Dach
44b8725458
Merge pull request #12839 from smoogipoo/add-overlay-link-colours 2021-05-17 21:01:44 +02:00
Salman Ahmed
f667ea3fd0 Replace AllowDefaultHUDComponentsFallback with a temporary override at LegacyBeatmapSkin 2021-05-17 21:34:53 +03:00
Bartłomiej Dach
2bf62b86ea
Merge branch 'master' into add-overlay-link-colours 2021-05-17 20:11:27 +02:00
Bartłomiej Dach
400984457c Fix weird behaviour in test scene
Due to a callback set up in another place, clicking away from the 2022
year after launching the test scene would remove the 2022 button
(because the callback was returning metadata without it). For simplicity
just trim the 2022 year to make sure both test scenes use the same
consistent set of years.
2021-05-17 19:16:30 +02:00
Bartłomiej Dach
d614a47614 Rename variable to better explain purpose 2021-05-17 18:54:17 +02:00
Bartłomiej Dach
7befcf74ff Split value change callbacks out to separate methods 2021-05-17 18:53:09 +02:00
Dean Herbert
ff6ec45a70
Merge pull request #12840 from smoogipoo/fix-hitpoint-brightness
Fix accuracy heatmap points changing colour
2021-05-17 22:13:39 +09:00
Dan Balasescu
ea4dfd3374
Merge pull request #12842 from peppy/song-progress-skinnable
Add layout customisation support for `SongProgress`
2021-05-17 20:15:01 +09:00
Dean Herbert
7137315fa7 Remove HitErrorDisplay container and hook up data 2021-05-17 19:46:50 +09:00
Dean Herbert
42d2711dc6 Use ShouldBeConsideredForInput instead of ReceivePositionalInputAtSubTree 2021-05-17 19:29:59 +09:00
Dean Herbert
83b4515d5c
Merge pull request #12841 from smoogipoo/skin-editor-exclude-interfaces
Exclude interfaces from skinnable types
2021-05-17 19:11:58 +09:00
Dean Herbert
60f3e628bc Fix song progress being interactable inside toolbox button 2021-05-17 19:05:22 +09:00
Dean Herbert
ecf70c1707 Remove unnecessary container 2021-05-17 18:55:18 +09:00
Dean Herbert
b80768b44a Hook up seeking flow 2021-05-17 18:52:56 +09:00
Dean Herbert
0c433cda86 Update HUDOverlay logic to add automatic layout for bottom-aligned components 2021-05-17 18:52:56 +09:00
Dean Herbert
da0913ca2d Make SongProgress a skinnable component 2021-05-17 18:52:56 +09:00
Dan Balasescu
4151f18f74
Merge pull request #12804 from peppy/fix-autoplay-load-fail-nullref
Fix a potential nullref when starting `Player` with autoplay disabled and beatmap fails to load
2021-05-17 18:40:05 +09:00
Dean Herbert
1f3ae901ce Expose DrawableRuleset for consupmtion by HUD components 2021-05-17 18:23:01 +09:00
smoogipoo
0d7a349500 Exclude interfaces from skinnable types 2021-05-17 18:16:09 +09:00
smoogipoo
0989aa3364 Fix accuracy heatmap points changing colour 2021-05-17 18:07:50 +09:00
Andrei Zavatski
555e3e2db3
Delete NewsSideBar.cs 2021-05-17 12:02:33 +03:00
Andrei Zavatski
fc6e65b7db
Delete TestSceneNewsSideBar.cs 2021-05-17 12:02:06 +03:00
Andrei Zavatski
01090de1fd Fix filenames does not match contained type 2021-05-17 11:55:55 +03:00
Salman Ahmed
df248ea41b Improve code readability 2021-05-17 11:41:53 +03:00
Andrei Zavatski
586c5c7365 Emulate year changes in the test scene 2021-05-17 11:36:53 +03:00
Andrei Zavatski
ab16c32bb1 Merge remote-tracking branch 'refs/remotes/ppy/master' into news-sidebar-new 2021-05-17 11:36:41 +03:00
Dean Herbert
7921930a92
Merge pull request #12781 from Game4all/directory-select-screen
Implement a directory selection screen
2021-05-17 17:23:00 +09:00
Dan Balasescu
d75ef160e8
Merge branch 'master' into directory-select-screen 2021-05-17 17:22:03 +09:00