40543 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
ekrctb	6e28c1b29a	Move default catcher sprite to its own file	2021-06-08 17:54:57 +09:00
Dan Balasescu	e5e3509c87	Merge pull request #13264 from peppy/legacy-skin-default-fallback ... Allow fallback to legacy defaults from legacy skins	2021-06-08 17:30:27 +09:00
Dan Balasescu	c0fdbfba04	Merge pull request #13374 from peppy/update-framework ... Update framework	2021-06-08 17:09:20 +09:00
Dan Balasescu	791855dfa0	Merge branch 'master' into legacy-skin-default-fallback	2021-06-08 16:54:26 +09:00
Dan Balasescu	e3cb6f45f5	Merge pull request #13371 from peppy/fix-poolable-sample-disposal-skin-change ... Clean up previous sample immediately on skin source change to avoid `Play` after disposal	2021-06-08 16:52:59 +09:00
Dan Balasescu	751a5e7cf3	Merge pull request #13373 from peppy/catch-no-visibility-increase ... Don't apply visibility increase to first object in osu!catch	2021-06-08 16:39:21 +09:00
Dean Herbert	89895f6ce4	Update framework	2021-06-08 16:24:00 +09:00
Dan Balasescu	67135ce3db	Add null check	2021-06-08 16:15:17 +09:00
Dean Herbert	e388a896e8	Don't apply visibility increase to first object in osu!catch ... The goal of the visibility increase is to help in cases where timing is an issue (by showing the approach circle etc.). This doesn't need to apply to catch. @smoogipoo interested as to whether you agree with this one. Visually it looks better to me but it does change the behaviour for only osu!catch, so I'm not 100% confident on it. Closes #13367.	2021-06-08 16:02:26 +09:00
Dean Herbert	f3f634e969	Clean up previous sample immediately on skin source change to avoid Play after disposal ... This seems to be the simplest way to avoid calls to `Play` after the underlying sample may have been disposed. As per the issue thread, a local workaround is acceptable here. Closes #13223.	2021-06-08 15:05:18 +09:00
Dean Herbert	be53b521fc	Merge pull request #13370 from smoogipoo/beatmap-collections-safeguard ... Attempt to safeguard against collections database corruptions	2021-06-08 15:01:26 +09:00
smoogipoo	7341e474f1	Attempt to safeguard against collections database corruptions	2021-06-08 14:25:39 +09:00
Dean Herbert	27e3de3ea3	Add TODO about beatmap skin fallback support	2021-06-08 12:12:14 +09:00
Dean Herbert	88b87b98a8	Fix slider ball layer sources	2021-06-08 12:10:14 +09:00
Dean Herbert	06840d78cc	Remove now unused method	2021-06-08 12:06:42 +09:00
Dean Herbert	2c1f22d7ae	Refactor animation lookup to properly handle skins providing non-animated resources	2021-06-08 01:17:20 +09:00
Dean Herbert	e7e9197f03	Fix FindProvider not correctly checking legacy default in SkinManager	2021-06-08 00:42:50 +09:00
Dean Herbert	273d66a0e0	Fix TaikoMascot texture animation lookups	2021-06-08 00:42:34 +09:00
Dean Herbert	6d56e02ddb	Add back incorrectly reverted animation handling logic ... This reverts commit b904fa6615.	2021-06-08 00:17:01 +09:00
Dean Herbert	c0305343bc	Fix FindProvider incorrectly returning LegacySkinTransformer itself	2021-06-07 23:23:44 +09:00
Dean Herbert	08701b5eab	Ensure all lookups in LegacyHealthDisplay use the found provider ... Not actually needed to fix the remaining issue but does feel better	2021-06-07 23:23:12 +09:00
Dan Balasescu	6ebac0b462	Merge pull request #13365 from bdach/catch-colour-error-meter ... Fix colour hit error meter not working with empty hit windows	2021-06-07 21:13:30 +09:00
Bartłomiej Dach	1b4771655a	Adjust test scene to avoid cross-test interference ... * Move steps from ctor to a separate basic test. * Wait for barrage to complete in basic test, as not doing so polluted state of other tests. * Reset score processor after every test.	2021-06-07 13:16:07 +02:00
Bartłomiej Dach	0531c2dcd9	Move empty window check to bar error meter ... It's not valid in the base `HitErrorMeter`, as the colour meter only displays colour for a given judgement, so it is still valid to add new items to it even if the hit window is 0, as misses are still possible.	2021-06-07 13:16:07 +02:00
Bartłomiej Dach	37d062c7cd	Add failing assertions to hit error meter test	2021-06-07 13:16:07 +02:00
Bartłomiej Dach	122a624b7f	Remove bogus CatchHitWindows ... `CatchHitWindows` were a vestige from the past, and were not actually used anywhere except for the hit error meter test, giving off an appearance that the hit error meter was working properly. `CatchHitObject` actually specifies empty hit windows.	2021-06-07 13:16:07 +02:00
Dan Balasescu	b32191f924	Merge pull request #13364 from Susko3/android-add-mime-type-x-osu-archive ... Add `application/x-osu-archive` mime type to Android `IntentFilter`s	2021-06-07 19:30:15 +09:00
Bartłomiej Dach	8d7a250c6e	Merge pull request #13360 from peppy/fix-slider-repeat-arrow-rotation-editor	2021-06-07 12:22:41 +02:00
Dan Balasescu	3225bc2c71	Merge branch 'master' into fix-slider-repeat-arrow-rotation-editor	2021-06-07 18:46:25 +09:00
Dan Balasescu	ee256083e3	Merge pull request #13362 from peppy/fix-background-screen-reload ... Stop `BackgroundScreenDefault` from reloading beatmap background when already correct	2021-06-07 18:44:47 +09:00
Susko3	a0fbf29b98	add application/x-osu-archive mime type to Android IntentFilters	2021-06-07 11:24:48 +02:00
Dean Herbert	824130355a	Merge pull request #13357 from ekrctb/fruit-representation ... Move osu!catch "fruit visual representation" state from `DrawableFruit` to skin pieces	2021-06-07 17:49:00 +09:00
Dean Herbert	729e05241f	Add more test coverage	2021-06-07 17:32:10 +09:00
Dean Herbert	59130be99c	Fix switching storyboard mode not triggering a reload	2021-06-07 17:32:04 +09:00
Dean Herbert	f677f9b5f4	Stop BackgroundScreenDefault from reloading beatmap background when already correct	2021-06-07 17:22:36 +09:00
Dan Balasescu	d95f3841cc	Merge pull request #13359 from peppy/update-framework ... Update framework	2021-06-07 16:56:23 +09:00
Dean Herbert	e8d4147773	Add missing null handling for never Markdig version	2021-06-07 16:08:44 +09:00
Dean Herbert	1b93234c76	Merge branch 'master' into fruit-representation	2021-06-07 16:05:00 +09:00
Dean Herbert	277eb9fa6e	Fix slider repeat arrow not updating rotation immediately while paused in editor ... A bit of a local solution, but not sure there's a better way to handle this. Closes #13342.	2021-06-07 15:58:43 +09:00
Dean Herbert	aa700702fe	Update framework	2021-06-07 15:48:45 +09:00
Dean Herbert	a17bbe8393	Merge pull request #13358 from ekrctb/move-files ... Move all osu!catch legacy skin piece files to the correct location	2021-06-07 15:47:58 +09:00
ekrctb	bb02c35f2d	Move all osu!catch legacy skin piece files to the correct location	2021-06-07 15:10:47 +09:00
ekrctb	ac5c55bd2c	Remove "fruit visual representation" state from DrawableFruit ... Instead, skin pieces compute visual representation from `IndexInBeatmap`.	2021-06-07 14:49:37 +09:00
ekrctb	166e4565be	Move FruitVisualRepresentation namespace	2021-06-07 13:59:17 +09:00
Dean Herbert	e10dfab2e8	Ensure scorebar marker lookup is performed on the source the background is retrieved from	2021-06-06 23:23:35 +09:00
Dean Herbert	b5f145cfa9	Use null propagation for animation lookups	2021-06-06 23:01:37 +09:00
Dean Herbert	9ebafb1ec0	Fix cursor trail logic	2021-06-06 22:26:27 +09:00
Dean Herbert	b904fa6615	Revert "Ensure all frames in an animation are retrieved from the same skin" ... This reverts commit 37c8c63fc5.	2021-06-06 12:37:42 +09:00
Dean Herbert	b87a5956dd	Add fallback logic to SkinManager	2021-06-06 12:17:55 +09:00
Dean Herbert	39f99bf785	Move FindProvider to ISkinSource	2021-06-06 12:17:32 +09:00