58147 Commits

This Branch

This Branch

All Branches

• 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
• 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
• Remove inherited mods in incompatible list and add between Auto and NoFail.
  Huo Yaoyuan · 2017-03-07 16:27:55 +08:00
  ffd79bee06
• Remove usages of the 'new' keyword.
  Huo Yaoyuan · 2017-03-07 16:17:51 +08:00
  8979b28496
• Merge branch 'master' into modselect
  Huo Yaoyuan · 2017-03-07 16:10:53 +08:00
  b56d6c767b
• Remove unnecessary using
  Alex Amadori · 2017-03-07 08:47:50 +01:00
  2c7a9d2f77
• Merge remote tracking branch 'upstream/master' into archive-reader
  Alex Amadori · 2017-03-07 08:41:44 +01:00
  309019aab3
• Make playfield scaling optional.
  Dean Herbert · 2017-03-07 15:49:04 +09:00
  1fb846e61d
• Fix other regression.
  Dean Herbert · 2017-03-07 15:18:15 +09:00
  533868a608
• Fix regression in deployment tool
  Dean Herbert · 2017-03-07 14:57:58 +09:00
  v2017.307.0 577601a90f
• Merge pull request #436 from peppy/replay

  Replay loading via drag-drop huzzah!

  Dean Herbert · 2017-03-07 14:41:23 +09:00
  2fc72b370d
• Merge branch 'master' into replay

  # Conflicts:
  #	osu.Game/Modes/Mod.cs

  Dean Herbert · 2017-03-07 14:32:14 +09:00
  bff1179624
• Fix error-level inspections.
  Dean Herbert · 2017-03-07 14:31:54 +09:00
  5cbcf7a20a
• Merge pull request #448 from peppy/less-mods-enum

  Remove Mods enum.

  Dean Herbert · 2017-03-07 14:19:01 +09:00
  95fb34ccfb