9126 Commits

• Merge branch 'master' into seperateCursorSize
  Dean Herbert · 2017-03-22 08:11:45 +09:00
  b00f86d809
• renamed CursorSize to MenuCursorSize
  Jorolf · 2017-03-21 17:16:23 +01:00
  82d6129063
• Hide letterbox position sliders
  Andrey Zavadskiy · 2017-03-21 18:24:19 +03:00
  943bd737c4
• Hard-code text size in cases it wasn't set.
  smoogipooo · 2017-03-20 13:48:06 +09:00
  d27f37beb5
• Merge remote-tracking branch 'upstream/master' into DrabWeb/leaderboards
  Dean Herbert · 2017-03-19 18:51:53 +09:00
  5d0adc6454
• fixed typo
  Jorolf · 2017-03-18 15:22:03 +01:00
  80de15d935
• Fix NaN when dragging music controller

  When dragging music controller we divide by the dragged distance.
  When dragging to the origin of the drag this resulted in NaN.
  Now, we check for this and use 0 in this case.

  Thomas Müller · 2017-03-18 12:46:12 +01:00
  9af0104e3e
• Merge branch 'master' into leaderboards
  Seth · 2017-03-17 18:23:01 -03:00
  4aea06be22
• Separated menu and gameplay cursor size
  Jorolf · 2017-03-17 18:40:03 +01:00
  8568e1536c
• AlwaysReceiveInput and InternalContains.
  Dean Herbert · 2017-03-16 17:38:36 +09:00
  ab8a5afdb9
• Remove a lot of customisation from Avatar (and add it in individual usages).
  Dean Herbert · 2017-03-15 15:22:28 +09:00
  1ae4c2dfbb
• ScoreRank, Avatar to own files, +DrawableRank
  DrabWeb · 2017-03-14 10:58:28 -03:00
  650fc7563d
• Merge branch 'master' into leaderboards
  Seth · 2017-03-14 10:07:33 -03:00
  21a9996225
• Merge branch 'master' into mod_application
  Dan Balasescu · 2017-03-14 12:38:55 +09:00
  879a78156d
• Fix removal of the last one beatmap.
  Huo Yaoyuan · 2017-03-14 05:35:58 +08:00
  3913a0a9ee
• Random diff
  DrabWeb · 2017-03-13 13:02:56 -03:00
  74eddc768a
• Changed animation to match the one in Comp3 6c(will probably clean later), changed avatar sprite to a toolbar avatar(doesn't load in visual test since there's no OsuGame), removed random test case data, now static
  DrabWeb · 2017-03-13 12:31:46 -03:00
  8e90e05f23
• Merge https://github.com/ppy/osu into leaderboards
  DrabWeb · 2017-03-13 09:36:16 -03:00
  dbc8d513f9
• Initial attempt at making mods apply better.
  smoogipooo · 2017-03-12 22:13:43 +09:00
  c0e29652a6
• Merge pull request #458 from Lahvuun/master

  Options sidebar flickering fix.

  Dean Herbert · 2017-03-10 13:20:07 +09:00
  e6f4fe9e61
• 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
• 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
• Fix typo.
  Huo Yaoyuan · 2017-03-09 15:55:40 +08:00
  1b182b1361
• Fix warnings not covered by resharper locally.
  Dean Herbert · 2017-03-09 16:07:34 +09:00
  dad6060149
• 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
• Abstract constructors -> protected.
  Dean Herbert · 2017-03-09 14:01:08 +09:00
  3eece390cb
• 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
• Allow null in mod list to generate a placeholder ModButton.
  Huo Yaoyuan · 2017-03-07 19:52:51 +08:00
  b19405c987
• 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
• 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 13:52:47 +09:00
  ecdbcb20cf
• 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
• Merge remote-tracking branch 'upstream/master' into less-mods-enum

  # Conflicts:
  #	osu.Game.Modes.Mania/ManiaMod.cs
  #	osu.Game.Modes.Osu/OsuMod.cs
  #	osu.Game/Modes/Mod.cs

  Dean Herbert · 2017-03-07 13:42:50 +09:00
  3e4cd0dc7c
• Fix most warnings.
  Dean Herbert · 2017-03-07 13:05:57 +09:00
  0cad5d7d41
• Merge branch 'master' into replay
  Dan Balasescu · 2017-03-07 11:41:16 +09:00
  bc74f453aa
• Fix remaining errors.
  Dean Herbert · 2017-03-07 10:42:59 +09:00
  9106c45858
• Merge branch 'master' into increase-ci-strictness
  Thomas Müller · 2017-03-06 21:44:39 +01:00
  9b92e99ce9
• Merge branch 'master' into options-footer
  Thomas Müller · 2017-03-06 20:01:51 +01:00
  6e9c4a4251
• Update deselect logic.

  Change to DeselectTypes to avoid enumerating children for multi times.

  Huo Yaoyuan · 2017-03-07 01:15:21 +08:00
  27edc9971e
• Fix and update mode changing handling.
  Huo Yaoyuan · 2017-03-07 01:01:42 +08:00
  eda7e1b26f
• Fix missed color during loading.
  Huo Yaoyuan · 2017-03-07 00:46:36 +08:00
  5cd859ecf1
• Add abstract ModType for ModSection.
  Huo Yaoyuan · 2017-03-07 00:32:22 +08:00
  836484ba51
• Use Bindable<IEnumerable<Mod>> to fit other changes.
  Huo Yaoyuan · 2017-03-07 00:17:06 +08:00
  318ab68af1