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

31827 Commits

Author SHA1 Message Date
smoogipoo
43525614ad Store raw BeatmapCollection in filter control 2020-09-09 23:10:21 +09:00
Dean Herbert
af412947b2
Merge branch 'master' into collection-database 2020-09-09 22:59:46 +09:00
Dean Herbert
aa2be09d4b
Merge pull request #10104 from smoogipoo/leaderboard-loading-spinner-fix
Fix leaderboard loading spinner disappearing too early
2020-09-09 22:49:27 +09:00
Dan Balasescu
989d44412e
Merge pull request #10097 from peppy/fix-overlay-sound-on-disabled
Fix overlay sound effects playing when open requested while disabled
2020-09-09 22:46:55 +09:00
Dan Balasescu
6f6adb61d7
Merge pull request #10099 from peppy/add-editor-tool-icons
Add icons for editor toolbox tools
2020-09-09 22:22:58 +09:00
Dan Balasescu
fbbc3b4921
Merge branch 'master' into fix-overlay-sound-on-disabled 2020-09-09 21:54:00 +09:00
Dan Balasescu
68dbd6e421
Merge pull request #10101 from peppy/editor-toggles
Add distance snap toggle (and support for future arbitrary composer toggles)
2020-09-09 21:50:50 +09:00
Dean Herbert
2019b3bd14
Merge pull request #10105 from smoogipoo/rollingcounter-currentvalue
Fix broken RollingCounter current value implementation
2020-09-09 21:35:01 +09:00
Dean Herbert
caa10a474d
Merge branch 'master' into leaderboard-loading-spinner-fix 2020-09-09 21:22:17 +09:00
Dan Balasescu
511e542384
Merge branch 'master' into editor-toggles 2020-09-09 21:22:03 +09:00
Dan Balasescu
53a9804455
Merge branch 'master' into add-editor-tool-icons 2020-09-09 21:21:56 +09:00
Dean Herbert
5b93752065
Merge pull request #10103 from smoogipoo/disable-online-lookups-tests
Disable online beatmap lookups in tests
2020-09-09 21:21:04 +09:00
smoogipoo
12188ec3c9 Fix broken RollingCounter current value 2020-09-09 20:51:56 +09:00
smoogipoo
bbef7ff720 Fix leaderboard loading spinner disappearing too early 2020-09-09 20:19:07 +09:00
smoogipoo
aeae009512 Disable online beatmap lookups in tests 2020-09-09 20:12:40 +09:00
Dan Balasescu
e81de1ddbd
Merge pull request #10100 from peppy/settings-group-title-fix
Move title specification for settings groups to constructor
2020-09-09 19:24:18 +09:00
Dean Herbert
d210e05629 Add a touch of spacing between toolbox groups 2020-09-09 19:20:11 +09:00
Dean Herbert
fb2aced3ac Add toggle for distance snap 2020-09-09 19:15:35 +09:00
Dean Herbert
d3957e6155 Move title specification for settings groups to constructor
Using an abstract property was awkward for this as it is being consumed
in the underlying constructor but could not be dynamically set in time from a
derived class.
2020-09-09 18:50:31 +09:00
Dean Herbert
a65f564e45 Add icons for other ruleset editors 2020-09-09 18:40:01 +09:00
Dean Herbert
c9f5005efd Add icons for editor toolbox tools 2020-09-09 18:40:01 +09:00
Dean Herbert
cdf3e20685 Add comment regarding feedback 2020-09-09 18:07:58 +09:00
Dean Herbert
b1daca6cd3 Fix overlay sound effects playing when open requested while disabled 2020-09-09 18:05:44 +09:00
smoogipoo
1a023d2c88 Fix a few more tests 2020-09-09 16:33:48 +09:00
smoogipoo
b1b99e4d6f Fix tests 2020-09-09 16:04:44 +09:00
smoogipoo
2d7e85f622 Remove async load (now using loadComponentSingleFile) 2020-09-09 15:40:45 +09:00
smoogipoo
0360f7d845 Move CollectionManager to OsuGame 2020-09-09 15:39:15 +09:00
smoogipoo
4ddf5f054b Rename BeatmapCollectionManager -> CollectionManager 2020-09-09 15:31:08 +09:00
Dean Herbert
b79e9791c3
Merge pull request #10093 from peppy/fix-crash-on-multiple-saves
Fix editor crash on saving more than once
2020-09-09 15:28:40 +09:00
Dean Herbert
5d9ce0df98 Add remark about temporary nature of database format 2020-09-09 14:44:04 +09:00
Dean Herbert
8cd0bbe469 Make BeatmapCollectionManager a component 2020-09-09 14:31:23 +09:00
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
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