Commit Graph

953 Commits

Author SHA1 Message Date
4e55212638 Merge branch 'master' into sorcerer-catch-changes 2020-04-08 12:15:24 +09:00
7f3ad6d5be Move default colour fallback to the extension methods itself 2020-04-05 22:15:11 +03:00
42ac0c72ea Fix grammer issue and more rewording
Co-authored-by: Bartłomiej Dach <dach.bartlomiej@gmail.com>
2020-04-05 00:46:52 +03:00
b8327ed877 Add test for osu!catch skin colour decoding
Tests the skin configuration CatchTheBeat section's colours decoding part
2020-04-05 00:30:10 +03:00
42ccee5e6c Fix CI issue 2020-04-05 00:15:42 +03:00
55d076d6f3 Transform CatchSkinColour lookup to skin configuration custom colours lookup 2020-04-05 00:10:25 +03:00
c4f7b45768 Revert "Add support for custom hyper-dash fruit colouring"
This reverts commit 6f2cc5471a and also its testing cases.

This became dead code after actual correct osu!catch skin colouring, we don't support modern skinning (non-legacy skinning) at the moment, so for what it's worth this can be reverted to default red-coloured
2020-04-05 00:07:25 +03:00
0014a8404e GetHyperDashEndGlowColour() -> GetHyperDashCatcherAfterImageColour() 2020-04-04 23:12:42 +03:00
19f39fe632 Change AdditiveTarget into a set method 2020-04-04 19:33:52 +03:00
fbe95a52e3 Remove unnecessary restating comment 2020-04-04 19:29:41 +03:00
50604dc7b2 Update catcher hyper-dashing colours on changing hyper-dash state only 2020-04-04 19:29:06 +03:00
f3bcb0628c Add helper methods for retrieving other skin hyper-dash colours 2020-04-04 19:09:52 +03:00
ee247e58c8 Merge branch 'catch-hyperdash-fruit-colouring' into catch-hyperdash-catcher-colouring 2020-04-04 18:07:29 +03:00
f67a62699b Merge remote-tracking branch 'upstream/master' into catch-hyperdash-fruit-colouring 2020-04-03 19:57:52 +03:00
7e82f5740b Add a skin extension for simplifying falling back on hyper-dash colours 2020-04-03 19:35:50 +03:00
53c99d137a Merge branch 'master' into mania-config-lookup-refactor 2020-04-03 22:22:59 +09:00
51db361c32 Update usages of Animation and Video in line with framework changes 2020-04-03 16:00:06 +09:00
1f797207f7 Rework lookups to not require total playfield columns 2020-04-03 12:31:05 +09:00
f653d37058 Merge pull request #8521 from peppy/remove-scale-down-to-fit
Remove ScaleDownToFit as it was implemented without enough safety
2020-03-31 23:22:04 +09:00
03b90fe2db Remove local application of same margin in CatchDifficultyCalculator 2020-03-31 19:01:49 +09:00
b7d73f96ea Fix osu!catch catcher hit area being too large 2020-03-31 18:33:09 +09:00
1fce7cce01 Remove ScaleDownToFit as it was not implemented without enough safety 2020-03-31 13:50:04 +09:00
16a4525a9c CatchSkinConfiguration -> CatchSkinColour 2020-03-30 09:33:47 +03:00
2abb8a37df Merge branch 'master' into show-mod-settings-tooltip 2020-03-29 14:35:04 +09:00
c2e31f53f1 Merge remote-tracking branch 'upstream/master' into catch-hyperdash-fruit-colouring 2020-03-28 07:44:11 +03:00
2949e8dc27 Reduce spread of stacked fruit 2020-03-26 16:58:23 +09:00
fecafc2e48 Fix additive target accidentally clears all of the added containers
It sets the AdditiveTarget on the object initializer but then the catcher is set to Child which wipes up all of the existing children (containers added by Catcher through AdditiveTarget setter)
2020-03-26 09:14:44 +03:00
302fdd834a Add support for custom hyper-dash catcher colouring 2020-03-26 09:11:59 +03:00
e3a7c8a124 Make catcher trails colouring per container 2020-03-26 09:11:31 +03:00
d995f3e1cc Add support for custom hyper-dash legacy fruit colouring 2020-03-26 05:42:13 +03:00
6f2cc5471a Add support for custom hyper-dash fruit colouring 2020-03-26 05:42:12 +03:00
0a368f13d9 Add default hyper-dash colour constant on Catcher 2020-03-26 05:42:11 +03:00
e6b2e3b0ed Add osu!catch skin configurations 2020-03-26 05:42:11 +03:00
8a2aac5f83 Rename conversion methods for clarity 2020-03-25 20:21:34 +09:00
388cf5c83a Fix catch positional data being incorrectly recorded 2020-03-24 15:38:54 +09:00
96a849f897 Add remaining replay recorders 2020-03-24 14:55:49 +09:00
022465f546 Add encoding and import support 2020-03-24 14:51:52 +09:00
546772192c Add helper method to convert to legacy mods enums 2020-03-24 13:07:51 +09:00
1da590c63f use N1 format instead of 0.# 2020-03-22 22:54:21 -04:00
afe7397d89 remove unnecessary using statements 2020-03-22 22:50:52 -04:00
67667b3d22 enforce precision for ModDifficultyAdjust and derived classes 2020-03-22 21:22:46 -04:00
63e9b2a299 use string.Empty, use base SettingDescription for [Osu/Catch]ModDifficultyAdjust 2020-03-22 18:50:09 -04:00
a440d15620 simplify array initializationstatement 2020-03-20 16:58:02 -04:00
e84b40f8ed remove unnecessary ToString calls 2020-03-20 16:53:40 -04:00
cda1efef0b move overridability to SettingDescription method 2020-03-20 16:34:36 -04:00
7bdbdd25f8 Revert "use SettingSource to define IconTooltip format"
This reverts commit 5a6d8f1932.
2020-03-20 16:05:12 -04:00
5a6d8f1932 use SettingSource to define IconTooltip format 2020-03-20 12:47:17 -04:00
7a0a633ef9 don't use ToString, proper indent level 2020-03-19 00:06:55 -04:00
18bf7c913b show mod settings in ModIcon tooltip 2020-03-18 23:43:26 -04:00
f904859943 Remove leftover unused private methods 2020-03-15 15:45:13 +01:00