515 Commits

• Merge remote-tracking branch 'upstream/master' into catch-hyperdash-catcher-colouring
  Salman Ahmed · 2020-04-23 05:21:56 +03:00
  278c3795e4
• Privatize externally-unused methods
  Salman Ahmed · 2020-04-22 07:37:49 +03:00
  883788dd5a
• Adjust documents

  *whoops*

  Salman Ahmed · 2020-04-22 07:36:59 +03:00
  fccb30e031
• Replace constructing a whole Catcher with static calculation methods
  Salman Ahmed · 2020-04-22 07:27:15 +03:00
  f841eb7e06
• Reword special default hyper-dash colour constant a bit
  Salman Ahmed · 2020-04-22 05:25:40 +03:00
  2d4077e713
• Separate trail-related logic to its own container
  Salman Ahmed · 2020-04-22 05:12:29 +03:00
  9ab0f6d8bc
• Mark Catcher.additiveTarget to never be null

  And provide empty containers instead.

  Salman Ahmed · 2020-04-22 05:04:07 +03:00
  95de2c6f7f
• Remove redundant property set

  Co-Authored-By: Dean Herbert <pe@ppy.sh>

  Salman Ahmed · 2020-04-21 11:44:39 +03:00
  c8c2b51108
• Simplify process of adding catcher trails
  Salman Ahmed · 2020-04-21 11:44:39 +03:00
  ee62739b08
• Add XMLDoc for default hyper-dash colour constant
  Salman Ahmed · 2020-04-21 11:44:39 +03:00
  a82efa626e
• Fix XMLDoc references
  Salman Ahmed · 2020-04-21 06:09:57 +03:00
  282d100109
• Add constant for special colour of catcher on default skin
  Salman Ahmed · 2020-04-21 05:59:37 +03:00
  9373520bca
• Merge branch 'master' of github.com:ppy/osu into catch-hyperdash-catcher-colouring
  Salman Ahmed · 2020-04-21 05:58:56 +03:00
  e17a44c99b
• Convert all static getter-only properties to static readonly fields
  Salman Ahmed · 2020-04-08 14:23:29 +03:00
  d27d8671ab
• Fix CI issue
  Salman Ahmed · 2020-04-05 00:15:42 +03:00
  42ccee5e6c
• GetHyperDashEndGlowColour() -> GetHyperDashCatcherAfterImageColour()
  Salman Ahmed · 2020-04-04 23:12:42 +03:00
  0014a8404e
• Change AdditiveTarget into a set method
  Salman Ahmed · 2020-04-04 19:33:52 +03:00
  19f39fe632
• Remove unnecessary restating comment
  Salman Ahmed · 2020-04-04 19:29:41 +03:00
  fbe95a52e3
• Update catcher hyper-dashing colours on changing hyper-dash state only
  Salman Ahmed · 2020-04-04 19:29:06 +03:00
  50604dc7b2
• Add helper methods for retrieving other skin hyper-dash colours
  Salman Ahmed · 2020-04-04 19:09:52 +03:00
  f3bcb0628c
• Merge branch 'catch-hyperdash-fruit-colouring' into catch-hyperdash-catcher-colouring
  Salman Ahmed · 2020-04-04 18:07:29 +03:00
  ee247e58c8
• Merge remote-tracking branch 'upstream/master' into catch-hyperdash-fruit-colouring
  Salman Ahmed · 2020-04-03 19:57:52 +03:00
  f67a62699b
• Update usages of Animation and Video in line with framework changes
  Dean Herbert · 2020-04-03 16:00:06 +09:00
  51db361c32
• Merge pull request #8521 from peppy/remove-scale-down-to-fit

  Remove ScaleDownToFit as it was implemented without enough safety

  Dean Herbert · 2020-03-31 23:22:04 +09:00
  f653d37058
• Fix osu!catch catcher hit area being too large
  Dean Herbert · 2020-03-31 18:33:09 +09:00
  b7d73f96ea
• Remove ScaleDownToFit as it was not implemented without enough safety
  Dean Herbert · 2020-03-31 13:50:04 +09:00
  1fce7cce01
• Merge remote-tracking branch 'upstream/master' into catch-hyperdash-fruit-colouring
  Salman Ahmed · 2020-03-28 07:44:11 +03:00
  c2e31f53f1
• Reduce spread of stacked fruit
  Dean Herbert · 2020-03-26 16:58:23 +09:00
  2949e8dc27
• 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)

  Salman Ahmed · 2020-03-26 09:14:44 +03:00
  fecafc2e48
• Add support for custom hyper-dash catcher colouring
  Salman Ahmed · 2020-03-26 09:11:59 +03:00
  302fdd834a
• Make catcher trails colouring per container
  Salman Ahmed · 2020-03-26 09:11:31 +03:00
  e3a7c8a124
• Add default hyper-dash colour constant on Catcher
  Salman Ahmed · 2020-03-26 05:42:11 +03:00
  0a368f13d9
• Fix catch positional data being incorrectly recorded
  Dean Herbert · 2020-03-24 15:38:54 +09:00
  388cf5c83a
• Add remaining replay recorders
  Dean Herbert · 2020-03-24 14:55:49 +09:00
  96a849f897
• Remove leftover unused private methods
  Bartłomiej Dach · 2020-03-15 15:45:13 +01:00
  f904859943
• Move across to new file in line with master
  Dean Herbert · 2020-03-14 17:06:23 +09:00
  d3f23b766e
• Merge branch 'master' into correct-trail-animation-frame
  Dean Herbert · 2020-03-14 16:57:35 +09:00
  9ea0e83f3d
• Centralise additive texture creation
  Dean Herbert · 2020-03-14 16:39:44 +09:00
  45dfb22bd5
• Add braces to satisfy codefactor
  Dean Herbert · 2020-03-14 15:35:59 +09:00
  202c8cdad8
• Split out CatcherArea nested classes and reorder methods
  Dean Herbert · 2020-03-13 12:59:30 +09:00
  1733519c3a
• Merge branch 'master' into correct-trail-animation-frame
  Dean Herbert · 2020-03-13 09:55:41 +09:00
  c30bfa79e7
• Apply suggestions
  Andrei Zavatski · 2020-03-12 12:04:36 +03:00
  bc2a1cdb62
• Add test scene
  Andrei Zavatski · 2020-03-11 23:09:29 +03:00
  e46c070d95
• Fix CatcherAnimationState is Fail if missing banana shower
  Andrei Zavatski · 2020-03-11 21:14:07 +03:00
  09b9983286
• Merge branch 'master' into add-catcher-animation-states
  Dan Balasescu · 2020-03-11 14:53:14 +09:00
  03c8140d3c
• Make catcher's trail reflect the current animation frame rather than play the full animation
  Dean Herbert · 2020-03-11 14:28:13 +09:00
  73b225ad62
• Load all catcher states ahead-of-time to avoid blocking loads
  Dean Herbert · 2020-03-11 13:45:55 +09:00
  1bad2ff879
• Add afterimage glow when entering hyperdash
  Dean Herbert · 2020-03-10 16:41:08 +09:00
  eab544b49f
• Add catcher kiai/fail animation states
  Dean Herbert · 2020-03-10 15:28:37 +09:00
  7069cef9ce
• Merge pull request #8192 from peppy/fix-hyperdash

  Fix hyperdash not initiating correctly when juice streams are present

  Dan Balasescu · 2020-03-10 14:00:44 +09:00
  a6cf6207aa