Dan Balasescu
3f0c3fc9ae
Merge branch 'master' into editor-ternary-buttons
2020-09-25 18:57:10 +09:00
Dean Herbert
d25e058492
Merge branch 'master' into editor-load-audio
2020-09-25 18:52:05 +09:00
Dan Balasescu
af93b56c32
Merge pull request #10246 from peppy/update-framework
...
Update framework
2020-09-25 18:42:12 +09:00
Dean Herbert
8b255f4579
Fix test failures
...
The issue was the ArchiveModelManager change; the test local change is
just there because it makes more sense to run for every test in that
scene.
2020-09-25 18:40:22 +09:00
Dean Herbert
204024c76e
Merge branch 'master' into editor-load-audio
2020-09-25 18:32:51 +09:00
Dean Herbert
8e6bf516d9
Merge branch 'master' into editor-ternary-buttons
2020-09-25 18:30:59 +09:00
Dean Herbert
59bfa08684
Forcefully re-apply DrawableHitObject state transforms on post-load DefaultsApplied
2020-09-25 18:26:54 +09:00
Dean Herbert
4cc02abc76
Update framework
2020-09-25 18:11:49 +09:00
Dean Herbert
dbfa05d3b3
Fix placement object not getting updated with initial state
2020-09-25 18:00:17 +09:00
Dean Herbert
b561429f92
Add toolbar toggle buttons for hit samples
2020-09-25 17:53:41 +09:00
Dean Herbert
346d14d40b
Rename variables to match
2020-09-25 17:45:19 +09:00
Dean Herbert
22511c36c3
Ensure toggles are not instantiated more than once for safety
2020-09-25 17:43:09 +09:00
Dean Herbert
51cc644b7b
Fix set access to SelectionHandler
...
Co-authored-by: Dan Balasescu <smoogipoo@smgi.me>
2020-09-25 17:42:49 +09:00
Dan Balasescu
7b09f73fe5
Merge branch 'master' into new-combo-toggle
2020-09-25 17:33:12 +09:00
Dan Balasescu
e1fc8d76fb
Merge branch 'master' into editor-dont-block-keys-unnecessarily
2020-09-25 17:31:41 +09:00
Dean Herbert
b8e9f19b92
Move common HitSampleInfo lookup to static method
2020-09-25 17:30:31 +09:00
Dean Herbert
98c6027352
Remove unused using
2020-09-25 17:07:58 +09:00
Dan Balasescu
9b29c9e185
Merge branch 'master' into editor-ternary-states
2020-09-25 16:58:15 +09:00
Dean Herbert
b70a20e7f1
Avoid consuming keystrokes in editor when a modifier key is held down
2020-09-25 16:56:39 +09:00
Dean Herbert
da820c815e
Add shortcut keys to toolbox gorup titles
2020-09-25 16:46:06 +09:00
Dean Herbert
a6298c60eb
Fix button spacing
2020-09-25 16:44:37 +09:00
Dean Herbert
ae68dcd962
Add ternary toggle buttons to editor toolbox selection
2020-09-25 16:38:12 +09:00
Dan Balasescu
039e1b2032
Merge pull request #10217 from peppy/fix-taiko-editor-type-stats
...
Fix changing rim/strong types in taiko editor not applying correctly
2020-09-25 15:43:43 +09:00
Dean Herbert
0f8551e9ea
Merge branch 'editor-ternary-states' into new-combo-toggle
2020-09-25 15:36:33 +09:00
Dean Herbert
bac6515d09
Merge branch 'master' into editor-ternary-states
2020-09-25 15:35:52 +09:00
Dean Herbert
a859fe78ee
Expose update ternary state method and use better state determination function
2020-09-25 15:32:36 +09:00
Dean Herbert
50290f3cb4
Rework ternary states to fix context menus not updating after already displayed
2020-09-25 15:10:13 +09:00
Dan Balasescu
f1efc0ba42
Merge pull request #10240 from peppy/fix-setup-textbox-commit
...
Ensure setup screen text boxes commit on losing focus
2020-09-25 14:58:26 +09:00
Dan Balasescu
69d057a8b3
Merge branch 'master' into fix-taiko-editor-type-stats
2020-09-25 14:53:47 +09:00
Dan Balasescu
e828cf1607
Merge branch 'master' into editor-load-audio
2020-09-25 14:49:54 +09:00
Dan Balasescu
440adc305d
Merge pull request #10233 from peppy/file-selector
...
Add a basic file selector with extension filtering support
2020-09-25 14:44:32 +09:00
Dan Balasescu
d9fee594ea
Merge pull request #10238 from peppy/fix-hoc-keyboard-shortcut-hard-crash
...
Fix hard crash on hitting an out of range key (Q~P)
2020-09-25 14:44:14 +09:00
Dean Herbert
7f9a5f5f0d
Ensure setup screen text boxes commit on losing focus
2020-09-25 14:25:24 +09:00
Dean Herbert
a6adf8334e
Use existing method to update combo state of selection
2020-09-25 14:19:35 +09:00
Dean Herbert
e009264f10
Add new combo toggle to main composer interface
2020-09-25 14:10:30 +09:00
Dean Herbert
bca774a0d4
Allow BlueprintContainer to specify toggles
2020-09-25 14:09:31 +09:00
Dean Herbert
3c191cfe25
Add basic xmldoc to HitObjectComposer
2020-09-25 14:08:47 +09:00
Dean Herbert
325bfdbf71
Fix hard crash on hitting an out of range key (Q~P)
2020-09-25 13:25:42 +09:00
Dean Herbert
26ba7d3100
Remove unused method (was moved to a more local location)
2020-09-25 13:20:19 +09:00
Dean Herbert
892d440ed0
Add fallback path for potential null ParentGameplayClock
2020-09-25 13:19:07 +09:00
Dan Balasescu
952e84396a
Merge branch 'master' into editor-object-object-snapping
2020-09-25 13:17:30 +09:00
Dean Herbert
7df8b5bce7
Merge branch 'master' into fix-spinner-rpm-user-rate-adjust
2020-09-25 13:17:03 +09:00
Dean Herbert
ea971ecb90
Remove local file handling from SetupScreen
2020-09-25 13:16:30 +09:00
Dean Herbert
50ba320a51
Expand available file operations in ArchiveModelManager
2020-09-25 13:16:30 +09:00
Dean Herbert
71e1f981fe
Merge branch 'file-selector' into editor-load-audio
2020-09-25 12:44:00 +09:00
Dean Herbert
a890e5830d
Add more file icons
2020-09-25 12:42:28 +09:00
Dean Herbert
1b8b417b85
Merge branch 'master' into file-selector
2020-09-25 12:33:18 +09:00
Dean Herbert
f047ff10bf
Remove local specification for file selector search path
2020-09-25 12:30:05 +09:00
Dean Herbert
b1e72c311e
Add null check because we can
2020-09-25 12:28:41 +09:00
Dean Herbert
a17eac3692
Rename reload method to not mention beatmap unnecessarily
2020-09-25 12:27:08 +09:00
Dean Herbert
981585930d
Merge branch 'master' into editor-load-audio
2020-09-25 12:24:16 +09:00
Dean Herbert
44a6637c36
Use SingleOrDefault
2020-09-25 12:20:37 +09:00
Dean Herbert
90c4c172bf
Merge branch 'master' into fix-editor-screen-settings-remembering
2020-09-25 12:19:45 +09:00
Dean Herbert
b9196718b7
Merge branch 'master' into editor-object-object-snapping
2020-09-25 12:15:10 +09:00
Dean Herbert
c3df7e1fa8
Fix scroll container's scrollbar not respecting minimum size on first resize
2020-09-25 01:05:12 +09:00
Dean Herbert
dc85bcd470
Merge pull request #10229 from smoogipoo/fix-ruleset-disposal
...
Fix rulesets disposing game-wide texture store
2020-09-24 22:54:45 +09:00
Dean Herbert
011b176244
Add test coverage of audio track changing
2020-09-24 22:00:13 +09:00
Dean Herbert
cc9ae32811
Fix summary timeline not updating to new track length correctly
2020-09-24 21:05:29 +09:00
Dean Herbert
833ff1c1d7
Fix test failures due to editor dependency
2020-09-24 20:56:35 +09:00
Dean Herbert
7e7e2fd64a
Use bindable for track to fix rate adjustments not applying correctly
2020-09-24 20:56:35 +09:00
Dean Herbert
978f6edf38
Add basic track reloading support while inside the editor
2020-09-24 20:56:35 +09:00
Dean Herbert
65e6dd2ac3
Remove the previous audio file before adding a new one
2020-09-24 20:56:35 +09:00
Dean Herbert
4d714866cd
Add ability to actually import a new audio file to the beatmap / database
2020-09-24 20:56:35 +09:00
Dean Herbert
4b9581bca0
Add audio selection to song setup screen
2020-09-24 20:56:35 +09:00
Dean Herbert
937d5870b3
Add a basic file selector with extension filtering support
2020-09-24 20:54:25 +09:00
Dean Herbert
158d307126
Avoid destroying editor screens when changing between modes
2020-09-24 17:03:54 +09:00
Dan Balasescu
abec9224cf
Merge pull request #10230 from peppy/editor-toggle-shortcuts
...
Add ability to toggle editor toggles using keyboard shortcuts (Q~P)
2020-09-24 16:55:39 +09:00
Dan Balasescu
ad30c20b8c
Merge pull request #10227 from peppy/editor-negative-current-time
...
Fix editor not showing sign when time goes negative
2020-09-24 16:27:05 +09:00
Dean Herbert
44be0ab762
Add basic osu! object to object snapping
2020-09-24 16:24:35 +09:00
Dean Herbert
6ebea3f6f2
Add ability to toggle editor toggles using keyboard shortcuts (Q~P)
2020-09-24 16:24:25 +09:00
Dan Balasescu
f84b5087bd
Merge pull request #10226 from peppy/results-fix-relayout-misalignment
...
Fix score panel being incorrectly vertically aligned on screen resize
2020-09-24 15:50:31 +09:00
smoogipoo
62c2dbc310
Nest classes + make private
2020-09-24 14:33:43 +09:00
Dan Balasescu
02d8355321
Merge pull request #10224 from peppy/results-statistics-replay-button
...
Add more descriptive description and download button when statistics not available
2020-09-24 14:31:38 +09:00
smoogipoo
600b823a30
Fix game texture store being disposed by rulesets
2020-09-24 14:30:18 +09:00
Dean Herbert
33fad27ec2
Avoid API change to DrawableHitObject
2020-09-24 13:28:29 +09:00
Dean Herbert
00b0228b61
Merge branch 'master' into fix-taiko-editor-type-stats
2020-09-24 13:18:13 +09:00
Dean Herbert
9c074e0ffb
Fix editor not showing sign when time goes negative
2020-09-24 13:10:54 +09:00
Dean Herbert
5612357574
Fix score panel being incorrectly vertically aligned on screen resize
2020-09-24 12:49:32 +09:00
Dean Herbert
fda6e88dd3
Fix braces style
2020-09-24 12:39:08 +09:00
Dean Herbert
cb903ec9e2
Fix extended statistics not being vertically centered
2020-09-24 12:21:46 +09:00
Dean Herbert
f4d2c2684d
Add more descriptive description and download button when statistics not available
2020-09-24 12:21:08 +09:00
Dean Herbert
fb9d2cb05c
Merge pull request #10218 from peppy/update-framework
2020-09-23 21:45:36 +09:00
Dean Herbert
26d1c4322d
Merge pull request #10200 from peppy/fix-hit-object-container-unbinding
...
Fix HitObjectContainer not correctly unbinding from startTime fast enough
2020-09-23 21:17:31 +09:00
Dan Balasescu
37af9e767f
Merge branch 'master' into fix-taiko-change-handling
2020-09-23 19:47:29 +09:00
Dan Balasescu
d1e41e41f7
Merge pull request #10214 from peppy/new-combo-editor-toggle
...
Add the ability to toggle new combo state from composer context menu
2020-09-23 19:46:55 +09:00
Dean Herbert
e8d099c01d
Update framework
2020-09-23 19:28:20 +09:00
Dean Herbert
fee379b4b9
Reword xmldoc for legibility
2020-09-23 18:12:07 +09:00
Dean Herbert
9a0e5ac154
Handle type/strength changes from samples changes
2020-09-23 18:09:40 +09:00
Dean Herbert
ccb3ef5020
Merge branch 'new-combo-editor-toggle' into fix-taiko-change-handling
2020-09-23 17:08:27 +09:00
Dean Herbert
02201d0ec6
Fix incorrect cast logic
2020-09-23 17:08:25 +09:00
Dean Herbert
487fc2a2c6
Add missing change handler scopings to taiko context menu operations
2020-09-23 16:58:22 +09:00
Dean Herbert
2d67faeb72
Add xmldoc
2020-09-23 16:40:56 +09:00
Dean Herbert
a1ec167982
Add the ability to toggle new combo state from composer context menu
2020-09-23 16:38:16 +09:00
Joehu
c5b684bd2e
Fix typo in log when beatmap fails to load
2020-09-23 00:30:20 -07:00
Dan Balasescu
d6ae66384d
Merge branch 'master' into fix-hit-object-container-unbinding
2020-09-23 15:16:58 +09:00
Dean Herbert
c38cd50723
Fix editor not using beatmap combo colours initially on load
2020-09-23 13:16:50 +09:00
Dean Herbert
80fb8f074c
Merge branch 'master' into add-editor-keybindings
2020-09-23 12:32:04 +09:00
Dean Herbert
260ca31df0
Change default mute key to Ctrl+F4 for now
2020-09-23 12:31:50 +09:00
Dan Balasescu
fbaa6675c2
Merge branch 'master' into fix-hit-object-container-unbinding
2020-09-23 12:05:14 +09:00
Dan Balasescu
3d90bb5e38
Merge pull request #10203 from peppy/fix-fail-animation
...
Fix fail animation breaking on post-fail judgements
2020-09-23 11:57:49 +09:00
Dan Balasescu
6d58973452
Merge pull request #10208 from peppy/reduce-all-hitobject-enumerator-complexity
...
Reduce complexity of AllHitObjects enumerator when nested playfields are not present
2020-09-23 11:50:10 +09:00
Bartłomiej Dach
941ff81d8d
Merge branch 'master' into fix-hit-object-container-unbinding
2020-09-22 16:38:35 +02:00
Dean Herbert
e0a2321822
Reduce complexity of AllHitObjects enumerator when nested playfields are not present
2020-09-22 18:17:04 +09:00
Dean Herbert
0e01ac2d90
Merge branch 'master' into fix-new-samples-starting-while-gameplay-paused
2020-09-22 16:16:54 +09:00
Dean Herbert
3062fe4411
Add editor key bindings to switch between screens
2020-09-22 15:55:25 +09:00
Dean Herbert
3276b9ae9c
Fix fail animation breaking on post-fail judgements
2020-09-22 15:08:53 +09:00
Dean Herbert
552968f65f
Remove unnecessary using
2020-09-22 13:38:52 +09:00
Dean Herbert
7c40071b21
Revert changes to SkinnableTestScene but change load order
2020-09-22 13:35:35 +09:00
Salman Ahmed
bfe332909c
Remove "hide combo counter on break time" feature for being too complex
...
The combo counter will be hidden at most one second after the break has started anyways, so why not just remove this feature if the way of implementing it is complicated to be merged within the legacy counter implementation.
2020-09-21 14:32:14 +03:00
Dean Herbert
508278505f
Make local clock private
2020-09-21 19:40:57 +09:00
Dean Herbert
3f788da06d
Fix SPM changing incorrectly with playback rate changes
2020-09-21 19:39:54 +09:00
Dean Herbert
dd5b15c64f
Fix HitObjectContainer not correctly unbinding from startTime fast enough
2020-09-21 18:27:15 +09:00
Dean Herbert
1e09d8fd1a
Merge branch 'master' into catch-combo-counter
2020-09-21 17:53:00 +09:00
S Stewart
d2f498a268
remove unnec using
2020-09-19 15:13:52 -05:00
S Stewart
c49dcca1ff
spacing oops
2020-09-19 14:55:52 -05:00
S Stewart
e0cef6686d
Change collection deletion notif to be consistent
2020-09-19 14:54:14 -05:00
Salman Ahmed
735b6b0d6f
Remove a pointless portion of the inline comment
2020-09-19 05:54:40 +03:00
Salman Ahmed
6aa84424e4
Merge remote-tracking branch 'upstream/master' into fix-new-samples-starting-while-gameplay-paused
2020-09-19 05:53:04 +03:00
Dean Herbert
1fcf443314
Ensure BeatmapProcessor.PostProcess is run before firing HitObjectUpdated events
2020-09-18 19:33:03 +09:00
Joehu
393ee1c9f5
Fix hovered osu tab items not showing hover state when deselected
2020-09-17 23:09:09 -07:00
Joehu
2ad7e6ca88
Fix hovered channel tabs color when unselected
2020-09-17 19:10:58 -07:00
Joehu
83d23c9547
Use new icon in chat overlay
2020-09-17 14:56:08 -07:00
Dean Herbert
141fbbf5bb
Merge pull request #10180 from smoogipoo/beatmap-conversion-cancellation
...
Make beatmap conversion support cancellation tokens
2020-09-17 22:30:46 +09:00
smoogipoo
de5ef8a471
Rework to support obsoletion
2020-09-17 21:37:32 +09:00
smoogipoo
e71991a53c
Add default token
2020-09-17 18:37:48 +09:00
smoogipoo
c7d24203ce
Make beatmap conversion support cancellation tokens
2020-09-17 17:40:05 +09:00
smoogipoo
73a7b759cb
Add missing obsoletion notice
2020-09-17 17:04:44 +09:00
Dan Balasescu
0d889f8cc0
Merge pull request #10173 from Joehuu/fix-profile-section-tab-control-input
...
Fix profile section tab control not absorbing input from behind
2020-09-17 16:53:18 +09:00
Dean Herbert
3529a1bfea
Fix global bindings being lost when running tests under headless contexts
2020-09-17 13:01:14 +09:00
Dean Herbert
c7e4b192ae
Merge branch 'master' into better-skin-hashing
2020-09-17 12:30:14 +09:00
Joehu
9063c60b9c
Fix profile section tab control not absorbing input from behind
2020-09-16 12:00:27 -07:00
Joehu
c6386ea605
Remember leaderboard mods filter selection in song select
2020-09-15 21:53:35 -07:00
Salman Ahmed
35c7677d0a
Fix gameplay samples potentially start playing while player is paused
2020-09-16 01:59:07 +03:00
Dean Herbert
53f9381ad9
Merge branch 'master' into better-skin-hashing
2020-09-16 00:25:33 +09:00
Dean Herbert
3c70b3127c
Fix potential nullref in FilterControl during asynchronous load
2020-09-15 23:19:31 +09:00
Dan Balasescu
8f5115b4e8
Merge branch 'master' into fix-test-storage-weirdness
2020-09-15 19:32:52 +09:00
Dean Herbert
f7c9c80566
Force OsuGameTests to use a unique storage each run
2020-09-15 19:01:32 +09:00
Dan Balasescu
0761aab42f
Merge branch 'master' into catch-combo-counter
2020-09-15 17:20:31 +09:00
Dan Balasescu
fc15b4546d
Merge pull request #10140 from peppy/editor-clipboard
...
Editor clipboard support
2020-09-15 17:15:49 +09:00
Dean Herbert
d03bfec807
Merge branch 'master' into fix-test-storage-weirdness
2020-09-15 16:54:06 +09:00
Dean Herbert
7f2ce14f36
Merge pull request #9294 from smoogipoo/morth-taiko-changes
2020-09-15 16:11:17 +09:00
Dan Balasescu
16ae83c499
Merge branch 'master' into editor-clipboard
2020-09-15 16:05:43 +09:00
Dan Balasescu
6cbff98295
Merge branch 'master' into add-collections-to-beatmap-options
2020-09-15 15:23:33 +09:00
Dan Balasescu
3e1c517700
Merge pull request #10160 from peppy/ss-dispose-null-check
...
Add null check in SongSelect disposal for safety
2020-09-15 15:06:17 +09:00
Dean Herbert
914785ce17
Merge branch 'master' into fix-test-storage-weirdness
2020-09-15 14:49:10 +09:00
Dean Herbert
0446bc8610
Fix game.ini getting left over by PlayerTestScene subclasses
2020-09-15 14:43:24 +09:00
Dean Herbert
2c7492d717
Add null check in SongSelect disposal for safety
2020-09-15 14:34:58 +09:00
Dean Herbert
879979ef57
Move host lookup to inside lazy retrieval to handle edge cases
2020-09-15 14:25:31 +09:00
Dean Herbert
234152b2fe
Use host storage as LocalStorage for headless test runs
2020-09-15 14:17:40 +09:00
Joehu
43daabc982
Remove unused using and move dialog to BDL
2020-09-14 12:10:00 -07:00
Joehu
c833f5fcc4
Reorder buttons to match stable
2020-09-14 11:23:41 -07:00
Joehu
57610ddad5
Fix beatmap options absorbing input from toolbar ruleset selector
2020-09-14 11:22:16 -07:00
Joehu
c30174cea3
Add manage collections button to beatmap options
2020-09-14 11:21:23 -07:00
Joehu
1a8a7ae7f8
Remove hardcoded key param from AddButton
2020-09-14 11:19:18 -07:00
Joehu
368aca015a
Move override methods to bottom
2020-09-14 11:18:00 -07:00
Bartłomiej Dach
a377cccb4d
Unsubscribe from track changed event on disposal
2020-09-14 17:10:35 +02:00
Bartłomiej Dach
6ed4c7caef
Merge branch 'master' into flaky-song-select-tests-v2
2020-09-14 16:42:40 +02:00
Dean Herbert
be8877b0f4
Merge branch 'master' into better-skin-hashing
2020-09-14 23:32:17 +09:00
Dean Herbert
1884e0167b
Eagerly populate skin metadata to allow usage in hashing computation
2020-09-14 23:31:03 +09:00
Dean Herbert
91d37e0459
Fix typo in comment
2020-09-14 20:17:00 +09:00
Dean Herbert
2b48ae42be
Merge branch 'master' into better-skin-hashing
2020-09-14 20:16:33 +09:00
Dean Herbert
daf54c7eb9
Revert EditorBeatmap.Remove API
2020-09-14 17:55:41 +09:00
Dean Herbert
6b60888139
Merge branch 'fix-post-convert-json-serialize' into editor-clipboard
2020-09-14 17:38:53 +09:00
Dean Herbert
a8b405791a
Fix non-convert slider and spinner serialization
2020-09-14 17:32:32 +09:00
Dan Balasescu
2c4aa42023
Merge pull request #10149 from Joehuu/fix-mod-select-absorbing-input
...
Fix mod select overlay absorbing input from toolbar ruleset selector
2020-09-14 17:20:05 +09:00
Dan Balasescu
3118f635f6
Merge branch 'master' into editor-fix-multiple-selection
2020-09-14 16:45:30 +09:00
Dean Herbert
62c55165d4
Merge branch 'editor-fix-multiple-selection' into editor-clipboard
2020-09-14 15:47:20 +09:00
Dean Herbert
b7a06524fb
Update comment to make more sense
2020-09-14 15:47:10 +09:00
Dean Herbert
75e4f224e5
Add back accidentally removed remove
2020-09-14 15:47:04 +09:00
Dean Herbert
0ef4dfc192
Move more logic to base EditorTestScene
2020-09-14 15:27:08 +09:00
Dean Herbert
da02ee8828
Add ability to create a TestBeatmap with no HitObjects
2020-09-14 15:26:57 +09:00
Dean Herbert
692f2c8489
Simplify debounced update pathway
2020-09-14 14:58:00 +09:00
Joehu
4dacdb9994
Fix mod select overlay absorbing input from toolbar ruleset selector
2020-09-13 11:50:21 -07:00
Dean Herbert
320e314356
Use minimum start time to handle SelectedHitObjects not being sorted
2020-09-13 22:53:30 +09:00
Dean Herbert
c573392bb2
Remove completed todo
2020-09-13 22:31:59 +09:00
Dean Herbert
0079d94676
Merge branch 'master' into editor-clipboard
2020-09-13 22:30:13 +09:00
Bartłomiej Dach
3db0e7cd75
Generalise LegacyRollingCounter
2020-09-12 22:40:32 +02:00
Bartłomiej Dach
f17b2f1359
Ensure track is looping in song select immediately
2020-09-12 20:43:17 +02:00
Dean Herbert
5e108e1d6a
Merge branch 'master' into nowplaying-collections-filter
2020-09-12 21:33:07 +09:00
Dean Herbert
1a9f0ac16a
Select new objects
2020-09-12 21:23:12 +09:00
Dean Herbert
3854caae9b
Remove secondary schedule logic
2020-09-12 21:23:12 +09:00
Dean Herbert
81f30cd264
Select blueprint if object is already selected at the point of adding
2020-09-12 21:23:11 +09:00
Dean Herbert
2d9b0acabe
Fix empty selection via keyboard shortcuts crashing
2020-09-12 21:23:10 +09:00
Dean Herbert
001cd1194c
Consume BindCollectionChanged
2020-09-11 22:53:03 +09:00
Dean Herbert
cb14d847de
Update framework
2020-09-11 22:40:12 +09:00
Dean Herbert
94d929d8cd
Remove unnecessary contains checks
2020-09-11 22:03:19 +09:00
Dan Balasescu
53fab11321
Merge pull request #10138 from peppy/editor-fix-masking
...
Fix editor hitobjects getting masked weirdly
2020-09-11 20:57:53 +09:00
Dean Herbert
08be45c9e7
Merge branch 'master' into editor-clipboard
2020-09-11 20:35:05 +09:00
Dean Herbert
97b995246a
Merge branch 'editor-fix-multiple-selection' into editor-clipboard
2020-09-11 20:34:58 +09:00
Dean Herbert
22e6df02b6
Fix editor selected hitobjects containing the selection up to five times
2020-09-11 20:27:07 +09:00
Dean Herbert
432c3e17eb
Fix toolbox becoming inoperable due to incorrect ordering
2020-09-11 20:23:34 +09:00
Dean Herbert
139a5acd1b
Fix editor hitobjects getting masked weirdly
...
Closes #10124
2020-09-11 20:16:50 +09:00
Dean Herbert
2858296c25
Avoid editor confirm-save dialog looping infinitely when using keyboard shortcut to exit
...
Will now exit without saving if the keyboard shortcut is activated twice
in a row, as expected.
Closes #10136 .
2020-09-11 19:58:37 +09:00
Dean Herbert
de3d8e83e1
Add keyboard shortcuts
2020-09-11 19:55:41 +09:00
Dean Herbert
7d7401123c
Add initial implementation of editor clipboard
2020-09-11 19:54:20 +09:00
Dean Herbert
8e028dd88f
Fix incorrect ordering of ApplyDefaults for newly added objects
2020-09-11 19:54:11 +09:00
smoogipoo
b047fbb8ee
Use bindable value for search text
2020-09-11 17:46:07 +09:00
smoogipoo
6327f12fe4
Disable manage collections item in now playing overlay
2020-09-11 16:58:18 +09:00
smoogipoo
fcc8683629
Hook up now playing overlay to collections
2020-09-11 16:46:11 +09:00
Dean Herbert
ef77658311
Add coverage of case where skin.ini doesn't specify name/author
2020-09-11 16:29:14 +09:00
Dean Herbert
15b533f2a4
Hash skins based on name, not skin.ini contents
...
It is feasible that a user may be changing the contents of skin.ini
without changing the skin name / author. Such changes should not create
a new skin if already imported.
2020-09-11 16:20:54 +09:00
smoogipoo
a6a76de7a9
Re-expose sealed methods
2020-09-11 16:09:08 +09:00
smoogipoo
06c49070b1
Remove player collection settings
2020-09-11 16:04:09 +09:00
smoogipoo
4061480419
Rename menu item
2020-09-11 16:02:46 +09:00
smoogipoo
5b80a7db5f
Re-namespace collections dropdown
2020-09-11 16:01:01 +09:00
Dan Balasescu
54520faa7e
Merge pull request #10082 from EVAST9919/profile-sections-update
...
Update section headers in ProfileOverlay in line with web
2020-09-11 14:53:17 +09:00
Dean Herbert
033bd82953
Merge branch 'master' into fix-filtercontrol-order
2020-09-11 13:07:41 +09:00
Dan Balasescu
48db5739ed
Merge pull request #10126 from Joehuu/fix-playlist-item-no-drag-handle
...
Fix drag handles not showing on now playing playlist items
2020-09-11 12:31:57 +09:00
smoogipoo
22c5e9f64f
Rename missing parameter
2020-09-11 12:19:26 +09:00
smoogipoo
be5d143b5a
Reorder params
2020-09-11 12:17:12 +09:00
Dean Herbert
b594a2a507
Import collections on initial import-from-stable step
2020-09-11 11:16:00 +09:00
Bartłomiej Dach
a350802158
Fix wrong mono streak length handling in corner case
2020-09-10 20:50:26 +02:00
Joehu
370f22f975
Show drag handle by default on main class
2020-09-10 11:11:45 -07:00
Bartłomiej Dach
0fb0dc0fde
Merge branch 'master' into fix-filtercontrol-order
2020-09-10 20:07:31 +02:00
Andrei Zavatski
cfc6e2175d
Add missing header to MostPlayedBeatmapsContainer
2020-09-10 20:58:37 +03:00
Andrei Zavatski
913e3faf60
Move PaginatedContainerWithHeader logic to a base class
2020-09-10 20:48:06 +03:00
Joehu
6c9fcae69f
Fix drag handles not showing on now playing playlist items
2020-09-10 10:48:00 -07:00
Andrei Zavatski
e5f70d8eae
Simplify counter visibility changes in PaginatedContainerHeader
2020-09-10 20:31:00 +03:00
Andrei Zavatski
931e567c7e
Replace counter font size with an actual value
2020-09-10 20:25:35 +03:00
Andrei Zavatski
9b504272e4
Make Header a property
2020-09-10 20:24:43 +03:00
Andrei Zavatski
e5d0f3b657
Merge remote-tracking branch 'refs/remotes/ppy/master' into profile-sections-update
2020-09-10 20:23:02 +03:00
smoogipoo
447fd07b4e
Fix maps with only bonus score having NaN scores
2020-09-11 01:13:55 +09:00
smoogipoo
314cd13b74
Fix song select filter ordering
2020-09-10 23:36:22 +09:00
Dean Herbert
18d96738a1
Fix hard crash on deleting a collection with no collection selected
2020-09-10 19:52:34 +09:00
Dean Herbert
23b51e8f7f
Merge pull request #10106 from smoogipoo/score-recalc
2020-09-10 19:05:42 +09:00
Dan Balasescu
14dbeb58bc
Merge pull request #10116 from peppy/update-framework
...
Update framework
2020-09-10 18:37:29 +09:00
Dean Herbert
ef44c7d063
Merge branch 'master' into score-recalc
2020-09-10 18:30:41 +09:00
Dean Herbert
df1537f2a0
Update framework
2020-09-10 18:10:39 +09:00
smoogipoo
d700ae55fb
Merge branch 'master' into morth-taiko-changes
2020-09-10 16:34:09 +09:00
Dean Herbert
4faddd0088
Merge branch 'master' into collection-database
2020-09-10 00:07:49 +09:00
Dan Balasescu
75ebfe41e0
Merge pull request #10102 from peppy/editor-prompt-for-save
...
Prompt to save changes when exiting the editor
2020-09-09 23:56:41 +09:00
smoogipoo
6b56c6e83f
Rename to CollectionMenuItem
2020-09-09 23:11:19 +09:00
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
smoogipoo
d7ca2cf1cc
Replace loaded check with better variation
2020-09-09 22:01:09 +09:00
Dan Balasescu
fbbc3b4921
Merge branch 'master' into fix-overlay-sound-on-disabled
2020-09-09 21:54:00 +09:00
Dan Balasescu
f474d3b7f1
Merge branch 'master' into editor-prompt-for-save
2020-09-09 21:51:51 +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
smoogipoo
be2d34d5dc
Merge branch 'master' into score-recalc
2020-09-09 21:31:31 +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
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
Lucas A
82e314da59
Fix merge conflicts.
2020-09-03 21:56:47 +02:00
Dean Herbert
a99e7a1dc2
Merge branch 'master' into add-info-wedge-icons
2020-09-03 21:57:58 +09:00
Dean Herbert
ebed7d09e3
Update resources
2020-09-03 21:56:36 +09:00
Dean Herbert
d32b77f045
Add missing extension to filename
...
Co-authored-by: Dan Balasescu <smoogipoo@smgi.me>
2020-09-03 21:33:25 +09:00
Dan Balasescu
4d9a5f7ba8
Merge branch 'master' into update-icons
2020-09-03 20:19:51 +09:00
Dean Herbert
1c1c583d3b
Fix regression in file update logic (filename set too early)
2020-09-03 19:31:40 +09:00
Dean Herbert
a555407f37
Fix various test failures due to missing beatmap info in empty beatmap
2020-09-03 19:25:18 +09:00
