1
0
mirror of https://github.com/ppy/osu.git synced 2024-12-14 18:33:20 +08:00
Commit Graph

31743 Commits

Author SHA1 Message Date
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
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
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
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
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
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
Dean Herbert
2b4e2d8ed6 Standardise corner radius of dropdowns 2020-09-08 19:04:46 +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
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
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
Dean Herbert
c3123bf117 Rename drag blueprint selection method for discoverability 2020-09-08 17:22:59 +09:00
Dan Balasescu
1943883b9f
Merge pull request #10084 from peppy/fix-clean-run-test-usability
Avoid requiring sending the calling method for CleanRunHeadlessGameHost
2020-09-08 12:32:39 +09:00
Dean Herbert
5268eee0fb Avoid requiring sending the calling method for CleanRunHeadlessGameHost 2020-09-08 11:31:42 +09:00
Dean Herbert
512b75f01b
Merge pull request #10047 from peppy/editor-new-beatmap
Support creating new empty beatmaps
2020-09-08 10:26:42 +09:00
Dean Herbert
9e559cb9ac
Merge branch 'master' into editor-new-beatmap 2020-09-08 02:58:38 +09:00
Dean Herbert
308412762d
Merge pull request #10080 from Joehuu/lowercase-one-more-toolbar-tooltip
Lowercase one more toolbar tooltip
2020-09-08 02:26:11 +09:00
Joehu
2b62579488 Lowercase one more toolbar tooltip 2020-09-07 10:18:22 -07:00
Dean Herbert
01c0b61b20 Fix incorrect test names 2020-09-08 01:52:31 +09:00
Dan Balasescu
f19d9a29c5
Merge pull request #10077 from peppy/editor-bpm-usability
Improve usability of BPM modifying in timing setup view
2020-09-07 20:02:49 +09:00
Dean Herbert
6b50d44dde Merge branch 'master' into editor-new-beatmap 2020-09-07 18:43:16 +09:00
Dean Herbert
4792b44911 Merge branch 'master' into editor-new-beatmap 2020-09-07 18:42:51 +09:00
Dean Herbert
a1275dd51c
Merge pull request #10064 from smoogipoo/update-dcc-exclusions 2020-09-07 18:32:04 +09:00
Dean Herbert
1468b9589f Increase max sane BPM value 2020-09-07 18:20:47 +09:00
Dean Herbert
98676af7bb Move default declarations for readability 2020-09-07 18:18:50 +09:00
Dean Herbert
86512d6e8d Add BPM entry textbox 2020-09-07 18:18:50 +09:00
Dean Herbert
6091714f15 Limit BPM entry via slider to a sane range 2020-09-07 18:18:50 +09:00
Dean Herbert
a8a0bfb8aa Update framework 2020-09-07 18:01:56 +09:00