2522 Commits

• Cleanup.
  DrabWeb · 2018-05-19 02:51:51 -03:00
  9cd0ec366e
• Don't set size in ctor.
  DrabWeb · 2018-05-19 02:27:33 -03:00
  136c57b824
• Add null room support to RoomInspector.
  DrabWeb · 2018-05-19 02:23:09 -03:00
  ad878003f7
• Create drawable hierarchy for RoomInspector in load, remove display* methods.
  DrabWeb · 2018-05-19 01:26:39 -03:00
  4b2b2086df
• Allow using back button on PlayerLoader and Replay
  Dean Herbert · 2018-05-18 13:32:05 +09:00
  e2389ad7a4
• Get rid of multiple blank lines in a row
  Roman Kapustin · 2018-05-18 01:01:54 +03:00
  17d1759c37
• Resolve merge conflict
  Roman Kapustin · 2018-05-18 00:25:47 +03:00
  81d7e8a393
• Move Header breadcrumbs to a subclass.
  DrabWeb · 2018-05-17 06:19:55 -03:00
  ebfbe58abb
• Fix an endless feedback loop
  Dean Herbert · 2018-05-17 17:56:29 +09:00
  d20011ba58
• Add Multiplayer screen.
  DrabWeb · 2018-05-15 21:14:10 -03:00
  1a78ac3d10
• Add multiplayer screen header.
  DrabWeb · 2018-05-15 20:34:14 -03:00
  1450bf64f5
• Use both OnKeyDown and GlobalAction.Back
  Roman Kapustin · 2018-05-14 22:09:09 +03:00
  f2f2fb8c73
• Revert "Handle mouse back button using OnMouseDown override instead of using GlobalAction"

  This reverts commit 44bbb8700e.

  Roman Kapustin · 2018-05-14 20:27:05 +03:00
  e802b722f0
• Merge branch 'master' into hud-above-letterbox
  Dean Herbert · 2018-05-14 19:31:39 +09:00
  28edf3bce7
• Move definition inline
  Dean Herbert · 2018-05-14 19:14:17 +09:00
  0234bbc37f
• Merge branch 'master' into exit-hold-confirmation
  Dean Herbert · 2018-05-14 18:13:40 +09:00
  f14948c022
• Move hud below the skip button
  smoogipoo · 2018-05-14 18:02:18 +09:00
  115c2dc239
• Proxy the ruleset cursor above the break overlay
  smoogipoo · 2018-05-14 15:36:56 +09:00
  64fba5f6d1
• Place break overlay underneath the hud
  smoogipoo · 2018-05-14 15:36:42 +09:00
  43409127b7
• Merge branch 'master' into fix-wedge-nullref
  Dan Balasescu · 2018-05-14 13:36:07 +09:00
  d7cba000ab
• Fix nullref when changing ruleset at main menu
  Dean Herbert · 2018-05-13 12:55:54 +09:00
  db0470243a
• Fix song progress time counters wrapping after an hour

  Resolves #2466.
  Supersedes and closes #2487.

  Dean Herbert · 2018-05-11 22:10:26 +09:00
  cfa18bdf1f
• Merge branch 'master' into ruleset-beatmap-statistics
  Dean Herbert · 2018-05-11 17:37:50 +09:00
  c19432dc6d
• Remove some unnecessary changes
  smoogipoo · 2018-05-11 14:13:52 +09:00
  fd9796d08c
• Pass down ruleset to the buffered wedge
  smoogipoo · 2018-05-11 14:10:53 +09:00
  816ad5c426
• 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
• 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
• 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
• 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
• Handle GlobalAction.Back
  TocoToucan · 2018-04-29 20:15:09 +03:00
  804b59ee80
• 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