86 Commits

• 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
• Merge branch 'general_hud' into counter_bindables

  Conflicts:
  	osu.Desktop.VisualTests/Tests/TestCaseScoreCounter.cs
  	osu.Game/Modes/UI/HUDOverlay.cs

  smoogipooo · 2017-03-10 14:44:29 +09:00
  aed89b7c0f
• More general refactorings.
  smoogipooo · 2017-03-10 14:42:14 +09:00
  58a88cc715
• Merge branch 'combocounter_bindable' into general_hud

  Conflicts:
  	osu.Game.Modes.Osu/OsuRuleset.cs
  	osu.Game/Modes/Ruleset.cs

  smoogipooo · 2017-03-10 14:35:31 +09:00
  5f440d0b53
• More ComboCounter fixups + refactorings.
  smoogipooo · 2017-03-10 14:34:08 +09:00
  605326e8f6
• Fix silly spelling mistake.
  smoogipooo · 2017-03-10 14:01:54 +09:00
  ff3faeaf40
• s/SetHP/SetHealth.
  smoogipooo · 2017-03-10 13:58:17 +09:00
  712739d779
• Remove unused methods.
  smoogipooo · 2017-03-10 13:49:56 +09:00
  122792eb93
• More bindables!
  smoogipooo · 2017-03-10 13:49:51 +09:00
  cd1717c42f
• Renaming + use IEnumerable.
  smoogipooo · 2017-03-10 13:40:44 +09:00
  2d6e667c7c
• General fixes.
  smoogipooo · 2017-03-10 13:09:50 +09:00
  4015b87965
• General fixes.
  smoogipooo · 2017-03-10 13:02:50 +09:00
  444c645da0
• Make ComboCounter count a bindable, and properly bind it to the processor.
  smoogipooo · 2017-03-10 12:55:10 +09:00
  4cc032e1d7
• Rename to StandardComboCounter, add HealthDisplay abstraction.
  smoogipooo · 2017-03-10 12:47:00 +09:00
  617ceb8001
• Rename ScoreOverlay -> HUDOverlay, move to osu.Game, make it not overridable by rulesets.
  smoogipooo · 2017-03-10 12:14:13 +09:00
  31f6cbd8cf
• Merge branch 'master' into modselect
  Dean Herbert · 2017-03-09 17:31:25 +09:00
  115ebd4773
• Fix second mono regression.
  Dean Herbert · 2017-03-09 15:53:16 +09:00
  1b532b0741
• Reduce error count.
  Dean Herbert · 2017-03-09 14:24:16 +09:00
  da751804b6
• Merge branch 'master' into modselect
  Dean Herbert · 2017-03-09 12:51:40 +09:00
  0c4c1689b6
• Update license headers.
  Dean Herbert · 2017-03-08 15:50:52 +09:00
  5a42035f88
• Add comment.
  Dean Herbert · 2017-03-08 11:54:52 +09:00
  123c8f3489
• 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
• Merge branch 'master' into modselect
  Huo Yaoyuan · 2017-03-07 16:10:53 +08:00
  b56d6c767b
• Make playfield scaling optional.
  Dean Herbert · 2017-03-07 15:49:04 +09:00
  1fb846e61d
• 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
• Remove one-entry backing fields.
  Huo Yaoyuan · 2017-03-06 17:14:41 +08:00
  c2cf5242e1
• 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
• Merge branch 'master' into replay

  # Conflicts:
  #	osu.Desktop.VisualTests/Tests/TestCasePlayer.cs

  Dean Herbert · 2017-03-05 17:45:03 +09:00
  4e4408cd20
• Use Color4Extensions from Framework and remove redundant Name
  Thomas Müller · 2017-03-04 19:42:37 +01:00
  a14bdf8624
• Merge remote-tracking branch 'upstream/master' into replay

  # Conflicts:
  #	osu.Game.Modes.Catch/CatchRuleset.cs
  #	osu.Game.Modes.Mania/ManiaRuleset.cs
  #	osu.Game.Modes.Taiko/TaikoRuleset.cs
  #	osu.Game/Screens/Play/Player.cs

  Dean Herbert · 2017-03-04 13:17:01 +09:00
  9e1383fa48
• Merge branch 'master' into mod-overlay

  # Conflicts:
  #	osu.Desktop.VisualTests/osu.Desktop.VisualTests.csproj
  #	osu.Game/Screens/Select/PlaySongSelect.cs
  #	osu.Game/osu.Game.csproj

  Dean Herbert · 2017-03-02 20:27:04 +09:00
  471b9daa93
• Fix some license headers.
  Dean Herbert · 2017-03-02 18:45:20 +09:00
  4163569e57