480 Commits

• Make Samples null by default and prepopulate in mania
  Dean Herbert · 2017-12-23 18:06:46 +09:00
  aeafa5645a
• Simplify DrawableHitObject's sample load code
  Dean Herbert · 2017-12-23 17:20:14 +09:00
  2db68df999
• SoundControlPoint -> SampleControlPoint
  Dean Herbert · 2017-12-23 16:34:34 +09:00
  5026c7a95e
• Remove unnecessary newline
  Dean Herbert · 2017-12-23 16:23:33 +09:00
  ff0927e71b
• Merge remote-tracking branch 'upstream/master' into taiko-hitsounds-fix

  # Conflicts:
  #	osu.Game/Audio/SampleInfo.cs

  Dean Herbert · 2017-12-23 14:50:35 +09:00
  46865bbacd
• Merge remote-tracking branch 'origin/master' into taiko-hitsounds-fix
  Dean Herbert · 2017-12-23 14:20:16 +09:00
  1fa9dac1bb
• Make HitObjects construct nested hit objects
  smoogipoo · 2017-12-22 21:42:54 +09:00
  6a29f6020a
• Determine SampleInfo defaults in DrawableHitObject
  smoogipoo · 2017-12-21 16:02:33 +09:00
  cb7e192aff
• Merge branch 'master' into beatmap-serialization
  smoogipoo · 2017-12-21 13:39:39 +09:00
  c99ea32574
• Fix line endings
  Dean Herbert · 2017-12-18 21:51:00 +09:00
  051a3c4d47
• Make the captured objects not update for now

  Since this is not the intended functionality.

  smoogipoo · 2017-12-18 19:31:03 +09:00
  fabf1bf60a
• FinishCapture -> FinishDrag from Handles
  smoogipoo · 2017-12-18 19:24:41 +09:00
  5493493f82
• Marker* -> Handle
  smoogipoo · 2017-12-18 19:21:26 +09:00
  09c51df2bd
• DragSelector -> HitObjectSelectionBox
  smoogipoo · 2017-12-18 19:17:26 +09:00
  3999940538
• Update SelectionLayer.cs
  Dan Balasescu · 2017-12-18 14:10:14 +09:00
  812181190e
• Update SelectionInfo.cs
  Dan Balasescu · 2017-12-18 13:59:46 +09:00
  17c58678cf
• Expose selected objects from SelectionLayer
  smoogipoo · 2017-12-15 14:48:24 +09:00
  66b19b6c97
• Use Lazy for threadsafety on playfield
  smoogipoo · 2017-12-14 20:27:51 +09:00
  b28b86dea9
• Add license headers
  smoogipoo · 2017-12-11 22:21:33 +09:00
  3d51301e03
• Give HitObjectComposer a SelectionLayer
  smoogipoo · 2017-12-11 22:20:02 +09:00
  666dcdbd62
• Give control over screen space conversion to DrawableHitObject
  smoogipoo · 2017-12-11 22:19:02 +09:00
  a303bf71cf
• Refactor into separate files + add xmldocs + rename some methods
  smoogipoo · 2017-12-11 21:56:58 +09:00
  2f1063c5c0
• Implement hover colours
  smoogipoo · 2017-12-11 21:27:19 +09:00
  c12c241633
• Finish up logical implementation of markers
  smoogipoo · 2017-12-11 21:03:34 +09:00
  25d80a36be
• More refactorings + add markers

  Move

  smoogipoo · 2017-12-11 19:07:40 +09:00
  5147b342dc
• Fix incorrect SelectionPoint
  smoogipoo · 2017-12-11 18:08:16 +09:00
  b28306d3c0
• Refactor into a new DragBox class, representing a single drag
  smoogipoo · 2017-12-11 17:45:03 +09:00
  4573cc3322
• Merge remote-tracking branch 'origin/master' into editor-selection-tool
  smoogipoo · 2017-12-11 16:34:27 +09:00
  7189446943
• Fix comment formatting
  Dean Herbert · 2017-12-11 14:52:15 +09:00
  77592ed15f
• Update RulesetInfo and add migration
  Dean Herbert · 2017-12-10 12:15:55 +09:00
  d02e1ae896
• Add ShortName to rulesets
  Dean Herbert · 2017-12-08 18:55:25 +09:00
  679134c030
• Remove SelectionDragger for now
  smoogipoo · 2017-12-08 17:51:15 +09:00
  5341e79102
• Fix up post-merge issues
  smoogipoo · 2017-12-08 17:41:10 +09:00
  faa921ba05
• Merge branch 'master' of https://github.com/ppy/osu into taiko-hitsounds-fix
  FreezyLemon · 2017-12-08 08:30:02 +01:00
  9e3d439f0a
• Merge remote-tracking branch 'origin/master' into editor-selection-tool
  smoogipoo · 2017-12-08 15:13:18 +09:00
  f41af191ed
• Rolled back the bad earlier implementation
  FreezyLemon · 2017-12-07 21:18:51 +01:00
  43c270ea49
• Merge remote-tracking branch 'upstream/master' into input-revamp
  Dean Herbert · 2017-12-07 18:07:26 +09:00
  c35c8263b9
• Merge branch 'master' into fix-beatmap-carousel-lag
  Dean Herbert · 2017-12-07 15:30:50 +09:00
  44ee11e75f
• Don't serialize HitObject.Kiai
  smoogipoo · 2017-12-07 14:42:36 +09:00
  e573db04d4
• Apply changes in line with framework input adjustments
  Dean Herbert · 2017-12-07 13:16:59 +09:00
  a78441bc5a
• Dont serialize hitobject sample properties copied from the control point
  smoogipoo · 2017-12-07 03:40:43 +09:00
  41b607c165
• Make Beatmap ISerializable and add more JsonIgnores
  smoogipoo · 2017-12-06 00:37:37 +09:00
  b584178e85
• 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
• CI adjustments

  - removing unnecessary `using`s
  - name Fields/Methods according to rules
  - removing unnecessary initializations

  Aergwyn · 2017-12-01 17:58:11 +01:00
  db50ad794e
• restructured OsuLegacyDecoder into LegacyDecoder

  Beatmap works, Storyboard not...

  Aergwyn · 2017-12-01 17:43:33 +01:00
  806c0e3b26
• Make the dragger attach to objects it surrounds

  Plus a lot more implementation.

  smoogipoo · 2017-12-02 00:26:02 +09:00
  cf859a6cf2
• Implement a selection dragger box
  smoogipoo · 2017-12-01 13:15:58 +09:00
  f6591851c3
• Add/fix up license headers
  smoogipoo · 2017-11-30 22:21:02 +09:00
  52ba68e25d
• Remove unused parameter for now
  smoogipoo · 2017-11-30 21:58:41 +09:00
  c0c051aa32