Dean Herbert
66910f1ee3
Remove unnecessary bindable setter
2020-02-14 17:50:53 +09:00
Dean Herbert
48dcb91118
Merge branch 'master' into custom-detail-area
2020-02-14 17:40:12 +09:00
smoogipoo
5ec9f454d5
Implement the match beatmap detail area
2020-02-14 17:20:38 +09:00
smoogipoo
25e399f11b
Merge branch 'match-playlist' into match-detail-area
2020-02-14 17:04:22 +09:00
smoogipoo
aceba8791c
Clean up selection handling
2020-02-14 16:56:44 +09:00
smoogipoo
afd3e4604b
Fix race condition causing selection to be reset incorrectly
2020-02-14 16:48:23 +09:00
smoogipoo
1909ea2bd3
Add a way to hide the drag handle
2020-02-14 16:09:19 +09:00
smoogipoo
5e871f9838
Make room playlist use the common rearrangeable design
2020-02-14 15:36:47 +09:00
smoogipoo
eb14dbcd77
Initial implementation of rearrangeable playlist
2020-02-14 15:01:45 +09:00
Dean Herbert
0e439e3a70
Fix missing dependency in ZoomableScrollContainer test
2020-02-14 14:41:55 +09:00
Dean Herbert
884a5fbad4
Fix osu! gameplay cursor not adjusting to mod/convert circle size changes
2020-02-14 14:30:15 +09:00
Dan Balasescu
60d796ae3f
Merge branch 'master' into fix-timeline-seek-while-playing
2020-02-14 13:04:38 +09:00
voidedWarranties
368e6f9579
Use CarouselBeatmap.State to select
2020-02-13 17:47:16 -08:00
voidedWarranties
c871f07d2e
Use CarouselBeatmap action to select beatmap
2020-02-13 17:14:46 -08:00
Dean Herbert
d7c71cd0c1
Merge branch 'master' into update-placement-more-often
2020-02-13 23:55:18 +09:00
Dean Herbert
4a04b434a9
Merge branch 'master' into remove-current-item
2020-02-13 21:41:23 +09:00
Dean Herbert
b9a296d3f9
Merge branch 'master' into remove-current-item
2020-02-13 19:34:15 +09:00
Dean Herbert
28ca1a5bcc
Merge branch 'master' into participants-bindable
2020-02-13 19:31:50 +09:00
smoogipoo
bce9c8f3f3
Make room participants into a bindable list
2020-02-13 18:59:15 +09:00
Dean Herbert
e022352812
Merge pull request #7784 from smoogipoo/fix-beatmap-disposal
...
Fix disposal-related errors by making WorkingBeatmap non-disposable
2020-02-13 18:52:47 +09:00
Dean Herbert
49a1725749
Merge pull request #7812 from smoogipoo/playlist-bindables
...
Make playlist beatmap and ruleset into bindables
2020-02-13 18:51:42 +09:00
smoogipoo
75bef15583
Remove "current" multiplayer room item
2020-02-13 18:48:28 +09:00
Dan Balasescu
4b7a053544
Merge branch 'master' into update-placement-more-often
2020-02-13 18:43:27 +09:00
Dean Herbert
d6263adb7b
Merge pull request #7806 from peppy/timeline-zoom-button-repeat
...
Add mouse down repeat support to timeline zoom buttons
2020-02-13 18:35:11 +09:00
Dean Herbert
24e7c3e11b
Merge pull request #7811 from smoogipoo/mod-expansion-types
...
Improve extensibility of mod display expansion
2020-02-13 18:34:46 +09:00
smoogipoo
91edadfe9d
Make playlist beatmap and ruleset into bindables
2020-02-13 18:12:47 +09:00
smoogipoo
d4f14e552a
Improve extensibility of mod display expansion
2020-02-13 18:05:53 +09:00
Dan Balasescu
c384e3cfc2
Merge branch 'master' into timeline-zoom-button-repeat
2020-02-13 18:04:36 +09:00
Dan Balasescu
d80e9550fb
Merge branch 'master' into timeline-zoom-button-repeat
2020-02-13 17:38:45 +09:00
Dan Balasescu
5a90e6f9b5
Merge branch 'master' into fix-blueprint-outside-container
2020-02-13 17:32:49 +09:00
voidedWarranties
ad0de27964
Safer dependency injection and accessibility levels
2020-02-12 22:11:26 -08:00
smoogipoo
6f7196b0b8
Make beatmap detail area abstractable
2020-02-13 13:46:23 +09:00
voidedWarranties
f8b69fe632
Remove unnecessary carousel variable, fix code formatting
2020-02-12 20:11:39 -08:00
voidedWarranties
b126c00292
Use dependency loader to get SongSelect instance
2020-02-12 19:05:08 -08:00
Dean Herbert
118f862342
Fix not being able to seek using scroll wheel in timeline while playing track
2020-02-13 12:03:50 +09:00
Dean Herbert
03bf10f9a2
Remove unused using statement
2020-02-13 11:15:00 +09:00
Dean Herbert
487dd47c9e
Add mouse down repeat support to timeline zoom buttons
2020-02-13 11:14:09 +09:00
Dean Herbert
e34a24a063
Update placement blueprint more often for better display
2020-02-13 10:45:16 +09:00
Dean Herbert
2b6f99d404
Standardise placement blueprint creation and destruction
2020-02-13 10:12:56 +09:00
Dean Herbert
b65e839bd2
Simplify blueprints by removing visible state
2020-02-13 10:00:09 +09:00
Dean Herbert
0fe41fd50a
Fix blueprint showing even when mouse outside of container
2020-02-13 09:03:48 +09:00
Dan Balasescu
866b6bb058
Merge branch 'master' into fix-song-select-weirdness
2020-02-12 15:01:15 +09:00
voidedWarranties
2901ec9f26
Select specific difficulties using their icons
2020-02-11 20:05:26 -08:00
Dean Herbert
2a67246b21
Ensure game is at main menu before performing exit on screen
2020-02-11 22:37:38 +09:00
Dean Herbert
8186f72507
Remove unused using
2020-02-10 17:12:45 +09:00
smoogipoo
51e2a934bd
Fix possible beatmap nullref in logo visualisation
2020-02-10 17:02:00 +09:00
Dean Herbert
66fb72cd8a
Fix song select not showing active beatmap if it is filtered by local criteria
2020-02-10 16:59:54 +09:00
Dan Balasescu
bb15153f30
Merge branch 'master' into placement-display-in-timeline
2020-02-10 14:29:01 +09:00
Dan Balasescu
28cf5c7a59
Add accessor
2020-02-10 14:28:43 +09:00
Dean Herbert
84d9e3eda7
Merge branch 'master' into fix-accuracy-format
2020-02-08 11:37:03 +09:00
Dean Herbert
801e39a543
Improve xmldoc for PlacementObject
2020-02-08 11:35:27 +09:00
Bartłomiej Dach
9bfd3a1a63
Make PercentageBreakInfoLine use FormatAccuracy
2020-02-08 00:11:19 +01:00
TheWildTree
2770fb71b2
Use SortedStatistics where needed
2020-02-07 21:12:21 +01:00
Dean Herbert
91203c2b12
Merge branch 'master' into placement-display-in-timeline
2020-02-08 01:50:24 +09:00
Dan Balasescu
4ad20ccd8b
Merge pull request #7754 from peppy/screen-under-timeline
...
Make editor screens display below timeline
2020-02-08 00:47:20 +09:00
Dan Balasescu
e4c7b9ebc1
Merge branch 'master' into screen-under-timeline
2020-02-08 00:05:45 +09:00
Dan Balasescu
7c715937ca
Merge branch 'master' into skin-animation-frame-rate
2020-02-07 23:52:45 +09:00
Dean Herbert
2082948f9a
Make editor screens display below timeline
2020-02-07 18:23:59 +09:00
Dean Herbert
56a091674b
Add placement display to timeline
2020-02-07 18:04:10 +09:00
Dean Herbert
e08437c5dc
Track placement object in EditorBeatmap
2020-02-07 18:03:14 +09:00
Dean Herbert
e31d69c749
Add commit status to EndPlacement; call BeginPlacement on initial movement
2020-02-07 18:02:48 +09:00
Dean Herbert
b7996f91fc
Update the windows platform offset to match stable
2020-02-07 17:51:38 +09:00
Dean Herbert
7460018cd3
Move combo colours to GlobalSkinColours
2020-02-07 14:58:07 +09:00
Dan Balasescu
edf20e2c3e
Merge branch 'master' into lounge-ruleset-filtering
2020-02-06 15:35:26 +09:00
Dan Balasescu
8d12d820f1
Merge pull request #7734 from peppy/editor-slider-repeat
...
Add the ability to extend hold notes (spinners / sliders etc.) via timeline
2020-02-06 15:35:16 +09:00
Dan Balasescu
108de6ac56
Merge branch 'master' into editor-slider-repeat
2020-02-06 14:48:45 +09:00
smoogipoo
6ae0efa40d
Fix adjustment not working when dragged before object
2020-02-06 14:47:43 +09:00
smoogipoo
c138e3907e
Move methods below ctor
2020-02-06 14:35:45 +09:00
Dean Herbert
fd71a53717
Fix test regression
2020-02-06 14:28:09 +09:00
Dean Herbert
a84386ba01
Merge branch 'simplify-mp-subscreen-disables' into lounge-ruleset-filtering
2020-02-06 14:22:52 +09:00
Dean Herbert
81cadb7875
Simplify the way multiple subscreens handle their disable states via a custom stack
2020-02-06 14:22:01 +09:00
Dean Herbert
114fd967c1
Revert "Remove leasing at a Multiplayer screen level"
...
This reverts commit 304a071e39
.
2020-02-06 13:47:34 +09:00
Dean Herbert
d00b61de99
Merge branch 'master' into lounge-ruleset-filtering
2020-02-06 13:38:27 +09:00
Dean Herbert
e548a4b8dd
Fix missing bind causing regression in filter
2020-02-06 13:36:49 +09:00
Dean Herbert
94b6564b98
Merge branch 'master' into editor-slider-repeat
2020-02-06 13:16:39 +09:00
Dean Herbert
75eb9ca040
Merge pull request #7739 from peppy/fix-rooms-test-scene
...
Fix rooms test scene not displaying anything
2020-02-06 13:12:10 +09:00
Dean Herbert
061b8c389f
Fix null search string causing an exception
2020-02-06 13:03:04 +09:00
Dean Herbert
1dc7fc4a33
Fix case where playlist is empty
2020-02-06 13:01:48 +09:00
Dan Balasescu
38bf14a06c
Merge branch 'master' into editor-beatmap-component
2020-02-06 12:25:33 +09:00
Dean Herbert
a79d6ff27a
Change transition to better handle mass filter cases
2020-02-06 12:17:20 +09:00
Dean Herbert
304a071e39
Remove leasing at a Multiplayer screen level
2020-02-06 12:17:20 +09:00
Dean Herbert
50c4e34c92
Add ruleset to multiplayer filter criteria
2020-02-06 12:17:20 +09:00
Dean Herbert
00edc7e66f
Fix RoomsContainer test scene not displaying
2020-02-06 12:14:17 +09:00
Dean Herbert
f5edad16e6
Improve visuals
2020-02-05 19:43:13 +09:00
Dean Herbert
98ab1f9862
Fix negative spinners
2020-02-05 18:35:31 +09:00
Dean Herbert
3d42973764
Allow scrolling via drag while dragging a hold note handle
2020-02-05 18:35:31 +09:00
Dean Herbert
cef45afbc8
Add a simple hover state
2020-02-05 18:35:31 +09:00
Dean Herbert
d56accaef1
Disallow negative / zero repeat counts (and fix off-by-one)
2020-02-05 18:35:31 +09:00
Dean Herbert
d04cc0123d
Initial implementation of timeline blueprint dragbars
2020-02-05 18:35:31 +09:00
Dean Herbert
96986bf5fc
Remove beat divisor from ctor and use DI instead
2020-02-05 17:48:21 +09:00
Dean Herbert
63c595ed97
Make EditorBeatmap a component and move UpdateHitObject to it
2020-02-05 17:48:21 +09:00
Dan Balasescu
27c24fb08a
Merge pull request #7721 from recapitalverb/display-accuracy
...
Add {ScoreInfo,UserStatistics}.Accuracy
2020-02-04 16:16:33 +09:00
Dan Balasescu
0e3c1ed0f7
Merge branch 'master' into fix-key-counter-visible-on-reshowing-hud
2020-02-04 14:06:23 +09:00
recapitalverb
79bb476f4c
Merge branch 'master' into display-accuracy
2020-02-04 11:39:47 +07:00
Dan Balasescu
3600b0daf0
Merge branch 'master' into fix-mod-select-overflowing
2020-02-04 11:57:54 +09:00
Joehu
22e3150f68
Fix comment and remove magic numbers
2020-02-03 17:21:06 -08:00
Salman Ahmed
4cd4055e7c
Rename to AlwaysVisible and add XMLDoc
2020-02-03 20:00:43 +03:00
Salman Ahmed
51ed289c59
Revert namings and behaviour changes
2020-02-03 19:59:58 +03:00
recapitalverb
9898a926b2
Use ScoreInfo.DisplayAccuracy everywhere
2020-02-03 22:11:36 +07:00
Salman Ahmed
351cb8ac1a
Rename Visible to HasReplayLoaded and change default value
...
Doesn't make sense to be true by default
2020-02-03 15:47:52 +03:00
Salman Ahmed
443063263e
Merge remote-tracking branch 'upstream/master' into fix-key-counter-visible-on-reshowing-hud
2020-02-03 15:18:25 +03:00
Dan Balasescu
c6e7603e5e
Merge branch 'master' into safe-screen-lease
2020-02-03 18:18:13 +09:00
Dan Balasescu
93952d438f
Merge pull request #7677 from peppy/decouple-mod-select-bindable
...
Decouple ModSelectOverlay from global SelectedMods
2020-02-03 16:27:47 +09:00
Dean Herbert
591c7b6250
Merge pull request #7682 from peppy/fix-timeline-tick-overrun
...
Fix too many ticks being displayed on beatmaps with multiple timing sections
2020-02-03 16:16:23 +09:00
Dean Herbert
9183c78319
Fix crash on exiting song select with ctrl-enter autoplay
2020-02-03 16:04:32 +09:00
Salman Ahmed
4cdf4b223c
Rename to alwaysShow and add XMLDoc
2020-02-02 18:47:12 +03:00
Salman Ahmed
28e340c486
Inherit Container and fade the key flow instead of individual children
2020-02-02 18:46:27 +03:00
Dean Herbert
aa1daa0ad5
Merge pull request #7703 from bdach/beatmap-stats-precision
...
Apply precision when determining bar colour in difficulty statistics
2020-02-02 22:31:52 +09:00
Salman Ahmed
6a11c3a8f9
Expose ConfigVisibility bindable for testing purposes
2020-02-02 14:48:07 +03:00
Salman Ahmed
abccf05155
Update visibility of each key counter instead of this container
...
For isolating changing visibility of the key counter display based on config and internal values from just fading the container.
2020-02-02 14:47:14 +03:00
Bartłomiej Dach
434c0d92e4
Use Bindable{Float,Double}s everywhere
...
To avoid further floating-point comparison bugs, remove all usages of
Bindable<{float,double}>, replacing them with their
Bindable<Float,Double> counterparts.
2020-02-01 22:50:29 +01:00
Bartłomiej Dach
e894acf53c
Make star filter range bindables BindableDoubles
...
Due to using Bindable<double>s previously, song select's filter control
would not apply tolerance when checking IsDefault, therefore wrongly
hiding maps with star ratings above 10.1.
2020-02-01 22:48:46 +01:00
Joehu
609ee26030
Fix mod select overlay not showing up in test
2020-02-01 11:41:41 -08:00
Joehu
2d42a83bb9
Fix mod select overlay overflowing toolbar at max ui scale
2020-02-01 11:24:29 -08:00
Bartłomiej Dach
0bfadfbbf1
Apply precision when comparing adjusted values
...
In some cases, applying the Difficulty Adjust mod without actually
changing any of the settings previously caused the bar in song select
beatmap details to appear red/blue instead of staying white.
This was caused by not accounting for floating-point imprecisions when
determining bar colour in AdvancedStats. To resolve, first check
equality with tolerance, and only then apply blue/red colours if that
equality check does not hold.
2020-02-01 16:16:15 +01:00
Bartłomiej Dach
a74d22d9e5
Extract beatmap stats test to separate scene
2020-02-01 15:50:33 +01:00
Dean Herbert
ed368e44ea
Merge branch 'master' into safe-screen-lease
2020-02-01 02:11:18 +09:00
Dean Herbert
c5422743e2
Merge branch 'master' into decouple-mod-select-bindable
2020-02-01 02:06:23 +09:00
Dean Herbert
90caa61245
Reverse comparison for readability
...
Co-Authored-By: Bartłomiej Dach <dach.bartlomiej@gmail.com>
2020-02-01 02:05:26 +09:00
Dean Herbert
a66cdee5e9
Fix missed issues
2020-01-31 21:36:19 +09:00
Dean Herbert
19f516e710
Ensure OsuScreen level leases are taken out synchronously
2020-01-31 19:10:44 +09:00
Dean Herbert
a547d2ed5c
Don't least at Player just yet
2020-01-31 18:37:16 +09:00
Dean Herbert
2f61d3f5ad
Fix song select remaining issue locally
2020-01-31 17:35:53 +09:00
Dean Herbert
5f48affcba
Centralise screen exit logic to ScreenTestScene
2020-01-31 14:19:29 +09:00
Dean Herbert
f51cfa2220
Fix too many ticks being displayed on beatmaps with multiple timing sections
...
Closes https://github.com/ppy/osu/issues/7681 .
2020-01-31 00:24:00 +09:00
Dean Herbert
7bf2e9b369
Decouple ModSelectOverlay from global SelectedMods
2020-01-30 17:38:15 +09:00
Dan Balasescu
09f6c57b0f
Merge branch 'master' into fix-import-different-ruleset
2020-01-30 15:08:25 +09:00
Dan Balasescu
c18b1b302c
Merge branch 'master' into editor-match-accessibility
2020-01-30 13:49:56 +09:00
Dean Herbert
c158570249
Fix typo in comment
...
Co-Authored-By: Bartłomiej Dach <dach.bartlomiej@gmail.com>
2020-01-30 11:31:34 +09:00
Dean Herbert
f72de235cc
Remove unnecessary length specifications
2020-01-30 11:00:14 +09:00
Dean Herbert
37ecf8a060
Remove commented line
2020-01-30 10:50:48 +09:00
Dean Herbert
bea20efb64
Merge branch 'master' into mod_content_centering
2020-01-30 10:34:46 +09:00
Bartłomiej Dach
f130e48c9e
Remove leftover negative margin
2020-01-29 19:17:07 +01:00
Bartłomiej Dach
c9dda78ded
Refactor drawable hierarchy to center properly
...
* Use FillFlowContainer.Spacing instead of manually applying margins.
* Use Update() for calculating button padding to preserve it after
mod button expansion and adjust FooterButtonRandom to use this method
while avoiding flickering.
* Expose mod display margin to clear it in the footer button.
2020-01-29 18:59:51 +01:00
Dean Herbert
da6952407e
Allow null DI
2020-01-29 23:01:57 +09:00
Dean Herbert
13eb32fea2
Fix editor being accessible for multiplayer song select
2020-01-29 22:20:34 +09:00
smoogipoo
76af8bea5d
Fix percentage-formatted displays containing a space
2020-01-29 19:51:24 +09:00
Dean Herbert
7588c574a2
Fix presenting a beatmap from a different ruleset not working
2020-01-29 19:37:54 +09:00
Dan Balasescu
db3e360229
Merge branch 'master' into fix-carousel-missing-import
2020-01-29 18:06:27 +09:00
Dean Herbert
77c06b1c6e
Fix beatmap carousel potentially missing beatmap imports
2020-01-29 17:09:12 +09:00
Dan Balasescu
66b8d38d42
Merge branch 'master' into selection-composition-conformity
2020-01-29 16:52:45 +09:00
Dan Balasescu
e553a9b9e0
Merge branch 'master' into distance-snap-grid-correct-colouring
2020-01-29 16:09:35 +09:00
Dan Balasescu
63501c188a
Merge pull request #7644 from peppy/standardise-zoom-levels
...
Standardise editor timeline zoom across maps of all lengths
2020-01-29 16:04:25 +09:00
Dan Balasescu
018c005c71
Merge branch 'master' into distance-snap-grid-correct-colouring
2020-01-29 15:33:07 +09:00
Dan Balasescu
0d6fd0a54a
Merge branch 'master' into standardise-zoom-levels
2020-01-29 15:32:57 +09:00
Dan Balasescu
65ac412ff8
Merge branch 'master' into fix-beat-snap
2020-01-29 15:32:27 +09:00
smoogipoo
391681b7af
Separate calculation to follow other examples
2020-01-29 15:16:48 +09:00
Dean Herbert
7d05840ee0
Merge branch 'master' into select-tool
2020-01-29 15:04:22 +09:00
Dan Balasescu
ea2ee53ee3
Merge branch 'master' into timline-beat-lines
2020-01-29 14:44:07 +09:00
smoogipoo
9a47428bfd
Remove out of date comment
2020-01-29 14:40:42 +09:00
Dan Balasescu
abe0041b65
Merge branch 'master' into select-tool
2020-01-29 14:29:12 +09:00
Dan Balasescu
4d43833db4
Merge branch 'master' into timline-beat-lines
2020-01-29 14:12:00 +09:00
Dan Balasescu
b10143fdf2
Merge branch 'master' into fix-key-count-mod-affect
2020-01-29 14:11:59 +09:00
Dean Herbert
12ff51f686
Fix key count being incorrectly adjusted by hard/easy mods
2020-01-28 17:21:50 +09:00
Dean Herbert
40379a5e22
Use foreach
2020-01-28 16:04:13 +09:00
Dean Herbert
dbb89cfde7
Merge remote-tracking branch 'upstream/master' into timline-beat-lines
2020-01-28 16:03:50 +09:00
Dean Herbert
8e2159e4eb
Ensure selection tool correctly matches selection state
...
- When a selection is made (via the timeline) the selection tool should become the select tool.
- When the selection tool is changed to anything *but* the select tool, the selection should be cleared.
2020-01-28 15:13:12 +09:00
Dean Herbert
e81d3c51ed
Move select tool to an actual tool implementation
...
Also tidies up radio button action firing so calling Select actually fires the associated action in all cases.
2020-01-28 15:05:29 +09:00
Dean Herbert
596a01661c
Remove 1ms offset and update tests
2020-01-28 13:42:22 +09:00
unknown
aa264cd2a8
allow tooltip to show as percentage as needed
2020-01-28 12:32:30 +08:00
Dean Herbert
4bb33046ca
Standardise editor timeline zoom across maps of all lengths
2020-01-28 13:03:06 +09:00
Dean Herbert
58654f28b6
Fix beat snap implementation being incorrect
2020-01-28 12:48:24 +09:00
Dean Herbert
29daabb40a
Fix distance snap grid showing incorrect colouring
...
Now matches timeline colours (based on timing point).
2020-01-28 11:59:21 +09:00
Dean Herbert
d5fda053f4
Use centre origin/anchors
2020-01-27 18:09:54 +09:00
Dean Herbert
493390b750
Rename class to TimelineTickDisplay
2020-01-27 18:08:01 +09:00
Dean Herbert
084fa2f04a
Add timeline beat display
2020-01-27 17:38:50 +09:00
Dean Herbert
e24c4ab901
Adjust zoom defaults for timeline to be more useful
2020-01-27 17:34:40 +09:00
Dean Herbert
df665c3a3c
Move beat index colour retrieval to static function
2020-01-27 17:34:40 +09:00
Dean Herbert
508b92e611
Update beat divisor colours to be more distinguishable
...
Close to osu-stable
2020-01-27 17:34:40 +09:00
Dean Herbert
7aa5e8c23e
Limit input propagation correctly
2020-01-27 14:55:47 +09:00
Dean Herbert
1c64b70b06
Revert "Fix crash due to misordered selection events"
...
This reverts commit 2d74609f50
.
2020-01-27 14:53:24 +09:00
Dean Herbert
2d74609f50
Fix crash due to misordered selection events
2020-01-26 19:06:50 +09:00
Salman Ahmed
8aec9e4500
Fix NullReferenceException on main menu for mobile game hsots
2020-01-25 11:41:26 +03:00
Dean Herbert
92a5fbe948
Merge branch 'master' into star-filtering
2020-01-24 23:28:36 +09:00
smoogipoo
45a25214ab
Make upper and lower bounds inclusive
2020-01-24 19:39:21 +09:00
Dan Balasescu
9be3d7a161
Merge pull request #7591 from peppy/improve-song-select-uiscale
...
Improve song select display on ultrawide displays (or when UI scale is set low)
2020-01-24 19:14:46 +09:00
smoogipoo
9e0e7be8d0
Modernise filter implementation
2020-01-24 18:57:17 +09:00
smoogipoo
12cc97ca31
Merge remote-tracking branch 'origin/master' into star-filtering
...
# Conflicts:
# osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapCarousel.cs
# osu.Game/Screens/Select/Carousel/CarouselBeatmap.cs
# osu.Game/Screens/Select/FilterControl.cs
# osu.Game/Screens/Select/FilterCriteria.cs
2020-01-24 18:30:52 +09:00
Dan Balasescu
368587fc06
Merge branch 'master' into timeline-maybe
2020-01-24 18:08:29 +09:00
smoogipoo
811ddb02a4
General refactoring
2020-01-24 17:50:36 +09:00
smoogipoo
28727bbafd
Fix crash when deselecting via ctrl+click
2020-01-24 17:30:37 +09:00
Dean Herbert
f9e93e2a6a
Fix regressed input handling order
2020-01-24 17:15:05 +09:00
Dean Herbert
827f48c29b
Adjust fade
2020-01-24 16:32:39 +09:00
Dean Herbert
6f44f8a1ad
Ensure only run once when not current screen
2020-01-24 16:27:49 +09:00
Dean Herbert
f9a54dfb1d
Tidy up implementation and show on returning with new song
2020-01-24 16:27:37 +09:00
Dean Herbert
3f6fa93365
Merge remote-tracking branch 'upstream/master' into main-menu-song-ticker
2020-01-24 16:08:34 +09:00
Dean Herbert
f5a3de3187
Merge remote-tracking branch 'upstream/master' into improve-song-select-uiscale
2020-01-24 15:44:40 +09:00
Dean Herbert
fdde4a6858
Tidy up song select hierarchy to be more readable
2020-01-24 15:44:31 +09:00
Dean Herbert
c0a233e8bb
Align background wedge with carousel
2020-01-24 15:00:10 +09:00
Dean Herbert
997b49f6dc
Change display to always show progress bar, only hiding seeking handle instead
2020-01-24 14:21:22 +09:00
Dean Herbert
da65fff48e
Merge remote-tracking branch 'upstream/master' into collapse-graph-option
2020-01-24 13:55:42 +09:00
Dean Herbert
ea2271c905
Merge branch 'master' into timeline-maybe
2020-01-24 13:39:51 +09:00
Dean Herbert
e4702ffe9e
Fix editor rate adjustment polluting global beatmap rate
2020-01-24 13:10:02 +09:00
Dean Herbert
eb5abcab8c
Rename and simplify circle logic
2020-01-24 12:01:40 +09:00
Dean Herbert
851b891285
Fix incorrect insert logic
2020-01-24 12:01:14 +09:00
Dean Herbert
c390348eab
Merge remote-tracking branch 'upstream/master' into colour-score-meter
2020-01-24 11:45:33 +09:00
Dean Herbert
f8cb898516
Improve song select display on ultrawide displays (or when UI scale is set low)
2020-01-23 20:03:52 +09:00
Dean Herbert
5646f7777e
Add comment about custom SelectionHandler
2020-01-23 16:23:42 +09:00
Dean Herbert
5cadbb1ffb
Move timeline blueprint to own class
2020-01-23 16:22:43 +09:00
Dean Herbert
9d90799447
Remove useless container
2020-01-23 16:20:42 +09:00
Dean Herbert
143d47ec93
Merge pull request #7538 from peppy/decouple-blueprint-container
...
Decouple blueprint container to allow usage in timeline
2020-01-23 16:13:51 +09:00
Dean Herbert
02ae92418f
Merge remote-tracking branch 'upstream/master' into decouple-blueprint-container
2020-01-23 15:54:46 +09:00
Dean Herbert
289be7a17b
Merge branch 'i-beat-snapping' into timeline-maybe
2020-01-23 15:45:33 +09:00
Dean Herbert
ccf911884b
Remove passed in BaetDivisor
2020-01-23 15:31:56 +09:00
Dean Herbert
098d643955
Move beat snapping to its own interface
2020-01-23 14:39:56 +09:00
Dean Herbert
56c044c44a
Move beat snapping to its own interface
2020-01-23 14:30:25 +09:00
Dean Herbert
cb09c2e144
Add support for dragging outside visible extents
2020-01-23 14:30:25 +09:00
Dean Herbert
477e1b7d27
Rename TimelineHitObjectDisplay to TimelineBlueprintContainer
2020-01-23 14:30:25 +09:00
Dean Herbert
9d2a46df89
Add beat snapping to timeline movement
2020-01-23 14:30:25 +09:00
Dean Herbert
c76f76e5aa
Fix being able to drag out of the blueprint intending to be moved
2020-01-23 14:30:25 +09:00
Dean Herbert
aa1a226ab7
Remove unused ScreenSpaceStartPosition field
2020-01-23 14:30:25 +09:00
Dean Herbert
53bdf72592
Allow basic timeline selection temporal movement
2020-01-23 14:30:25 +09:00
Dean Herbert
cb6e7425ae
Make dragbox stateful to fix blueprint movement
2020-01-23 14:30:25 +09:00
Dean Herbert
f0d810fe20
Follow start time and duration changes
2020-01-23 14:30:08 +09:00
Dean Herbert
63cef8b8b7
Rename nested classes to be more appropriate
2020-01-23 14:30:08 +09:00
Dean Herbert
89d90fdfa0
Fix drag not updating until mouse is moved while scrolling timeline
2020-01-23 14:30:07 +09:00
Dean Herbert
a8ec4907c4
Fix selections while scrolling timeline
2020-01-23 14:27:21 +09:00
Dean Herbert
c4395b1cea
Clean up nested class implementations
2020-01-23 14:27:20 +09:00
Dean Herbert
482409e776
Colour extension bars of long objects
2020-01-23 14:26:33 +09:00
Dean Herbert
a6775d1bd3
Implement custom drag box and allow drag seeking once again
2020-01-23 14:26:33 +09:00
Dean Herbert
8a7f7c5e46
Merge remote-tracking branch 'smoogipoo/void-key-up-returns' into update-framework
2020-01-22 22:57:56 +09:00
Dean Herbert
7c62cc3ac3
Merge remote-tracking branch 'smoogipoo/void-mouse-up-returns' into update-framework
2020-01-22 22:57:52 +09:00
Dean Herbert
5f8ffd9346
Merge remote-tracking branch 'smoogipoo/void-release-returns' into update-framework
2020-01-22 22:57:40 +09:00
smoogipoo
7b2f58eb30
Apply OnRelease method signature refactorings
2020-01-22 13:22:34 +09:00
Dean Herbert
e3a2b20f63
Fix SelectionHandler visibility on remote selection
2020-01-22 01:32:11 +09:00
Dean Herbert
83fa4a9bb3
Move circle size to a constant
2020-01-21 22:24:04 +09:00
Dean Herbert
a963d652bc
Mark readonly
2020-01-21 20:54:50 +09:00
Dean Herbert
c88bdbd4a0
Share selected hitobjects across multiple blueprint containers
2020-01-21 20:46:39 +09:00
Dean Herbert
1ce78afa98
Disable y offset for now
2020-01-21 19:51:44 +09:00
Dean Herbert
f582c42bbd
Perform deletion directly via EditorBeatmap
2020-01-21 18:56:09 +09:00
Dean Herbert
a888d148b6
Remove remaining cast
2020-01-21 18:01:10 +09:00
Dean Herbert
6187b2e77c
Implement IDistanceSnapProvider in timeline for now
2020-01-21 18:00:36 +09:00
Dean Herbert
353b74b04a
Handle selection events in timeline
2020-01-21 17:37:35 +09:00
Dean Herbert
79351976d5
Allow timeline content to get more localised dependencies
2020-01-21 17:37:05 +09:00
Dean Herbert
8f16c1cb04
Add non-hiding selection state
2020-01-21 14:21:00 +09:00
Dean Herbert
53fe0ce790
Use AliveChildren
2020-01-21 14:20:52 +09:00
Dean Herbert
bd96cf94a6
Begin refactoring SelectionBlueprint to handle non-drawable HitObjects
2020-01-21 12:47:14 +09:00
smoogipoo
40f502c6d1
Apply input method signature refactorings
2020-01-20 19:35:37 +09:00
smoogipoo
1b1003bd73
Refactor
2020-01-20 18:31:25 +09:00
smoogipoo
bfb056c612
Apply input method signature refactorings
2020-01-20 18:17:21 +09:00
Dean Herbert
25aff5d96e
Merge remote-tracking branch 'upstream/master' into decouple-blueprint-container
2020-01-20 17:08:59 +09:00
Dean Herbert
cd5290b030
Enforce using get-only auto property where possible
2020-01-20 13:50:27 +09:00
Dean Herbert
ef735f106e
Merge pull request #7534 from revelsix/fix-tooltip-capitalization
...
Fix tooltip capitalization
2020-01-16 12:46:20 +09:00
smoogipoo
9535b3eeba
Fix possible nullref on blueprint removal
2020-01-16 12:00:36 +09:00
smoogipoo
5f178b7755
General refactorings
2020-01-16 11:54:03 +09:00
Dean Herbert
d57f55f053
Apply remaining changes required to restore previous functionality
2020-01-15 19:09:49 +09:00
Dean Herbert
1ec54eeaf9
Merge branch 'master' into beatmap-export
2020-01-15 15:39:35 +09:00
Dean Herbert
990f5b5f78
Implement editor beatmap saving ( #7532 )
...
Implement editor beatmap saving
2020-01-15 15:35:26 +09:00
Dean Herbert
e88e40eec4
Expand on comment
2020-01-15 15:11:36 +09:00
Joehu
b42b23d65b
Add comment for alt pressed
...
Taken from OsuScrollContainer
2020-01-14 20:52:15 -08:00
smoogipoo
e49701a215
Save before exporting
2020-01-15 13:48:28 +09:00
Joehu
2060be345d
Move alt pressed condition to top of method
2020-01-14 20:44:55 -08:00
smoogipoo
c25fefa3ca
Add beatmap package export
2020-01-15 13:44:46 +09:00
Revel
a86fb2113e
fix tooltip capitalization
2020-01-14 14:26:54 -05:00
smoogipoo
f695b1e055
Merge remote-tracking branch 'origin/master' into editor-beatmap-saving
2020-01-14 19:25:04 +09:00
smoogipoo
b51575b433
Add temporary keybind for saving
2020-01-14 19:24:53 +09:00
smoogipoo
ea7510d2f5
Rename menu option
2020-01-14 19:24:53 +09:00
smoogipoo
a255832195
Add beatmapmanager method for saving
2020-01-14 19:24:53 +09:00
Joehu
c196e83e75
Allow changing volume in song select with arrow keys when pressing alt
2020-01-13 20:48:39 -08:00
TheWildTree
b5ac707c6c
Remove unnecessary directive
2020-01-12 21:09:48 +01:00
TheWildTree
aa2645502c
Fix adjusted value always being 0
2020-01-12 20:43:48 +01:00
Andrei Zavatski
730cc92bf3
Fade out instead of insta hiding on menu suspending
2020-01-11 22:43:07 +03:00
Andrei Zavatski
bd33687f53
Add AllowUpdates flag to SongTicker
2020-01-11 18:27:22 +03:00
Andrei Zavatski
81948744d0
remove unnecessary null checks
2020-01-11 17:50:13 +03:00
Andrei Zavatski
d25ef1966d
Remove unnecessary local bindable
2020-01-11 17:48:09 +03:00
Andrei Zavatski
e6210f10b7
Add unicode metadata support
2020-01-11 07:32:40 +03:00
Andrei Zavatski
d59cae33d3
Some animation adjustments
2020-01-11 07:17:13 +03:00
Andrei Zavatski
7716a555ec
Move only ButtonSystem on screen changes rather than everything
2020-01-11 07:08:00 +03:00
Andrei Zavatski
6500cc967f
Implement SongTicker component
2020-01-11 06:58:35 +03:00
Dean Herbert
f745d74666
Add ability to delete individual scores ( #7252 )
...
Add ability to delete individual scores
Co-authored-by: Dan Balasescu <smoogipoo@smgi.me>
Co-authored-by: Dean Herbert <pe@ppy.sh>
2020-01-10 01:58:35 +08:00
Dean Herbert
56724d2580
Merge branch 'master' into #7146
2020-01-10 01:08:20 +08:00
Dean Herbert
3be2fc27f3
Merge branch 'master' into Remove_osuTK.MathHelper
2020-01-10 00:28:46 +08:00
Dan Balasescu
03c778df75
Merge branch 'master' into update-framework
2020-01-09 19:02:26 +09:00
Dean Herbert
ab9603b06a
Merge remote-tracking branch 'upstream/master' into #7146
2020-01-09 17:08:12 +08:00
smoogipoo
dde8432684
Fix exception through due to multiple binds
2020-01-09 13:43:57 +09:00
smoogipoo
91735ff367
Update MathUtils namespace usages
2020-01-09 13:43:44 +09:00
Berkan Diler
34d8740ec4
Remove remaining usage of osuTK.MathHelper
2020-01-08 20:21:13 +01:00
Bartłomiej Dach
f0fe3bc804
Pass bindable to BeatmapMetadataDisplay
...
It was reported that mods selected in song select would show up during
loading of replays which were recorded under a different set of mods.
This was caused by BeatmapMetadataDisplay accepting a plain read-only
value of the Mods bindable in PlayerLoader.load(), therefore making the
mod value assignment in ReplayPlayerLoader.OnEntering() have no effect
on that component.
To resolve this issue, make BeatmapMetadataDisplay accept the
higher-level bindable, bind to it locally and pass it down the hierarchy
to ModDisplay.
2020-01-08 20:10:43 +01:00
Bartłomiej Dach
a3f7d3c445
Add failing test
...
Add test case demonstrating the lack of update of the metadata display's
mods upon setting the Mods property in PlayerLoader.
2020-01-08 19:55:35 +01:00
smoogipoo
28510674ac
Shorten body text
2020-01-06 17:48:29 +09:00
smoogipoo
61c269b17b
Leaderboard should not change the model
2020-01-06 17:32:24 +09:00
smoogipoo
4a7f5f98df
Cleanup methods/events
2020-01-06 17:20:09 +09:00
Willy Tu
e23c71be80
Update Resolved and Cached attribute issues
2020-01-03 11:34:26 -08:00
Willy Tu
0a4e180ce7
Merge branch 'master' of github.com:ppy/osu into #7146
2020-01-03 11:32:06 -08:00
Dean Herbert
d8d12cbbdd
wip: Move more functionality into ComposeBlueprintContainer
2020-01-02 19:09:37 +09:00
Dean Herbert
ee332e0d42
Split out BlueprintContainer functionality further
2020-01-02 18:21:16 +09:00
Dean Herbert
f09f9eb07d
Merge branch 'master' into general-editor-beatmap
2020-01-01 23:27:08 +09:00
Dean Herbert
4f2fa2626a
Centralise calls to mutable hitobjects list
2020-01-01 21:24:00 +09:00
Dean Herbert
ca90f708f1
Merge remote-tracking branch 'upstream/master' into remove-editor-beatmap-generics
2020-01-01 21:03:31 +09:00
Viktor Rosvall
ddec59ec91
Further refactoring. I think this may have polluted the FooterButton too much. Not sure what to do about the centering.
2020-01-01 12:22:19 +01:00
Viktor Rosvall
8695e57f62
Hides mod display when no mods are active to fix issue of invisible margin
2019-12-31 12:21:55 +01:00
Viktor Rosvall
f40ebc83ca
Begun refractorization process of wrapping Button text in a FillFlowContainer
2019-12-30 23:58:49 +01:00
Viktor Rosvall
b0bcbf8b93
Adjusted margin to fix the 1 px increase
2019-12-30 21:55:09 +01:00
smoogipoo
8c378dc625
Move EditorBeatmap construction/conversion to Editor
2019-12-30 14:51:14 +09:00
Viktor Rosvall
875a25c529
adjusted the margin values
2019-12-29 09:00:59 +01:00
Viktor Rosvall
b3d32710df
Centered button mods by adding padding to FillFlowContainer
2019-12-29 00:19:51 +01:00
smoogipoo
6069d98ced
Remove generic editor beatmap
2019-12-27 19:39:30 +09:00
Dean Herbert
ca862124a5
Fix replay import from main menu causing a hard crash
2019-12-27 19:36:48 +09:00
Dean Herbert
b330aec03e
Drain starting at the first hitobject, not gameplay start
2019-12-27 16:16:30 +09:00
Dean Herbert
cac011edc1
Merge branch 'master' into hp-drain
2019-12-26 23:51:12 +09:00
Dean Herbert
033bb15500
Fix early-escape not continuing to results screen ( #7362 )
...
Fix early-escape not continuing to results screen
2019-12-26 23:50:21 +09:00
Dean Herbert
a041f32072
Use cleaner solution via cancellation of older schedule
2019-12-26 19:05:32 +09:00
smoogipoo
8903f286ef
Fix escape not continuing to results screen
2019-12-26 18:27:48 +09:00
smoogipoo
522847987b
Implement break/gameplay start times
2019-12-26 15:00:58 +09:00
smoogipoo
b348abcd07
Only drain health in non-break times
2019-12-26 14:59:49 +09:00
smoogipoo
977fb3d1bf
Make processors and break overlay frame-stable
2019-12-26 14:59:49 +09:00
smoogipoo
a4b1c79e18
Initial implementation of HP drain
2019-12-26 14:59:49 +09:00
smoogipoo
90cb9d9162
Simplify scoreprocesor/healthprocessor implementations
2019-12-26 14:59:49 +09:00
smoogipoo
7414a6aadd
Merge remote-tracking branch 'huoyaoyuan/master' into health-processor
...
# Conflicts:
# osu.Game.Rulesets.Catch/CatchRuleset.cs
# osu.Game.Rulesets.Mania/ManiaRuleset.cs
# osu.Game.Rulesets.Taiko/TaikoRuleset.cs
2019-12-26 14:56:54 +09:00
Dean Herbert
41d99df73c
Merge branch 'master' into allow-ctrl-tabbing-on-more-tab-controls
2019-12-25 20:49:45 +09:00
Dan Balasescu
a265a0c7c5
Merge branch 'master' into settings-source-value-changed
2019-12-25 17:23:08 +09:00
Dean Herbert
89886ceb79
Fix incorrect dialog button animating on requesting quit twice ( #7325 )
...
Fix incorrect dialog button animating on requesting quit twice
2019-12-25 13:15:30 +09:00
Joseph Madamba
2a5f661408
Merge branch 'master' into allow-ctrl-tabbing-on-more-tab-controls
2019-12-24 08:29:56 -08:00
smoogipoo
c7936e40d5
Protect against potential nullref
2019-12-23 19:13:36 +09:00
Joehu
b038c192d1
Rename property to IsSwitchable
2019-12-22 19:47:47 -08:00
mcendu
796223d3e0
Invert if
2019-12-22 21:39:25 +08:00
mcendu
1f41acc5b9
Integrate auto click into exit confirmed check
2019-12-22 21:20:55 +08:00
mcendu
5d29ff29cb
Animate "Good bye" instead on exit
2019-12-22 20:52:00 +08:00
Andrei Zavatski
7a0d76ae77
Fix nullref
2019-12-22 03:41:19 +03:00
Andrei Zavatski
aded12af9e
Refactoor to avoid bindable usage
2019-12-22 03:30:17 +03:00
Andrei Zavatski
eb75c6c70f
Update FadeIn animation for new judgement
2019-12-22 03:17:56 +03:00
Andrei Zavatski
46501cf0ac
Use FillFlowContainer
2019-12-22 03:06:57 +03:00
Joehu
1342556894
Allow ctrl tabbing navigation to chat and song select leaderboards
2019-12-21 10:48:11 -08:00
Andrei Zavatski
14a77a8f16
Improve animations
2019-12-21 16:08:28 +03:00
Andrei Zavatski
b61aa660c6
Move colours to HitErrorMeter class
2019-12-21 14:52:53 +03:00
Andrei Zavatski
5e3c3f2a90
Make judgements work
2019-12-21 14:30:41 +03:00
Andrei Zavatski
5b115d8d8a
Implement basic logic
2019-12-21 13:41:50 +03:00
Willy Tu
8e60ae7039
Removed directive is not required
2019-12-20 15:45:20 -08:00
Willy Tu
8353c893c0
Update BodyText of LocalScoreDeleteDialog
2019-12-20 12:00:10 -08:00
Dean Herbert
a6bdf04f6b
Remove unused using
2019-12-20 18:36:39 +09:00
Dean Herbert
822903d5db
Update song select statistics when mod changes settings
2019-12-20 18:01:35 +09:00
Willy Tu
2769ddb3bb
Merge branch 'master' of github.com:ppy/osu into #7146
2019-12-19 22:23:13 -08:00
Salman Ahmed
7d090d6cd9
Fix key overlay appearing regardless of the setting
2019-12-19 17:52:58 +03:00
smoogipoo
76f2fb378f
Separate score and health parts of ScoreProcessor
2019-12-19 20:03:14 +09:00
Willy Tu
ed07b779b1
Update to use score.ID identify local scores
2019-12-18 21:54:02 -08:00
Willy Tu
27163a5133
Removed unnecessary code for deleting individual local score.
2019-12-18 21:04:10 -08:00
Willy Tu
b67f986058
Fix CodeFactor issues
2019-12-18 19:26:35 -08:00
Willy Tu
531ac16743
Update Scoreboard Refresh Method for deleting individual scores
2019-12-18 19:22:42 -08:00
Willy Tu
d1fcadc700
Merge branch 'master' of github.com:ppy/osu into #7146
2019-12-18 19:16:54 -08:00
smoogipoo
2905a4418d
Fix potential nullref
2019-12-18 21:30:57 +09:00
smoogipoo
cb5a35f8f9
Fix incorrect bindable valuechanged usage
2019-12-18 21:08:49 +09:00
smoogipoo
4e11fb0fd7
Merge remote-tracking branch 'refs/remotes/origin/master' into multiplier-text
2019-12-18 19:36:16 +09:00
Dean Herbert
36172cf2bd
Merge pull request #7175 from LeNitrous/update-beatmap-settings
...
Display current difficulty statistics with mods applied
2019-12-18 18:43:49 +09:00
Dan Balasescu
6683460240
Merge branch 'master' into update-beatmap-settings
2019-12-18 17:59:27 +09:00
Dean Herbert
bf85f4affb
Fix editor crashing when loading a beatmap for an unsupported ruleset
2019-12-18 17:53:26 +09:00
smoogipoo
8e651962c7
Fix incorrectly binding inside BDL load()
2019-12-18 17:41:30 +09:00
Dean Herbert
ada2ae2b2c
Use tuple to avoid potential for incorrect display
2019-12-18 17:12:41 +09:00
Dean Herbert
e87aa281bf
Don't clone beatmap unnecessarily
2019-12-18 17:00:35 +09:00
wltu
4646524bf9
Remove unnecessary library
2019-12-17 13:18:20 -08:00
wltu
8aeef3f59a
Added refresh scoreboard upon deleting local score and formatted the code
2019-12-17 12:56:30 -08:00
wltu
bb2b1475cd
Merge branch 'master' of https://github.com/ppy/osu into #7146
2019-12-17 12:54:47 -08:00
Dean Herbert
e0ce87adca
Move CreateScoreProcessor() to Ruleset ( #7244 )
...
Move CreateScoreProcessor() to Ruleset
2019-12-17 22:15:42 +09:00
Dan Balasescu
fd2785bab3
Merge branch 'master' into fxcop
2019-12-17 20:14:45 +09:00
smoogipoo
49bf8d27d1
Move CreateScoreProcessor() to Ruleset
2019-12-17 20:08:13 +09:00
Huo Yaoyuan
caf3f774ba
CA1309: compare strings correctly.
2019-12-17 13:00:15 +08:00
Huo Yaoyuan
d5994ed484
CA2208: create exceptions correctly.
2019-12-17 13:00:10 +08:00
Huo Yaoyuan
ecfc6dfa3d
CA1825: use Array.Empty.
2019-12-17 12:59:48 +08:00
Dean Herbert
b5db927d93
Merge branch 'master' into cinema-mod
2019-12-17 12:56:06 +09:00
Willy Tu
bef9637fdf
Implemented delete local score individually. Currently does not refresh the score screen after the delete is compelete.
2019-12-16 19:25:28 -08:00
Dean Herbert
eed2984bef
Update sdk and InspectCode version ( #7208 )
...
Update sdk and InspectCode version
2019-12-16 19:46:12 +09:00
smoogipoo
6cf318c34b
Merge remote-tracking branch 'refs/remotes/origin/master' into improve-hud-hiding
2019-12-16 18:41:21 +09:00
smoogipoo
a276643a4b
Reorder health display and score elements
2019-12-16 18:41:14 +09:00
smoogipoo
83f77d9c35
Make the layout faster
2019-12-16 18:41:02 +09:00
Dean Herbert
d7eb4f73f4
Merge branch 'master' into update-beatmap-settings
2019-12-16 14:57:57 +09:00
Huo Yaoyuan
ab70abe8bd
Turn off unexpected new warnings.
2019-12-15 20:07:56 +08:00
Dean Herbert
59538bfd32
Merge branch 'global-available-mods' into adjustable-rate-mods
2019-12-13 21:57:27 +09:00
Dean Herbert
3dc2b59d2a
Move variable above common bindables
2019-12-13 20:06:12 +09:00
Dean Herbert
395b058ff8
Fix OsuScreenDependencies not caching non-leased versions
2019-12-13 20:05:54 +09:00
unknown
3945e7403a
improve tests and refactor AdvancedStats
2019-12-13 09:39:54 +08:00
unknown
ec5b506960
apply mod difficulty settings during song select
2019-12-12 23:41:46 +08:00
Dean Herbert
7559012fb7
Merge remote-tracking branch 'upstream/master' into lighten-playfield-during-breaks
2019-12-12 19:55:09 +09:00
Dean Herbert
d15f49f60f
Also hide the break overlay
2019-12-12 16:13:02 +09:00
Dean Herbert
37a94988a3
Merge branch 'improve-hud-hiding' into cinema-mod
2019-12-12 16:12:19 +09:00
Dean Herbert
94f3dbb2f6
Adjust transitions slightly
2019-12-12 16:09:50 +09:00
Dean Herbert
3ccfee64f6
Add HUDOverlay tests
2019-12-12 16:09:42 +09:00
smoogipoo
59345c97e4
Remove now unnecessary editor working beatmap
2019-12-12 15:58:31 +09:00
smoogipoo
5861eca80d
Make DrawableRuleset take a converted beatmap
2019-12-12 15:58:11 +09:00
Dean Herbert
ffb5cdc6ae
Hide settings overlay along with other HUD-hidden content
2019-12-12 15:20:42 +09:00
Dean Herbert
ad2528d4d2
Hide key counter along with other hud elements
...
Also tidies up HUD hide logic and protects against incorrect hiding.
2019-12-12 15:19:45 +09:00
Dean Herbert
9961fa7385
Merge branch 'master' into adjustable-rate-mods
2019-12-12 15:10:23 +09:00
Dean Herbert
606bd33aa6
Use beatmap background in editor
2019-12-12 13:04:32 +09:00
Dean Herbert
a93d57b77e
Merge branch 'master' into lighten-playfield-during-breaks
2019-12-12 11:57:21 +09:00
Dean Herbert
d2ada90434
Merge branch 'master' into single-scoreprocessor
2019-12-12 11:36:45 +09:00
Albie
4a1c6db3ed
Merge branch 'master' into cinema-mod
2019-12-11 18:00:17 +00:00
Dan Balasescu
b77f9504d0
Merge branch 'master' into adjustable-rate-mods
2019-12-11 19:28:59 +09:00
Dean Herbert
a106e2a53f
Refactor distance snap grid to not require hitobjects ( #7138 )
...
Refactor distance snap grid to not require hitobjects
2019-12-11 19:02:29 +09:00
smoogipoo
48f1dad4aa
Remove abstract ScoreProcessor class
2019-12-11 17:25:06 +09:00
Dean Herbert
75f9250645
Don't automatically pause when window is inactive if in break time
2019-12-11 15:46:07 +09:00
Dean Herbert
9ebad16436
Fix logic regression
2019-12-11 14:37:10 +09:00
Dean Herbert
77b9989e11
Fix some weird private field names
2019-12-11 14:10:35 +09:00
Dean Herbert
9eed64997f
Merge branch 'customized-mods' into adjustable-rate-mods
2019-12-11 13:26:05 +09:00
Salman Ahmed
53daa37eaa
Fix failing tests
2019-12-10 23:06:13 +03:00
Albie
a61f8cc2c3
Merge branch 'master' into cinema-mod
2019-12-10 17:06:53 +00:00
Salman Ahmed
38f1a8bc17
Bind UserDimContainer.IsBreakTime from Player
2019-12-10 15:14:47 +03:00
Salman Ahmed
bb078c2afc
Lighten user-dim container if on break time
2019-12-10 15:13:44 +03:00
Dan Balasescu
bd6a08a21b
Merge branch 'master' into apply-to-track
2019-12-10 16:15:24 +09:00
smoogipoo
94a298a82d
Refactor distance snap grid to not require hitobjects
2019-12-10 16:00:09 +09:00
Dean Herbert
cdde5d1d69
Fix song select filters not reapplied if in a child screen
...
Closes https://github.com/ppy/osu/issues/6980 .
2019-12-10 02:30:23 +09:00
Dean Herbert
7fd52c21f5
Update mods and user adjust to use adjustments
2019-12-09 19:41:31 +09:00
Huo Yaoyuan
ad1fb3bda2
Remove IComparable in constraint.
2019-12-09 17:48:41 +08:00