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

39666 Commits

Author SHA1 Message Date
Bartłomiej Dach
e9cab29134 Cache editor beatmap in placement blueprint test scene 2021-05-19 20:48:06 +02:00
Bartłomiej Dach
1d9a4b7bba
Merge branch 'master' into fix-editor-blueprint-wrong-beatmap 2021-05-19 19:30:11 +02:00
Dean Herbert
db6d980623
Merge pull request #12784 from smoogipoo/mania-pooling
Implement pooling for osu!mania
2021-05-19 18:36:03 +09:00
Dean Herbert
6c4709e7b4 Fix PlacementBlueprint using the wrong beatmap when applying defaults
Closes #12855.
2021-05-19 18:34:07 +09:00
Dean Herbert
cc5c702a92 Apply all properties after cast (looks cleaner) 2021-05-19 17:31:47 +09:00
Dean Herbert
bddc3121dc Merge branch 'master' into mania-pooling 2021-05-19 17:23:45 +09:00
Dean Herbert
87833bfb61
Merge pull request #12736 from EVAST9919/news-sidebar-new
Implement NewsSideBar component
2021-05-19 16:29:52 +09:00
Dean Herbert
19a07b0107 IsOpen -> Expanded 2021-05-19 15:49:22 +09:00
Dean Herbert
539e5179fe Tidy up content and bind event code 2021-05-19 15:49:22 +09:00
Dean Herbert
a727043014
Merge pull request #12858 from smoogipoo/fix-headless-test
Fix test not being marked as headless
2021-05-19 14:50:24 +09:00
smoogipoo
e8bc2cac5b Fix test not being marked as headless 2021-05-19 13:36:39 +09:00
Dan Balasescu
6717355fbe
Merge pull request #12627 from ekrctb/always-use-lifetime-entry
Always use lifetime entry to manage hit objects in HitObjectContainer
2021-05-19 13:12:01 +09:00
Andrei Zavatski
d70d37b7f4 Remove convoluted autosize logic in MonthSection 2021-05-18 22:30:36 +03:00
Andrei Zavatski
24af86689f Merge remote-tracking branch 'refs/remotes/ppy/master' into news-sidebar-new 2021-05-18 22:18:52 +03:00
Dean Herbert
9ede358e7e
Merge branch 'master' into mania-pooling 2021-05-18 22:25:54 +09:00
Dean Herbert
41d8bc291c
Merge pull request #12783 from smoogipoo/hoc-event-queue
Add a HitObjectUsageEventBuffer to handle HOC events appropriately
2021-05-18 22:22:53 +09:00
Dean Herbert
70b36cdc0d
Merge pull request #12850 from smoogipoo/fix-score-duplication
Only ignore online score id for database import
2021-05-18 22:18:42 +09:00
Dean Herbert
598ebd7dd7
Merge pull request #12849 from smoogipoo/remove-legacy-playlist-id
Remove legacy playlist item ID handling
2021-05-18 21:42:58 +09:00
smoogipoo
c6160d5304 Only ignore online score id for database import 2021-05-18 21:17:41 +09:00
smoogipoo
5f94b3bdac Remove legacy playlist item ID handling 2021-05-18 21:03:59 +09:00
Dan Balasescu
6b90e602cc
Merge pull request #12847 from peppy/refactor-selection-mutation-logic
Add more correct flip support to skin editor
2021-05-18 20:41:45 +09:00
Dan Balasescu
ef81bdf63f
Merge branch 'master' into always-use-lifetime-entry 2021-05-18 20:10:12 +09:00
ekrctb
ee9fe3c4be Revert "Add failing test showing lifetime not recomputed with pooled objects"
This reverts commit b88e5a31
2021-05-18 19:55:44 +09:00
ekrctb
84a1a86c63 Revert "Use entry to calculate lifetime in ScrollingHOC"
This reverts commit 632bb70e
2021-05-18 19:55:31 +09:00
ekrctb
2c65b8fa93 Revert "Fix uninitialized scrollLength value is used"
This reverts commit 73dfb04d
2021-05-18 19:55:25 +09:00
smoogipoo
d93ac7ac98 Change class xmldoc a bit 2021-05-18 19:15:46 +09:00
smoogipoo
ab6a79f84c Simplify 2021-05-18 19:15:46 +09:00
smoogipoo
97f4f7bbd1 Remove Component inheritance 2021-05-18 18:59:45 +09:00
smoogipoo
633f841a0f Rename to HitObjectUsageEventBuffer 2021-05-18 18:57:02 +09:00
smoogipoo
bfc0205e9b Fix (began, finished) event 2021-05-18 18:49:11 +09:00
smoogipoo
a31a6947bb Add test 2021-05-18 18:49:05 +09:00
Dean Herbert
d661e98fa6 Move common functionality out of OsuSelectionHandler and implement flip support 2021-05-18 18:34:06 +09:00
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
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
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