1847 Commits

Author	SHA1	Message	Date
Santeri Nogelainen	6bde102207	Merge remote-tracking branch 'upstream/master'	2020-03-28 18:14:17 +02:00
Santeri Nogelainen	faa2b49be4	Fix namespace for CarouselBeatmapRank, make UpdateableRank in TopLocalRank readonly	2020-03-28 18:13:39 +02:00
Santeri Nogelainen	1c711147f3	Move all carousel rank logic into separate classes (TopLocalRank and CarouselBeatmapRank)	2020-03-28 17:22:01 +02:00
Endrik Tombak	87854fc4fa	Rename variable	2020-03-28 13:23:31 +02:00
Endrik Tombak	6a0c5c87aa	Use already existing variable	2020-03-28 13:06:03 +02:00
Endrik Tombak	fc3f9ff6fa	Don't use drawables for select next	2020-03-28 12:54:48 +02:00
Endrik Tombak	bbbaaae3ee	Write tests	2020-03-26 19:18:16 +02:00
Endrik Tombak	ee112c6f50	Move and change logic	2020-03-26 18:42:08 +02:00
Endrik Tombak	2f5dc93d61	Select recommended difficulty	2020-03-26 00:19:54 +02:00
Dean Herbert	b1d4261402	Fix track looping state not being reset when entering editor from song select ... Closes #8432.	2020-03-25 15:50:19 +09:00
Dean Herbert	2a1e7a7ff0	Merge branch 'master' into fix-select-filter-not-absorbing-input	2020-03-24 14:03:58 +09:00
Dan Balasescu	6279c78e3c	Merge branch 'master' into fix-keypad-autoplay-shortcut	2020-03-24 13:34:31 +09:00
Joehu	5bc5119389	Handle OnHover on song select filter and footer	2020-03-23 16:03:33 -07:00
Joehu	96d962ab30	Fix autoplay keyboard shortcut not working with keypad enter key	2020-03-23 11:25:40 -07:00
Joehu	96848405fd	Fix song select filter not absorbing input from carousel	2020-03-23 10:54:45 -07:00
Dean Herbert	47c7673c9e	Fix crash when holding a key down while entering player	2020-03-23 17:04:54 +09:00
Dan Balasescu	d0c7b49376	Merge branch 'master' into fix-carousel-root-selects-from-nothing	2020-03-23 11:34:04 +09:00
Dean Herbert	29009c85c0	Fix typo in comment ... Co-Authored-By: Bartłomiej Dach <dach.bartlomiej@gmail.com>	2020-03-22 00:32:53 +09:00
Dean Herbert	9b60b535e5	Fix selection not occurring when switching from empty ruleset on first load	2020-03-20 15:01:26 +09:00
Dean Herbert	be4a97c289	Correctly bypass last selected when it is filtered	2020-03-20 13:01:24 +09:00
Dean Herbert	8f9e97b4cc	Fix carousel not remembering last selection correctly	2020-03-19 18:07:39 +09:00
smoogipoo	1c4296f5e7	Implement the new results screen	2020-03-17 17:43:16 +09:00
Dean Herbert	5e3668b2ea	Merge pull request #8260 from smoogipoo/add-workingbeatmap-timeout ... Add beatmap loading timeout to prevent runaway loading scenarios	2020-03-17 11:17:35 +09:00
Dan Balasescu	e835f88c0c	Merge pull request #8255 from peppy/fix-carousel-scroll-while-import ... Fix carousel scrolling being inoperable during beatmap import	2020-03-16 12:50:45 +09:00
Dan Balasescu	3e65f13c67	Merge branch 'master' into fix-carousel-scroll-while-import	2020-03-16 12:06:50 +09:00
Dean Herbert	9bb3a6c677	Merge branch 'master' into click-group-difficulty-icons	2020-03-16 12:01:09 +09:00
Dean Herbert	d6be8eec0c	Merge branch 'master' into click-disabled-difficulty-icons	2020-03-16 11:30:57 +09:00
Dan Balasescu	f390c1995d	Apply comment suggestions ... Co-Authored-By: Dean Herbert <pe@ppy.sh> Co-Authored-By: Bartłomiej Dach <dach.bartlomiej@gmail.com>	2020-03-16 11:29:28 +09:00
Dan Balasescu	bd05462a7f	Merge branch 'master' into carousel-selection-fallback-improvement	2020-03-16 10:53:10 +09:00
Dan Balasescu	25a35a1370	Merge branch 'master' into always-apply-ruleset-filter	2020-03-16 10:32:36 +09:00
Dean Herbert	340d362d69	Appease inspectcode	2020-03-15 03:51:30 +09:00
smoogipoo	c33ca6e99c	Decorate usages with exception management	2020-03-13 14:28:11 +09:00
Dean Herbert	ac70fcc544	Change logic to be more resilient by identifying user scroll events	2020-03-13 12:30:27 +09:00
Dean Herbert	5f8d180b5e	Fix carousel scrolling being inoperable during beatmap import	2020-03-13 11:51:26 +09:00
Dean Herbert	04f1da04db	Remove incorrect xmldoc from SelectBeatmap function	2020-03-13 10:52:08 +09:00
Dean Herbert	3f8b454ff4	Reword comment to match new filtering behaviour ... Co-Authored-By: Bartłomiej Dach <dach.bartlomiej@gmail.com>	2020-03-13 10:01:28 +09:00
Dean Herbert	ca9cfbe51d	Move selection fallback logic out of BeatmapCarousel to SongSelect	2020-03-12 18:42:08 +09:00
Dean Herbert	6e11c3014c	Allow grouped difficulty icons to be clicked	2020-03-12 18:42:08 +09:00
Dean Herbert	ce5d01ed19	Allow filtered difficulty icons to be clicked	2020-03-12 18:42:08 +09:00
Dean Herbert	fc058f8896	Remove unnecessary this. prefix	2020-03-12 18:03:18 +09:00
Dean Herbert	933a8ffc8a	Add test coverage	2020-03-12 17:10:51 +09:00
Dean Herbert	28ac5af91c	Fix beatmap carousel tests loading beatmap manager beatmaps in test browser	2020-03-12 16:53:23 +09:00
Dean Herbert	63edcddaf1	Apply ruleset filter in all cases (even when bypassing filter for selection purposes)	2020-03-12 15:06:26 +09:00
Dan Balasescu	e6685c88fc	Merge pull request #8205 from peppy/always-scroll-to-selection ... Fix changing ruleset at song select not scrolling the current selection back into view	2020-03-11 14:38:57 +09:00
Dan Balasescu	f8f8e3628f	Merge branch 'master' into always-scroll-to-selection	2020-03-11 13:38:28 +09:00
Dan Balasescu	9119e32f63	Merge branch 'master' into better-filter-bypass	2020-03-11 13:37:55 +09:00
Dean Herbert	ed837d3115	Use framework extension method for FromHex	2020-03-11 10:18:41 +09:00
Dean Herbert	a2d3f20409	Merge branch 'master' into better-filter-bypass	2020-03-11 02:55:14 +09:00
Dean Herbert	8294dd0b71	Fix changing ruleset at song selectnot scrolling the current selection back into view	2020-03-10 19:59:49 +09:00
Dean Herbert	979988235d	Increase flexibility of StarCounter component	2020-03-08 15:56:22 +09:00
Dean Herbert	0477ef6c13	Force a selection after filtering to ensure correct difficulty is selected	2020-03-05 21:45:19 +09:00
Dean Herbert	332f56a7f8	Fix nullref in tests	2020-03-05 20:34:24 +09:00
Dean Herbert	f8776a0be4	Display all difficulties from overriding selection	2020-03-04 22:59:49 +09:00
Dean Herbert	a62550b323	Reapply filters on next change after a forced beatmap display	2020-03-04 20:14:18 +09:00
Dean Herbert	e890e45420	Fix Ctrl+Enter behaviour regression	2020-03-02 19:44:25 +09:00
Dean Herbert	48f2f615cd	Merge branch 'master' into fix-volume-bninding-handling	2020-03-02 19:28:36 +09:00
Dean Herbert	489bf16bea	Add SelectNext and SelectPrevious global actions	2020-03-02 18:55:28 +09:00
smoogipoo	7ad6ad0bb0	Remove hacks that bypassed layout shortcomings	2020-02-27 13:32:23 +09:00
Dean Herbert	623b78d675	Combine all loading animation implementations	2020-02-21 15:32:46 +09:00
Dean Herbert	cd666166d5	Merge pull request #7809 from voidedWarranties/proposal-difficulty-icon-select ... Allow selecting/playing a specific difficulty using the beatmapset difficulty icons	2020-02-21 10:24:12 +09:00
Dean Herbert	db4fe4f728	Merge branch 'master' into adjust-beatmap-overlay	2020-02-21 09:52:44 +09:00
smoogipoo	f9145ce5b4	Fix playlist items added with the wrong IDs	2020-02-17 17:02:19 +09:00
TheWildTree	64a9b9c6fb	Remove redundant using directives	2020-02-16 21:52:08 +01:00
TheWildTree	4d180a685a	Adjust font sizes and spacing in BeatmapSetOverlay	2020-02-16 21:43:33 +01:00
voidedWarranties	8c81f1e684	Move CarouselBeatmap access to private, test using indices	2020-02-15 17:51:55 -08:00
recapitalverb	2778c6617c	Merge branch 'master' into remove-duplicated-load	2020-02-15 15:13:35 +07:00
Dean Herbert	637c1dc840	In the case of only one playlist item, update with current selection on select	2020-02-15 14:41:16 +09:00
recapitalverb	7c9569c9a3	Merge branch 'master' into remove-duplicated-load	2020-02-15 12:10:34 +07:00
Dean Herbert	da68ae5461	Merge branch 'master' into match-songselect-playlist-logic	2020-02-15 12:27:51 +09:00
voidedWarranties	8e1ecddb1d	Add testing	2020-02-14 17:23:24 -08:00
recapitalverb	c46d828716	Preserve permitNulls	2020-02-14 20:59:51 +07:00
recapitalverb	10798aeab3	Fix code formatting	2020-02-14 20:30:27 +07:00
recapitalverb	c753cb46c5	Use [Resolved] wherever possible	2020-02-14 20:14:00 +07:00
smoogipoo	f31220c1ee	Fix exception when adding duplicate items	2020-02-14 19:56:43 +09:00
Dean Herbert	14f632b532	Merge branch 'master' into match-detail-area	2020-02-14 19:54:17 +09:00
smoogipoo	f0f739707f	Add playlist support to match song select	2020-02-14 17:51:42 +09:00
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
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	b9a296d3f9	Merge branch 'master' into remove-current-item	2020-02-13 19:34:15 +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
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
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
voidedWarranties	2901ec9f26	Select specific difficulties using their icons	2020-02-11 20:05:26 -08:00
Dean Herbert	8186f72507	Remove unused using	2020-02-10 17:12:45 +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
Dean Herbert	81cadb7875	Simplify the way multiple subscreens handle their disable states via a custom stack	2020-02-06 14:22:01 +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
recapitalverb	9898a926b2	Use ScoreInfo.DisplayAccuracy everywhere	2020-02-03 22:11:36 +07: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	9183c78319	Fix crash on exiting song select with ctrl-enter autoplay	2020-02-03 16:04:32 +09: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
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	19f516e710	Ensure OsuScreen level leases are taken out synchronously	2020-01-31 19:10:44 +09:00
Dean Herbert	2f61d3f5ad	Fix song select remaining issue locally	2020-01-31 17:35:53 +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
Dean Herbert	77c06b1c6e	Fix beatmap carousel potentially missing beatmap imports	2020-01-29 17:09:12 +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	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
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
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
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	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	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
smoogipoo	40f502c6d1	Apply input method signature refactorings	2020-01-20 19:35:37 +09:00
smoogipoo	bfb056c612	Apply input method signature refactorings	2020-01-20 18:17:21 +09:00
Dean Herbert	cd5290b030	Enforce using get-only auto property where possible	2020-01-20 13:50:27 +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
Joehu	2060be345d	Move alt pressed condition to top of method	2020-01-14 20:44:55 -08: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