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

39881 Commits

Author SHA1 Message Date
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
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
Dean Herbert
c885ad87d5 Update HitErrorDisplay tests 2021-05-18 15:12:29 +09: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
Dean Herbert
c71d53a0f9 Fix text and button layout 2021-05-18 13:40:26 +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
Lucas A
79740dd2d8 Merge conditionnal expression. 2021-05-17 22:01:05 +02:00
Lucas A
8530b31e39 Use bitshifts for enum values instead of literal values. 2021-05-17 21:02:45 +02:00
Bartłomiej Dach
44b8725458
Merge pull request #12839 from smoogipoo/add-overlay-link-colours 2021-05-17 21:01:44 +02:00
Bartłomiej Dach
2bf62b86ea
Merge branch 'master' into add-overlay-link-colours 2021-05-17 20:11:27 +02:00
Lucas A
e2018f81f3 Use equality check for nullable types. 2021-05-17 19:54:21 +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
Lucas A
97952bc3f0 Fix backwards stable install resolution logic. 2021-05-17 18:39:04 +02:00
Lucas A
6110a847aa Simplify import ordering logic by making beatmapImportTask non-nullable. 2021-05-17 16:30:13 +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
Lucas A
5ca4fd5ab4 Block overlays to prevent getting into a bad state. 2021-05-17 13:28:59 +02: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
Lucas A
a38fc1a2e0 Override text header. 2021-05-17 13:04:49 +02:00
Lucas A
db255e6814 Mark StableImportManager as potentially null in tests.
(StableImportManager is added to the DI in OsuGame and not in the OsuGameBase)
2021-05-17 12:55:59 +02:00
Lucas A
ed4c025c7e Fix other tests and move TestPlaySongSelect class declaration. 2021-05-17 12:55:59 +02:00
Lucas A
fe11426238 Disable appearance of the stable import prompt waiting for user interaction in tests, which caused them to fail. 2021-05-17 12:55:59 +02:00
Lucas A
41fafdf643 Remove now unreachable code paths. 2021-05-17 12:55:59 +02:00
Lucas A
bec06cfac7 Reword StableDirectoryLocationDialog header
Co-authored-by: Salman Ahmed <frenzibyte@gmail.com>
2021-05-17 12:55:58 +02:00
Lucas A
f60dbbfbbd Reword import dialogs.
Co-authored-by: Dean Herbert <pe@ppy.sh>
2021-05-17 12:55:58 +02:00
Lucas A
e15e8068d3 Reword StableDirectoryLocationDialog.
Co-authored-by: Dean Herbert <pe@ppy.sh>
2021-05-17 12:55:58 +02:00
Lucas A
dabe8bd4c7 Fix code inspections and remove now unused code. 2021-05-17 12:55:58 +02:00
Lucas A
a7b740fd1d Reword ImportFromStablePopup and display the popup regardless of whether a stable install is detected. 2021-05-17 12:55:58 +02:00
Lucas A
8ba50b1854 Bring back injected dependency incorrectly marked as unused. 2021-05-17 12:55:58 +02:00
Lucas A
481b0a0125 Add StableDirectoryLocationDialog 2021-05-17 12:55:57 +02:00
Lucas A
325a689d65 Order imports depending on beatmap imports if any is running. 2021-05-17 12:55:57 +02:00
Lucas A
851e33fd15 Hook up StableImportManager. 2021-05-17 12:55:57 +02:00
Lucas A
5d5b1e1f0e Add StableImportManager 2021-05-17 12:55:56 +02: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