2345 Commits

This Branch

This Branch

All Branches

• General fixes.
  smoogipooo · 2017-03-11 14:17:07 +09:00
  eef18eea42
• 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
• Merge pull request #458 from Lahvuun/master

  Options sidebar flickering fix.

  Dean Herbert · 2017-03-10 13:20:07 +09:00
  e6f4fe9e61
• Merge pull request #459 from Jorolf/rulesetAndPlayModeRemake

  Added Descriptions to Rulesets + PlayModes list

  Dean Herbert · 2017-03-10 13:18:43 +09:00
  9e223bd77b
• General fixes.
  smoogipooo · 2017-03-10 13:09:50 +09:00
  4015b87965
• Merge branch 'general_hud' of https://github.com/smoogipooo/osu into general_hud
  smoogipooo · 2017-03-10 13:03:26 +09:00
  75f004eeb9
• Oops o_o.
  smoogipooo · 2017-03-10 13:03:13 +09:00
  7c1a3067e6
• 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
• Merge branch 'master' into general_hud
  Dan Balasescu · 2017-03-10 12:49:37 +09:00
  70d91e16d5
• 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 pull request #460 from smoogipooo/remove_custom_combocounters

  Remove custom combo counters.

  Dean Herbert · 2017-03-10 11:43:00 +09:00
  69776d436f
• Fix using statements.
  Dean Herbert · 2017-03-10 11:37:53 +09:00
  2b64de9dd8
• Remove custom combo counters.
  smoogipooo · 2017-03-10 11:04:46 +09:00
  fa9110ce6e
• didn't see this was unnecessary after my changes
  Jorolf · 2017-03-09 21:43:11 +01:00
  9dd835e256
• Added Descriptions to Rulesets + PlayModes list
  Jorolf · 2017-03-09 21:37:03 +01:00
  d9a4a677fd
• Options sidebar flickering fix.
  Lahvuun · 2017-03-09 22:29:39 +02:00
  427a0dd0f5
• Merge pull request #450 from huoyaoyuan/modselect

  Modselect refactor

  Dean Herbert · 2017-03-09 18:16:16 +09:00
  a266add670
• Follow appveyor's code style check.
  Huo Yaoyuan · 2017-03-09 16:44:45 +08:00
  9007409072
• Merge branch 'master' into modselect
  Dean Herbert · 2017-03-09 17:31:25 +09:00
  115ebd4773
• Merge pull request #456 from peppy/general-fixes

  Update framework.

  Dean Herbert · 2017-03-09 17:30:51 +09:00
  ca4c524fae
• Fix typo.
  Huo Yaoyuan · 2017-03-09 15:55:40 +08:00
  1b182b1361
• Remove duplicate reference to nunit.
  Dean Herbert · 2017-03-09 16:15:33 +09:00
  30de7aa59c
• Fix warnings not covered by resharper locally.
  Dean Herbert · 2017-03-09 16:07:34 +09:00
  dad6060149
• Fix second mono regression.
  Dean Herbert · 2017-03-09 15:53:16 +09:00
  1b532b0741
• Reduce warning/suggestion count to zero.
  Dean Herbert · 2017-03-09 15:52:40 +09:00
  d7497330b2
• Fix autoproperty which doesn't work on mono.
  Dean Herbert · 2017-03-09 14:26:09 +09:00
  a048e666d7
• Reduce error count.
  Dean Herbert · 2017-03-09 14:24:16 +09:00
  da751804b6
• Bring dotsettings up-to-date.
  Dean Herbert · 2017-03-09 14:03:26 +09:00
  149bf7b5fc
• User invariant culture sorting.
  Dean Herbert · 2017-03-09 14:02:20 +09:00
  01c379da19