4131 Commits

• Merge remote-tracking branch 'origin/master' into ruleset-beatmap-statistics

  # Conflicts:
  #	osu.Game/Beatmaps/Beatmap.cs

  smoogipoo · 2018-05-11 14:05:40 +09:00
  73465c35fa
• Cleanup.
  DrabWeb · 2018-05-10 22:50:03 -03:00
  a241ff1c05
• Add selection to DrawableRoom.
  DrabWeb · 2018-05-10 22:48:07 -03:00
  ec53927d8e
• Create the drawable hierarchy for DrawableRoom in load.
  DrabWeb · 2018-05-10 22:12:25 -03:00
  d87ac5a1cb
• Remove unused usings caused by multiplayer folder restructuring.
  DrabWeb · 2018-05-10 20:49:42 -03:00
  a86843ccc9
• Move multiplayer screens to osu.Game/Screens/Multi/Screens
  DrabWeb · 2018-05-10 20:47:25 -03:00
  bc9ac8f72a
• Move multiplayer screen components to osu.Game/Screens/Multi/Components
  DrabWeb · 2018-05-10 20:44:24 -03:00
  2d206d258a
• Rename osu.Game/Screens/Multiplayer to Multi.
  DrabWeb · 2018-05-10 20:39:05 -03:00
  c35760fdef
• Update CircularProgress.FillTo calls
  Roman Kapustin · 2018-05-10 21:08:02 +03:00
  86430da6d6
• Remove mouseWheelCheckbox from InputSettings player overlay
  Roman Kapustin · 2018-05-10 20:38:55 +03:00
  93029fd548
• Merge branch 'master' into beatmap-conversion-rework
  Dean Herbert · 2018-05-10 19:10:07 +08:00
  8a6ef0dabb
• Merge remote-tracking branch 'upstream/master' into smoogipoo-i-beatmap
  Dean Herbert · 2018-05-10 19:51:52 +09:00
  9e26bcd571
• Implement a hold-to-confirm screen when exiting game using escape key
  Dean Herbert · 2018-05-10 17:07:19 +09:00
  5df9f126d1
• Show InputSettings on the PlayerLoader screen
  Roman Kapustin · 2018-05-09 17:31:52 +03:00
  ccf82cacb0
• Introduce InputSettings
  Roman Kapustin · 2018-05-09 17:22:37 +03:00
  6676c55fe0
• Fix tests and implementation
  AlFasGD · 2018-05-08 16:37:06 +03:00
  e44062b77a
• Prevent user from scrolling outside the timeline in the editor
  AlFasGD · 2018-05-08 16:21:54 +03:00
  dd9b9a18ac
• Handle mouse back button using OnMouseDown override instead of using GlobalAction
  Roman Kapustin · 2018-05-08 00:22:11 +03:00
  44bbb8700e
• Fix beatmap/ruleset being changeable while in the editor
  smoogipoo · 2018-05-07 16:32:15 +09:00
  674e45d49b
• Make BeatmapInfoWedge display properly for converts
  smoogipoo · 2018-05-07 15:51:08 +09:00
  fbd7ccc03f
• Implement ruleset-specific beatmap statistics
  smoogipoo · 2018-05-07 15:51:08 +09:00
  5489976c20
• Rename OriginalBeatmap back to Beatmap
  smoogipoo · 2018-05-07 10:29:38 +09:00
  9128e64c9a
• Remove now-unnecessary IsForCurrentRuleset property of RulesetContainer
  smoogipoo · 2018-05-07 10:17:54 +09:00
  4ecdea8b2e
• Merge branch 'i-beatmap' into beatmap-conversion-rework
  smoogipoo · 2018-05-07 10:00:24 +09:00
  77e661489d
• Merge remote-tracking branch 'origin/master' into i-beatmap
  smoogipoo · 2018-05-07 09:58:53 +09:00
  1aefd71b65
• Introduce OsuScreen.AllowBackButton property
  Roman Kapustin · 2018-05-04 21:18:48 +03:00
  b08b24b6da
• Rename HoldToQuit to QuitButton
  Roman Kapustin · 2018-05-03 23:50:30 +03:00
  39db1e8cbb
• Do not expose HoldToQuit.HoldToQuitButton
  Roman Kapustin · 2018-05-03 23:29:58 +03:00
  f8630115d6
• Handle GlobalAction.Back
  TocoToucan · 2018-04-29 20:15:09 +03:00
  804b59ee80
• Merge branch 'master' into exit_replay_button
  UselessToucan · 2018-04-28 20:48:16 +03:00
  d18a8ec9f5
• HoldToQuitButton cleanup
  TocoToucan · 2018-04-28 20:43:41 +03:00
  c78c5195f3
• Invert logic to match existing toggles
  Dean Herbert · 2018-04-25 16:18:55 +09:00
  4f53185d43
• Merge branch 'master' into ignore_beatmap_skin
  Dean Herbert · 2018-04-25 15:57:39 +09:00
  c517b73375
• Merge branch 'master' into ignore_beatmap_skin
  Dean Herbert · 2018-04-24 17:15:39 +09:00
  45810e6220
• Fix potentially missing group headers in beatmap carousel
  Dean Herbert · 2018-04-24 01:52:25 +09:00
  3886e75959
• Remove annotation
  Dean Herbert · 2018-04-23 22:22:31 +09:00
  93b77d9cfe
• Merge branch 'master' into ignore_beatmap_skin
  UselessToucan · 2018-04-23 13:06:24 +03:00
  254e9929be
• Fix instability in carousel item sorting
  Dean Herbert · 2018-04-23 19:01:01 +09:00
  2d1cef79d6
• Merge remote-tracking branch 'upstream/master' into async-screens
  Dean Herbert · 2018-04-23 18:29:37 +09:00
  ff3d3379f0
• Use exceptions
  Dean Herbert · 2018-04-23 17:57:47 +09:00
  194992936d
• Merge branch 'master' into misc-fixes
  Dean Herbert · 2018-04-23 17:46:58 +09:00
  0709a0926b
• Fix logical regression
  Dean Herbert · 2018-04-23 16:41:15 +09:00
  2d82c0b5cd
• Add assert to appease rider/r#
  Dean Herbert · 2018-04-23 15:03:41 +09:00
  6e16f2a3c3
• Fix new detections in rider 2018.1
  Dean Herbert · 2018-04-23 14:56:45 +09:00
  36a671e306
• Fix intro setting beatmap in background thread causing race conditions
  Dean Herbert · 2018-04-22 02:46:20 +09:00
  2c9b2aa0e7
• Convert HoldToQuit.text to local variable
  TocoToucan · 2018-04-21 20:35:24 +03:00
  630980255e
• Fix HoldToQuit appearance and set HoldToQuitButton.ExitAction
  TocoToucan · 2018-04-21 20:21:09 +03:00
  e6d7136a92
• Revert "Add 'End replay' button"

  This reverts commit c34ef42f00.

  TocoToucan · 2018-04-21 19:27:17 +03:00
  21454d1f10
• Implement CircularProgress filling
  TocoToucan · 2018-04-21 19:25:21 +03:00
  3b621db460
• Initial HoldToQuit commit
  TocoToucan · 2018-04-21 18:24:31 +03:00
  633c775306