101 Commits

• OpenTK -> osuTK
  smoogipoo · 2018-11-20 17:14:59 +09:00
  f27bd3ef3e
• Hide placement when cursor is not in the playfield
  smoogipoo · 2018-11-13 12:52:04 +09:00
  fbc20d2d4d
• 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 '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
• PlayfieldLayer -> PlayfieldAdjustmentContainer
  smoogipoo · 2018-10-05 10:39:18 +09:00
  d0007c047a
• Implement an intermediary EditRulesetContainer
  smoogipoo · 2018-10-03 15:36:24 +09:00
  540a010fbb
• 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
• Merge remote-tracking branch 'upstream/master' into update-framework
  Dean Herbert · 2018-09-26 19:50:48 +09:00
  2ed7785cfc
• Update framework with positional/non-positional changes
  smoogipoo · 2018-09-26 14:01:15 +09:00
  a8f156584b
• Use HitObject scale to determine judgement size
  Kyle Chang · 2018-09-24 21:18:55 -04:00
  2069467434
• Make judgements scale with cs
  Kyle Chang · 2018-09-22 22:54:38 -04:00
  7a43677849
• Remove GetAspectAdjustedSize() and PlayfieldArea
  smoogipoo · 2018-09-21 15:14:49 +09:00
  0bc2bcaf14
• Simplify + rename playfield layers in Osu/Catch
  smoogipoo · 2018-09-21 15:01:58 +09:00
  26094ea325
• Remove duplicate implementation of the Osu playfield layer
  smoogipoo · 2018-09-21 14:43:38 +09:00
  a166d03ede
• Simplify creation of a playfield
  smoogipoo · 2018-09-21 14:35:50 +09:00
  368ceec47c
• Make Playfield not a ScalableContainer
  smoogipoo · 2018-09-21 14:02:32 +09:00
  826dc6ceb7
• DrawInfo -> DrawColourInfo
  Dean Herbert · 2018-09-06 18:02:04 +09:00
  a1780fddc9
• Revert async changes
  Dean Herbert · 2018-08-31 07:07:10 +09:00
  03084aa04b
• Fix mania throwing an exception on start of map
  Dean Herbert · 2018-08-30 14:58:00 +09:00
  68a79f895a
• Use GetAsync on all textures
  smoogipoo · 2018-08-27 17:26:44 +09:00
  1b279d383f
• Update uniform usage
  Dean Herbert · 2018-08-20 13:39:22 +09:00
  e628e78f24
• Rename more judgement-related methods to "result"
  smoogipoo · 2018-08-06 11:31:46 +09:00
  741ec0021e
• Rename judgement-related methods/events + commenting
  smoogipoo · 2018-08-06 10:55:25 +09:00
  5fd4ed2f4e
• Make Rulesets.Osu use the new judgement result structure
  smoogipoo · 2018-08-02 20:36:38 +09:00
  4548d2c87f
• Merge branch 'master' into centralise-judgement-display
  Dean Herbert · 2018-07-23 02:58:49 +09:00
  d868d81b59
• Update framework
  Dean Herbert · 2018-07-21 16:21:53 +09:00
  0f37758314
• Merge branch 'master' into centralise-judgement-display
  Dean Herbert · 2018-07-20 17:29:15 +09:00
  3fc7f33e90
• Centralise method of disabling playfield judgements
  smoogipoo · 2018-07-20 17:04:33 +09:00
  1139f0dbf2
• Fix GameplayCursor state not restoring correctly after Show/Hide
  Dean Herbert · 2018-07-18 19:59:04 +09:00
  ffd3040fe2
• Merge branch 'master' into use-switch-over-if
  Dan Balasescu · 2018-07-17 16:44:57 +09:00
  64cde1ebad
• Use switch with type matching in place of if-else where possible
  Dean Herbert · 2018-07-17 14:35:09 +09:00
  825941aff1
• Fix lead-in time now being long enough in many cases
  Dean Herbert · 2018-07-17 14:29:22 +09:00
  b967fe714b
• Remove unused field
  Dean Herbert · 2018-06-29 17:00:41 +09:00
  cacabeb67e
• RulesetContainer<TObject> cannot be derived
  Tom Arrow · 2018-06-19 14:31:24 +02:00
  ad883e087a
• Fix memory leak due to incorrect binding
  Dean Herbert · 2018-06-13 14:16:58 +09:00
  f4cb0d7d8d
• Merge branch 'master' into ruleset-configs
  Dean Herbert · 2018-06-12 13:13:18 +09:00
  ae136e89a4
• Merge branch 'master' into fix-object-ordering
  Dan Balasescu · 2018-06-11 17:53:33 +09:00
  9994c69d58
• Give ruleset settings a ruleset-specific config manager
  smoogipoo · 2018-06-11 13:28:50 +09:00
  f4fbf27d42
• Explicitly construct local beatmaps rather than using GetBoundCopy
  smoogipoo · 2018-06-06 20:19:30 +09:00
  ff60f69f47
• Rename GameBeatmap -> BindableBeatmap
  smoogipoo · 2018-06-06 20:16:20 +09:00
  72cc53aded
• Reverse order of exposed objects in HitObjectContainer

  Closes #2740.

  Dean Herbert · 2018-06-06 15:03:47 +09:00
  3567823759
• Privatise the OsuGame beatmap, add local beatmap to OsuTestCase
  smoogipoo · 2018-05-23 17:38:02 +09:00
  8004b8af4d
• Remove now-unnecessary IsForCurrentRuleset property of RulesetContainer
  smoogipoo · 2018-05-07 10:17:54 +09:00
  4ecdea8b2e
• Merge branch 'i-beatmap' into beatmap-conversion-rework
  smoogipoo · 2018-05-07 10:00:24 +09:00
  77e661489d
• Merge remote-tracking branch 'origin/master' into remove-approachcircle-hax

  # Conflicts:
  #	osu.Game.Rulesets.Osu/Edit/OsuEditPlayfield.cs
  #	osu.Game.Rulesets.Osu/UI/OsuPlayfield.cs

  smoogipoo · 2018-04-20 18:04:43 +09:00
  c9e4a07e12
• Initial rework of beatmap conversion process
  smoogipoo · 2018-04-19 22:04:12 +09:00
  03a5df84c6
• Normalize all the line endings
  Dean Herbert · 2018-04-13 18:26:38 +09:00
  32a74f95a5
• Remove now unnecessary approachcircle proxy disables

  Prereqs:
  - [ ] ppy/osu-framework#1505

  smoogipoo · 2018-04-09 18:44:50 +09:00
  cea3e1c7f5
• Don't display judgements in OsuEditPlayfield
  smoogipoo · 2018-04-04 17:12:41 +09:00
  d4cb00e08f