61410 Commits

This Branch

This Branch

All Branches

• 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
• Fix warnings
  Alex Amadori · 2017-03-09 21:07:21 +01:00
  faecaa297a
• Fix test
  Alex Amadori · 2017-03-09 21:00:13 +01:00
  f969c3b7b3
• Merge branch 'archive-reader' of https://github.com/tacchinotacchi/osu into archive-reader
  Alex Amadori · 2017-03-09 17:07:37 +01:00
  c60353faf7
• Merge remote-tracking branch 'upstream/master' into archive-reader
  Alex Amadori · 2017-03-09 17:07:00 +01:00
  7374839923
• 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
• Abstract constructors -> protected.
  Dean Herbert · 2017-03-09 14:01:08 +09:00
  3eece390cb
• Remove redundant parentheses.
  Dean Herbert · 2017-03-09 14:00:17 +09:00
  0976e205d8
• Add missing access modifiers.
  Dean Herbert · 2017-03-09 13:55:29 +09:00
  dc5ac6e88f
• Update framework.
  Dean Herbert · 2017-03-09 13:50:33 +09:00
  9772f2a042
• Merge branch 'master' into modselect
  Dean Herbert · 2017-03-09 12:51:40 +09:00
  0c4c1689b6
• Update BeatmapArchiveReader's test
  Alex Amadori · 2017-03-08 21:55:38 +01:00
  9f40a888ec
• Merge remote-tracking branch 'upstream/master' into archive-reader
  Alex Amadori · 2017-03-08 21:54:17 +01:00
  1acd51cc90
• Merge pull request #454 from peppy/ci-improvements

  CI improvements.

  Dean Herbert · 2017-03-08 16:06:20 +09:00
  488cc87985
• Remove unused file.
  Dean Herbert · 2017-03-08 16:01:54 +09:00
  2821451d5b
• Update resources.
  Dean Herbert · 2017-03-08 15:56:51 +09:00
  954827aaf3
• Add appveyor.yml.
  Dean Herbert · 2017-03-08 15:53:09 +09:00
  d06bbd5e20
• Update license headers.
  Dean Herbert · 2017-03-08 15:50:52 +09:00
  5a42035f88
• Framework update.
  Dean Herbert · 2017-03-08 15:47:40 +09:00
  b810a43bba
• Merge pull request #451 from peppy/replay

  Make playfield scaling optional.

  Dean Herbert · 2017-03-08 11:55:14 +09:00
  abb653a763
• Add comment.
  Dean Herbert · 2017-03-08 11:54:52 +09:00
  123c8f3489
• Follow current mod layout.
  Huo Yaoyuan · 2017-03-07 20:05:50 +08:00
  b3b813c0ae
• Allow null in mod list to generate a placeholder ModButton.
  Huo Yaoyuan · 2017-03-07 19:52:51 +08:00
  b19405c987