109 Commits

• Merge branch 'master' into fix_combo
  Hanamuke · 2018-09-14 18:48:13 +02:00
  a17200a66a
• Compute combo for nested Objects. Display fruit depending on Combo for

  osu!catch

  Hanamuke · 2018-09-13 21:52:15 +02:00
  1c2cc3837a
• Fixed comment. Created static CatchArea.GetCatcheWidth method
  Hanamuke · 2018-09-13 17:01:33 +02:00
  7d3380db66
• Fixes hyperdash computation (for nested objects)
  Hanamuke · 2018-09-12 19:48:35 +02:00
  a3c3bfb1a8
• Implement combo offsets
  smoogipoo · 2018-08-15 11:47:31 +09:00
  31f324945e
• Make HitObject not store the judgement
  smoogipoo · 2018-08-06 11:50:18 +09:00
  3a7488767c
• Rename more judgement-related methods to "result"
  smoogipoo · 2018-08-06 11:31:46 +09:00
  741ec0021e
• Make hitobjects only have one judgement + result
  smoogipoo · 2018-08-03 15:38:48 +09:00
  2a4994e5ce
• Make Rulesets.Catch use the new judgement result structure
  smoogipoo · 2018-08-02 20:37:07 +09:00
  9dff5cea07
• Migrate Rulesets.Catch to the new judgement system
  smoogipoo · 2018-08-02 15:44:48 +09:00
  e825edb6d7
• Make bananas explode even on miss
  Dean Herbert · 2018-06-29 16:49:01 +09:00
  f1a35f77d2
• Centralise judgement logic
  Dean Herbert · 2018-06-29 15:27:02 +09:00
  f7fbf61306
• Merge branch 'master' into catch-scoring
  Dean Herbert · 2018-06-29 14:59:15 +09:00
  0940715631
• Add legacy slider offsets
  smoogipoo · 2018-06-27 12:09:21 +09:00
  80501de4b9
• Fix regression causing new combos to once again not be respected
  Dean Herbert · 2018-06-26 20:13:55 +09:00
  1a8aa6eab1
• Merge branch 'master' into catch-droplet-fix
  Dean Herbert · 2018-06-26 19:29:15 +09:00
  f7f17bab78
• Merge remote-tracking branch 'origin/master' into catch_star_rating

  # Conflicts:
  #	osu-framework
  #	osu.Game.Rulesets.Catch/Difficulty/CatchDifficultyCalculator.cs
  #	osu.Game/Rulesets/Difficulty/DifficultyCalculator.cs

  smoogipoo · 2018-06-21 12:15:25 +09:00
  c9581a2d56
• Fix droplet position clamping
  ekrctb · 2018-06-20 18:29:23 +09:00
  516b1c5495
• Clamp juice stream position
  ekrctb · 2018-06-20 17:23:55 +09:00
  9d7e5b4920
• Merge branch 'master' into droplets-should-bounce
  Dan Balasescu · 2018-06-15 17:34:54 +09:00
  0ba80fad60
• Fix droplets not bouncing off catcher's plate immediately
  Dean Herbert · 2018-06-15 15:44:47 +09:00
  149d94116b
• Merge branch 'master' into catch-droplet-fix
  Dean Herbert · 2018-06-15 14:34:01 +09:00
  2ff7b4cdcf
• Remove banana positioning comment
  smoogipoo · 2018-06-14 21:38:08 +09:00
  31bd59442f
• Fix combos ending with JuiceStreams never leaving the catcher's plate

  Closes #2634.

  Dean Herbert · 2018-06-14 16:39:31 +09:00
  c41a50bf24
• Merge branch 'master' into catch-droplet-fix
  Dan Balasescu · 2018-06-13 15:18:52 +09:00
  cbb883614a
• Remove unnecessary usings and move Banana out of BananaShower
  clayton · 2018-06-11 12:43:01 -07:00
  e44e08201b
• Add judgements to catch
  clayton · 2018-06-09 17:38:17 -07:00
  f486bcfee1
• Fix InspectCode issues
  ekrctb · 2018-05-25 19:18:11 +09:00
  456dc81f2f
• catch: the fruit positions are finalized on the post process
  ekrctb · 2018-05-25 19:11:29 +09:00
  26c6313dec
• Make all drawable fruit absolute values easily scalable
  Dean Herbert · 2018-05-25 17:37:52 +09:00
  f5ab93a712
• We need DistanceToHyperDash for star rating calculation
  frankhjwx · 2018-05-21 09:58:46 +08:00
  44fd4b95bd
• Make HitWindows not return null by default
  smoogipoo · 2018-05-11 15:52:51 +09:00
  97a523584d
• Normalize all the line endings
  Dean Herbert · 2018-04-13 18:26:38 +09:00
  32a74f95a5
• Move AccentColour changes local to rulesets which rely on it
  Dean Herbert · 2018-03-22 18:53:16 +09:00
  af65f2dd48
• Merge remote-tracking branch 'upstream/master' into accent-colour-properties
  Dean Herbert · 2018-03-22 15:07:28 +09:00
  7bdca0ff39
• IHasComboIndex -> IHasComboInformation
  Dean Herbert · 2018-03-22 12:35:17 +09:00
  78a8f60b39
• Move combo colours completely out of HitObjects
  Dean Herbert · 2018-03-20 15:50:12 +09:00
  cb3d0db555
• Fix juice stream droplets spawning in incorrect locations

  Closes #2149.

  Dean Herbert · 2018-03-16 17:03:38 +09:00
  8d790e180d
• Make DrawableHitObject a CompositeDrawable

  No reason for it to be a container.

  Dean Herbert · 2018-03-15 13:41:06 +09:00
  a42035f494
• Fix catch now having incorrect offsets
  smoogipoo · 2018-02-24 02:59:55 +09:00
  f5fc9cdfba
• Fix catch never hitting result screen
  Dean Herbert · 2018-02-01 18:08:15 +09:00
  3bd42e3c85
• Fix incorrect offset check for DrawableCatchHitObjects
  Dean Herbert · 2018-02-01 18:08:15 +09:00
  daac7494dd
• Clean up off-by-one offsets from repeat-related properties
  smoogipoo · 2018-01-23 13:37:25 +09:00
  d37844c068
• remove unnecessary empty lines

  codefactor.io \(o.o)/
  also one unnecessary semicolon

  Aergwyn · 2018-01-12 19:30:34 +01:00
  ae1adfd2f2
• Apply review fixes
  Dean Herbert · 2018-01-13 00:51:20 +09:00
  b4b15b7dd0
• Fix banannanananana showers not exploding enough
  Dean Herbert · 2018-01-12 22:30:35 +09:00
  9e10854840
• Fix weird fruit not fading out
  Dean Herbert · 2018-01-12 22:30:35 +09:00
  7b19353ed8
• Make banana showers always last in combo (explodey)
  Dean Herbert · 2018-01-12 22:30:35 +09:00
  f03b8206da
• Make catch plate fruit again
  Dean Herbert · 2018-01-12 22:30:35 +09:00
  93c4d58b69
• Merge branch 'master' into catch-banana-shower
  Dan Balasescu · 2018-01-12 20:00:00 +09:00
  d9c47f98a8