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

31915 Commits

Author SHA1 Message Date
Dean Herbert
2cd07b2d3c Fix editor crash on saving more than once
I'm fixing this in the simplest way possible as this kind of issue is
specific to EF core, which may cease to exist quite soon. Turns out the
re-retrieval of the beatmap set causes concurrency confusion and wasn't
actually needed in my final iteration of the new beatmap logic.
2020-09-09 12:48:12 +09:00
Dean Herbert
66d3bda962
Merge branch 'master' into collection-database 2020-09-08 23:18:47 +09:00
Dan Balasescu
4dd6594547
Merge pull request #10087 from peppy/fix-toggle-pause-state
Fix pause/play operation sometimes displaying incorrectly on OSD
2020-09-08 22:58:07 +09:00
Dan Balasescu
43d67a89f9
Merge branch 'master' into fix-toggle-pause-state 2020-09-08 22:26:53 +09:00
Dan Balasescu
d09289b1ce
Merge pull request #10063 from frenzibyte/fix-music-controller-regressed
Move OsuGame-dependent music functionalities outside of MusicController
2020-09-08 22:26:35 +09:00
Dan Balasescu
53496aab33
Merge pull request #10090 from peppy/editor-song-setup
Add basic metadata info editing support to editor
2020-09-08 22:26:20 +09:00
Dan Balasescu
99aa618f27
Merge branch 'master' into fix-music-controller-regressed 2020-09-08 21:54:55 +09:00
Andrei Zavatski
95eeebd93f Fix setting count for recent scores is overcomplicated 2020-09-08 15:31:00 +03:00
Dan Balasescu
69f482f2cf
Merge pull request #10089 from peppy/fix-editor-multiple-screens
Avoid multiple editor screens potentially loading on top of each other
2020-09-08 21:26:10 +09:00
Dean Herbert
c38e7d796a Fix tab key not working 2020-09-08 19:52:56 +09:00
Dean Herbert
b55b6e3746 Bring design somewhat in line with collections dialog 2020-09-08 19:52:56 +09:00
Dean Herbert
c8281b17bd Remove editor screen fade (looks bad) 2020-09-08 19:52:56 +09:00
Dean Herbert
fe31edfa26 Add rudimentary saving logic 2020-09-08 19:52:56 +09:00
Dean Herbert
f43f8cf6b9 Add basic setup for song select screen 2020-09-08 19:52:56 +09:00
Dean Herbert
379fdadbe5 Add test scene for setup screen 2020-09-08 19:52:56 +09:00
Dean Herbert
22c30811eb Merge branch 'master' into editor-new-beatmap 2020-09-08 19:52:56 +09:00
Dean Herbert
a501df954b Avoid multiple editor screens potentially loading on top of each other 2020-09-08 19:52:05 +09:00
Dan Balasescu
30aefd3d7b
Merge pull request #10088 from peppy/dropdown-standardise-corner-radius
Round the corners of dropdowns when expanded
2020-09-08 19:47:00 +09:00
Dan Balasescu
31e69fc628
Merge pull request #10086 from peppy/rename-select-blueprint-method
Rename drag blueprint selection method for discoverability
2020-09-08 19:44:15 +09:00
smoogipoo
8e2f5d4ea8 Fix test failures 2020-09-08 19:41:05 +09:00
smoogipoo
b7ca003928 Remove unnecessary check 2020-09-08 19:14:48 +09:00
Dean Herbert
2b4e2d8ed6 Standardise corner radius of dropdowns 2020-09-08 19:04:46 +09:00
smoogipoo
a5e1e8d043 Rename More... to Manage... 2020-09-08 18:57:18 +09:00
smoogipoo
ae022d7559 Show all items in dropdown, set global max height 2020-09-08 18:55:53 +09:00
smoogipoo
4962213cc4 Rename manage collections filter/text 2020-09-08 18:42:55 +09:00
Dean Herbert
186507a88e Merge branch 'fix-music-controller-regressed' into fix-toggle-pause-state 2020-09-08 18:37:52 +09:00
Dean Herbert
e1053c4b6f Revert exposure changes to GlobalActionContainer 2020-09-08 18:36:11 +09:00
Dan Balasescu
68f3a1ea9a
Merge branch 'master' into collection-database 2020-09-08 18:30:01 +09:00
Dean Herbert
072aab90ab Merge branch 'master' into fix-music-controller-regressed 2020-09-08 18:26:15 +09:00
Dean Herbert
ad5d6117c7 Remove unnecessary RunTask calls 2020-09-08 18:26:13 +09:00
smoogipoo
f581df47c8 Add "New collection..." item to dropdown 2020-09-08 18:25:09 +09:00
Dean Herbert
14bf2ab936 Fix grammar in xmldoc 2020-09-08 18:21:26 +09:00
Dean Herbert
a46be45a71 Fix OSD occasionally display incorrect play/pause state 2020-09-08 18:12:03 +09:00
Dean Herbert
b1110e5e3a Rename class to match derived class 2020-09-08 18:10:14 +09:00
smoogipoo
070704cba7 Asyncify initial load 2020-09-08 17:59:38 +09:00
smoogipoo
06328e0000 Add import/deletion progress notifications 2020-09-08 17:59:27 +09:00
Dean Herbert
c3123bf117 Rename drag blueprint selection method for discoverability 2020-09-08 17:22:59 +09:00
smoogipoo
4737add00b Add close button to dialog 2020-09-08 17:21:29 +09:00
smoogipoo
d2650fc1a0 Add count to deletion dialog 2020-09-08 17:12:58 +09:00
smoogipoo
bee450ae1e Fix tests/add placeholder item tests 2020-09-08 17:05:51 +09:00
smoogipoo
2e40ff25f7 Only pad textbox after collection is created 2020-09-08 17:05:31 +09:00
smoogipoo
38ade433a6 Add some xmldocs 2020-09-08 16:50:51 +09:00
smoogipoo
0bf6bfe5ee Create a new collection via a placeholder item 2020-09-08 16:43:37 +09:00
smoogipoo
1260e30cde Make ShowDragHandle into a bindable 2020-09-08 16:36:36 +09:00
smoogipoo
17e8171827 Don't prompt to remove empty collection 2020-09-08 14:38:25 +09:00
smoogipoo
c2da3d9c84 Fix button input and tests 2020-09-08 14:36:38 +09:00
smoogipoo
8a3c8a6185 Show button when selected or preselected 2020-09-08 14:03:49 +09:00
smoogipoo
32e3f5d091 Adjust button styling 2020-09-08 13:45:26 +09:00
smoogipoo
525026e7f0 Fix tests failing due to timings 2020-09-08 13:23:58 +09:00
Dean Herbert
0e93bbb62d Adjust sizing of delete button 2020-09-08 13:02:58 +09:00