4131 Commits

• Merge branch 'master' into watch-replays-4
  Dean Herbert · 2019-07-02 13:24:16 +09:00
  6539c6da17
• Merge branch 'master' into reduce-db-contexts
  Dan Balasescu · 2019-07-01 23:40:58 +09:30
  3d4c5104b3
• Change song select initialisation to promote db context sharing
  Dean Herbert · 2019-06-30 22:23:48 +09:00
  8703f0ad40
• Fix skinning support for combobreak
  Dean Herbert · 2019-06-30 21:58:30 +09:00
  60ea3d4e1a
• Merge remote-tracking branch 'upstream/master' into combobreak
  Dean Herbert · 2019-06-30 21:27:53 +09:00
  bd54b34538
• Add a note explaining why manual handling is required
  Dean Herbert · 2019-06-30 20:47:09 +09:00
  fa879b4b60
• allow exiting editor again
  Unknown · 2019-06-30 12:31:31 +02:00
  5b26ef75b1
• Clean up some more leftover code
  naoey · 2019-06-30 10:56:20 +05:30
  bfcbb47b77
• Merge branch 'master' into combobreak
  welsar55 · 2019-06-29 11:55:10 -05:00
  d6561531a3
• Make ComboEffects its own class
  Welsar55 · 2019-06-29 11:28:40 -05:00
  a22c166575
• Disable replay button when replay is unavailable
  naoey · 2019-06-29 12:49:03 +05:30
  d8f6bbc90e
• Code quality fixes
  naoey · 2019-06-29 12:29:12 +05:30
  7d9e215744
• Fix replay button shake container

  - Add license headers
  - Slightly reduce bottom margin of button in score screen

  naoey · 2019-06-29 12:26:37 +05:30
  424711d24b
• Move replay button to score card
  naoey · 2019-06-29 10:55:30 +05:30
  bc52f76556
• Move to LocalSkinOverride
  Welsar55 · 2019-06-28 20:45:11 -05:00
  a57218e50e
• Update to match upstream changes
  naoey · 2019-06-28 09:33:13 +05:30
  53d6d74537
• Implement replay downloading with ArchiveDownloadModelManager
  naoey · 2019-06-28 09:33:13 +05:30
  ab0bb8b678
• Remove unneeded bindable
  Welsar55 · 2019-06-26 12:16:44 -05:00
  826699a7e7
• Merge branch 'master' into generic-download-model-manager
  Dean Herbert · 2019-06-26 20:37:56 +09:00
  c34f6180e6
• Merge branch 'master' into toolbar-rulesets-refactor
  Dan Balasescu · 2019-06-26 18:33:45 +09:00
  f06aabad5f
• Add combobreak sound
  Welsar55 · 2019-06-26 00:20:33 -05:00
  7dd1479050
• Merge remote-tracking branch 'upstream/master' into generic-download-model-manager
  Dean Herbert · 2019-06-26 12:21:04 +09:00
  1eda4e0dd4
• Remove existing argument for ItemAdded event

  For all usages, it looks like this was unnecessary.

  Dean Herbert · 2019-06-26 11:40:41 +09:00
  9e1cb90dd8
• Merge branch 'master' into one-hit-screen
  Dan Balasescu · 2019-06-26 11:34:54 +09:00
  6063e7a69f
• Add base class for startup screens

  Avoids missing adding changes to screens like Disclaimer, which may not be shown in debug builds.

  Dean Herbert · 2019-06-26 01:36:17 +09:00
  446fbce81c
• Fix pause not correctly showing pause screen
  Dean Herbert · 2019-06-25 23:15:58 +09:00
  40cf573368
• Disallow back button on disclaimer screen
  Dean Herbert · 2019-06-25 22:27:50 +09:00
  983cabdb98
• Merge remote-tracking branch 'upstream/master' into gamewide-backbutton
  Dean Herbert · 2019-06-25 20:23:49 +09:00
  f9dad0f640
• Merge remote-tracking branch 'refs/remotes/ppy/master' into toolbar-rulesets-refactor
  Andrei Zavatski · 2019-06-25 14:16:05 +03:00
  bae0258d8d
• Remove unnecessary extra property
  smoogipoo · 2019-06-25 18:38:14 +09:00
  aa81c95f30
• Exit match before exiting multiplayer
  smoogipoo · 2019-06-25 18:33:26 +09:00
  531b107a98
• Close mod select before exiting song selection
  smoogipoo · 2019-06-25 18:33:21 +09:00
  1a26608ba9
• Relieve OsuScreen of back button input duties
  smoogipoo · 2019-06-25 18:33:18 +09:00
  d9927204f8
• Move back button to OsuGame
  smoogipoo · 2019-06-25 18:33:08 +09:00
  8c96e4c1fa
• Reduce background brightness at PlayerLoader
  Dean Herbert · 2019-06-25 17:22:10 +09:00
  7bc7df2249
• Revert a hotfix in multi screen

  since it's been fixed in a framework

  Andrei Zavatski · 2019-06-24 22:57:18 +03:00
  9dedd62d9a
• Merge remote-tracking branch 'refs/remotes/ppy/master' into toolbar-rulesets-refactor
  Andrei Zavatski · 2019-06-24 22:52:24 +03:00
  35516e7304
• Fix licence header
  Dean Herbert · 2019-06-24 18:34:23 +09:00
  f91467eddc
• Add correct conditionals to allow exit
  Dean Herbert · 2019-06-24 18:15:27 +09:00
  fad1ced1b5
• Merge remote-tracking branch 'upstream/master' into quickEscape
  Dean Herbert · 2019-06-24 18:14:48 +09:00
  d70248338d
• Fix multiplayer create button appearing in match song selection
  smoogipoo · 2019-06-24 11:54:41 +09:00
  8d6fc3edf0
• Add missing blank line
  Andrei Zavatski · 2019-06-24 02:09:00 +03:00
  bbdb114f04
• Finally fix the problem when we can't apply a ruleset in the multi screen

  because it's disabled

  Andrei Zavatski · 2019-06-24 01:55:35 +03:00
  94e819578e
• Remove local implementation of bindable in OsuCheckbox (#5046)

  Remove local implementation of bindable in OsuCheckbox

  Dean Herbert · 2019-06-21 21:08:09 +09:00
  f766068e17
• Merge branch 'master' into tournament-tools
  Dean Herbert · 2019-06-21 15:52:47 +09:00
  6627cdefd2
• Merge branch 'master' into use-modelbackeddrawable
  Dan Balasescu · 2019-06-21 14:26:07 +09:00
  c79c4641f3
• Add comment for why it's not a fill flow
  Dan Balasescu · 2019-06-21 12:42:35 +09:00
  8ab7a8641b
• Merge branch 'master' into carousel-gradient
  Dan Balasescu · 2019-06-21 12:40:24 +09:00
  0571bbd555
• Fix position of gradient in beatmap carousel
  David Zhao · 2019-06-20 15:05:15 +09:00
  65c84428cc
• Remove bad words on code comments
  Joehu · 2019-06-19 21:33:58 -07:00
  ca919f02e6