h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2024-12-20 00:13:04 +08:00
Code Issues Releases Wiki Activity
28,297 Commits 5 Branches 664 Tags 365 MiB
dd6c9173da
Commit Graph

5765 Commits

Author SHA1 Message Date
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
Dean Herbert
d650bfb6d6 Remove unnecessary cast 2019-12-09 18:05:14 +09:00
Dean Herbert
eb074b7058 Allow mods to apply to track, not clock 2019-12-09 17:44:45 +09:00
Dan Balasescu
5738ef5fab
Merge branch 'master' into editor-timeline-hitobject-display 2019-12-09 14:34:55 +09:00
Dan Balasescu
54798b134e
Add accessibility modifiers 2019-12-08 03:16:41 +09:00
Dean Herbert
48c6279e8b Only undo adjustments in GameplayClockContainer if applied at least once 2019-12-06 13:49:22 +09:00
Dean Herbert
de23364608 Add failing test 2019-12-06 13:47:34 +09:00
Dean Herbert
b1426d1b22 Full impossible nullref 2019-12-06 12:51:43 +09:00
Dean Herbert
9248fbe881 Remove extra checkboxes for now 2019-12-06 12:22:44 +09:00
Dean Herbert
28400aa865 Update test scene 2019-12-06 11:27:24 +09:00
Dean Herbert
12a9843835 Move thickness to a constant 2019-12-06 10:48:18 +09:00
Dean Herbert
e76f8bdd64 Fix warnings 2019-12-05 23:31:21 +09:00
Dean Herbert
d8620a70fb Make work in editor 2019-12-05 20:12:25 +09:00
Dean Herbert
e225b0032a Add basic hitobject display to timeline 2019-12-05 19:31:40 +09:00
Dan Balasescu
36c734c4c2
Merge branch 'master' into decouple-api-room-scoreinfo 2019-12-05 12:43:43 +09:00
Dan Balasescu
f18519965c
Merge branch 'master' into eager-skip-filters 2019-12-05 12:27:42 +09:00
Dean Herbert
48287459a0 Optimise filters to avoid property retrieval 
Also reduces number of instantiations of SearchableTerms array in the case of multiple criteria terms.
 2019-12-05 01:52:22 +09:00
Dean Herbert
36224dca13 Fix multiplayer aggregate score inheriting from ScoreInfo 2019-12-05 01:45:28 +09:00
Dean Herbert
9ac0ac0944
Merge branch 'master' into fix-pause-testcase 2019-12-05 01:00:27 +09:00
Dan Balasescu
19c5848e73
Merge branch 'master' into decouple-legacy-score-info 2019-12-04 11:47:27 +09:00
Dan Balasescu
242e1b0b2e
Merge branch 'master' into add-missing-long-running 2019-12-04 11:29:25 +09:00
Huo Yaoyuan
a42f9447e6 Don't use Equals(object) on T?. 2019-12-03 20:07:22 +08:00
Dean Herbert
f0d49d0cdf Decouple APILegacyScoreInfo from ScoreInfo 2019-12-03 15:31:11 +09:00
Dean Herbert
b51ebe4431 Fix ScoreResultsPage usage 2019-11-29 15:50:50 +09:00
Dean Herbert
2663e5d756 Add some more missing LongRunningLoad flags 2019-11-29 13:52:23 +09:00
Albie
7864899249
Merge branch 'master' into cinema-mod 2019-11-28 16:42:01 +00:00
Ganendra Afrasya
ada8dabf7e Add right margin on score multiplier text 2019-11-28 18:48:43 +07:00
smoogipoo
f504370867 Make player block exit if pausable 2019-11-28 15:58:26 +09:00
Ganendra Afrasya
944835da23 Add multiplier score text on mods footer button 2019-11-28 12:01:40 +07:00
Dan Balasescu
c6a85a11bd
Merge branch 'master' into sharpen 2019-11-27 17:09:11 +09:00
Huo Yaoyuan
eba8657d38 Remove newly introduced redundant this. 2019-11-26 18:41:19 +08:00
Huo Yaoyuan
c0fe91a84c Merge branch 'master' into sharpen 2019-11-26 18:21:50 +08:00
Albie
09158b6b08
Merge branch 'master' into cinema-mod 2019-11-26 06:57:47 +00:00
Dean Herbert
77ce9642ba Add test coverage and simplify break time updating 2019-11-26 15:32:48 +09:00
Dean Herbert
a453129d44 Fix nullref in tests 2019-11-26 15:13:50 +09:00
Dan Balasescu
8a8e863c0e
Merge branch 'master' into intro-outro-break 2019-11-26 12:47:42 +09:00
Dan Balasescu
b21de98296
Merge branch 'master' into get-end-time 2019-11-26 11:47:01 +09:00
Dean Herbert
fbebbab5db Remove excess parenthesis 2019-11-25 22:37:07 +09:00
Albie
87ee3f1083
Merge branch 'master' into cinema-mod 2019-11-25 13:35:14 +00:00
Dean Herbert
709ec1404f Centralise End/StartTime retrieval to extension method 2019-11-25 19:09:14 +09:00
Dean Herbert
6b8983b489 Consider intro and outro time as "break" time 2019-11-25 19:02:11 +09:00
smoogipoo
719f0d5947 Fix stutters when changing beatmap difficulties 2019-11-25 18:28:43 +09:00
Albie
0a70ec0b11
Merge branch 'master' into cinema-mod 2019-11-25 07:25:30 +00:00
Albie
9fdbb2a58e change name of interface and expose method instead of seperate values 2019-11-25 07:24:29 +00:00
Berkan Diler
fccdbffa93 Use MathF instead of Math- functions when possible 
MathF-functions are faster than the Math-counterpart and it looks cleaner, so use MathF when we cast to float or int anyway.
 2019-11-25 00:45:42 +01:00
Albie
9a8e3fe1da add brackets 2019-11-24 07:44:35 +00:00
Albie
1d6665fe57 improve code quality using resharper and codefactor advice 2019-11-24 07:42:39 +00:00
Albie
b8e5796af5 add forced video/storyboard and disabled dim for mod inside new interface 2019-11-24 07:37:06 +00:00
Dean Herbert
4063135a3a Fix result mode button's corner exponent 2019-11-22 20:45:05 +09:00
Dean Herbert
c2e85a2057 Apply CornerExponent fixes 2019-11-22 19:49:20 +09:00
Dean Herbert
83080c3b5f Fix merge regression 2019-11-22 14:14:18 +09:00
Dan Balasescu
5d2a608be0
Merge branch 'master' into lead-in-fixes 2019-11-22 13:48:55 +09:00
Dan Balasescu
7c19f7cd7b
Merge branch 'master' into improve-skip-button-feel 2019-11-22 13:36:27 +09:00
Dan Balasescu
ba0ac93f70
Merge branch 'master' into skip-multiple-times 2019-11-22 13:23:50 +09:00
Dean Herbert
d8260f4a65 Reduce carousel scroll motion on initial display 2019-11-22 10:51:49 +09:00
Dean Herbert
ab42fac43a Improve naming 2019-11-22 02:38:31 +09:00
Dean Herbert
f390e558c7 Combine and simplify beatmap change logic 2019-11-22 02:32:02 +09:00
Dean Herbert
a97d760afa Merge remote-tracking branch 'upstream/master' into menu-background-modes 2019-11-22 02:23:02 +09:00
Huo Yaoyuan
818553027b Merge branch 'master' into sharpen 2019-11-21 23:42:46 +08:00
Dean Herbert
201f32859a
Merge branch 'master' into slider-control-point-removal 2019-11-21 22:10:52 +09:00
Dean Herbert
bd6831624a Decouple skip button animations from gameplay clock 2019-11-21 19:51:22 +09:00
Dean Herbert
ffd0e17826 Merge branch 'skip-multiple-times' into lead-in-fixes 2019-11-21 19:01:28 +09:00
Dean Herbert
46a94821d4 Add support for consecutive skips 2019-11-21 18:59:55 +09:00
Dean Herbert
29d2374928 Add back skip button actuation count tests 2019-11-21 17:23:52 +09:00
Dean Herbert
2dd2e3d861 Add correct AudioLeadIn support 2019-11-21 16:55:18 +09:00
Dean Herbert
8369be90f2 Allow skip button to actuate more than once 2019-11-21 15:19:06 +09:00
Dean Herbert
c0b9bb5a12 Merge remote-tracking branch 'upstream/master' into lead-in-fixes 2019-11-21 14:22:17 +09:00
Dean Herbert
2325f0382c Cancel a potentially pending filter update when an update occurs 2019-11-21 13:46:45 +09:00
Dean Herbert
4d6904468d Merge remote-tracking branch 'upstream/master' into multi-searching 2019-11-21 13:44:04 +09:00
Dan Balasescu
a7c074ff37
Merge branch 'master' into math_clamp 2019-11-21 11:08:56 +09:00
smoogipoo
0cbe29dbec Refactor / cleanup debouncing 2019-11-21 11:05:18 +09:00
Berkan Diler
6cab517b2d .NET Standard 2.1 implements Math.Clamp , use it instead of MathHelper.Clamp from osuTK. 2019-11-20 13:37:47 +01:00
Dean Herbert
3ba9f840fd Fix song select not always scrolling to the correct location 2019-11-20 19:39:13 +09:00
Huo Yaoyuan
374ef6ff83 Merge branch 'master' into sharpen 2019-11-20 17:30:58 +08:00
Dean Herbert
8c9ed99b1b Merge remote-tracking branch 'upstream/master' into fix-carousel-double-filter 2019-11-20 17:24:54 +09:00
Dean Herbert
5b416eb7ba Move initial filter to run on entering 2019-11-20 17:24:43 +09:00
Dean Herbert
e0f59d8e24 Move method 2019-11-20 15:43:00 +09:00
Huo Yaoyuan
b04bca7db6 Reference elements in origin definition. 2019-11-17 20:55:40 +08:00
Dean Herbert
e9e37fc821 Add private setter for FilterControl 2019-11-15 18:23:35 +09:00
Dean Herbert
296fff9243 Merge remote-tracking branch 'upstream/master' into fix-carousel-double-filter 2019-11-15 18:20:36 +09:00
smoogipoo
10287eb66d Add debounce logic in several places 2019-11-15 17:58:47 +09:00
smoogipoo
1b4bcb81c8 Fix filtering breaking on secondary filters 2019-11-15 17:49:02 +09:00
Dean Herbert
eee5902851 Merge remote-tracking branch 'upstream/master' into lead-in-fixes 2019-11-15 14:05:31 +09:00
Dean Herbert
2c3109980a Fix broken merge 2019-11-15 13:51:39 +09:00
Dean Herbert
6d06b444ba Allow screen to specify whether to apply audio rate adjustments from mods 2019-11-15 13:47:14 +09:00
Dean Herbert
b8bb97607b Merge remote-tracking branch 'upstream/master' into fix-mod-retention 2019-11-15 13:46:44 +09:00
smoogipoo
f0b7b2e1c4 Fix broken test case 2019-11-15 11:07:16 +09:00
smoogipoo
956fb9912d Hook up multiplayer search filter 2019-11-15 08:23:56 +09:00
Huo Yaoyuan
677717875e Change a case to EqualityComparer.Default to handle null properly. 2019-11-14 17:35:02 +08:00
Huo Yaoyuan
f25b1ba06f Merge branch 'master' into equals 2019-11-14 17:33:44 +08:00
Dean Herbert
c15f909d83 Remove local bindable at song select, along with misplaced reset logic 2019-11-14 13:29:06 +09:00
Dean Herbert
d8a5750e5d
Fix typo 
Co-Authored-By: Bartłomiej Dach <dach.bartlomiej@gmail.com>
 2019-11-14 08:38:01 +09:00
Dean Herbert
a580b9079a
Reword comment 2019-11-14 08:28:41 +09:00
Huo Yaoyuan
87d40cf8d0 Resolve equals usages. 2019-11-13 22:35:50 +08:00
Dean Herbert
110c155fa0 Fix background loading twice when entering song select 2019-11-13 19:42:05 +09:00
Dean Herbert
280c1a0eb4 Fix carousel filtering twice on startup due to unpopulated ruleset 2019-11-13 19:04:52 +09:00
Dean Herbert
bca1be0bfa Add failing test 2019-11-13 18:54:33 +09:00
smoogipoo
76ab0ecd3c Disallow deselections with right clicks 2019-11-13 17:21:55 +09:00
Huo Yaoyuan
f3f5094c26 Convert delegate to local function. 2019-11-12 20:14:22 +08:00
Huo Yaoyuan
42a98c5d87 Use constants. 2019-11-12 20:07:01 +08:00
Huo Yaoyuan
d60493a961 Use discards. 2019-11-12 20:03:21 +08:00
Huo Yaoyuan
e5e8e70704 Use pattern matching. 2019-11-12 19:55:19 +08:00
Huo Yaoyuan
7d7b9e36b2 Use compound assignment. 2019-11-12 19:53:50 +08:00
Dean Herbert
4b66ce0c52
Merge branch 'master' into slider-controlpoint-addition 2019-11-12 18:13:27 +09:00
Dean Herbert
dd196385cb
Add Ctrl+A to select all and Escape to deselect all (#6803) 
Add Ctrl+A to select all and Escape to deselect all

Co-authored-by: Dean Herbert <pe@ppy.sh>
 2019-11-12 18:10:45 +09:00
Dean Herbert
cdd87a6903
Merge branch 'master' into delete-selection 2019-11-12 17:59:43 +09:00
smoogipoo
10fd5ef5a7 Merge context menus 2019-11-12 15:02:27 +09:00
Dean Herbert
b4525c1f6e Fix right clicking to select not showing context menu 2019-11-12 14:42:30 +09:00
smoogipoo
9f1d490ac9 Only handle selection input on blueprints 2019-11-12 12:18:24 +09:00
Dean Herbert
a43b0ee01b Apply naming and styling changes 2019-11-12 10:45:46 +09:00
Dean Herbert
b37bf4ea01 Merge remote-tracking branch 'upstream/master' into selection-hitsound-addition 2019-11-12 10:44:53 +09:00
Huo Yaoyuan
e9b8cbb516 Apply other styles. 2019-11-11 20:27:04 +08:00
Huo Yaoyuan
ccc8aa6fa4 Apply brace style. 2019-11-11 20:13:13 +08:00
smoogipoo
f3dc38e342 Add Ctrl+A to select all (esc to deselect all) 2019-11-11 13:41:10 +09:00
smoogipoo
97ea07db0e Add delete option to the right-click menu 2019-11-08 19:44:47 +09:00
Dean Herbert
c70c05c896
Less sickening parallax (#6743) 
Less sickening parallax
 2019-11-08 19:15:25 +09:00
Dean Herbert
5699f3e22b
Seek to the first hitobject when entering the editor (#6766) 
Seek to the first hitobject when entering the editor

Co-authored-by: Dean Herbert <pe@ppy.sh>
 2019-11-08 19:15:08 +09:00
Dean Herbert
a849bc0746 Move implementation into resetTrack for safety 2019-11-08 18:51:01 +09:00
smoogipoo
e904928314 Seek to first hitobject when entering editor 2019-11-08 17:42:19 +09:00
smoogipoo
36cc79f04f Softly handle invalid beat divisors instead of throwing 2019-11-08 17:28:11 +09:00
smoogipoo
998e1dfe47 Fix non-1/1 initial beat divisor control display 2019-11-08 17:23:47 +09:00
smoogipoo
eb9fff96ba Read default beat divisor from beatmap 2019-11-08 17:22:58 +09:00
smoogipoo
df08a95734 Separate addition/removal into separate methods 2019-11-08 16:46:58 +09:00
smoogipoo
6fc1be64c2 Make hitobject samples a bindable list 2019-11-08 14:04:57 +09:00
smoogipoo
864b8db638 Use three states for the hitsound menu items 2019-11-08 13:52:36 +09:00
smoogipoo
046f0b0fe5 Allow right-clicks to trigger selection 2019-11-08 13:40:47 +09:00
smoogipoo
573d11503e Remove unused using 2019-11-08 13:36:17 +09:00
smoogipoo
abb3a6ca5b Initial right click context menu implementation 2019-11-08 13:36:17 +09:00
Dean Herbert
70cf91fb40
Seek editor when hit objects are double clicked (#6745) 
Seek editor when hit objects are double clicked
 2019-11-06 19:22:41 +09:00
Dean Herbert
0df0260dd9
Disallow selections to be moved outside of the playfield (#6742) 
Disallow selections to be moved outside of the playfield
 2019-11-06 18:29:06 +09:00
smoogipoo
3680e7c704 Seek editor when hit objects are double clicked 2019-11-06 18:15:57 +09:00
Dean Herbert
aaa06396f0 Reduce editor parallax 2019-11-06 18:11:56 +09:00
Dean Herbert
813d3a0bfa
Fix adjustments not being removed correctly on retry from pause (#6728) 
Fix adjustments not being removed correctly on retry from pause
 2019-11-06 17:54:20 +09:00
smoogipoo
2c1bfd62ef Disallow selections to be moved outside of the playfield 2019-11-06 17:28:04 +09:00
Dean Herbert
c631a05a44
Add ability to edit individual ControlPoint attributes from tim… (#6638) 
Add ability to edit individual ControlPoint attributes from timing screen
 2019-11-06 17:24:51 +09:00
Dean Herbert
a2963b66f6
Limit distance snap between two adjacent hit objects (#6740) 
Limit distance snap between two adjacent hit objects
 2019-11-06 17:18:00 +09:00
Dean Herbert
23eab68c72 Merge remote-tracking branch 'upstream/master' into editor-timing-screen-2 2019-11-06 16:22:55 +09:00
smoogipoo
020b08b450 Initial implementation of limited distance snap 2019-11-06 15:27:48 +09:00
Dean Herbert
ebfb5d050d Move section update code to abstract method to avoid incorrect BindValue usage 2019-11-06 14:36:43 +09:00
smoogipoo
322a1f0a86 Fix potential nullref 2019-11-06 12:45:35 +09:00
smoogipoo
7cd4cb8a93 Rename selectedPoints to selectedGroup 2019-11-06 12:32:12 +09:00
smoogipoo
9dd7f997d2 Reoder SampleSection to match others 2019-11-06 12:17:18 +09:00
smoogipoo
f20bfe7a55 Fix extra semicolon 2019-11-06 12:16:48 +09:00
Dan Balasescu
b5a8bbaa60
Merge branch 'master' into editor-timing-screen 2019-11-06 12:02:00 +09:00
Dean Herbert
cd1dd0f898 Fix adjustments not being removed correctly on retry from pause 2019-11-06 10:38:04 +09:00
Dean Herbert
52dba69a64
Implement slider control point deletion (#6679) 
Implement slider control point deletion

Co-authored-by: Dean Herbert <pe@ppy.sh>
 2019-11-05 19:15:15 +09:00
Dean Herbert
f4b93ec943 Add exception when holding control 2019-11-05 18:29:08 +09:00
Dean Herbert
f77de7d880 Simplify implementation 2019-11-05 18:25:38 +09:00
smoogipoo
0db34a47f8 Fix selecting underneath selected blueprints 2019-11-05 17:28:42 +09:00
smoogipoo
7c20a589f2 Remove unused usings 2019-11-05 13:56:21 +09:00
smoogipoo
c8beb5296f Use PlatformAction.Delete instead of Delete key 2019-11-05 13:26:44 +09:00
Dan Balasescu
23ad516348
Merge branch 'master' into game-handles-links 2019-11-05 12:33:32 +09:00
Dean Herbert
eb1ec78b33
Disable retry hotkey overlay when viewing results from leaderbo… (#6702) 
Disable retry hotkey overlay when viewing results from leaderboard
 2019-11-04 12:34:18 +09:00
Bartłomiej Dach
539f8ad6dd Remove overlay when viewing leaderboard scores 
Do not add the hold-to-retry hotkey overlay if the user has navigated
to the results screen from the leaderboard and not from gameplay.
 2019-11-04 01:57:31 +01:00
Dean Herbert
c71a082ffe
Merge branch 'master' into user-score-highlight 2019-11-04 08:18:18 +09:00
Dean Herbert
5127b52c25 Merge remote-tracking branch 'upstream/master' into game-handles-links 2019-11-03 13:04:18 +09:00
Dean Herbert
6dde755ef2
Merge branch 'master' into add-retry-button 2019-11-02 21:23:16 +09:00
Dean Herbert
fd13f0bc55
Move ReplayDownloadButton to correct namespace (#6689) 
Move ReplayDownloadButton to correct namespace
 2019-11-02 21:22:23 +09:00
Dean Herbert
551032803d
Fix GameplayClockContainer operating on beatmap's track after s… (#6688) 
Fix GameplayClockContainer operating on beatmap's track after screen exited
 2019-11-02 21:22:13 +09:00
Dan Balasescu
8a5d3ab40a
Merge branch 'master' into add-retry-button 2019-11-02 10:51:14 +09:00
Dan Balasescu
5be7d439ae
Add null check for nullable dependency 2019-11-02 10:32:23 +09:00
Ganendra Afrasya
8da15f6897 Fix all score are highlighted on local scope 2019-11-01 23:19:15 +07:00
Ganendra Afrasya
ce3b34a768 Fix UserTopScoreContainer is also tinted 2019-11-01 23:00:55 +07:00
Dan Balasescu
036e67bbc2
Merge pull request #6676 from peppy/fix-multi-logout-crash 
Fix multi logout crash
 2019-11-01 17:13:16 +09:00
Dean Herbert
156d0ae9b9
Remove braces 
Co-Authored-By: Salman Ahmed <email@iisalman.me>
 2019-11-01 16:08:44 +09:00
Dean Herbert
daa0ebe2b5 Add xmldoc 2019-11-01 15:51:45 +09:00
Dean Herbert
14453da1d2 Centralise MakeCurrent call 2019-11-01 15:51:10 +09:00
Dean Herbert
c532f77657 Add hold-to-retry support to results 2019-11-01 15:49:42 +09:00
Dean Herbert
84d17f3702 Add retry button 2019-11-01 15:41:51 +09:00
Dean Herbert
14fec6f1f3 Move ReplayDownloadButton to correct namespace 2019-11-01 15:06:36 +09:00
Dean Herbert
dcc8f6e827 Better group cancel conditional 2019-11-01 14:43:52 +09:00
Dean Herbert
d089e47a56
Merge branch 'master' into master 2019-11-01 14:15:57 +09:00
Dean Herbert
ac02bb005d Fix GameplayClockContainer operating on beatmap's track after scren exited 2019-11-01 14:11:18 +09:00
Dean Herbert
898520935e Move link handling code to OsuGame 
This allows for future calls from arguments / associations
 2019-11-01 11:40:51 +09:00
Dean Herbert
5b405abc52 Schedule forcefullyExit call for safety 
Screen state may have changed at an inopportune moment. Run on local scheduler, not API scheduler to avoid any weirdness.
 2019-10-31 13:43:25 +09:00
Dean Herbert
32dabf80a6 Ensure forceful exit completely exits from mutliplayer 
Previously it may have gotten blocked by being in a sub screen.
 2019-10-31 13:42:28 +09:00
Dean Herbert
5b5703544b
Fix crash when quickly exiting multiplayer after joining a room (#6666) 
Fix crash when quickly exiting multiplayer after joining a room
 2019-10-31 13:15:46 +09:00
Dean Herbert
7b67701e57
Merge branch 'master' into editor-timing-screen 2019-10-30 19:27:24 +09:00
Dean Herbert
7f2916454d Simplify EditorClock.Seek method 2019-10-30 19:09:46 +09:00
Dean Herbert
93076ad6a1
Merge branch 'master' into editor-timing-screen 2019-10-30 18:42:20 +09:00
smoogipoo
45af796943 Remove usages of EF internals 2019-10-30 17:05:15 +09:00
Dan Balasescu
514c9f1eef
Merge branch 'master' into bindable-control-points 2019-10-30 16:20:54 +09:00
smoogipoo
f56d9fe50c Forcefully part room when multiplayer exits 2019-10-30 14:42:14 +09:00
smoogipoo
b6457f0ce9 Cancel room joins on part 2019-10-30 14:41:54 +09:00
smoogipoo
95ff48c123 Don't log cancelled join requests 2019-10-30 14:38:06 +09:00
Dean Herbert
3f192ca915
Fix song progress not displaying correctly (#6640) 
Fix song progress not displaying correctly

Co-authored-by: Dan Balasescu <smoogipoo@smgi.me>
 2019-10-29 18:16:54 +09:00
Dean Herbert
e3a1613d2a
Fix PlayerSettingsOverlay being shown by default (#6641) 
Fix PlayerSettingsOverlay being shown by default
 2019-10-29 18:16:33 +09:00
Dan Balasescu
f4ae65c3e8
Merge branch 'master' into fix-song-progress-display 2019-10-29 18:06:58 +09:00
Dan Balasescu
c25a243d5b
Merge branch 'master' into fix-triangles-performance 2019-10-29 13:31:33 +09:00
Dean Herbert
a4a57eec54 Fix game-wide performance drop when triangles intro is used 2019-10-29 01:09:49 +09:00
Bartłomiej Dach
c181edaedf Replace manual comparer implementation 
Replace manually-implemented CriteriaComparer with a call to
Comparer<T>.Create() to decrease verbosity.
 2019-10-28 15:07:36 +01:00
Dean Herbert
46b44f4f99 Fix PlayerSettingsOverlay being shown by default 2019-10-28 18:37:58 +09:00
Dean Herbert
16e33e8bc7 Fix song progress not displaying correctly 2019-10-28 18:34:58 +09:00
Dean Herbert
522572eace Add ability to adjust all control point attributes 2019-10-28 16:21:31 +09:00
Dean Herbert
9c3e54909c Ensure tooltips of RowAttributes are up-to-date 2019-10-28 16:20:54 +09:00
Dean Herbert
ee5591d7d5 Add missing license headers 2019-10-28 12:42:17 +09:00
Dean Herbert
43ad4a3a3c Tidy up string output 2019-10-28 12:31:38 +09:00
Dean Herbert
1953aa64b6 Merge branch 'bindable-control-points' into editor-timing-screen 2019-10-28 12:00:51 +09:00
Dean Herbert
8069674824 Merge remote-tracking branch 'upstream/master' into bindable-control-points 2019-10-28 11:52:04 +09:00
Dean Herbert
29e20bc8d2 Add xmldoc and combine GroupAt / CreateGroup 2019-10-28 10:45:11 +09:00
Bartłomiej Dach
c8d3dd0e5a Make carousel item sorting stable 
Migrate beatmap carousel item sorting from List<T>.Sort()
to IEnumerable<T>.OrderBy(), as the second variant is documented to be
a stable sorting algorithm. This allows for eliminating unnecessary
movement of carousel items occurring whenever any set of items is tied
when changing sorting criteria.
 2019-10-27 23:14:14 +01:00
Dean Herbert
81b5d7b79f Select another group after deleting selected 2019-10-27 16:30:05 +09:00
Dean Herbert
73369ae613 Add the ability to add/remove groups 2019-10-27 16:13:24 +09:00