2030 Commits

• Fix drag breaking if scrolling while dragging
  smoogipoo · 2018-11-26 16:08:56 +09:00
  f9f300b215
• Merge branch 'master' into note-placement
  Dean Herbert · 2018-11-26 14:35:31 +09:00
  4cfeb1b9a1
• Merge branch 'master' into fix-deletion-crash
  Dean Herbert · 2018-11-26 14:20:02 +09:00
  c944e8bb29
• 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
• Merge branch 'master' into note-placement
  Dean Herbert · 2018-11-22 19:44:39 +09:00
  1da2006dea
• Implement mania note deletion
  smoogipoo · 2018-11-20 17:26:00 +09:00
  dc8cd51e15
• OpenTK -> osuTK
  smoogipoo · 2018-11-20 17:14:59 +09:00
  f27bd3ef3e
• Fix post-merge issue
  smoogipoo · 2018-11-19 19:17:03 +09:00
  d5b937f88f
• Merge branch 'master' into note-placement
  Dan Balasescu · 2018-11-19 19:08:53 +09:00
  8cee4141e8
• SelectionBox -> SelectionHandler
  smoogipoo · 2018-11-19 16:58:11 +09:00
  55edeb095d
• Unbind event when column changes
  smoogipoo · 2018-11-19 16:20:21 +09:00
  595e2ffbff
• Move positional adjustment to SelectionBox
  smoogipoo · 2018-11-16 17:12:24 +09:00
  4cbda97b1e
• apply suggestions
  jorolf · 2018-11-15 17:38:38 +01:00
  80bd98bb9d
• Pass all selected hitobjects to the selection blueprints
  smoogipoo · 2018-11-15 21:01:09 +09:00
  df7515b66f
• Fix post-merge issue
  smoogipoo · 2018-11-15 20:56:34 +09:00
  d5464702fa
• Merge branch 'note-placement' into inter-column-movements
  smoogipoo · 2018-11-15 20:53:57 +09:00
  eddba44d0f
• Merge branch 'master' into flashlight-mod
  jorolf · 2018-11-15 00:35:42 +01:00
  41a0f9896e
• split shader, remove unnecessary clutter and fix some bugs
  jorolf · 2018-11-15 00:33:13 +01:00
  7d2958b7b0
• Merge remote-tracking branch 'origin/master' into placement-hiding
  smoogipoo · 2018-11-14 18:34:45 +09:00
  4b86c29f7b
• Reduce chaining
  smoogipoo · 2018-11-14 18:34:13 +09:00
  c963fc7cd2
• Merge remote-tracking branch 'upstream/master' into note-placement
  Dean Herbert · 2018-11-14 18:29:31 +09:00
  4dec2d1db0
• Merge branch 'master' into placement-hiding
  Dean Herbert · 2018-11-14 16:59:41 +09:00
  84d16ee71b
• Merge branch 'master' into more-global-scrollalgo
  Dean Herbert · 2018-11-14 13:54:53 +09:00
  2ae139d260
• Merge branch 'master' into scrollalgorithm-timeat
  Dean Herbert · 2018-11-14 13:32:16 +09:00
  34973a3e9f
• Merge branch 'master' into more-global-scrollalgo
  Dean Herbert · 2018-11-14 13:32:14 +09:00
  8b190edde0
• Merge branch 'master' into no-drawable-speedchangevis
  Dean Herbert · 2018-11-13 19:42:04 +09:00
  3caf0cb0d9
• Make show/hide only invoked once each
  smoogipoo · 2018-11-13 13:12:11 +09:00
  6d43baf4bf
• Hide placement when cursor is not in the playfield
  smoogipoo · 2018-11-13 12:52:04 +09:00
  fbc20d2d4d
• Implement note placement
  smoogipoo · 2018-11-12 18:24:18 +09:00
  3a1fee59fb
• Merge branch 'notepieces' into note-placement
  smoogipoo · 2018-11-12 17:59:54 +09:00
  a0c75a0597
• Merge branch 'more-global-scrollalgo' into note-placement
  smoogipoo · 2018-11-12 17:47:02 +09:00
  9e1b54f1ef
• 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
• Make sure control points is internally initialised
  smoogipoo · 2018-11-12 17:14:06 +09:00
  f3ba429701
• Implement IEquatable
  smoogipoo · 2018-11-12 16:53:30 +09:00
  f4fd6189f8
• Ignore distance for json serialisation
  smoogipoo · 2018-11-12 16:38:49 +09:00
  0220ed21b0
• Define default json deserialisation constructor
  smoogipoo · 2018-11-12 16:38:33 +09:00
  0e92b385f0
• Safety for default(SliderPath)
  smoogipoo · 2018-11-12 16:38:14 +09:00
  8ad9b6a02a
• Revert "Make SliderPath.ControlPoints read-only"

  This reverts commit 3b88d94793.
  
  # Conflicts:
  #	osu.Game/Rulesets/Objects/SliderPath.cs

  smoogipoo · 2018-11-12 16:20:38 +09:00
  d594ce3530
• Add xmldocs
  smoogipoo · 2018-11-12 14:16:21 +09:00
  77d16aa968
• Re-order file
  smoogipoo · 2018-11-12 14:08:36 +09:00
  4eef1134a6
• Make Path.Distance a property again
  smoogipoo · 2018-11-12 14:07:48 +09:00
  3aba462e52