362 Commits

• Merge branch 'master' into use-lifetime-optimization
  Dan Balasescu · 2019-02-18 15:22:34 +09:00
  c9c8cccd68
• Fix incorrect application of scaling in some cases

  Isolates different usages of hitcircle scale so they can't ever cause regressions.

  Dean Herbert · 2019-02-14 18:47:05 +09:00
  810175235d
• Rollback other fallthrough regressions
  Dean Herbert · 2019-02-05 18:14:43 +09:00
  5b1f111922
• Fix combo colour fallbacks when skin is not providing any
  Dean Herbert · 2019-02-05 17:54:14 +09:00
  2f8f4fac64
• Merge branch 'master' into use-lifetime-optimization
  ekrctb · 2019-01-29 12:15:02 +09:00
  504e79b968
• revert accidentally renamed variables
  Unknown · 2019-01-25 11:22:05 +01:00
  77763fde8b
• revert previous rename and rename ruleset specific classes instead
  Unknown · 2019-01-25 11:14:37 +01:00
  8ddff673b7
• Merge branch 'master' into move-osu-settings
  Unknown · 2019-01-25 10:57:04 +01:00
  5446c99f22
• Update licence header (and remove year)
  Dean Herbert · 2019-01-24 17:43:03 +09:00
  8617aaa2a7
• move osu! settings into its ruleset
  Unknown · 2019-01-23 13:17:29 +01:00
  cf147083cd
• rename OsuConfigManager to GameConfigManager

  also OsuSetting to GameSetting

  Unknown · 2019-01-23 13:17:29 +01:00
  4a9bcf4937
• remove blank lines
  Unknown · 2019-01-11 10:34:56 +01:00
  6eff79913b
• Make skinning better
  Dean Herbert · 2019-01-07 20:12:39 +09:00
  4cee21f356
• Merge remote-tracking branch 'upstream/master' into moreOptionsFromSkin.ini
  Dean Herbert · 2019-01-07 18:11:17 +09:00
  13b077c83b
• Use LifetimeManagementContainer

  This is a significant performance boost for gameplay,
  especially for long or stroyboard-heavy maps.

  ekrctb · 2018-12-13 15:23:06 +09:00
  6f8a2e6ff2
• Make Slider's CustumColors skinnable
  Dragicafit · 2018-12-07 22:24:24 +01:00
  ec3c87dbea
• Initial design for user registration dialog
  Dean Herbert · 2018-12-05 12:57:26 +09:00
  1a974f64de
• Fix taiko hitobjects potentially disappearing before being judged
  smoogipoo · 2018-11-29 12:12:29 +09:00
  aea84f737b
• Fix spinners not having proper lifetimes
  smoogipoo · 2018-11-29 12:11:45 +09:00
  52bc47499f
• OpenTK -> osuTK
  smoogipoo · 2018-11-20 17:14:59 +09:00
  f27bd3ef3e
• Fix post-merge issues
  smoogipoo · 2018-11-14 14:29:22 +09:00
  050af88be9
• Use bindables for hitobject events
  smoogipoo · 2018-11-09 13:58:46 +09:00
  cc8531790a
• Merge branch 'master' into slider-placement
  Dean Herbert · 2018-11-02 19:45:34 +09:00
  63cbc8e0e8
• Merge remote-tracking branch 'upstream/master' into slider-placement
  Dean Herbert · 2018-11-01 17:59:37 +09:00
  c1304eca1b
• Merge branch 'master' into spinner-selection
  Dean Herbert · 2018-11-01 17:47:59 +09:00
  5fd21d35dc
• ControlPoint -> PathControlPoint

  Also Curve -> Path.

  Dean Herbert · 2018-11-01 03:56:51 +09:00
  bb2f8deb18
• Add a spinner selection mask
  smoogipoo · 2018-10-29 18:23:23 +09:00
  af1de01ed6
• Merge branch 'slider-controlpoint-masks' into slider-placement

  # Conflicts:
  #	osu.Game.Rulesets.Osu/Edit/Masks/SliderMasks/Components/SliderBodyPiece.cs
  #	osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs

  smoogipoo · 2018-10-29 15:55:38 +09:00
  08b16be3b8
• Make sliders respond to control point changes
  smoogipoo · 2018-10-29 15:36:43 +09:00
  acd703c27b
• Make sliders respond to scale changes
  smoogipoo · 2018-10-29 15:26:28 +09:00
  660cd24750
• Merge branch 'separate-slider-body' into editor-mask-placement

  # Conflicts:
  #	osu.Game.Rulesets.Osu/Edit/Layers/Selection/Overlays/SliderMask.cs

  smoogipoo · 2018-10-29 15:24:15 +09:00
  619a0dfd59
• Separate slider body to bypass snaking logic

  The snaking logic contains a lot of caching/optimisations and offsetting of the path which is tedious to re-compute when the path changes.

  smoogipoo · 2018-10-29 15:15:29 +09:00
  86e09a68f7
• Merge branch 'master' into skinnable-spritetext
  Dean Herbert · 2018-10-28 08:35:25 -07:00
  4f65d67e2b
• Make circle piece respond to hitobject scale
  smoogipoo · 2018-10-26 15:26:19 +09:00
  22c545ea8c
• Merge remote-tracking branch 'origin/master' into editor-mask-placement

  # Conflicts:
  #	osu.Game.Rulesets.Catch/UI/CatchRulesetContainer.cs
  #	osu.Game.Rulesets.Mania/Edit/ManiaEditRulesetContainer.cs
  #	osu.Game.Rulesets.Osu/Edit/OsuEditRulesetContainer.cs
  #	osu.Game/Rulesets/UI/RulesetContainer.cs

  smoogipoo · 2018-10-16 17:28:16 +09:00
  70f1d17b7e
• Merge branch 'master' into skinnable-spritetext
  Dan Balasescu · 2018-10-09 16:23:43 +09:00
  a2838d32bf
• Make SliderBody use the new SmoothPath
  smoogipoo · 2018-10-05 15:45:45 +09:00
  42664f1c19
• Fix StackHeight changes not causing position updates
  smoogipoo · 2018-10-03 17:06:18 +09:00
  1cd11a6e5b
• Adjust usage of Handle(Non)PositionalInput to follow framework update
  ekrctb · 2018-10-02 14:45:33 +09:00
  68980fc477
• Adapt signature change of event handlers
  ekrctb · 2018-10-02 12:02:55 +09:00
  50091252e2
• Change signature to new event handler
  ekrctb · 2018-10-02 12:02:47 +09:00
  99fc04c8af
• Implement skinnable sprite text
  smoogipoo · 2018-09-27 17:40:28 +09:00
  0d8276c5f8
• Update framework with positional/non-positional changes
  smoogipoo · 2018-09-26 14:01:15 +09:00
  a8f156584b
• Merge remote-tracking branch 'upstream/master' into framework-image-changes
  Dean Herbert · 2018-09-07 18:56:00 +09:00
  7cca990be4
• Fix potential nullref in IsPresent override
  Dean Herbert · 2018-09-06 18:01:32 +09:00
  9f67119ba9
• Update in line with framework Image changes
  Dean Herbert · 2018-09-06 13:28:44 +09:00
  4ff66bf531
• Revert async changes
  Dean Herbert · 2018-08-31 07:07:10 +09:00
  03084aa04b
• Use GetAsync on all textures
  smoogipoo · 2018-08-27 17:26:44 +09:00
  1b279d383f
• Merge remote-tracking branch 'upstream/master' into tgi74-hit-shake

  # Conflicts:
  #	osu.Game.Rulesets.Osu.Tests/TestCaseHitCircle.cs
  #	osu.Game.Rulesets.Osu/Objects/Drawables/DrawableOsuHitObject.cs
  #	osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/SliderBall.cs

  Dean Herbert · 2018-08-24 15:26:36 +09:00
  ffcad6e0f1
• Remove sliderball's input override
  smoogipoo · 2018-08-21 12:24:48 +09:00
  34b1abeca3