56 Commits

• Allow playfield to specify whether it has a cursor or not.
  Dean Herbert · 2017-04-05 17:38:57 +09:00
  4aafc172ca
• Merge remote-tracking branch 'upstream/master' into partial-judgements

  # Conflicts:
  #	osu.Game/osu.Game.csproj

  Dean Herbert · 2017-03-31 16:46:40 +09:00
  50c328f1b4
• Add some commenting.
  Dean Herbert · 2017-03-31 16:01:48 +09:00
  3f080ab424
• Allow SetReplay to receive null.
  Dean Herbert · 2017-03-31 16:00:40 +09:00
  cf87330f80
• Refactor ReplayInputHandler creation for more flexibility.
  Dean Herbert · 2017-03-31 15:59:53 +09:00
  fa7c72a099
• Implement partial judgements + make Result non-nullable.
  smoogipooo · 2017-03-29 18:35:28 +09:00
  3050039972
• Move ScoreProcessor and Score to Scoring/.
  smoogipooo · 2017-03-24 09:51:52 +09:00
  2074812f46
• JudgementInfo -> Judgement.

  There is no case where we use the term "Judgement" without the suffix, so deemed it unnecessary.

  Dean Herbert · 2017-03-23 19:00:18 +09:00
  2cb801317d
• Enforce readonly private members where possible.
  Dean Herbert · 2017-03-23 13:50:08 +09:00
  54e1b24fe9
• 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
• 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
• 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
• 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
• 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
• 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
• Make HitRenderer not have a publicly-settable Beatmap, replace AllObjectsJudged for performance.
  smoogipooo · 2017-03-10 15:19:36 +09:00
  02281d8a2a
• Move InputManager to a higher and more implicit level.

  Also makes KeyCounterCollection work with replays.

  Dean Herbert · 2017-03-07 19:30:48 +09:00
  02cab41d34
• Fix error-level inspections.
  Dean Herbert · 2017-03-07 14:31:54 +09:00
  5cbcf7a20a
• Merge remote-tracking branch 'upstream/master' into replay

  # Conflicts:
  #	osu.Desktop.VisualTests/Tests/TestCasePlayer.cs
  #	osu.Desktop/OsuGameDesktop.cs
  #	osu.Game.Modes.Osu/Objects/Drawables/DrawableHitCircle.cs
  #	osu.Game.Modes.Osu/Objects/Drawables/DrawableSlider.cs
  #	osu.Game/Database/BeatmapDatabase.cs
  #	osu.Game/Graphics/Cursor/OsuCursorContainer.cs
  #	osu.Game/IPC/BeatmapImporter.cs
  #	osu.Game/Modes/Mod.cs
  #	osu.Game/Modes/Objects/Drawables/DrawableHitObject.cs
  #	osu.Game/Modes/UI/Playfield.cs
  #	osu.Game/Screens/Play/Player.cs
  #	osu.Game/Screens/Play/PlayerInputManager.cs

  Dean Herbert · 2017-03-07 13:50:08 +09:00
  4430255ec4
• Fix most warnings.
  Dean Herbert · 2017-03-07 13:05:57 +09:00
  0cad5d7d41
• Only show replay cursor when replay input is present.
  Dean Herbert · 2017-03-06 15:24:00 +09:00
  610de4a34c
• Use generics everywhere.
  Dean Herbert · 2017-03-06 13:59:11 +09:00
  faf07ab51a
• Basic partial replay support.
  Dean Herbert · 2017-03-01 22:04:20 +09:00
  58ae9e888d
• Add follow points.
  Damnae · 2017-02-10 06:19:59 +01:00
  77ee161be8
• Add hit object stacking.
  Damnae · 2017-02-09 07:28:40 +01:00
  38b25a7df3
• Update and standardise license headers.
  Dean Herbert · 2017-02-07 14:27:41 +09:00
  50bd80cb0c