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
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
06c49070b1
Remove player collection settings
2020-09-11 16:04:09 +09:00
smoogipoo
5b80a7db5f
Re-namespace collections dropdown
2020-09-11 16:01:01 +09:00
Dean Herbert
033bd82953
Merge branch 'master' into fix-filtercontrol-order
2020-09-11 13:07:41 +09:00
Dean Herbert
b594a2a507
Import collections on initial import-from-stable step
2020-09-11 11:16:00 +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
ef44c7d063
Merge branch 'master' into score-recalc
2020-09-10 18:30:41 +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
smoogipoo
be2d34d5dc
Merge branch 'master' into score-recalc
2020-09-09 21:31:31 +09:00
Dan Balasescu
53a9804455
Merge branch 'master' into add-editor-tool-icons
2020-09-09 21:21:56 +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
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
smoogipoo
37a659b2af
Refactor/add xmldocs
2020-09-09 17:36:47 +09:00
smoogipoo
1a023d2c88
Fix a few more tests
2020-09-09 16:33:48 +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
smoogipoo
117c7ec6b2
Merge branch 'master' into score-recalc
2020-09-09 14:38:36 +09:00
Dean Herbert
66d3bda962
Merge branch 'master' into collection-database
2020-09-08 23:18:47 +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
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
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
Dan Balasescu
68f3a1ea9a
Merge branch 'master' into collection-database
2020-09-08 18:30:01 +09:00
smoogipoo
f581df47c8
Add "New collection..." item to dropdown
2020-09-08 18:25:09 +09:00
Dean Herbert
c3123bf117
Rename drag blueprint selection method for discoverability
2020-09-08 17:22:59 +09:00
smoogipoo
1260e30cde
Make ShowDragHandle into a bindable
2020-09-08 16:36:36 +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
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
9e559cb9ac
Merge branch 'master' into editor-new-beatmap
2020-09-08 02:58:38 +09: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
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
4680728b9c
Merge branch 'master' into update-dcc-exclusions
2020-09-07 18:01:44 +09:00
Dan Balasescu
476c325626
Merge branch 'master' into gameplay-disable-overlays
2020-09-07 15:34:02 +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
Bartłomiej Dach
f138b92078
Merge branch 'master' into editor-new-beatmap
2020-09-06 18:24:02 +02: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
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
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
fba253f131
Take user argument in CreateNew method parameters
2020-09-04 13:17:43 +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
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
Dan Balasescu
4d9a5f7ba8
Merge branch 'master' into update-icons
2020-09-03 20:19:51 +09:00
Dean Herbert
7a0c1411b6
Merge branch 'master' into timeshift-leaderboard-topscore
2020-09-03 18:11:04 +09:00
Dean Herbert
72cb65c22f
Update and add missing beatmap statistic icons to info wedge
2020-09-03 17:52:22 +09:00
Dean Herbert
942276d88f
Remove outdated SearchableList classes
2020-09-03 16:34:58 +09:00
Dean Herbert
4c011a88ce
Merge branch 'master' into update-framework
2020-09-03 15:08:18 +09:00
Dean Herbert
fe524ec491
Merge branch 'master' into update-framework
2020-09-03 14:58:32 +09:00
Dan Balasescu
cf89a6e1a4
Merge pull request #10043 from peppy/better-outro-music-fade
...
Improve music fade on game exit
2020-09-03 14:24:46 +09:00
Dan Balasescu
84b3604192
Merge branch 'master' into game-overlay-activation-mode
2020-09-03 13:34:22 +09:00
Dean Herbert
d849f7f2b5
Use the local user's username when saving a new beatmap
2020-09-03 13:20:23 +09:00
Dean Herbert
e032844570
Start with a fresh beatmap when entering editor from main menu
2020-09-03 13:20:23 +09:00
Dean Herbert
2f42c57f4b
Add safeties to ensure the current track doesn't loop or change
2020-09-03 13:15:23 +09:00
Dean Herbert
547c8090e5
Improve game exit music fade
2020-09-03 13:15:23 +09:00
Lucas A
754274a146
Fix and add XMLDoc
2020-09-02 20:55:26 +02:00
Lucas A
3fc6a74fdf
Expose an immutable bindable in interface.
2020-09-02 19:55:46 +02:00
smoogipoo
fca0324264
Disallow being able to add dummy beatmap
2020-09-02 23:34:38 +09:00
smoogipoo
d83264f538
Add max height
2020-09-02 22:56:13 +09:00
smoogipoo
7fcbc3a814
Respond to changes in beatmap
2020-09-02 22:06:17 +09:00
smoogipoo
661eac8f1d
Add add/remove button to dropdown items
2020-09-02 22:03:38 +09:00
smoogipoo
02a908752f
Fix stackoverflow
2020-09-02 21:52:56 +09:00
smoogipoo
5ebead2bfd
Prevent ValueChanged binds to external bindable
2020-09-02 21:44:07 +09:00
smoogipoo
d363a5d164
Add basic ordering
2020-09-02 21:19:15 +09:00
smoogipoo
094ddecc95
Add dropdowns to carousel items
2020-09-02 21:08:31 +09:00
smoogipoo
6d5e155106
Change to BindableList to notify of changes
2020-09-02 20:44:26 +09:00
smoogipoo
9dde37fe40
Hook up collection filter
2020-09-02 20:25:42 +09:00
smoogipoo
bb090a55e0
Add dropdown to filter control
2020-09-02 20:25:25 +09:00
Dean Herbert
6a765d2d76
Add smooth fading between audio tracks on transition
2020-09-02 20:04:56 +09:00
Dean Herbert
c964e4036e
Merge branch 'master' into update-framework
2020-09-02 15:49:19 +09:00
Dean Herbert
249ae5df1b
Merge branch 'master' into beatmap-track-rework
2020-09-02 15:24:46 +09:00
smoogipoo
7a6e02c558
Allow null rank
2020-09-02 14:28:31 +09:00
Craftplacer
c2ade44656
Change types back
2020-09-01 17:58:06 +02:00
Craftplacer
9835d98942
Merge remote-tracking branch 'upstream/master' into combo-colors
2020-09-01 17:39:35 +02:00
smoogipoo
7e1844ed77
Fix track adjusments being reset incorrectly
2020-09-01 18:07:19 +09:00
smoogipoo
26b4226b55
Fix ModTimeRamp not working
2020-09-01 16:55:10 +09:00
Dan Balasescu
f08e7828da
Merge branch 'master' into beatmap-track-rework
2020-09-01 16:06:38 +09:00
smoogipoo
9e3b809cab
Rename to user_score to match API
2020-09-01 15:42:47 +09:00
Dean Herbert
d1f79a6a48
Fix potentially incorrect zoom level getting set on very short audio
...
track
2020-09-01 15:41:36 +09:00
Dean Herbert
d45a1521a1
Update BindableList usages
2020-09-01 11:56:23 +09:00
Dean Herbert
44c02d7d58
Merge branch 'master' into wedge-star-difficulty
2020-09-01 09:33:28 +09:00
Bartłomiej Dach
876fd21230
Apply shear to right-anchored items
2020-08-31 19:31:47 +02:00
Bartłomiej Dach
2e2f26449d
Change anchoring to TopRight
2020-08-31 19:23:19 +02:00
Bartłomiej Dach
3ca2a7767a
Exclude misses and empty window hits from UR calculation
2020-08-31 14:29:37 +02:00
Bartłomiej Dach
3b22b891d1
Add failing test cases
2020-08-31 14:29:18 +02:00
smoogipoo
5e77e8cfcf
Reduce min size of chat
2020-08-31 20:21:57 +09:00
smoogipoo
61d580b6ba
Don't highlight top score
2020-08-31 20:17:23 +09:00
smoogipoo
8cf26979fb
Allow null user score
2020-08-31 20:16:28 +09:00
smoogipoo
6ed191786f
Add support for position
2020-08-31 20:01:59 +09:00
smoogipoo
77698ec31e
Add support for showing own top score in timeshift
2020-08-31 19:54:57 +09:00
smoogipoo
d1ceb81797
Rename request
2020-08-31 19:54:41 +09:00
smoogipoo
ed74c39b55
Move UserTopScoreContainer into base leaderboard
2020-08-31 19:54:22 +09:00
Bartłomiej Dach
88ae9ca91d
Merge branch 'master' into fix-unhide-hud-not-updating-stats
2020-08-31 11:48:19 +02:00
Dan Balasescu
cccf5b8a35
Merge pull request #10017 from peppy/fix-first-editor-scroll-wheel
...
Fix first scroll wheel in editor incorrectly advancing twice
2020-08-31 18:32:34 +09:00
Lucas A
dd093f44d8
Cast base immutable bindable to mutable for testing purposes and make InitialOverlayActivationMode property protected
2020-08-31 11:26:55 +02:00
Dean Herbert
a171d0e292
Remove unused methods and classes
2020-08-31 18:14:22 +09:00
Bartłomiej Dach
7d273d631b
Do not show star difficulty on wedge if zero
2020-08-31 11:05:42 +02:00
Dean Herbert
bee01bdd38
Fix first scroll wheel in editor incorrectly advancing twice
2020-08-31 18:01:16 +09:00
Bartłomiej Dach
4736845318
Add spacing between star rating and beatmap status
2020-08-31 10:56:06 +02:00
smoogipoo
c3bfce6ccf
Add star rating to beatmap wedge
2020-08-31 15:03:41 +09:00
Dean Herbert
abdb991923
Hide misses from timing distribution graph
2020-08-31 14:15:47 +09:00
Craftplacer
db413686bb
Add BeatmapSkin to EditorBeatmap
2020-08-30 21:12:45 +02:00
Craftplacer
b39ec74bb8
Scope down to IBeatmapSkin in EditorChangeHandler
2020-08-30 16:07:06 +02:00