120 Commits

• Late-add the HitObjects container in the Playfield.

  Allows derivers to define the Content container in the constructor, to redirect the positioning of the HitObjects container.

  smoogipooo · 2017-03-21 16:46:43 +09:00
  66752af81f
• Hard-code text size in cases it wasn't set.
  smoogipooo · 2017-03-20 13:48:06 +09:00
  d27f37beb5
• Merge branch 'master' into better_hitobject_defaults
  Dean Herbert · 2017-03-17 02:51:15 +09:00
  5474710c13
• Add xmldoc.
  smoogipooo · 2017-03-17 02:22:52 +09:00
  88dfdf3f85
• Minor re-ordering to make Playfield OnJudgement be called before ScoreProcessor's.
  smoogipooo · 2017-03-17 01:26:12 +09:00
  52c1cd407c
• Fix post-rebase issues.
  smoogipooo · 2017-03-17 00:38:40 +09:00
  faacac331d
• Pass through method instead of instantiating object.
  smoogipooo · 2017-03-17 00:36:10 +09:00
  9f6f581b64
• Better hit object defaults setting.
  smoogipooo · 2017-03-17 00:36:09 +09:00
  0c47638820
• Merge branch 'master' into generic_scoreprocessor
  Dean Herbert · 2017-03-16 23:04:19 +09:00
  271dddc9a7
• AlwaysReceiveInput and InternalContains.
  Dean Herbert · 2017-03-16 17:38:36 +09:00
  ab8a5afdb9
• Make ScoreProcessors take generic judgements.
  smoogipooo · 2017-03-16 12:45:23 +09:00
  c82ae011fb
• Adjust/improve a few comments.
  smoogipooo · 2017-03-15 21:58:00 +09:00
  418189effd
• Fix post-merge error.
  smoogipooo · 2017-03-15 21:40:19 +09:00
  4de3dde44d
• Merge remote-tracking branch 'origin/master' into generic_judgements_2

  Conflicts:
  	osu.Desktop.VisualTests/Tests/TestCaseHitObjects.cs
  	osu.Game.Modes.Catch/UI/CatchHitRenderer.cs
  	osu.Game.Modes.Mania/UI/ManiaHitRenderer.cs
  	osu.Game.Modes.Mania/osu.Game.Modes.Mania.csproj
  	osu.Game.Modes.Osu/Objects/Drawables/DrawableSlider.cs
  	osu.Game.Modes.Osu/Objects/Drawables/DrawableSpinner.cs
  	osu.Game.Modes.Osu/UI/OsuHitRenderer.cs
  	osu.Game.Modes.Taiko/UI/TaikoHitRenderer.cs
  	osu.Game.Modes.Taiko/osu.Game.Modes.Taiko.csproj
  	osu.Game/Modes/Objects/Drawables/DrawableHitObject.cs
  	osu.Game/Modes/UI/HitRenderer.cs
  	osu.Game/osu.Game.csproj

  smoogipooo · 2017-03-15 21:36:43 +09:00
  42da0f1a72
• Add license headers.
  smoogipooo · 2017-03-15 21:32:47 +09:00
  3a8d1d3619
• General refactoring (no more casts :D).
  smoogipooo · 2017-03-15 19:18:23 +09:00
  a9bc253b8c
• Make DrawableHitObjects have generic JudgementInfos.
  smoogipooo · 2017-03-15 18:55:38 +09:00
  36e8618370
• Move a few classes/enums into separate files.
  smoogipooo · 2017-03-15 16:07:40 +09:00
  bf66b84ff8
• Fix defaults not being set (keep in mind this will be changed in a later pullrequest).
  smoogipooo · 2017-03-14 19:04:40 +09:00
  069a7a24ce
• Merge branch 'master' into beatmap_parsing
  Dean Herbert · 2017-03-14 17:50:00 +09:00
  5c2bf02c9d
• Attempt to fix nullref warning.
  smoogipooo · 2017-03-14 17:46:35 +09:00
  d6ccc66b23
• Rework beatmap post-processing into HitRenderer.
  smoogipooo · 2017-03-14 17:01:21 +09:00
  7141bc86d3
• Merge remote-tracking branch 'upstream/master' into general-fixes

  # Conflicts:
  #	osu.Game/Modes/UI/HitRenderer.cs

  Dean Herbert · 2017-03-14 16:15:26 +09:00
  14b22445fa
• Split PlayerInputManager into two classes, allowing more precise handling of input (for KeyCounter).
  Dean Herbert · 2017-03-14 16:00:35 +09:00
  1f68731a09
• Merge branch 'master' into beatmap_parsing

  Conflicts:
  	osu.Desktop.VisualTests/app.config
  	osu.Game.Modes.Catch/CatchRuleset.cs
  	osu.Game.Modes.Mania/ManiaRuleset.cs
  	osu.Game.Modes.Mania/app.config
  	osu.Game.Modes.Osu/OsuRuleset.cs
  	osu.Game.Modes.Osu/app.config
  	osu.Game.Modes.Taiko/TaikoRuleset.cs
  	osu.Game/Modes/Ruleset.cs
  	osu.Game/app.config
  	osu.Game/osu.Game.csproj

  smoogipooo · 2017-03-14 13:39:19 +09:00
  854212a7aa
• Add license headers.
  smoogipooo · 2017-03-14 13:02:42 +09:00
  bbd81dbc47
• I don't like this renaming.
  smoogipooo · 2017-03-14 12:54:09 +09:00
  99c23d8715
• Okay resharper u da boss.
  smoogipooo · 2017-03-14 12:52:12 +09:00
  db8cbba8d5
• Simplify foreach.
  smoogipooo · 2017-03-14 12:38:30 +09:00
  6ebd88060a
• Applyable -> Applicable.
  smoogipooo · 2017-03-14 12:32:31 +09:00
  bc5912eab5
• Rework/rewrite beatmap parsing to parse to base hit objects, which mode-specific beatmap converters can then use.
  smoogipooo · 2017-03-13 19:15:25 +09:00
  f50e0bbf3c
• Attempt to fix things.
  smoogipooo · 2017-03-12 22:38:50 +09:00
  7d129ebd6d
• Initial attempt at making mods apply better.
  smoogipooo · 2017-03-12 22:13:43 +09:00
  c0e29652a6
• Instantiate HitRenderer with WorkingBeatmap.
  smoogipooo · 2017-03-12 18:03:13 +09:00
  64aab090d5
• Remove PlayMode enum requirement. Clean things up a lot.
  smoogipooo · 2017-03-12 14:32:50 +09:00
  3480dca0ad
• Fix map would always be converted to itself when actually converting to a different game mode.
  smoogipooo · 2017-03-12 02:26:10 +09:00
  b0ea282a06
• Merge branch 'refactor_hitrenderer' into beatmap_conversion

  Conflicts:
  	osu.Game/Modes/UI/HitRenderer.cs

  smoogipooo · 2017-03-12 01:27:28 +09:00
  f484792546
• Merge remote-tracking branch 'origin/master' into refactor_hitrenderer
  smoogipooo · 2017-03-12 01:20:11 +09:00
  59b62b8fd4
• Move back to using an abstract method to determine if all objects have been judged.

  Because sliderticks provide judgements even though they are added as nested hitobjects, the count method would not work to determine if all hitobjects have been judged. This needs a little bit more thought put in...

  smoogipooo · 2017-03-12 01:19:51 +09:00
  74db255c78
• Better beatmap conversion model.
  smoogipooo · 2017-03-12 00:34:21 +09:00
  592e05a2c8
• Fix using.
  smoogipooo · 2017-03-11 14:28:06 +09:00
  e126a5600a
• Re-add files.
  smoogipooo · 2017-03-11 14:27:18 +09:00
  42b19cd3b3
• Remove files temporarily.
  smoogipooo · 2017-03-11 14:26:58 +09:00
  b63a1c549e
• Merge remote-tracking branch 'origin/master' into refactor_hitrenderer

  Conflicts:
  	osu.Game.Modes.Catch/CatchRuleset.cs
  	osu.Game.Modes.Mania/ManiaRuleset.cs
  	osu.Game.Modes.Osu/OsuRuleset.cs
  	osu.Game.Modes.Taiko/TaikoRuleset.cs

  smoogipooo · 2017-03-11 14:22:59 +09:00
  75ed7406e4
• Merge remote-tracking branch 'origin/master' into counter_bindables

  Conflicts:
  	osu.Game/Modes/UI/HudOverlay.cs

  smoogipooo · 2017-03-11 14:19:25 +09:00
  3276316ac8
• General fixes.
  smoogipooo · 2017-03-11 14:17:07 +09:00
  eef18eea42
• Make HudOverlay not dependent on Ruleset.
  smoogipooo · 2017-03-10 16:16:07 +09:00
  529cabb001
• Fix filenames.
  smoogipooo · 2017-03-10 16:11:38 +09:00
  75a5da62d0
• Combo should not be longs.
  smoogipooo · 2017-03-10 16:05:05 +09:00
  2bc36fecc6
• Make HitRenderer not have a publicly-settable Beatmap, replace AllObjectsJudged for performance.
  smoogipooo · 2017-03-10 15:19:36 +09:00
  02281d8a2a