383 Commits

• Formatting fixes
  Dean Herbert · 2019-01-23 14:51:25 +09:00
  c18ce2c23a
• Fix key counter receptor getting overwritten by async load drawables
  Dean Herbert · 2019-01-23 14:51:25 +09:00
  49633b3394
• Merge branch 'master' into do_not_use_local_user_for_autoplay_score
  Dean Herbert · 2019-01-04 13:11:17 +09:00
  b6dc6c4a74
• Remove mod multipliers

  We decided that mods shouldn't be interacting with other mods. This can be added once we have the ability to have per-mod settings, as a difficulty setting local to blinds.

  Dean Herbert · 2018-12-20 19:46:39 +09:00
  ef9d93ff6b
• Simplify changes to RulesetContainer
  Dean Herbert · 2018-12-20 19:35:32 +09:00
  d3368df94d
• Remove unnecessary private field
  Dean Herbert · 2018-12-07 20:13:03 +09:00
  7d9cdf6f81
• Merge branch 'master' of https://github.com/ppy/osu into mod-fl2
  WebFreak001 · 2018-12-06 12:14:48 +01:00
  3cb91979bd
• Handle ModAutoplay during score construction in the Player
  Roman Kapustin · 2018-12-03 22:37:26 +03:00
  c6c255718b
• Merge branch 'master' into scoredatabase
  Dean Herbert · 2018-11-30 14:59:58 +09:00
  271dcded3c
• Re-namespace replay-related classes
  smoogipoo · 2018-11-28 17:20:37 +09:00
  2ee181daf7
• Merge branch 'mania-selection-movement' into inter-column-movements

  # Conflicts:
  #	osu.Game.Rulesets.Mania/Edit/Blueprints/ManiaSelectionBlueprint.cs
  #	osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs

  smoogipoo · 2018-11-26 11:45:48 +09:00
  56032a4522
• OpenTK -> osuTK
  smoogipoo · 2018-11-20 17:14:59 +09:00
  f27bd3ef3e
• Unbind event when column changes
  smoogipoo · 2018-11-19 16:20:21 +09:00
  595e2ffbff
• Merge branch 'master' into more-global-scrollalgo
  Dean Herbert · 2018-11-14 13:54:53 +09:00
  2ae139d260
• Merge branch 'add-mania-selection-testcase' into mania-selection-movement
  smoogipoo · 2018-11-13 15:40:51 +09:00
  2c277545e0
• Add IScrollAlgorithm.TimeAt()
  smoogipoo · 2018-11-12 17:43:22 +09:00
  b9b20607af
• Fix post-rebase issues
  smoogipoo · 2018-11-12 17:36:19 +09:00
  d8e7ad8241
• Move rest of ScrollingPlayfield into ScrollingRulesetContainer
  smoogipoo · 2018-11-12 17:34:35 +09:00
  10543cf1b6
• Move ScrollAlgorithm inside IScrollingInfo
  smoogipoo · 2018-11-12 17:34:35 +09:00
  e7969ecec7
• Simplify construction of ScrollingInfo
  smoogipoo · 2018-11-12 17:34:35 +09:00
  54668a0dec
• Move scroll direction to scrollinginfo
  smoogipoo · 2018-11-12 17:34:35 +09:00
  ad45bc7666
• Remove unused code
  smoogipoo · 2018-11-12 17:34:35 +09:00
  48486895ba
• Move scrolling info to osu.Game
  smoogipoo · 2018-11-12 17:34:35 +09:00
  9fde7f7f44
• Move IScrollAlgorithm to ScrollingRulesetContainer + use DI
  smoogipoo · 2018-11-12 17:34:35 +09:00
  7f0f143a1b
• ScrollAlgorithm -> ScrollVisualisationMethod
  smoogipoo · 2018-11-12 17:26:37 +09:00
  aee7a80e71
• Adjust namespaces
  smoogipoo · 2018-11-08 14:04:21 +09:00
  33056b8098
• Rename IScrollChangeVisualiser -> IScrollAlgorithm
  smoogipoo · 2018-11-08 14:04:21 +09:00
  f66a9f4f1e
• Fix height being set instead of width
  smoogipoo · 2018-11-08 14:04:20 +09:00
  2f87f267a3
• Give visualiser methods range+length params again
  smoogipoo · 2018-11-08 14:04:20 +09:00
  195f82fa96
• Add some xmldocs
  smoogipoo · 2018-11-08 14:04:20 +09:00
  f41bfd14ca
• Reorder params
  smoogipoo · 2018-11-08 14:04:20 +09:00
  76ea314c27
• Remove state computation + updates from ISpeedChangeVisualiser
  smoogipoo · 2018-11-08 14:04:20 +09:00
  589c3a47e2
• Expose basic values from ISpeedChangeVisualiser
  smoogipoo · 2018-11-08 14:04:20 +09:00
  0bdeebbce2
• Merge branch 'master' into editor-mask-placement
  Dean Herbert · 2018-10-31 06:46:48 +09:00
  b28c0cd128
• Add type parameter to IApplicableToBeatmap
  Kyle Chang · 2018-10-30 00:13:33 -04:00
  6d00aff9fd
• Add interface to adjust Beatmaps
  Kyle Chang · 2018-10-28 02:21:25 -04:00
  df6fc4013a
• Merge branch 'master' of https://github.com/ppy/osu into mod-fl2

  Changes how OsuModBlinds passes the playfield and how DrawableOsuBlinds
  handles the restrictTo parameter.

  WebFreak001 · 2018-10-27 16:34:48 +02:00
  3b08ad0742
• Reduce complexity of creating edit ruleset containers
  smoogipoo · 2018-10-17 18:06:00 +09:00
  d36ac59ca2
• 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 remote-tracking branch 'upstream/master' into playfield-scaling-rework
  Dean Herbert · 2018-10-12 19:25:08 +09:00
  468f7fd1ea
• Add fallback logic in case a ruleset consumer forgets to add the HitObjectContainer
  Dean Herbert · 2018-10-12 19:15:11 +09:00
  ad42f2244d
• Merge branch 'master' into mod-fl2
  Jan Jurzitza · 2018-10-12 11:44:55 +02:00
  460c943958
• Merge branch 'master' into fix-sv
  Dean Herbert · 2018-10-12 18:13:50 +09:00
  1de770e093
• Merge branch 'master' into mod-fl2
  Dean Herbert · 2018-10-10 19:48:46 +09:00
  e0a8157d92
• Merge branch 'master' into consistent-terminology-format
  Dean Herbert · 2018-10-10 19:19:36 +09:00
  841b2e8692
• Merge branch 'master' into fix-sv
  Dean Herbert · 2018-10-09 18:00:34 +09:00
  06ea174f34
• Merge remote-tracking branch 'origin/master' into playfield-scaling-rework

  # Conflicts:
  #	osu.Game.Rulesets.Catch/UI/CatchPlayfield.cs
  #	osu.Game/Rulesets/UI/Scrolling/ScrollingPlayfield.cs

  smoogipoo · 2018-10-05 10:40:16 +09:00
  ff559a3a1b
• Remove duplicated code
  ekrctb · 2018-10-04 18:03:34 +09:00
  b9d0fc927b
• Fix gameplay mouse button disable setting no longer having any effect

  Regressed at https://github.com/ppy/osu/commit/50091252e272564807e046b699d6619382a44891#diff-20562da8cde558aacafa9540b97b7975

  Dean Herbert · 2018-10-04 03:07:00 +09:00
  593dee202c
• Implement an intermediary EditRulesetContainer
  smoogipoo · 2018-10-03 15:36:24 +09:00
  540a010fbb