1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-15 14:37:30 +08:00
Commit Graph

7687 Commits

Author SHA1 Message Date
Dean Herbert
3c2e2f29bc Remove unused using statement 2020-10-27 13:17:44 +09:00
Dean Herbert
27c1a4c4d3 Move right-click deletion logic to be handled at a SelectionBlueprint level 2020-10-27 12:53:54 +09:00
Dean Herbert
e1f578c590 Change editor timing screen seek behaviour to only occur on clicking table rows
Previously it would react to any selection changed event, which could in
lude time changes (which is done by removing then adding the
ControlPointGroup).

Closes #10590.
2020-10-27 12:28:12 +09:00
Dean Herbert
266596d404
Merge branch 'master' into right-click-circle-delete 2020-10-27 12:02:29 +09:00
Bartłomiej Dach
3f8c4c57d0 Fix code style issues & restructure 2020-10-26 22:16:28 +01:00
Charlie
255bb9d100 fixed issue with returns 2020-10-26 14:52:59 -05:00
Charlie
ccaf6560ec formatting 2020-10-26 14:30:37 -05:00
Charlie
1239670566 moved right click shift delete functionality to HandleSelectionRequested + reduced func size 2020-10-26 14:28:53 -05:00
Charlie
ead3c19567 added function so circle is deleted when shift+right click 2020-10-26 13:40:42 -05:00
Leon Gebler
704f8cc4f2 Fix selection box wandering off into the distance 2020-10-26 18:45:03 +01:00
Dean Herbert
b86347dc81 Merge branch 'master' into spectator 2020-10-26 13:39:07 +09:00
Dean Herbert
431054377a
Merge branch 'master' into epilepsy-warning-volume-restoration 2020-10-25 22:22:11 +09:00
Bartłomiej Dach
0542a45c43 Change to manual adjustment add/remove 2020-10-25 12:33:35 +01:00
Dean Herbert
8b04cd2cb0 Fix a potential null reference when loading carousel difficulties 2020-10-25 20:28:24 +09:00
Bartłomiej Dach
85e14f3f0c Shorten fade duration to make fade out snappier 2020-10-25 00:40:11 +02:00
Bartłomiej Dach
e101ba5cba Move volume manipulations to player loader 2020-10-25 00:40:11 +02:00
Bartłomiej Dach
73174961f0 Rework animation sequence for readability 2020-10-24 22:30:08 +02:00
Max Hübner
81ebcd8796 Load SeasonalBackgroundLoader asynchronously 2020-10-23 13:41:00 +02:00
Dean Herbert
8232bf1957
Merge pull request #10576 from Game4all/song-select-wedge-dynamic-star-rating 2020-10-23 15:39:02 +09:00
Dean Herbert
9141f48b04 Remove beatmap-based ctor to promote single flow 2020-10-23 14:57:27 +09:00
Dean Herbert
4fca7675b0 Don't send spectate data when an autoplay mod is active 2020-10-23 14:47:21 +09:00
Dean Herbert
9753dab93b Remove IOnlineComponent and change existing components to use bindable flow 2020-10-22 14:19:12 +09:00
Lucas A
cf69eacae9 Make StarRatingDisplay dynamic. 2020-10-21 19:05:14 +02:00
Lucas A
670775cecb Make beatmap wedge difficulty indicator color update dynamically. 2020-10-21 18:57:48 +02:00
Dean Herbert
8273715bde
Merge pull request #9484 from FlashyReese/visible-playfield-boundary 2020-10-20 19:43:41 +09:00
Dan Balasescu
bd4e0e1a60
Merge branch 'master' into epilepsy-warning 2020-10-20 17:43:37 +09:00
Dan Balasescu
5fe38533e2
Merge branch 'master' into hide-hud-during-break-time 2020-10-20 15:39:35 +09:00
Dean Herbert
55d08fad5c Remove unused field 2020-10-20 15:18:15 +09:00
Dean Herbert
7a68636f71 Adjust fade sequence and durations to feel better 2020-10-20 15:03:33 +09:00
Dean Herbert
4e57751ca1 Fix background dim application to avoid overdraw, transition smoother 2020-10-20 15:03:12 +09:00
Dan Balasescu
1fe987d4b3
Merge pull request #10497 from peppy/beatmap-carousel-less-diffcalc-stutter
Disable difficulty calculation for set-level difficulty icons
2020-10-20 14:57:34 +09:00
Dan Balasescu
976f96b51d
Merge branch 'master' into beatmap-carousel-refactor-less-alloc-overhead 2020-10-20 14:26:23 +09:00
Dan Balasescu
13060b8575
Merge branch 'master' into beatmap-carousel-less-diffcalc-stutter 2020-10-20 14:26:16 +09:00
Dan Balasescu
f35611b452
Merge pull request #10494 from peppy/beatmap-carousel-refactor
Add beatmap set level pooling to beatmap carousel
2020-10-20 14:25:56 +09:00
Dean Herbert
80b1f816c7 Merge branch 'master' into hide-hud-during-break-time 2020-10-20 14:19:04 +09:00
Dean Herbert
c57fecd1fc Update comment to make it clear this is a hack 2020-10-20 12:43:57 +09:00
Bartłomiej Dach
fd4bab85cf Merge branch 'master' into epilepsy-warning 2020-10-20 01:06:46 +02:00
Bartłomiej Dach
05251c646e Fade volume back up on pop out 2020-10-20 01:06:20 +02:00
Bartłomiej Dach
1fc22bdbff Only show warning once on given map 2020-10-20 00:59:36 +02:00
Bartłomiej Dach
a164d330e5 Improve feel of transition 2020-10-20 00:51:31 +02:00
Bartłomiej Dach
6e50ae0458 Reformulate push sequence code 2020-10-20 00:22:30 +02:00
Bartłomiej Dach
8505903041 Move warning construction to load() 2020-10-20 00:08:05 +02:00
Bartłomiej Dach
aeca61eb3e Split warning to separate file 2020-10-19 23:48:02 +02:00
Bartłomiej Dach
44279ed347 Remove unused using directive 2020-10-19 23:46:09 +02:00
Salman Ahmed
6e4b28ed1e Different version of epilepsy warning display 2020-10-20 00:32:44 +03:00
Bartłomiej Dach
ba818e3ae0
Merge branch 'master' into results-dynamic-pp-calc 2020-10-19 21:41:07 +02:00
Joehu
fef6e55b39 Remove unused using and field 2020-10-19 12:32:16 -07:00
Joehu
dbda18acea Fix autoplay/replay settings going off screen on some legacy skins 2020-10-19 12:04:23 -07:00
Bartłomiej Dach
4267d23d59 Move border to more appropriate namespace 2020-10-19 20:56:34 +02:00
Bartłomiej Dach
4af3fd1ed6 Allow toggling border on & off during gameplay 2020-10-19 20:41:45 +02:00
Dean Herbert
85790d8569
Merge branch 'master' into beatmap-carousel-refactor 2020-10-19 20:46:55 +09:00
Dean Herbert
d5940193a2 Ensure visible items is greater than zero before trying to display a range 2020-10-19 19:55:20 +09:00
Dean Herbert
9106e97c37 Ensure max value in clamp is at least zero 2020-10-19 19:10:01 +09:00
Dean Herbert
002ade51fc
Merge pull request #9816 from voidedWarranties/duplicate-multi-room 2020-10-19 19:02:03 +09:00
Dean Herbert
46d17d3857 Merge branch 'master' into beatmap-carousel-refactor 2020-10-19 18:43:17 +09:00
Dean Herbert
1c2185e969 Replace comment with link to issue 2020-10-19 18:41:28 +09:00
Dean Herbert
044622a7a6 Fix out of bounds issues 2020-10-19 18:41:17 +09:00
Dean Herbert
22bde43106
Merge branch 'master' into visible-playfield-boundary 2020-10-19 18:05:28 +09:00
Dean Herbert
437ca91b94 Use DI to open the copy rather than passing in an ugly action 2020-10-19 17:23:04 +09:00
Dean Herbert
61a43770bd Merge branch 'master' into duplicate-multi-room 2020-10-19 16:58:45 +09:00
Dean Herbert
79a17b2371 Reapply waveform colour fix 2020-10-19 16:57:08 +09:00
Dan Balasescu
b5cadd6a2c
Merge pull request #10555 from peppy/fix-score-display-zero-padding
Fix incorrect zero padding for classic scoring mode
2020-10-19 15:54:12 +09:00
Dean Herbert
ba99c5c134 Remove rolling delay on default combo counter 2020-10-19 14:39:02 +09:00
Dean Herbert
cb1784a846 Fix score displays using non-matching zero padding depending on user score display mode 2020-10-19 14:05:28 +09:00
Dean Herbert
467bb9b96f
Merge branch 'master' into beatmap-carousel-refactor 2020-10-19 13:17:11 +09:00
Dean Herbert
bff3856c83 Account for panel height when removing as off-screen 2020-10-19 13:13:32 +09:00
Dean Herbert
ee0efa0b4c Fix off-by-one in display range retrieval logic 2020-10-19 13:05:42 +09:00
Dean Herbert
4590d9b93b Remove outdated comment logic 2020-10-19 13:04:12 +09:00
Dan Balasescu
b7c12ff61e
Merge pull request #10530 from peppy/fix-catch-dual-combo-counter
Fix osu!catch showing two combo counters for legacy skins
2020-10-16 23:52:14 +09:00
smoogipoo
dfbc0965e4 Merge branch 'master' into peppy/skinnable-health-display 2020-10-16 23:17:17 +09:00
Dean Herbert
e87f515a4f
Merge pull request #10522 from Morilli/legacyskin-fixes
Add support for ScorePrefix and ScoreOverlap values in legacy skins
2020-10-16 20:54:03 +09:00
Berkan Diler
cc11283143 Use string.Starts-/EndsWith char overloads 2020-10-16 11:27:02 +02:00
Dean Herbert
8a3bce3cc3 Fix osu!catch showing two combo counters for legacy skins 2020-10-16 18:20:17 +09:00
Dean Herbert
a774de2270 Also add support in LegacyComboCounter 2020-10-16 17:52:22 +09:00
Dean Herbert
77bf050a80 Ignore IgnoreHits for flashiness 2020-10-16 17:24:43 +09:00
Dean Herbert
f0b15813e2 Add support for both legacy styles 2020-10-16 17:08:46 +09:00
Dean Herbert
a810f56ec8 Move "flash on hit only" logic to binding 2020-10-16 17:08:46 +09:00
Dean Herbert
c0a1f2158c Add basic component structure for skinnable health displays 2020-10-16 17:08:46 +09:00
Dan Balasescu
829241a9f0
Merge pull request #10521 from peppy/fix-editor-seek-interval-when-playing
Fix editor not seeking by full beat when track is playing
2020-10-16 13:55:03 +09:00
Dean Herbert
aea31d1582 Fix editor not seeking by full beat when track is playing
This is expected behaviour as my osu-stable, and I still stand behind
the reasoning behind it.

Closes #10519.
2020-10-16 13:07:00 +09:00
Dean Herbert
88ffcb9234 Update EndsWith usages 2020-10-16 12:58:34 +09:00
Dean Herbert
88f74921fb Update with new r# inspections 2020-10-16 12:49:39 +09:00
Dan Balasescu
583fdc3a95
Merge pull request #10510 from peppy/skinnable-accuracy-display
Add legacy skinning support for accuracy display
2020-10-15 21:20:48 +09:00
Dan Balasescu
5d8cf87155
Merge pull request #10511 from peppy/bottom-error-display
Add support for bottom-anchored hit error display
2020-10-15 20:51:09 +09:00
Dan Balasescu
70b050f212
Merge branch 'master' into skinnable-accuracy-display 2020-10-15 20:28:57 +09:00
Dan Balasescu
1ce0e83e59
Merge branch 'master' into skinnable-score-display 2020-10-15 19:16:03 +09:00
Dan Balasescu
93dfbd5d9e
Merge pull request #10505 from peppy/skin-disabler-refactor
Move ISampleDisabler implementation to Player and FrameStabilityContainer
2020-10-15 19:14:52 +09:00
Dean Herbert
70806deba1 Add support for bottom-anchored hit error display 2020-10-15 19:14:02 +09:00
Dean Herbert
d76365ed1b Make container readonly 2020-10-15 18:38:41 +09:00
Dan Balasescu
5640d33d1a
Merge branch 'master' into skin-disabler-refactor 2020-10-15 18:32:50 +09:00
Dean Herbert
6983978c98 Correct top-right element offset by finding the lower top anchor element 2020-10-15 18:30:44 +09:00
Dean Herbert
b31a3fbabb Add test 2020-10-15 18:11:30 +09:00
Dean Herbert
254eba9008 Add and consume skinnable accuracy counter 2020-10-15 17:53:16 +09:00
Dean Herbert
90ff8ff050 Merge branch 'skinnable-combo-counter' into skinnable-score-display 2020-10-15 17:52:06 +09:00
Dean Herbert
37e9f331ad Simplify score font lookup 2020-10-15 17:49:55 +09:00
Dean Herbert
43e5cb90e2 Merge branch 'skinnable-combo-counter' into skinnable-score-display 2020-10-15 17:30:29 +09:00
Dean Herbert
9f51327e4b Fix completely incorrect default positioning logic 2020-10-15 17:29:40 +09:00
Dean Herbert
5b5ba7df93 Remove unused offset 2020-10-15 17:22:34 +09:00
Dean Herbert
d8d085ede9 Align top-right elements with lowest point in score display 2020-10-15 17:14:42 +09:00
Dean Herbert
74c031cfbb Fix ModOverlay not including "UNRANKED" text in size 2020-10-15 17:14:42 +09:00
Dean Herbert
b210147c2e Update combo counter to read from default score display's position correctly 2020-10-15 17:14:42 +09:00
Dean Herbert
950c47287c Fix positioning of score display in HUD overlay 2020-10-15 17:14:42 +09:00
Dean Herbert
e1da64398e Add and consume skinnable score counter 2020-10-15 17:14:42 +09:00
Dean Herbert
219cbec6bd Split out DefaultScoreCounter and make ScoreCounter abstract 2020-10-15 16:32:30 +09:00
Dean Herbert
d5f2aab52e Tidy up SkinnableComboCounter class slightly 2020-10-15 15:37:40 +09:00
Dean Herbert
e0210f5c4c Ignore failed casts to make tests happy 2020-10-14 23:52:58 +09:00
Dean Herbert
e3eaba7b2c Move ISampleDisabler implementation to Player and FrameStabilityContainer 2020-10-14 19:39:48 +09:00
Dean Herbert
ac4f56403d Adjust size/position 2020-10-14 19:16:34 +09:00
Dean Herbert
7f5ea57bd4 Clean-up pass (best effort) on LegacyComboCounter 2020-10-14 19:16:34 +09:00
Dean Herbert
9bb8a43bce Combine LegacyComboCounter and ComboCounter classes 2020-10-14 19:16:34 +09:00
Dean Herbert
fbbea48c8c Add score text skinnability 2020-10-14 19:16:34 +09:00
Dean Herbert
2fce064e32 Add basic legacy combo counter and updating positioning logic 2020-10-14 19:16:34 +09:00
Dean Herbert
6a6718ebab Allow bypassing origin/anchor setting of skinnable components
It makes little sense to set these when using RelativeSizeAxes.Both
2020-10-14 19:16:34 +09:00
Dean Herbert
899bac6ca5 Rename catch combo counter for clarity 2020-10-14 19:16:34 +09:00
Dean Herbert
f5623ee21e Setup skinnable combo counter component with default implementation 2020-10-14 19:16:34 +09:00
Dean Herbert
60603d2918 Add skin components and interfaces 2020-10-14 19:16:34 +09:00
Dean Herbert
98acf1e31d Make field read only 2020-10-14 19:16:25 +09:00
Dean Herbert
a7f8e26e35 Adjust bottom-right elements positions based on song progress display 2020-10-14 18:51:53 +09:00
Dean Herbert
0cf3e90904 Update SongProgress height based on its dynamic height during resize 2020-10-14 18:44:22 +09:00
Dean Herbert
ace9fbc8d3 Confine available area for HUD components to excluse the song progress area 2020-10-14 18:44:22 +09:00
Dean Herbert
30e1fce7a4 Reduce alloc overhead of DrawableCarouselBeatmapSet using new function-based ctor 2020-10-14 15:10:50 +09:00
Dean Herbert
07e6609e6d Disable difficulty calculation for set-level difficulty icons 2020-10-14 14:16:22 +09:00
Dean Herbert
e662dc5342 Add missing licence headers 2020-10-13 20:57:26 +09:00
Dean Herbert
8057ea1097 Fix formatting issues 2020-10-13 20:50:36 +09:00
Dean Herbert
3d416f4d64 Clean up beatmapSet resolution in DrawableCarouselBeatmapSet 2020-10-13 19:31:29 +09:00
Dean Herbert
75b6a5e17e Remove unnecessary hack (fixed via framework update) 2020-10-13 19:31:29 +09:00
Dean Herbert
5d11db7753 Locallise ChildItems to DrawableCarouselBeatmapSet for clarity 2020-10-13 19:31:29 +09:00
Dean Herbert
37daefc2b5 Remove outdated comment 2020-10-13 19:12:33 +09:00
Dean Herbert
8eca28e8bc Add comment about off-screen loading 2020-10-13 19:10:35 +09:00
Dean Herbert
834b0186f4 Adjust fade duration to be slightly shorter 2020-10-13 18:50:10 +09:00
Dean Herbert
2346644c04 Switch DelayedLoadUnloadWrappers to DelayedLoadWrappers
Due to pooling usage, there is no time we need to unload. Switching to
DelayedLoadWrapper cleans up the code and reduces overhead
substantially.
2020-10-13 18:47:40 +09:00
Dean Herbert
a1801f8ae4 Unmark todo for now 2020-10-13 18:47:36 +09:00
Dean Herbert
40a0ab7aaa Avoid allocating CarouselItems for bounds checks 2020-10-13 18:33:31 +09:00
Dean Herbert
4f4f222514 Remove unnecessary fade (already applied by base DrawableCarouselItem) 2020-10-13 18:28:28 +09:00
Dean Herbert
83358d487f Remove logging 2020-10-13 18:18:22 +09:00
Dean Herbert
3d9ea852ec Remove masking override (no longer needed as our size is now correct) 2020-10-13 18:14:23 +09:00
Dean Herbert
69650c16fc Simplify vertical position calculations by including spacing in height definition 2020-10-13 18:13:36 +09:00
Dean Herbert
b1ddb08a4e Fix right click context menus appearing in incorrect locations 2020-10-13 18:01:12 +09:00
Dean Herbert
d9a6a6b245 Split content out into own class 2020-10-13 18:01:12 +09:00
Dean Herbert
9b2ebb8f0f Fix main content DelayedLoadUnloadWrapper not getting a valid size before load 2020-10-13 17:45:41 +09:00
Dean Herbert
f3b937e358 Fix masking issues with certain aspect ratio displays 2020-10-13 17:37:33 +09:00
Dean Herbert
fdd4d95cdc Fix difficulties being at incorrect vertical positions after filter is applied 2020-10-13 17:37:33 +09:00
Dean Herbert
1f0aa974dd Fix failing tests 2020-10-13 17:37:33 +09:00
Dean Herbert
b536f571fd Move header height propagation to update for safety 2020-10-13 17:37:33 +09:00
Dean Herbert
ded09b78cb Avoid usage of AutoSize for DrawableCarouselItems in general 2020-10-13 17:37:33 +09:00
Dean Herbert
cecdf14f53 Avoid reconstructing beatmap difficulties that were recently displayed 2020-10-13 17:37:33 +09:00
Dean Herbert
1da49073ab Calculate content height automatically 2020-10-13 17:37:33 +09:00
Dean Herbert
c08b5e8d03 Align beatmap difficulties correctly 2020-10-13 17:37:33 +09:00
Dean Herbert
cfec4f4fc1 Extract header element from base DrawableCarouselItem class 2020-10-13 17:37:33 +09:00
Dean Herbert
2aad482545 Fix x offsets of difficulties not being updated 2020-10-13 17:37:33 +09:00
Dean Herbert
1b7e3397c6 Use expiry to avoid ToArray 2020-10-13 17:37:33 +09:00
Dean Herbert
075bf23714 Better track off-screen drawables (and return to pool less often) 2020-10-13 17:37:33 +09:00
Dean Herbert
29983afcef Replace pool/cleanup logic with simplest form possible
This will temporarily break panels that go off-screen, as they will
disappear immediately
2020-10-13 17:37:33 +09:00
Dean Herbert
06e84c8eb3 Add comments and split out update steps into a more logical flow 2020-10-13 17:37:33 +09:00
Dean Herbert
20b54fb904 Move transform clean-up to pooling free call 2020-10-13 17:37:33 +09:00
Dean Herbert
f6aa448523 Store y positions inside items rather than in a separate array 2020-10-13 17:37:33 +09:00
Dean Herbert
b92c22ad42 Add logging 2020-10-13 17:37:33 +09:00
Dean Herbert
9814e9ba7f Split classes out to reduce loc burder on DrawableCarouselBeatmapSet 2020-10-13 17:37:33 +09:00
Dean Herbert
975cd5a840 Add back beatmap difficulty appear/disappear movement 2020-10-13 17:37:33 +09:00
Dean Herbert
fd8654cff3 Add back difficulty panel spacing 2020-10-13 17:37:33 +09:00
Dean Herbert
ce67f65084 Fix single results not showing up 2020-10-13 17:37:33 +09:00
Dean Herbert
220c8ba2c4 Fix incorrect vertical offsets when difficulties are filtered away 2020-10-13 17:37:33 +09:00
Dean Herbert
82f9ca3de9 Bind to filter event changes in base drawable item 2020-10-13 17:37:33 +09:00
Dean Herbert
813ee19728 Use existing event flow for rendering beatmap difficulties 2020-10-13 17:37:33 +09:00
Dean Herbert
8847cedf29 Add initial pass of vertical transforms 2020-10-13 17:37:33 +09:00
Dean Herbert
15325f5f51 Base bounds checks on +1 (to avoid worrying about current item heights) 2020-10-13 17:37:33 +09:00
Dean Herbert
bb03c5d77c Temporarily disable masking temporarily to fix panels disappearing at extents 2020-10-13 17:37:33 +09:00
Dean Herbert
524419d5e4 Fix filtered items being considered for height calculation 2020-10-13 17:37:33 +09:00
Dean Herbert
0a144a1388 Correctly free panels after use to avoid finalizer disposal of subtree 2020-10-13 17:37:33 +09:00
Dean Herbert
c5a6f4b453 Fix scroll to selected beatmap 2020-10-13 17:37:33 +09:00
Dean Herbert
5c29aa8cce Fix multiple difficulties being expanded at once 2020-10-13 17:37:33 +09:00
Dean Herbert
5c2f134665 Add back left offset for selected set 2020-10-13 17:37:33 +09:00
Dean Herbert
3cfc0dc82d Add safeties to beatmap panel loading code 2020-10-13 17:37:33 +09:00
Dean Herbert
954d43ef56 Debounce state application events 2020-10-13 17:37:33 +09:00
Dean Herbert
ca1f5dcada Add back panel padding 2020-10-13 17:37:33 +09:00
Dean Herbert
0400b34349 Load more components asynchronously after pool resolution 2020-10-13 17:37:33 +09:00
Dean Herbert
f3b24b9bb5 Avoid performing eager selection constantly on adding ranges of new children 2020-10-13 17:37:33 +09:00
Dean Herbert
0a978c6131 Add basic pooling setup 2020-10-13 17:37:33 +09:00
Dean Herbert
f17d661c1a Add basic range-based invalidation 2020-10-13 17:37:33 +09:00
Dean Herbert
3143224e5b Refactor how drawable carousel items are constructed 2020-10-13 17:37:33 +09:00
Dean Herbert
9193f5b0ba Expose panel height from non-drawable models 2020-10-13 17:37:33 +09:00
Dean Herbert
a393bbe8f7 Remove direct drawable storage from carousel models 2020-10-13 17:37:33 +09:00
Dean Herbert
b08e7ce1f5 Update BaseColour specification 2020-10-13 17:37:24 +09:00
Bartłomiej Dach
68b505ab86 Extract helper function for pp value handling 2020-10-12 22:14:45 +02:00
Dean Herbert
8431a5a23c
Merge pull request #10483 from Joehuu/add-extended-stats-keyboard-shortcut 2020-10-11 22:48:42 +09:00
Dean Herbert
a246991c50
Merge pull request #10472 from LeNitrous/expose-player-isbreaktime
Expose BreakTracker.IsBreakTime in Player
2020-10-11 22:36:24 +09:00
Dean Herbert
de6fe34361 Bind to local bindable and combine dual bindings 2020-10-11 21:51:48 +09:00
Dean Herbert
5fcdee6fd8 Remove cast and expose as IBindable 2020-10-11 21:46:55 +09:00
Joehu
8faa86b048 Add ability to toggle extended statistics using space or enter 2020-10-10 18:32:22 -07:00
unknown
6a52c98a42 make IsBreakTime its own bindable and bind it to BreakTracker on load 2020-10-11 06:15:20 +08:00
Lucas A
e845cc92b8 Round pp values to nearest integer. 2020-10-10 19:58:06 +02:00
Lucas A
de522d53ea Make CalculatePerformanceAsync() nullable. 2020-10-10 19:16:21 +02:00
unknown
7bbdd6ab25 expose break time bindable 2020-10-10 21:07:17 +08:00
Dean Herbert
73c238fae3 Add the ability to search for local beatmaps via online IDs
Closes #10470.
2020-10-10 21:34:11 +09:00
Dean Herbert
b0f8a7794a Make SelectionHandler require EditorBeatmap presence 2020-10-09 21:44:10 +09:00
Dean Herbert
681e88af40
Merge branch 'master' into editor-fix-button-states-after-paste 2020-10-09 20:51:09 +09:00
Dan Balasescu
ecfb7e94c5
Merge branch 'master' into fix-editor-batch-handling 2020-10-09 20:06:06 +09:00
Dan Balasescu
07f19342d1
Merge pull request #10428 from peppy/editor-reset-newcombo-on-placement
Reset new combo button state after successful placement
2020-10-09 19:48:47 +09:00
Dan Balasescu
bcc096ee49
Merge pull request #10446 from peppy/fix-timeline-tick-bar-lines
Fix bar lines ("down beat" as people call it) showing up too often in timeline
2020-10-09 19:24:29 +09:00
Dan Balasescu
62690e4873
Merge pull request #10432 from peppy/editor-reverse-pattern
Add "reverse pattern" support to editor selection handler
2020-10-09 19:19:24 +09:00
Dean Herbert
3838f405dd Fix missed usages 2020-10-09 18:50:05 +09:00
Dean Herbert
edaf6db5c6 Reference EditorBeatmap directly for selected objects 2020-10-09 18:44:23 +09:00
Dean Herbert
21c6242f90 Fix bar lines ("down beat" as people call it) showing up too often in timeline 2020-10-09 18:35:44 +09:00
Dan Balasescu
a6d19cd2d6
Merge pull request #10431 from peppy/fix-distribution-graph-rounding
Fix incorrect timing distribution display due to lack of rounding
2020-10-09 18:12:29 +09:00
Dan Balasescu
a1226ccaa2
Merge pull request #10440 from peppy/fix-editor-song-after-exit
Fix editor playing deleted beatmap's track on exit-without-save
2020-10-09 17:58:31 +09:00
Dan Balasescu
4881a13f4b
Merge pull request #10443 from peppy/editor-timeline-tick-display-performance
Improve TimelineTickDisplay performance
2020-10-09 17:53:12 +09:00
Dean Herbert
5d888f687a Account for the width of points so they don't suddenly appear at timeline edges 2020-10-09 16:49:51 +09:00
Dean Herbert
ceb1494c33 Only run regeneration when passing a new min/max tick boundary 2020-10-09 16:47:29 +09:00
Dean Herbert
017a8ce496 Only recalculate when display actually changes 2020-10-09 15:57:31 +09:00
Dean Herbert
9baf704942 Add local pooling to TimelineTickDisplay 2020-10-09 15:48:24 +09:00
Dean Herbert
8be19fd820 Increase height of contracted score panel to fit mods again 2020-10-09 13:26:09 +09:00
Dean Herbert
07558b5bc0 Merge branch 'master' into ruleset-result-types 2020-10-09 13:17:05 +09:00
Dean Herbert
68039cff40 Set beatmap to sane default on exiting editor 2020-10-09 13:12:48 +09:00
Dean Herbert
825e10ec8c Add reverse handler button to selection box 2020-10-09 06:32:23 +09:00
Dean Herbert
eacc7dca9a Fix SliderPath not handling Clear correctly 2020-10-09 06:31:59 +09:00
Dean Herbert
85b33fffd0 Fix incorrect comments 2020-10-09 05:14:44 +09:00
Dean Herbert
ff5a1937f5 Fix test logic and stabilise rounding direction 2020-10-09 05:04:03 +09:00
Dean Herbert
a5b2c4195e Fix incorrect timing distribution display due to lack of rounding 2020-10-09 04:41:45 +09:00
Dean Herbert
5966205037 Fix ternary button states not updating correctly after a paste operation 2020-10-09 04:31:45 +09:00
Dean Herbert
e7eda19b07 Reset new combo button state after successful placement 2020-10-09 03:31:01 +09:00
Dean Herbert
8dddd8aff5
Merge pull request #9883 from swoolcock/confine-during-gameplay
Add "During Gameplay" option for mouse confining
2020-10-08 20:25:27 +09:00
Dean Herbert
4ccd751604 Further simplify non-transactional change logic 2020-10-08 18:42:53 +09:00
Dean Herbert
3114174e09 Add missing non-transactional SaveState calls 2020-10-08 18:41:03 +09:00
Dean Herbert
dbdb25ccf7 Move reset logic to OsuGame 2020-10-08 18:29:19 +09:00
Dean Herbert
43a575484a Remove pointless comments 2020-10-08 18:29:09 +09:00
Dean Herbert
afed832b19 Tidy up EditorBeatmap slightly 2020-10-08 18:06:49 +09:00
Dean Herbert
1027b608ff Copy list content before firing events to avoid pollution 2020-10-08 18:04:07 +09:00
Dean Herbert
38babf3de5 Update usages of ChangeHandler to EditorBeatmap where relevant 2020-10-08 18:04:07 +09:00
Dean Herbert
b2d93f799f Hook ChangeHandler to transactional events rather than individual ones 2020-10-08 18:04:07 +09:00
Dean Herbert
0781fbd443 Make EditorBeatmap implement TransactionalCommitComponent 2020-10-08 18:04:07 +09:00
Dean Herbert
a9bca671d0 Make component and add hooking events 2020-10-08 18:04:07 +09:00
Dean Herbert
ce04daf053 Split transaction handling code out into base class 2020-10-08 18:04:07 +09:00
Dean Herbert
ef092de9ba Add missing UpdateHitObject calls and move local to usages (not via bindables) 2020-10-08 18:04:07 +09:00
Bartłomiej Dach
ac44f6f679 Ensure control point group exists after move
If the control point group moved was empty, it would not be created due
to a lack of ControlPointInfo.Add() calls.
2020-10-07 23:10:28 +02:00
Bartłomiej Dach
b1029a124c Move event subscription to LoadComplete
Prevents attempting to read from the `colours` field before it is
actually injected.
2020-10-07 22:57:20 +02:00
Bartłomiej Dach
4ba8d823d3
Merge branch 'master' into fix-quick-retry-music-playback 2020-10-07 20:57:10 +02:00
Lucas A
a425cf4a31 Fix broken class reference. 2020-10-07 13:29:10 +02:00
Lucas A
7f5cf04b2b Fix merge conflicts. 2020-10-07 13:28:49 +02:00
Dean Herbert
0f6eb9d4cb Ensure music playback is stopped when retrying by any means 2020-10-07 17:40:54 +09:00
Dean Herbert
5171c18a4b
Merge branch 'master' into ruleset-result-types 2020-10-07 17:04:02 +09:00
Dean Herbert
f77ad8cf39 Remove unused using 2020-10-07 17:03:34 +09:00
Dean Herbert
31d347be5c Make extended score panel taller to better fit all information 2020-10-07 16:50:00 +09:00
Dan Balasescu
f206ea96ce
Merge pull request #10391 from peppy/editor-setup-screen-difficulty-adjust
Add difficulty adjustment settings to editor setup screen
2020-10-07 16:33:10 +09:00
Dean Herbert
67398b5d95 Move timestamp text out of flow and attach to bottom edge 2020-10-07 16:30:14 +09:00
Shane Woolcock
2e0a9f53c1 Add test coverage 2020-10-07 17:52:39 +10:30
Dean Herbert
6ac70945f2 Show bonus judgements on expanded panel 2020-10-07 16:17:28 +09:00
Dean Herbert
c0bc6a75b3 Show auxiliary judgements on next line 2020-10-07 16:17:17 +09:00
Dean Herbert
e281d724b8 Consume display name logic 2020-10-07 15:43:52 +09:00
Shane Woolcock
8b8eb00bd7 Permit nulls rather than casting to OsuGame 2020-10-07 16:16:58 +10:30
Shane Woolcock
485bd962c7 Also reset LocalUserPlaying in OnSuspending 2020-10-07 16:15:17 +10:30
Shane Woolcock
7fff762dfc Rename IsGameplay 2020-10-07 16:14:49 +10:30
Dean Herbert
a6d1484ad5 Add arbirary precision specification for now 2020-10-07 14:26:01 +09:00
Dan Balasescu
2ef5a34ace
Merge branch 'master' into editor-beatmap-batch-change-support 2020-10-07 14:08:49 +09:00
Dean Herbert
c1a8fe01ef Fix postprocess order in batch events 2020-10-07 11:09:45 +09:00
Shane Woolcock
8847b88e65 Fix unit tests trying to resolve OsuGame 2020-10-07 11:44:41 +10:30
Shane Woolcock
ec12a21088 Merge branch 'master' into confine-during-gameplay
# Conflicts:
#	osu.Game/Overlays/Settings/Sections/Input/MouseSettings.cs
2020-10-07 11:07:00 +10:30
Dean Herbert
09f5e9c9eb Use batch change application in many places that can benefit from it 2020-10-06 22:10:07 +09:00
Dean Herbert
14c734c244 Add a very simple method of applying batch changes to EditorBeatmap 2020-10-06 22:10:07 +09:00
Shane Woolcock
478f2dec96 Maintain the current gameplay state in OsuGame 2020-10-06 22:39:35 +10:30
Dan Balasescu
aae4a74d14
Merge branch 'master' into editor-setup-screen-difficulty-adjust 2020-10-06 20:11:44 +09:00
Dan Balasescu
50872e3839
Merge pull request #10390 from peppy/editor-setup-sections-container
Split editor setup screen up into sections
2020-10-06 20:07:56 +09:00
Dan Balasescu
7d4b495197
Merge pull request #10395 from peppy/editor-timeline-show-repeats
Add repeats display to timeline blueprints
2020-10-06 19:53:50 +09:00
Dean Herbert
461be02e6f Update with underlying changes 2020-10-06 19:34:21 +09:00
Dean Herbert
87d4e86cad Merge branch 'editor-setup-sections-container' into editor-setup-screen-difficulty-adjust 2020-10-06 19:30:32 +09:00
Dan Balasescu
77ccbb087c
Merge pull request #10393 from peppy/fix-editor-backwards-seek
Increase backwards seek magnitude when the track is running
2020-10-06 19:28:28 +09:00
Dean Herbert
06a51297a3 Use content instead of exposing the flow container 2020-10-06 19:26:57 +09:00
Dean Herbert
a2796d2c01 Add repeats display to timeline blueprints 2020-10-06 19:22:35 +09:00
Dan Balasescu
fa65e14455
Merge pull request #10392 from peppy/fix-editor-seek-modifier
Seek at 4x normal speed when holding shift (not 2x)
2020-10-06 19:19:41 +09:00
Shane Woolcock
782fc1d60f Use OsuGame.OverlayActivationMode rather than per-Player 2020-10-06 20:27:35 +10:30
Dan Balasescu
064d081138
Merge branch 'master' into editor-setup-sections-container 2020-10-06 18:36:11 +09:00
Dan Balasescu
e2d081e3cc
Merge pull request #10388 from peppy/editor-setup-placeholder-text
Add placeholder text/colour when no beatmap background is specified yet
2020-10-06 18:29:01 +09:00
Dean Herbert
d5782c95bd
Merge branch 'master' into confine-during-gameplay 2020-10-06 18:05:15 +09:00
Dean Herbert
b1a64f89d7 Increase backwards seek magnitude when the track is running
This matches osu-stable. When the track is running, seeking backwards
(against the flow) is harder than seeking forwards. Adding a mutliplier
makes it feel much better.

Note that this is additive not multiplicative because for larger seeks
the (where `amount` > 1) we don't want to jump an insanely huge amount -
just offset the seek slightly to account for playing audio.
2020-10-06 17:53:12 +09:00
Dean Herbert
3ce234d552 Seek at 4x normal speed when holding shift
This matches osu-stable 1:1. Not sure if it feels better or not but
let's stick with what people are used to for the time being.
2020-10-06 17:47:25 +09:00
Dean Herbert
7e8ab1cb95 Add description text 2020-10-06 17:36:18 +09:00
Dean Herbert
7a20a34aff Add support to EditorBeatmap to update all hitobjects 2020-10-06 17:36:18 +09:00
Dean Herbert
6d7f12ad4b Add basic difficulty setting sliders 2020-10-06 17:33:50 +09:00
Dean Herbert
13b67b93a5 Add difficulty section 2020-10-06 17:33:50 +09:00
Dean Herbert
505dd37a75 Make SettingsItem conform to IHasCurrentValue 2020-10-06 17:33:50 +09:00
Dean Herbert
98fe5f78ee Split setup screen up into sections (and use a SectionContainer) 2020-10-06 17:29:08 +09:00
Dean Herbert
28756d862b Add placeholder text/colour when no beatmap background is specified yet 2020-10-06 17:21:01 +09:00
Dean Herbert
9d7880afda Make SettingsItem conform to IHasCurrentValue 2020-10-06 17:18:54 +09:00
Dean Herbert
46f6e84a33 Fix disclaimer potentially running same code from two different threads 2020-10-06 12:33:57 +09:00
Dan Balasescu
783a463772
Merge branch 'master' into colourise-control-point-table 2020-10-05 20:47:06 +09:00
Dan Balasescu
54f1bcf2ce
Merge pull request #10313 from peppy/control-point-timeline-representation
Display all control point information on the main editor timeline
2020-10-05 20:46:52 +09:00
Dean Herbert
6bc0afdafb Fix remaining conflicts 2020-10-05 20:09:18 +09:00
Dan Balasescu
051ea7eda9
Merge pull request #10329 from peppy/editor-file-drop-support
Add drag-drop support in editor setup screen for audio and background images
2020-10-05 20:05:41 +09:00
Dan Balasescu
ef8e6b3d96
Merge pull request #10310 from peppy/osu-selection-flip-rotate-buttons
Add buttons to flip/rotate the current selection by known amounts
2020-10-05 20:02:09 +09:00
Dean Herbert
e20c28f166
Merge pull request #10306 from smoogipoo/dynamic-difficulty-icon 2020-10-05 19:40:18 +09:00
Dan Balasescu
a920342a09
Merge branch 'master' into editor-file-drop-support 2020-10-05 19:28:44 +09:00
Dan Balasescu
2b824787c1
Guard against potential nullref 2020-10-05 19:28:13 +09:00
Dean Herbert
ba55256fb4
Merge branch 'master' into control-point-timeline-representation 2020-10-05 19:24:28 +09:00
Dan Balasescu
6d50a1ed7d
Merge branch 'master' into osu-selection-flip-rotate-buttons 2020-10-05 19:17:33 +09:00
Dan Balasescu
08f7b18dbe
Merge pull request #10294 from peppy/osu-selection-scaling
Add selection scale and rotate support
2020-10-05 19:17:19 +09:00
Dan Balasescu
2df5ea8ba8
Merge branch 'master' into osu-selection-scaling 2020-10-05 18:47:17 +09:00
Dean Herbert
2ed43c14f8
Merge branch 'master' into editor-file-drop-support 2020-10-05 17:48:06 +09:00
Dean Herbert
365a38e92f
Merge branch 'master' into dynamic-difficulty-icon 2020-10-05 17:37:01 +09:00
Dan Balasescu
16a599850c
Merge branch 'master' into more-timeline-toggles 2020-10-05 17:33:18 +09:00
Dean Herbert
d43ea68709
Merge branch 'master' into fix-gameplay-seek-sample-pausing 2020-10-05 16:21:28 +09:00
Dan Balasescu
d3e1da5922
Merge branch 'master' into editor-timing-screen-change-handling 2020-10-05 15:40:43 +09:00
Dan Balasescu
39f1ceb2ad
Merge pull request #10366 from peppy/fix-editor-save-new-beatmap
Fix editor persisting new beatmap even when user chooses not to
2020-10-05 14:38:43 +09:00
Dean Herbert
e4710f82ec Fix sample disabled status not being updated correctly from seek state 2020-10-05 14:27:51 +09:00
Shane Woolcock
a483dfd2d7 Allow confineMouseTracker to be null 2020-10-05 11:54:39 +10:30
Shane Woolcock
5859755886 Use current OverlayActivationMode to determine confine logic 2020-10-05 11:11:46 +10:30
Shane Woolcock
4b6f893408 Merge branch 'master' into confine-during-gameplay
# Conflicts:
#	osu.Game/Configuration/OsuConfigManager.cs
#	osu.Game/OsuGame.cs
#	osu.Game/Screens/Play/Player.cs
2020-10-05 10:23:37 +10:30
Dean Herbert
9ca0e48acc Change exit logic to be more test-friendly 2020-10-04 23:57:28 +09:00
Dean Herbert
02e4f3ddaf Fix the editor saving new beatmaps even when the user chooses not to 2020-10-04 23:47:16 +09:00
Bartłomiej Dach
6f2b991b32 Ensure true gameplay rate is finite when paused externally 2020-10-04 14:54:51 +02:00
Dean Herbert
ec30ca24c5
Merge pull request #10343 from bdach/hitresult-miss-fixes
Replace direct references to HitResult.Miss wherever applicable
2020-10-04 21:36:26 +09:00
Bartłomiej Dach
a366591d6d
Merge branch 'master' into osu-selection-scaling 2020-10-04 13:28:59 +02:00
Bartłomiej Dach
7957773d58
Merge branch 'master' into more-timeline-toggles 2020-10-04 12:53:10 +02:00
Dan Balasescu
06b55c6aba
Merge pull request #10326 from peppy/editor-less-autoplay-regeneration
Only regenerate autoplay on editor state change
2020-10-03 20:10:29 +09:00
Bartłomiej Dach
1f0620ffd4 Replace assignment references to HitResult.Miss with Judgement.MinResult 2020-10-02 23:31:24 +02:00
Bartłomiej Dach
2b1ef16f89 Replace comparison references to HitResult.Miss with IsHit 2020-10-02 23:31:24 +02:00
Dean Herbert
dab50bff6f Protect "use current time" button against crash when no timing point is selected 2020-10-03 01:27:42 +09:00
Dean Herbert
0d3a95d8fc Remove unnecessary string interpolation 2020-10-02 19:54:13 +09:00
Dean Herbert
2f15d558a3 Merge branch 'master' into control-point-timeline-representation 2020-10-02 19:53:25 +09:00
Dean Herbert
fcc6cb36e4 Change text colour to black 2020-10-02 18:50:47 +09:00
Dean Herbert
66f5187e6a Remove redundant access permission 2020-10-02 18:20:59 +09:00
Dean Herbert
519c3ac2bd Change SliderWithTextBoxInput to transfer on commit 2020-10-02 17:59:57 +09:00
Dean Herbert
9fc9009dbe Add change handling for sample section 2020-10-02 17:59:47 +09:00
Dean Herbert
08faef694b Add change handling for difficulty section 2020-10-02 17:58:27 +09:00
Dean Herbert
693a4ff474 Add change handling for effects section 2020-10-02 17:58:23 +09:00
Dean Herbert
98fd661b23 Add change handling for timing section 2020-10-02 17:55:47 +09:00
Dean Herbert
c1c5b5da8e Push state change on control point group addition / removal 2020-10-02 17:49:38 +09:00
Dean Herbert
436cc572d3 Expose ChangeHandler.SaveState via interface 2020-10-02 17:37:29 +09:00
Dean Herbert
00eed29527 Don't update time if it hasn't changed 2020-10-02 17:35:41 +09:00
Dean Herbert
fc920a8899 Add change handler logic 2020-10-02 17:32:34 +09:00
Dean Herbert
2a02f8f3f3 Add support for background changing 2020-10-02 16:52:45 +09:00
Dean Herbert
b7aba19441 Add audio file drag-drop support at editor setup screen 2020-10-02 16:31:11 +09:00
Dean Herbert
f3c8cd91f4 Remove unused method 2020-10-02 16:14:27 +09:00
Dean Herbert
0cb3926e1d Add event on EditorChangeHandler state change 2020-10-02 15:44:34 +09:00
Dean Herbert
2698dc513f Add basic textbox error handling 2020-10-02 15:33:33 +09:00
Dean Herbert
959c8730f6 Add settings section from TimingPointGroups on timing screen 2020-10-02 15:30:32 +09:00
Dean Herbert
94996f2cc0
Merge branch 'master' into osu-selection-scaling 2020-10-01 21:09:52 +09:00
Dan Balasescu
73edb87363
Merge pull request #10303 from peppy/more-textbox-entry
Add textbox entry for speed multiplier and volume
2020-10-01 20:42:14 +09:00
Dean Herbert
5ad2944e26 Fix ticks displaying higher than control point info 2020-10-01 19:31:41 +09:00
Dean Herbert
e96e30a19d Move control point colour specifications to common location and use for formatting timing screen table 2020-10-01 19:29:34 +09:00
Dean Herbert
fcccce8b4e Use pink for sample control points to avoid clash with waveform blue 2020-10-01 19:03:17 +09:00
Dean Herbert
589a26a149 Ensure stable display order for control points in the same group 2020-10-01 18:59:35 +09:00
Dean Herbert
b75c202a7e Add sample control point display in timeline 2020-10-01 18:55:34 +09:00
Dean Herbert
0bced34272 Add visualisation of bpm (timing) changes to timeline 2020-10-01 18:55:34 +09:00
Dean Herbert
70931abcb0 Separate out timeline control point display from summary timeline display 2020-10-01 18:55:34 +09:00
Dean Herbert
70d475be1f Fix elements appearing in front of hitobjects 2020-10-01 18:54:59 +09:00
Dean Herbert
00a19b4879 Also add toggle for ticks display 2020-10-01 18:16:49 +09:00
Dean Herbert
b654396a4c Move ticks display to timeline 2020-10-01 18:16:30 +09:00
Dean Herbert
0d03084cdc Move control point display to the base timeline class
We want them to display on all screens with a timeline as they are quite
useful in all cases.
2020-10-01 18:16:12 +09:00
Dean Herbert
60e6cfa45c Avoid recreating child hierarchy when unnecessary 2020-10-01 16:36:03 +09:00
Dean Herbert
1aff263419 Split out classes and simplify construction of buttons 2020-10-01 16:34:34 +09:00
Dean Herbert
db1ad4243e Remove need for ScaleDragHandle class 2020-10-01 16:27:42 +09:00
Dean Herbert
4e6a505a99 Add new icons and tooltips 2020-10-01 16:25:40 +09:00
Dean Herbert
78c5d57074 Add flip event flow and stop passing raw input events to handle methods 2020-10-01 16:25:29 +09:00
Dean Herbert
02f14ab4b0 Rename operation start/end to be more encompassing 2020-10-01 16:24:09 +09:00
Dean Herbert
b1f2bdd579 Add missing xmldoc 2020-10-01 13:47:49 +09:00
Dean Herbert
e0a0902a15 Ensure textbox always reverts to sane state on out-of-range failures 2020-10-01 13:06:24 +09:00
Dean Herbert
9d07dce5e4
Merge pull request #10251 from smoogipoo/additional-hit-results 2020-10-01 12:19:48 +09:00
Bartłomiej Dach
10ae93cc2e
Merge branch 'master' into more-textbox-entry 2020-09-30 23:54:00 +02:00
smoogipoo
fde00d3431 Make DifficultyIcon support dynamic star rating 2020-10-01 00:53:25 +09:00
Dan Balasescu
148e2769c8
Merge pull request #10304 from peppy/fix-control-point-bindable-updates
Fix control point timeline display not updating with changes
2020-09-30 23:30:35 +09:00
Dean Herbert
367b35bb10 Merge branch 'master' into fix-storyboard-sample-pausing 2020-09-30 22:42:26 +09:00
Dan Balasescu
6def54548b
Merge branch 'master' into fix-control-point-bindable-updates 2020-09-30 21:35:36 +09:00
Dan Balasescu
6dab5c2ceb
Merge branch 'master' into fix-editor-silence-on-seek 2020-09-30 21:33:15 +09:00
Dan Balasescu
7eb45990a4
Merge pull request #10302 from peppy/timing-screen-clean-up
Fix timing screen tests and add simple view of control points to timeline
2020-09-30 21:33:07 +09:00
Dan Balasescu
3af7e59103
Merge pull request #10289 from peppy/timeline-ux-improvements
Improve the usability of the editor timeline with combo colour and indices
2020-09-30 20:32:55 +09:00
Dean Herbert
fa742a2ef1 Update to consume framework fixes 2020-09-30 20:28:02 +09:00
Dean Herbert
df9d4bc2f0 Merge branch 'master' into fix-control-point-bindable-updates 2020-09-30 20:27:25 +09:00
Dean Herbert
a11c74d600 Update to consume framework fixes 2020-09-30 20:27:02 +09:00
Dean Herbert
f9d6aed2df Merge branch 'master' into timing-screen-clean-up 2020-09-30 20:26:02 +09:00
Dean Herbert
5242f5648d Fix timeline control point display not updating with changes 2020-09-30 18:34:13 +09:00
Dean Herbert
44fc0c6723 Fix default value of bpm being too high 2020-09-30 18:08:55 +09:00
Dean Herbert
bc943dee53 Add textbox entry for speed multiplier and volume 2020-09-30 17:52:12 +09:00
Dean Herbert
b0f8e11bd4 Fix incorrect caching 2020-09-30 17:34:14 +09:00
Dean Herbert
3422db1bb2 Use top-left colour for deciding the text colour (gradient was added in some cases) 2020-09-30 17:10:22 +09:00
Dean Herbert
7f579850dd
Merge branch 'master' into fix-editor-silence-on-seek 2020-09-30 17:03:23 +09:00
Dean Herbert
698042268f Show control points in timing screen timeline 2020-09-30 17:00:42 +09:00
Dean Herbert
5b200a8ca4 Change default zoom of timing screen timeline to most zoomed out 2020-09-30 16:39:27 +09:00
Dean Herbert
a40c2ea5ee Simplify control point group binding/update logic 2020-09-30 16:02:22 +09:00
Dean Herbert
414c40d298 Reverse inheritance order of SkinnableSound's pause logic 2020-09-30 15:45:14 +09:00
Dan Balasescu
466d37a450
Merge branch 'master' into fix-spinner-rpm-user-rate-adjust 2020-09-30 15:43:56 +09:00
Dean Herbert
59ce9fcab9 Merge branch 'master' into fix-editor-silence-on-seek 2020-09-30 15:35:55 +09:00
Dean Herbert
ae9e884a48 Fix header casing 2020-09-30 15:35:25 +09:00
Dean Herbert
d6c88ecd69 Merge branch 'master' into osu-selection-scaling 2020-09-30 15:09:04 +09:00
Dean Herbert
f1298bed79 Combine scale operations and tidy up scale drag handle construction 2020-09-30 15:08:56 +09:00
Dean Herbert
39b55a85df Move a lot of the implementation to base SelectionHandler 2020-09-30 13:52:57 +09:00
Dean Herbert
f2c26c0927 Move information text underneath the selection box 2020-09-30 13:07:24 +09:00
Dean Herbert
1386c9fe66 Standardise time display formats across the editor 2020-09-30 12:45:43 +09:00
Lucas A
35f7de2084 Apply review suggestions. 2020-09-29 18:08:21 +02:00
Dean Herbert
a2e2cca396 Add proper change handler support 2020-09-29 20:08:56 +09:00
Dean Herbert
0a10e40ce0 Add scaling support to osu! editor 2020-09-29 20:08:56 +09:00
Dean Herbert
cd794eaa65 Add basic selection box with drag handles 2020-09-29 20:08:56 +09:00
Dean Herbert
6e1ea00443 Don't apply gradient to non-duration objects 2020-09-29 17:34:50 +09:00
Dean Herbert
c47652c97a Add gradient to hide subtractive colour issues
Good thing is looks better than without.
2020-09-29 17:26:54 +09:00
Dean Herbert
8d8d45a0c0 Add combo index display support 2020-09-29 17:26:54 +09:00
Dean Herbert
f16fc29071 Add combo colour display support 2020-09-29 17:26:54 +09:00
Dean Herbert
53b3d23842 Expose HitObjectComposer for other components in the Compose csreen to use 2020-09-29 17:26:54 +09:00
Dean Herbert
136843c8e4 Make DrawableStoryboardSample a SkinnableSound
Allows sharing pause logic with gameplay samples.
2020-09-29 14:25:39 +09:00
Dean Herbert
74e74e1c31 Fix pause loop sound not working because paused 2020-09-29 14:20:41 +09:00
Dean Herbert
c5f6b77bba Add missing cached type 2020-09-29 13:42:17 +09:00
Dean Herbert
d6f3beffb6 Use existing bindable flow instead 2020-09-29 12:50:17 +09:00
Dean Herbert
585b857a0c Handle paused state correctly 2020-09-29 12:17:38 +09:00
Lucas A
6efc4c4250 Cache performance calculations to prevent recomputations. 2020-09-28 19:04:39 +02:00
Dean Herbert
4f0c0ea5f9 Fix hit samples playing while paused / seeking in the editor 2020-09-28 18:17:47 +09:00
Dean Herbert
fd58a24183
Merge branch 'master' into fix-spinner-rpm-user-rate-adjust 2020-09-28 17:45:48 +09:00
Dan Balasescu
2f5a2d3bba
Merge pull request #10277 from peppy/editor-implicit-autoplay
Add autoplay support to editor
2020-09-28 17:41:26 +09:00
Dan Balasescu
89c8fca3fa
Merge pull request #10270 from peppy/editor-fix-noop-states-saving
Avoid saving state changes if nothing has changed (via binary comparison)
2020-09-28 17:03:50 +09:00
Dan Balasescu
06ab33645e
Merge branch 'master' into editor-implicit-autoplay 2020-09-28 16:43:08 +09:00
Dan Balasescu
5cceb3c724
Merge pull request #10273 from peppy/editor-fix-missing-update-after-drag
Trigger a hitobject update after blueprint drag ends
2020-09-28 16:34:23 +09:00
Dean Herbert
7949eabaac Remove left-over using 2020-09-28 15:49:45 +09:00
Dean Herbert
d9ac5866b6 Merge branch 'editor-default-hit-sample' into editor-implicit-autoplay 2020-09-28 15:48:37 +09:00
Dean Herbert
a4e9c85333 Trigger a hitobject update after blueprint drag ends 2020-09-28 15:37:06 +09:00
Dean Herbert
0ae2266b82 Fix new placement hitobjects in the editor not getting the default sample added 2020-09-28 15:36:13 +09:00
Dean Herbert
1aa8b400d4 Avoid unnecessary object updates from SelectionHandlers 2020-09-28 15:33:49 +09:00
Dean Herbert
3cf430f494 Avoid saving state changes if nothing has changed (via binary comparison) 2020-09-28 15:30:51 +09:00
Lucas A
ddede85704 Split performance calculation to its own class. 2020-09-27 12:44:29 +02:00
Lucas A
3cb9103fe0 Inherit PerformanceStatistic from CounterStatistic 2020-09-27 09:37:57 +02:00
Lucas A
4d94bf3163 Rename CalculateScorePerformance -> CalculatePerformance 2020-09-25 19:16:33 +02:00
Lucas A
77a9d92f42 Add dynamic pp calculation to score panels for local scores 2020-09-25 19:15:40 +02:00
smoogipoo
a07597c369 Adjust displays to use new results/orderings 2020-09-25 20:22:59 +09:00
Dean Herbert
b2261f03e2
Merge branch 'master' into fix-spinner-rpm-user-rate-adjust 2020-09-25 20:21:35 +09:00
Dan Balasescu
2280568d27
Merge pull request #10245 from peppy/editor-sample-addition-buttons
Add sample toggle buttons to toolbox
2020-09-25 20:09:10 +09:00
Dan Balasescu
93a137ed84
Merge pull request #10234 from peppy/editor-load-audio
Add audio track selection to editor setup screen
2020-09-25 19:58:23 +09:00
Dan Balasescu
cc41b4bb9e
Merge branch 'master' into editor-sample-addition-buttons 2020-09-25 19:39:12 +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
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
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
Dean Herbert
ae68dcd962 Add ternary toggle buttons to editor toolbox selection 2020-09-25 16:38:12 +09:00
Dean Herbert
0f8551e9ea Merge branch 'editor-ternary-states' into new-combo-toggle 2020-09-25 15:36:33 +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
e828cf1607
Merge branch 'master' into editor-load-audio 2020-09-25 14:49:54 +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
26ba7d3100 Remove unused method (was moved to a more local location) 2020-09-25 13:20:19 +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
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
44a6637c36 Use SingleOrDefault 2020-09-25 12:20:37 +09:00
Dean Herbert
b9196718b7 Merge branch 'master' into editor-object-object-snapping 2020-09-25 12:15:10 +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
158d307126 Avoid destroying editor screens when changing between modes 2020-09-24 17:03:54 +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
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
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
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
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
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
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
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
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
1fcf443314 Ensure BeatmapProcessor.PostProcess is run before firing HitObjectUpdated events 2020-09-18 19:33:03 +09:00
Joehu
c6386ea605 Remember leaderboard mods filter selection in song select 2020-09-15 21:53:35 -07:00
Dean Herbert
3c70b3127c Fix potential nullref in FilterControl during asynchronous load 2020-09-15 23:19:31 +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
Dean Herbert
2c7492d717 Add null check in SongSelect disposal for safety 2020-09-15 14:34:58 +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
daf54c7eb9 Revert EditorBeatmap.Remove API 2020-09-14 17:55:41 +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
692f2c8489 Simplify debounced update pathway 2020-09-14 14:58:00 +09: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
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
94d929d8cd Remove unnecessary contains checks 2020-09-11 22:03:19 +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
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
Yao Chung Hu
96f39dd350 Merge remote-tracking branch 'upstream/master' into visible-playfield-boundary 2020-09-05 01:50:13 -05: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
Craftplacer
f5c82d41eb Remove if-cast 2020-08-30 16:06:48 +02:00
Craftplacer
00b68b050c Merge remote-tracking branch 'upstream/master' into combo-colors 2020-08-30 10:16:38 +02:00
Lucas A
03b7c8b889 Remove unneeded access modifier. 2020-08-29 19:39:50 +02:00
Lucas A
8de7744b52 Add back disabling of overlays on exiting game. 2020-08-29 19:34:53 +02:00
Lucas A
ad223bc460 Make game bindable immutable. 2020-08-29 19:34:53 +02:00
Lucas A
5949a281fc Make Introduce bindable property OverlayActivationMode in OsuScreen 2020-08-29 19:34:35 +02:00
Joehu
0a643fd5e5 Fix replay download button always being disabled when initial score's replay is unavailable 2020-08-29 09:33:01 -07:00
smoogipoo
c1838902a6 Add to more places 2020-08-28 22:51:48 +09:00
Dan Balasescu
4765f989b6
Merge branch 'master' into unstable-rate 2020-08-28 16:02:13 +09:00
Dan Balasescu
de222ddc24
Merge pull request #9984 from Poliwrath/lingering-circles
Fix lingering small ring in circles! intro
2020-08-28 15:15:56 +09:00
Bartłomiej Dach
6846a245f4 Reapply lost anchoring fix 2020-08-27 20:51:28 +02:00
Bartłomiej Dach
ea1f07e311 Simplify/rename SimpleStatisticRow mess 2020-08-27 20:37:10 +02:00
Bartłomiej Dach
ce013ac9b4 Make statistic header optional 2020-08-27 20:18:53 +02:00
Bartłomiej Dach
f152e1b924 Revert IStatisticRow changes 2020-08-27 20:13:44 +02:00
Bartłomiej Dach
f8042e6fd3 Add fade to prevent jarring transitions 2020-08-26 22:34:28 +02:00
Bartłomiej Dach
c3197da3da Adjust simple statistic item font sizes 2020-08-26 22:34:28 +02:00
Bartłomiej Dach
d81d538b7e Move out row anchor/origin set to one central place 2020-08-26 22:34:27 +02:00
Bartłomiej Dach
5973e2ce4e Add component for unstable rate statistic 2020-08-26 22:06:27 +02:00
Bartłomiej Dach
7c3368ecbe Reintroduce SimpleStatisticRow as a data class 2020-08-26 19:33:33 +02:00
Bartłomiej Dach
f5e52c80b4 Rename {-> Drawable}SimpleStatisticRow 2020-08-26 19:25:59 +02:00
Bartłomiej Dach
927a2a3d2d Introduce IStatisticRow interface 2020-08-26 19:19:42 +02:00
Poliwrath
edc15c965c
Update osu.Game/Screens/Menu/IntroSequence.cs
Co-authored-by: Bartłomiej Dach <dach.bartlomiej@gmail.com>
2020-08-26 12:52:39 -04:00
Dean Herbert
f65991f31f Revert some usages based on review feedback 2020-08-26 23:28:58 +09:00
Dean Herbert
b51db90147 Merge branch 'master' into beatmap-track-rework 2020-08-26 23:20:56 +09:00
Poliwrath
c50e495e03 fix lingering small ring in circles! intro 2020-08-26 02:49:55 -04:00
Bartłomiej Dach
f09f882cc7 Add component for displaying simple statistics on result screen 2020-08-25 22:51:40 +02:00
Bartłomiej Dach
29b4d98aac Show retry/fail graph when either list is present 2020-08-24 20:41:50 +02:00
Bartłomiej Dach
cc6ae8e3bd Fix crash if only one count list is received from API 2020-08-24 20:41:31 +02:00
Dean Herbert
dca307e933 Use beatmap directly in ReadyButton 2020-08-24 13:02:39 +09:00
Craftplacer
e6646b9877 Resolve review comments 2020-08-23 15:08:02 +02:00
Dean Herbert
122265ff0e Revert non-track usage 2020-08-22 19:47:08 +09:00
Keijia
b5b2e523ad change switch cases 2020-08-22 12:10:31 +03:00
Keijia
0b6185cd14 add "hp" filter keyword 2020-08-22 01:09:35 +03:00
Dean Herbert
f63d1ba612 Remove stray call to LoadTrack that was forgotten 2020-08-21 18:52:53 +09:00
Dean Herbert
1edafc39ba Fix intro welcome playing double due to missing conditional 2020-08-21 18:33:24 +09:00
Dean Herbert
a47b8222b5 Restore multiplayer to use beatmap track 2020-08-21 17:11:29 +09:00
Dean Herbert
70697cf1a0 Restore remaining editor components to use Beatmap.Track 2020-08-21 17:11:29 +09:00
Dean Herbert
3b03116179 Remove unnecessary using statement 2020-08-21 16:45:59 +09:00
Dean Herbert
0ae460fb8f Avoid beatmap load call in IntroScreen 2020-08-21 15:50:14 +09:00