64119 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Bartłomiej Dach	f239d03d75	Forcibly change ruleset to correct one before entering gameplay from main menu ... Closes #25663 (again). As it turns out, in some scenarios it can be the case that the current game-global `Beatmap` is not valid for the current game-global `Ruleset`. The validity of one and the other in conjunction is only really validated by the song select screen; elsewhere there is no guarantee that the global beatmap is playable using the global ruleset. However, this only comes up in very specific circumstances, namely one: when trying to autoplay a catch beatmap with osu! ruleset globally active via the skin editor flow. `Player` is responsible for retrieving the beatmap to be played. It does so by invoking the appropriate beatmap converter and asking it if the beatmap can be converted: 6d64538d7a/osu.Game/Beatmaps/WorkingBeatmap.cs (L262-L266) If the code above throws, `Player` actually silently covers for this, by trying the beatmap's default ruleset instead: 6d64538d7a/osu.Game/Screens/Play/Player.cs (L529-L536) However, for the pairing of osu! ruleset and catch beatmap, this fails, as `OsuBeatmapConverter`'s condition necessary for permitting conversion is that the objects have a defined position: 6d64538d7a/osu.Game.Rulesets.Osu/Beatmaps/OsuBeatmapConverter.cs (L25) which they will do, due to the fact that all catch beatmaps are really just osu! beatmaps but with conversion steps applied, and thus `Player` succeeds to load the catch beatmap in osu! ruleset. In the skin editor scenario, this would lead to the secondary failure of the skin editor trying to apply `CatchModAutoplay` on top of all of that, which would fail at the hard-cast of the beatmap to `CatchBeatmap`.	2023-12-06 10:35:41 +01:00
Bartłomiej Dach	faf60cec91	Extend test coverage of skin editor open to fail better	2023-12-06 10:11:41 +01:00
Bartłomiej Dach	6d64538d7a	Merge pull request #25687 from peppy/fix-skin-editor-beatmap-change ... Fix being able to change ruleset / beatmap when opening skin editor from main menu	2023-12-06 10:08:29 +01:00
Bartłomiej Dach	4585a169b1	Merge pull request #25686 from peppy/fix-song-select-match ... Fix searching at song select matching incorrect ruleset	2023-12-06 09:25:47 +01:00
Dean Herbert	ca991f1f54	Move flags local to EndlessPlayer	2023-12-06 17:18:35 +09:00
Bartłomiej Dach	2a3761fb29	Merge pull request #25598 from rodrigopina360/tournament-ban-count ... Add ban count option to round editor	2023-12-06 08:45:38 +01:00
Dean Herbert	317d581a8a	Merge pull request #25685 from smoogipoo/fix-catch-pixeljump-conversion ... Fix several issues around catch beatmap conversion	2023-12-06 16:19:17 +09:00
Dan Balasescu	394ea73055	Add some comments where truncations were added	2023-12-06 14:50:03 +09:00
Dan Balasescu	40ff95d586	Fix diffcalc tests	2023-12-06 12:27:11 +09:00
Dan Balasescu	2c44ca1915	Add more test beatmaps ... Move test files to Catch.Tests project	2023-12-06 12:27:11 +09:00
Dean Herbert	4da6d53c72	Merge pull request #25672 from frenzibyte/fix-argon-health-display-2 ... Fix `ArgonHealthDisplay` sometimes behaving weirdly on miss judgements (alternative)	2023-12-06 12:24:39 +09:00
Dean Herbert	639fac2d49	Fix being able to change ruleset / beatmap when opening skin editor from main menu ... No tests because it would be silly to test this – it's already a well established behaviour and was just initialised incorrectly.	2023-12-06 12:09:34 +09:00
Dean Herbert	2605aafe24	Merge branch 'master' into tournament-ban-count	2023-12-06 12:05:17 +09:00
Dean Herbert	49ca1ccb22	Simplify state reset in test scene	2023-12-06 12:03:54 +09:00
Dean Herbert	73aaa0406a	Add test coverage of multiple bans order	2023-12-06 12:00:32 +09:00
Dean Herbert	1d1b855510	Refactor test for readability	2023-12-06 11:57:04 +09:00
Dean Herbert	ac67320b61	Refactor for readability	2023-12-06 11:50:43 +09:00
Dean Herbert	8afa88eae0	Merge pull request #25683 from POeticPotatoes/master ... Remove hover checks for mod-copying menu item	2023-12-06 11:42:21 +09:00
Dean Herbert	8286d3896f	Fix searching at song select matching incorrect ruleset ... Regressed with https://github.com/ppy/osu/pull/25679.	2023-12-06 11:32:26 +09:00
POeticPotatoes	07f9f5c6d8	Remove hover checks for mod-copying menu item	2023-12-06 06:33:25 +08:00
Bartłomiej Dach	43701c5d47	Prefer using statement to fully qualified name	2023-12-05 21:49:32 +01:00
Bartłomiej Dach	7392cc2fda	Fix headless test failures due to input handling idiosyncrasies	2023-12-05 21:49:04 +01:00
Bartłomiej Dach	2c7db61a5c	Improve test	2023-12-05 21:19:35 +01:00
Salman Ahmed	c55bfc03ee	Move private method	2023-12-05 22:06:53 +03:00
Salman Ahmed	20fd458fac	Perserve miss animation when followed by a hit at same frame	2023-12-05 21:59:28 +03:00
Salman Ahmed	986f4fa407	Add test scenarios for same-frame judgements	2023-12-05 21:59:28 +03:00
Salman Ahmed	9496cdf42b	Add explanatory note for scheduling	2023-12-05 21:59:28 +03:00
Salman Ahmed	927cfe4257	Fix health processor event leaks	2023-12-05 21:59:28 +03:00
Rodrigo Pina	cda55065e7	Simplified ban order logic ... Implemented tests to make sure logic works as intended	2023-12-05 12:56:24 +00:00
Bartłomiej Dach	88095aaefa	Merge pull request #25637 from smoogipoo/multiplayer-abort ... Add ability for the host to abort an in-progress match	2023-12-05 13:51:00 +01:00
Bartłomiej Dach	4644c4e7a2	Remove unused class	2023-12-05 12:43:32 +01:00
Bartłomiej Dach	566d336470	Merge pull request #25679 from peppy/song-select-search-performance ... Improve song select search performance	2023-12-05 11:06:31 +01:00
Dean Herbert	8704dc3505	Fix change in filter behaviour	2023-12-05 18:20:27 +09:00
Dean Herbert	5a2240838b	Merge branch 'master' into multiplayer-abort	2023-12-05 17:01:54 +09:00
Dean Herbert	02178d8e61	Remove usage of case-when	2023-12-05 16:58:16 +09:00
Dean Herbert	f317e06da1	Use DangerousActionDialog	2023-12-05 16:54:44 +09:00
Dean Herbert	7b9c9a3bfd	Merge pull request #25675 from vegguid/editor-setup-show-filename ... Changed the LabelledFileChooser in the setup to show the file name of the file that is was selected	2023-12-05 16:38:07 +09:00
Dan Balasescu	3aaba3183b	Match stable precision when generating catch bananas	2023-12-05 15:39:26 +09:00
Dean Herbert	45e499778f	Search terms before performing other criteria checks ... Very minor, but putting the more common case towards the start of the method allows early return.	2023-12-05 15:28:56 +09:00
Dean Herbert	42010574b5	Avoid list construction when doing filtering	2023-12-05 15:26:14 +09:00
Dan Balasescu	7d602c792d	Fix legacy tick distance in JuiceStream generation	2023-12-05 15:10:03 +09:00
Dean Herbert	27e778ae09	Avoid sorting items when already in the correct sort order	2023-12-05 14:47:32 +09:00
Dean Herbert	7fda38d0b0	Use ordinal comparison when searching at song select ... Bypasses various overheads. In theory should be fine? (until it's not on some language)	2023-12-05 14:14:13 +09:00
Dan Balasescu	b90de83f33	Replicate integer calculations for tiny tick conversion	2023-12-05 11:58:00 +09:00
Guido	8756dd25c6	Changed file chooser in resource selection to show file name when file is selected	2023-12-04 22:51:56 +01:00
Salman Ahmed	4d82a55594	Remove method for being unused	2023-12-04 23:24:28 +03:00
Salman Ahmed	5723715ea0	Fix ArgonHealthDisplay sometimes behaving weirdly on miss judgements	2023-12-04 23:24:28 +03:00
Bartłomiej Dach	1292c322c0	Merge pull request #25671 from Susko3/uncomment-net6.0-code ... Uncomment net6.0 code and remove old code in `BeatmapListingOverlay`	2023-12-04 21:06:54 +01:00
Salman Ahmed	17577a6606	Add visual test case for late miss in argon health display	2023-12-04 23:01:11 +03:00
Susko3	0e47492858	Uncomment net6.0 code and remove old code	2023-12-04 20:17:22 +01:00