20430 Commits

This Branch

This Branch

All Branches

• Merge remote-tracking branch 'upstream/master' into generic-download-model-manager
  Dean Herbert · 2019-06-26 12:21:04 +09:00
  1eda4e0dd4
• Split out tests
  David Zhao · 2019-06-26 12:05:11 +09:00
  1ca9717e13
• fix channel selector not being closed
  David Zhao · 2019-06-26 12:00:58 +09:00
  6c8cc9728f
• Merge pull request #5155 from peppy/one-hit-screen

  Add base class for startup screens

  Dan Balasescu · 2019-06-26 11:49:15 +09:00
  681759582b
• 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
• Merge pull request #5154 from peppy/fix-pause-behaviour

  Fix pause not correctly showing pause screen

  Dan Balasescu · 2019-06-26 11:34:42 +09:00
  d68e2892dd
• Rename to DownloadButtonsContainer
  Salman Ahmed · 2019-06-26 05:22:08 +03:00
  eaf6f6891d
• Trim whitespaces
  Salman Ahmed · 2019-06-26 05:17:28 +03:00
  2e383a1f83
• Merge branch 'master' into not-available-to-download
  Salman Ahmed · 2019-06-26 05:13:58 +03:00
  f4e765cf99
• Remove test beatmapsets and use existing set info
  Salman Ahmed · 2019-06-26 05:01:29 +03:00
  33fbf56b4c
• Merge branch 'master' into android
  Albert Tang · 2019-06-25 17:54:23 -05:00
  3cf2ffc1a7
• Support both landscape and portrait mode

  Co-Authored-By: miterosan <33435289+miterosan@users.noreply.github.com>

  Albert Tang · 2019-06-25 17:54:14 -05:00
  4cb2c4b494
• 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
• Remove unnecessary private methods and inline used-once code
  naoey · 2019-06-25 21:16:30 +05:30
  c476e46a8e
• Remove unused using statement
  Dean Herbert · 2019-06-26 00:23:39 +09:00
  c04f14a1e3
• Add test for pause via hold
  Dean Herbert · 2019-06-26 00:00:53 +09:00
  a4214db39e
• Fix pause not correctly showing pause screen
  Dean Herbert · 2019-06-25 23:15:58 +09:00
  40cf573368
• Disallow back button on disclaimer screen (#5153)

  Disallow back button on disclaimer screen

  Dean Herbert · 2019-06-25 22:35:00 +09:00
  2019.625.0 bb3dde53d1
• Disallow back button on disclaimer screen
  Dean Herbert · 2019-06-25 22:27:50 +09:00
  983cabdb98
• Remove unnecessary try-catch block
  naoey · 2019-06-25 18:28:59 +05:30
  6f5fbd7ea1
• Merge remote-tracking branch 'upstream/master' into generic-download-model-manager
  naoey · 2019-06-25 18:27:16 +05:30
  9d88295ece
• Re-use the back button game-wide (#5149)

  Re-use the back button game-wide
  
  Co-authored-by: Dean Herbert <pe@ppy.sh>

  Dean Herbert · 2019-06-25 20:50:28 +09:00
  7d5554c2ac
• Make testcase even more useful
  Andrei Zavatski · 2019-06-25 14:27:29 +03:00
  08e31159fc
• Merge remote-tracking branch 'upstream/master' into gamewide-backbutton
  Dean Herbert · 2019-06-25 20:23:49 +09:00
  f9dad0f640
• Add testability of dismissal
  Dean Herbert · 2019-06-25 20:23:43 +09:00
  e87e4077e8
• Adjust transitions a tad
  Dean Herbert · 2019-06-25 20:23:34 +09:00
  f51be4c4fe
• Merge remote-tracking branch 'refs/remotes/ppy/master' into toolbar-rulesets-refactor
  Andrei Zavatski · 2019-06-25 14:16:05 +03:00
  bae0258d8d
• Reduce size of dropdown chevron (#5150)

  Reduce size of dropdown chevron
  
  Co-authored-by: Dan Balasescu <1329837+smoogipoo@users.noreply.github.com>

  Dean Herbert · 2019-06-25 20:05:52 +09:00
  75b78d5e27
• Use OsuScrollContainer for osu menus (#5094)

  Use OsuScrollContainer for osu menus
  
  Co-authored-by: Dean Herbert <pe@ppy.sh>

  Dean Herbert · 2019-06-25 20:05:09 +09:00
  28cfccbd64
• Merge branch 'master' into reduce-dropdown-chevron-size
  Dan Balasescu · 2019-06-25 19:58:37 +09:00
  7794fab7c9
• Merge pull request #5147 from peppy/reduce-background-brightness

  Reduce background brightness at PlayerLoader

  Dan Balasescu · 2019-06-25 19:58:25 +09:00
  89777c1743
• Merge branch 'master' into reduce-background-brightness
  Dan Balasescu · 2019-06-25 19:45:15 +09:00
  0f31d17129
• Reduce size of dropdown chevron
  Dean Herbert · 2019-06-25 19:32:00 +09:00
  a3de369c20
• Merge branch 'master' into fix-dropdown-styling
  Dean Herbert · 2019-06-25 19:28:37 +09:00
  8c02709d74
• Merge pull request #5148 from peppy/update-framework

  Update framework

  Dean Herbert · 2019-06-25 19:28:17 +09:00
  445660d066
• Merge branch 'master' into reduce-background-brightness
  Dan Balasescu · 2019-06-25 19:18:28 +09:00
  c6965a40dc
• Merge pull request #5144 from peppy/beatmap-overlay-load

  Improve loading state of BeatmapSet header

  Dan Balasescu · 2019-06-25 19:18:23 +09:00
  055b302da1
• Merge branch 'master' into beatmap-overlay-load
  Dan Balasescu · 2019-06-25 19:05:17 +09:00
  47974ca854
• Merge pull request #5143 from peppy/cancel-api-callback

  Avoid calling api request callback after user cancel

  Dan Balasescu · 2019-06-25 19:04:57 +09:00
  2d07514a56
• Merge branch 'master' into cancel-api-callback
  Dan Balasescu · 2019-06-25 18:43:33 +09:00
  ffcd3529a6
• Remove unnecessary extra property
  smoogipoo · 2019-06-25 18:38:14 +09:00
  aa81c95f30
• Update framework
  Dean Herbert · 2019-06-25 18:38:11 +09:00
  fe290ead63
• Adjust backbutton animation
  smoogipoo · 2019-06-25 18:33:35 +09:00
  5b294ba419
• Make TLB test scene test TLB and not back button
  smoogipoo · 2019-06-25 18:33:30 +09:00
  4ed14a295d
• 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
• Scale backbutton along with screens
  smoogipoo · 2019-06-25 18:33:13 +09:00
  f53d2fbe76
• Move back button to OsuGame
  smoogipoo · 2019-06-25 18:33:08 +09:00
  8c96e4c1fa