59 Commits

• Merge remote-tracking branch 'upstream/master' into AlFasGD-mania-mask-container
  Dean Herbert · 2018-07-23 06:36:10 +02:00
  aead4be134
• Centralise method of disabling playfield judgements
  smoogipoo · 2018-07-20 17:04:33 +09:00
  1139f0dbf2
• Remove more unnecessary changes
  smoogipoo · 2018-07-19 18:25:28 +09:00
  b7721edc80
• Add ruleset config to HitObjectComposer
  smoogipoo · 2018-07-17 16:53:32 +09:00
  9b7d01397b
• Merge branch 'editor-composer-cleanup' into mania-mask-container

  # Conflicts:
  #	osu.Game/Rulesets/Edit/HitObjectComposer.cs
  #	osu.Game/Screens/Edit/Screens/Compose/Layers/HitObjectMaskLayer.cs

  smoogipoo · 2018-07-17 16:00:46 +09:00
  9f730dd784
• Add a playfield method to retrieve all hitobjects
  smoogipoo · 2018-07-17 15:51:10 +09:00
  3905a9105c
• Invert flow order of hitobjects between composer and mask layers
  smoogipoo · 2018-07-17 15:35:32 +09:00
  0b66f63f7d
• Merge remote-tracking branch 'origin/master' into mania-mask-container

  # Conflicts:
  #	osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNote.cs

  smoogipoo · 2018-06-07 19:19:20 +09:00
  55475d129f
• Rename GameBeatmap -> BindableBeatmap
  smoogipoo · 2018-06-06 20:16:20 +09:00
  72cc53aded
• Privatise the OsuGame beatmap, add local beatmap to OsuTestCase
  smoogipoo · 2018-05-23 17:38:02 +09:00
  8004b8af4d
• Implement mask layering (incomplete)
  AlFasGD · 2018-05-21 23:08:04 +03:00
  d504a44dfb
• Remove now-unnecessary IsForCurrentRuleset property of RulesetContainer
  smoogipoo · 2018-05-07 10:17:54 +09:00
  4ecdea8b2e
• Normalize all the line endings
  Dean Herbert · 2018-04-13 18:26:38 +09:00
  32a74f95a5
• Merge master into editor-clock
  smoogipoo · 2018-04-12 13:35:53 +09:00
  fbc50d6030
• HitObjectComposer no longer needs a beat divisor
  smoogipoo · 2018-04-06 18:21:45 +09:00
  248be8e35f
• Give editor a custom clock to handle seeking
  smoogipoo · 2018-04-06 18:11:37 +09:00
  c7abd56fc4
• Use Linq.Append and Prepend.
  Huo Yaoyuan · 2018-04-02 12:06:34 +08:00
  b842f682eb
• Make bdl beat divisor nullable
  smoogipoo · 2018-03-20 14:01:06 +09:00
  786e6242e1
• Integrate beat snap divisor into editor seeking
  smoogipoo · 2018-03-19 20:42:06 +09:00
  b1d09500f2
• Pass down editor clocks through DI
  smoogipoo · 2018-03-19 16:27:52 +09:00
  e25d1f6982
• Merge branch 'master' into fix-editor-clocks
  Dean Herbert · 2018-03-16 23:32:54 +09:00
  4b83278cf4
• Adjust comment for readability
  smoogipoo · 2018-03-16 19:57:14 +09:00
  6f7163769d
• Merge branch 'master' into editor-wheel-movement
  Dean Herbert · 2018-03-16 15:56:51 +09:00
  bca4b620b6
• Re-order methods
  smoogipoo · 2018-03-15 18:28:08 +09:00
  fc15c63a88
• Fix not being able to scroll before the first timing point
  smoogipoo · 2018-03-15 18:26:53 +09:00
  c937ef5d24
• Move clock construction to Editor
  smoogipoo · 2018-03-15 17:27:37 +09:00
  c8f6a6980b
• Use a decoupled clock for accurate clock times
  smoogipoo · 2018-03-15 17:03:33 +09:00
  9e0aeec574
• Add more testcases + fix up seeking a bit more
  smoogipoo · 2018-03-15 15:40:52 +09:00
  50f9d810dd
• Add some basic tests + fixes to seek/seekforward functionality
  smoogipoo · 2018-03-14 20:52:48 +09:00
  0da3ae0944
• Rework a lot of naming and structure
  Dean Herbert · 2018-03-14 15:18:21 +09:00
  81f82d98a1
• Rewrite seeking to better handle timing point boundaries
  smoogipoo · 2018-03-13 16:54:34 +09:00
  299de4b866
• Change wheel direction to match stable
  smoogipoo · 2018-03-13 14:30:50 +09:00
  df352c98d6
• Rename to seekAmount
  smoogipoo · 2018-03-13 14:08:43 +09:00
  e580819621
• Don't skip beats when scrolling in the direction of the closest beat
  smoogipoo · 2018-03-13 14:02:37 +09:00
  6c148930b5
• Implement mouse wheel movement in the editor
  smoogipoo · 2018-03-13 11:23:44 +09:00
  8acba47a2b
• Move selection overlay to HitObjectOverlayLayer for extensibility
  smoogipoo · 2018-03-10 00:48:57 +09:00
  4103c66cff
• Allow dragging anywhere in a capture box to move objects
  smoogipoo · 2018-03-09 23:43:50 +09:00
  ad72d3816b
• Fix border being the wrong size
  smoogipoo · 2018-02-23 15:29:56 +09:00
  278b25bcbd
• Make selectionLayer handle input below object overlays
  smoogipoo · 2018-02-22 14:34:37 +09:00
  45c579630d
• Fix post-merge issues
  smoogipoo · 2018-02-22 14:22:04 +09:00
  07252254eb
• Merge remote-tracking branch 'origin/master' into editor-hitobject-overlays
  smoogipoo · 2018-02-22 14:16:01 +09:00
  99e9eb81f2
• Tidy up layer container logic
  Dean Herbert · 2018-02-22 13:42:36 +09:00
  7c942eb592
• Add playfield aspect ratio + scaling modifications to composer layers
  smoogipoo · 2018-02-21 11:07:42 +09:00
  4934ef7429
• Add hitobject overlays to selected hitobjects
  smoogipoo · 2018-02-20 18:01:45 +09:00
  ad2f556133
• Add playfield aspect ratio + scaling modifications to composer layers
  smoogipoo · 2018-02-20 14:01:33 +09:00
  8f25a5da66
• Update licence headers
  Dean Herbert · 2018-01-05 20:21:19 +09:00
  37d393bca0
• Use Logger.Error when exceptions are involved
  Dean Herbert · 2017-12-25 18:21:15 +09:00
  6f5f4f76e5
• Give HitObjectComposer a SelectionLayer
  smoogipoo · 2017-12-11 22:20:02 +09:00
  666dcdbd62
• Remove PlayfieldOverlay
  smoogipoo · 2017-12-02 20:24:10 +09:00
  a80059032c
• Remove PlayfieldUnderlay for now
  smoogipoo · 2017-12-02 19:53:20 +09:00
  5a7c4772bd