Commit Graph

1030 Commits

Author SHA1 Message Date
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
d3f23b766e Move across to new file in line with master 2020-03-14 17:06:23 +09:00
9ea0e83f3d Merge branch 'master' into correct-trail-animation-frame 2020-03-14 16:57:35 +09:00
45dfb22bd5 Centralise additive texture creation 2020-03-14 16:39:44 +09:00
63b4fa0d56 Merge branch 'master' into correct-trail-animation-frame 2020-03-14 16:12:52 +09:00
1523c4c63f Merge branch 'master' into catcher-area-file-cleanup 2020-03-14 15:41:26 +09:00
202c8cdad8 Add braces to satisfy codefactor 2020-03-14 15:35:59 +09:00
1733519c3a Split out CatcherArea nested classes and reorder methods 2020-03-13 12:59:30 +09:00
c8cdc5fda5 Expose half catcher width to movement skill 2020-03-13 12:43:01 +09:00
c30bfa79e7 Merge branch 'master' into correct-trail-animation-frame 2020-03-13 09:55:41 +09:00
cc8a413f6b Merge pull request #8230 from EVAST9919/catcher-fix
Fix catcher showing miss sprite upon missing bananas
2020-03-12 20:10:36 +09:00
bc2a1cdb62 Apply suggestions 2020-03-12 12:04:36 +03:00
e46c070d95 Add test scene 2020-03-11 23:09:29 +03:00
09b9983286 Fix CatcherAnimationState is Fail if missing banana shower 2020-03-11 21:14:07 +03:00
5c051027e7 Fix different offset being applied from stable 2020-03-11 18:43:08 +09:00
919410c627 Remove always-false condition 2020-03-11 18:39:50 +09:00
f8e7579f45 Fix juice stream position reset not ever being applied 2020-03-11 18:38:05 +09:00
5b03b3e363 Fix hyperdashes not recalculated with HR application 2020-03-11 18:36:37 +09:00
42bc8bc50d Merge pull request #8199 from peppy/add-banana-scale-rotate
Add random rotation and scale factors to osu!catch bananas
2020-03-11 16:31:18 +09:00
966e5bbc8a User helper function to reduce copy paste 2020-03-11 15:54:21 +09:00
03c8140d3c Merge branch 'master' into add-catcher-animation-states 2020-03-11 14:53:14 +09:00
73b225ad62 Make catcher's trail reflect the current animation frame rather than play the full animation 2020-03-11 14:28:13 +09:00
affb227b38 Merge pull request #8200 from peppy/add-hyperdash-afterimage
Add afterimage glow when entering hyperdash
2020-03-11 13:56:19 +09:00
cd5f0d6e96 Merge pull request #8201 from peppy/fix-hyperdash-test
Fix hyperdash test having a zero-length juice stream
2020-03-11 13:46:59 +09:00