61410 Commits

This Branch

This Branch

All Branches

• Merge branch 'beatmap_conversion' into mod_application

  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-12 22:20:52 +09:00
  447cc17de8
• Remove unused method.
  smoogipooo · 2017-03-12 22:19:35 +09:00
  5be1839710
• 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
• usings
  smoogipooo · 2017-03-12 14:37:39 +09:00
  b47c9e808e
• Merge branch 'beatmap_conversion' of https://github.com/smoogipooo/osu into beatmap_conversion
  smoogipooo · 2017-03-12 14:33:34 +09:00
  653c493178
• Remove PlayMode enum requirement. Clean things up a lot.
  smoogipooo · 2017-03-12 14:32:50 +09:00
  3480dca0ad
• Merge branch 'master' into beatmap_conversion
  Dean Herbert · 2017-03-12 12:56:57 +09:00
  e933d48179
• Merge pull request #465 from smoogipooo/refactor_hitrenderer

  Make HitRenderer not have a publicly-settable Beatmap, replace AllObj…

  Dean Herbert · 2017-03-12 12:56:41 +09:00
  6871588218
• 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
• General fixups.
  smoogipooo · 2017-03-12 01:26:07 +09:00
  1c7a9e3a07
• 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
• Cleanups.
  smoogipooo · 2017-03-12 01:08:34 +09:00
  77a4a896c9
• Better beatmap conversion model.
  smoogipooo · 2017-03-12 00:34:21 +09:00
  592e05a2c8
• Merge pull request #463 from smoogipooo/counter_bindables

  More counter bindables!

  Dean Herbert · 2017-03-11 15:39:43 +09:00
  8b0f60b6b3
• 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
• Merge pull request #461 from smoogipooo/general_hud

  General hud

  Dean Herbert · 2017-03-10 16:21:23 +09:00
  1f9ddd1cab
• 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
• Remove .orig files (not sure how they got here).
  smoogipooo · 2017-03-10 15:57:14 +09:00
  eca980bb95
• Make HitRenderer not have a publicly-settable Beatmap, replace AllObjectsJudged for performance.
  smoogipooo · 2017-03-10 15:19:36 +09:00
  02281d8a2a
• Use =>.
  smoogipooo · 2017-03-10 14:55:43 +09:00
  d3e14aad1b
• Fix post-merge errors.
  smoogipooo · 2017-03-10 14:44:38 +09:00
  c0bb2685bf
• 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
• Remove DrumHit.
  smoogipooo · 2017-03-10 14:23:57 +09:00
  b56d7f19e0
• Merge branch 'master' into counter_bindables
  Dan Balasescu · 2017-03-10 14:21:33 +09:00
  0fa2776975
• Merge branch 'master' into general_hud
  Dan Balasescu · 2017-03-10 14:17:34 +09:00
  8f724bd586
• Merge branch 'master' into combocounter_bindable
  Dan Balasescu · 2017-03-10 14:17:14 +09:00
  79fffdb7ef
• Merge pull request #464 from smoogipooo/remove_float_interpolation

  Remove float ValueAt method.

  Dean Herbert · 2017-03-10 14:16:33 +09:00
  e5bde712ed
• Why tho?
  smoogipooo · 2017-03-10 14:15:56 +09:00
  2fb5334d09
• Merge remote-tracking branch 'origin/master' into combocounter_bindable

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

  smoogipooo · 2017-03-10 14:15:06 +09:00
  7a68e46366
• Remove float ValueAt method.
  smoogipooo · 2017-03-10 14:09:55 +09:00
  5f72265eff
• 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
• Merge branch 'general_hud' of https://github.com/smoogipooo/osu into general_hud

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

  smoogipooo · 2017-03-10 13:42:50 +09:00
  f44fa56646
• Renaming + use IEnumerable.
  smoogipooo · 2017-03-10 13:40:44 +09:00
  2d6e667c7c
• Merge branch 'master' into general_hud
  Dean Herbert · 2017-03-10 13:25:26 +09:00
  2813484f2e