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
Dean Herbert
1803ecad80
Add cancel exit button
2020-09-09 20:04:25 +09:00
Dean Herbert
c6e72dabd3
Add test coverage
2020-09-09 20:04:25 +09:00
Dean Herbert
327179a81e
Expose unsaved changes state
2020-09-09 19:42:03 +09:00
Dean Herbert
6f067ff300
Only show confirmation if changes have been made since last save
2020-09-09 19:40:41 +09:00
Dean Herbert
ac0c4fcb8c
Add prompt to save beatmap on exiting editor
2020-09-09 19:31:19 +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
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
5cdc8d2e7b
Add cancellation support
2020-09-09 17:37:11 +09:00
smoogipoo
37a659b2af
Refactor/add xmldocs
2020-09-09 17:36:47 +09:00
smoogipoo
e271408fca
Move max score calculation inside ScoreProcessor
2020-09-09 16:51:53 +09:00
smoogipoo
1a023d2c88
Fix a few more tests
2020-09-09 16:33:48 +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
5d9ce0df98
Add remark about temporary nature of database format
2020-09-09 14:44:04 +09:00
smoogipoo
117c7ec6b2
Merge branch 'master' into score-recalc
2020-09-09 14:38:36 +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
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
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
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
Dean Herbert
0e93bbb62d
Adjust sizing of delete button
2020-09-08 13:02:58 +09:00
Dean Herbert
3e96c6d036
Improve paddings of collection management dialog
2020-09-08 12:51:42 +09:00
Dean Herbert
ab58f60529
Remove elasticity from dialog appearing
2020-09-08 12:47:21 +09:00
Dean Herbert
8b770626fa
Add missing '...' from some popup menu items
2020-09-08 12:18:08 +09:00
Dean Herbert
b15bbc882a
Move items up in menu
2020-09-08 12:04:35 +09:00
Dean Herbert
3e5ea6c42f
Change "Add to" to "Collections"
...
Doesn't make send to be 'add to' when it can also remove
2020-09-08 12:00:00 +09:00
Dean Herbert
5268eee0fb
Avoid requiring sending the calling method for CleanRunHeadlessGameHost
2020-09-08 11:31:42 +09:00
Andrei Zavatski
1bc41bcfd7
Move scores counter logic to a better place
2020-09-08 00:04:14 +03:00
Andrei Zavatski
f88b2509f8
Fix ProfileSection header margin is too small
2020-09-07 23:43:26 +03:00
Andrei Zavatski
c72a192cb5
Fix recent plays counter is always zero
2020-09-07 23:33:04 +03:00
Andrei Zavatski
e39609d3ca
Implement PaginatedContainerWithHeader component
2020-09-07 23:08:50 +03:00
Andrei Zavatski
b7bd084296
Remove missing text where not needed
2020-09-07 22:30:43 +03:00
Andrei Zavatski
1c55039994
Remove old header from PaginatedContainer
2020-09-07 22:24:10 +03:00
Andrei Zavatski
5a7e2e96e0
Merge remote-tracking branch 'refs/remotes/ppy/master' into profile-sections-update
2020-09-07 22:19:26 +03:00
Andrei Zavatski
3a24cc1aa9
Implement PaginatedContainerHeader component
2020-09-07 22:13:29 +03:00
Dean Herbert
9e559cb9ac
Merge branch 'master' into editor-new-beatmap
2020-09-08 02:58:38 +09:00
Joehu
2b62579488
Lowercase one more toolbar tooltip
2020-09-07 10:18:22 -07:00
smoogipoo
ca4423af74
Fix tests
2020-09-08 00:07:12 +09:00
smoogipoo
e37c04cb6d
Change back to solid icon
2020-09-08 00:04:03 +09:00
smoogipoo
a1214512bc
Add filter control tests
2020-09-07 23:57:49 +09:00
smoogipoo
0d5d293279
Add manage collections dialog tests
2020-09-07 22:47:19 +09:00
smoogipoo
ad625ecc7a
Add collection IO tests
2020-09-07 22:10:18 +09:00
smoogipoo
98e9c4dc25
General refactorings
2020-09-07 21:08:48 +09:00
smoogipoo
c1d255a04c
Split filter control into separate class
2020-09-07 20:44:39 +09:00
smoogipoo
120dfd50a6
Fix collection names not updating in dropdown
2020-09-07 20:29:28 +09:00
smoogipoo
b91a376f0a
Split dropdown into separate file
2020-09-07 20:06:38 +09:00
smoogipoo
6cc4517600
Merge branch 'master' into collection-database
2020-09-07 20:03:11 +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
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
Dean Herbert
4680728b9c
Merge branch 'master' into update-dcc-exclusions
2020-09-07 18:01:44 +09:00
Dan Balasescu
4c40d8f503
Merge pull request #9766 from Game4all/gameplay-disable-overlays
...
Disable activation of overlays while in gameplay
2020-09-07 16:06:45 +09:00
Dan Balasescu
fd2abc5c1e
Merge pull request #10074 from peppy/hide-cursor-on-touch-input
...
Hide the game-wide cursor on touch input
2020-09-07 16:00:17 +09:00
Dan Balasescu
476c325626
Merge branch 'master' into gameplay-disable-overlays
2020-09-07 15:34:02 +09:00
Dean Herbert
1a55d92c71
Use local input manager
2020-09-07 15:31:05 +09:00
Dean Herbert
daff060c9a
Hide the game-wide cursor on touch input
2020-09-07 15:20:51 +09:00
smoogipoo
9ab6d584d3
Merge branch 'master' into editor-new-beatmap
2020-09-07 14:30:41 +09:00
Dan Balasescu
e17ccdfe9f
Merge branch 'master' into combo-colors
2020-09-07 13:55:41 +09:00
Dean Herbert
8f8f907fc7
Fix missed string
2020-09-07 13:27:28 +09:00
Joehu
b4b9c71f00
Make all toolbar tooltips lowercase
2020-09-06 10:13:06 -07:00
Bartłomiej Dach
f138b92078
Merge branch 'master' into editor-new-beatmap
2020-09-06 18:24:02 +02:00
Salman Ahmed
33b76015d8
Fix MusicActionHandler unnecessarily depending on OnScreenDisplay's existance
2020-09-06 01:54:32 +03:00
smoogipoo
4b4dd02942
Make collection name a bindable
2020-09-05 04:43:59 +09:00
smoogipoo
345fb9d8e0
Rename classes
2020-09-05 03:55:43 +09:00
smoogipoo
ebd11ae0b7
Add a collection management dialog
2020-09-05 03:52:07 +09:00
smoogipoo
1143d5d992
Update class exclusion for dynamic compilation
2020-09-04 20:41:08 +09:00
Dean Herbert
b8e5acfef1
Merge branch 'master' into fix-music-controller-regressed
2020-09-04 20:10:43 +09:00
Dean Herbert
a0bc376446
Merge pull request #10062 from frenzibyte/fix-music-controller-propagating-event-twice
...
Fix MusicController raising track changed event twice
2020-09-04 20:09:49 +09:00
Salman Ahmed
3239576a23
Minor rewording of new comment
...
Co-authored-by: Dean Herbert <pe@ppy.sh>
2020-09-04 11:50:49 +03:00
Salman Ahmed
4236e5fe71
Replace useless "matching-code" comment with explanation of how it could happen
...
Co-authored-by: Dean Herbert <pe@ppy.sh>
2020-09-04 11:31:54 +03:00
Salman Ahmed
65d541456a
Slight rewording
2020-09-04 11:11:07 +03:00
Dan Balasescu
296294d024
Merge pull request #10061 from peppy/fix-ruleset-settings-crash
...
Fix potential hard crash if ruleset settings fail to construct
2020-09-04 17:07:55 +09:00
Dean Herbert
ab057e6c65
Remove unnecessary string interpolation
2020-09-04 16:28:35 +09:00
Dean Herbert
644f3375ac
Also catch exceptions in the construction call
2020-09-04 16:28:19 +09:00
Salman Ahmed
4d9a06bde9
Expose the global binding container to OsuGameTestScene
2020-09-04 10:24:54 +03:00
Salman Ahmed
001509df55
Move music global action handling to an own component
...
Due to requiring components that are added at an OsuGame-level
2020-09-04 10:24:54 +03:00
Salman Ahmed
42895e27b6
Expose track change results on the methods
2020-09-04 10:24:54 +03:00
Salman Ahmed
54013790fc
Fix MusicController raising TrackChanged event twice
2020-09-04 10:24:31 +03:00
Dan Balasescu
743c888986
Merge branch 'master' into expose-wedge-icons
2020-09-04 16:22:14 +09:00
Dan Balasescu
b631430a5b
Merge pull request #10045 from peppy/add-info-wedge-icons
...
Update and add missing beatmap statistic icons to info wedge
2020-09-04 16:22:01 +09:00
Dean Herbert
a15653c77c
Fix potential hard crash if ruleset settings fail to construct
2020-09-04 16:15:57 +09:00
Dean Herbert
974bef5586
Merge pull request #10060 from smoogipoo/fix-room-mod-retention
...
Fix global mods being retained by rooms
2020-09-04 15:58:07 +09:00
Dan Balasescu
1a4e058acc
Merge branch 'master' into add-info-wedge-icons
2020-09-04 15:52:11 +09:00
Dean Herbert
0b3f2fe7df
Update framework
2020-09-04 15:21:48 +09:00
smoogipoo
4399f5976c
Fix global mods being retained by rooms
2020-09-04 15:20:55 +09:00
Dean Herbert
25e142965d
Strongly type and expose default beatmap information icon implementations for other rulesets
2020-09-04 15:01:32 +09:00
Dean Herbert
7c99f66cf5
Update resources
2020-09-04 14:13:42 +09:00
Dean Herbert
fba253f131
Take user argument in CreateNew method parameters
2020-09-04 13:17:43 +09:00
Dean Herbert
f14a82e3a9
Remove unnecessary conversion
2020-09-04 13:13:53 +09:00
Dean Herbert
1f2f21e07a
Merge branch 'master' into editor-new-beatmap
2020-09-04 13:11:59 +09:00
Dean Herbert
cd253ab055
Further tweaks to get closer to design originals
2020-09-04 13:05:39 +09:00
Dean Herbert
9d2dff2cb8
Add scale to allow legacy icons to display correctly sized
2020-09-04 12:55:39 +09:00
Dean Herbert
d6b46936a0
Adjust sizing to match updated textures with less padding
2020-09-04 12:55:28 +09:00
