17516 Commits

This Branch

This Branch

All Branches

• Merge branch 'master' into skinnable-scaling-container-background
  Dean Herbert · 2019-03-25 13:33:39 +09:00
  fcc91efc1a
• Refactor async load logic (not required due to stack presence)
  Dean Herbert · 2019-03-25 13:28:51 +09:00
  cd1b171df7
• Merge pull request #4451 from nyquillerium/multi-background-stack

  Centralise BackgroundScreenStack handling
  
  Co-authored-by: Dean Herbert <pe@ppy.sh>

  Dean Herbert · 2019-03-25 13:12:01 +09:00
  1155dba195
• Revert unintentional change
  Dean Herbert · 2019-03-25 12:51:54 +09:00
  e705eb586d
• Merge remote-tracking branch 'upstream/master' into multi-background-stack
  Dean Herbert · 2019-03-25 12:40:31 +09:00
  9a6576c0a1
• Apply a few minor refactors
  Dean Herbert · 2019-03-25 12:39:40 +09:00
  371166955e
• Merge pull request #4522 from peppy/testcase-folders

  Add grouping of visual tests

  Dan Balasescu · 2019-03-25 11:50:49 +09:00
  129a799084
• remove empty argument list
  LeNitrous · 2019-03-25 06:05:57 +08:00
  fee260fa03
• make scaling container background use BackgroundScreenStack with BackgroundScreenDefault
  LeNitrous · 2019-03-25 05:49:57 +08:00
  01ce8f161e
• Add grouping of visual tests
  Dean Herbert · 2019-03-25 01:02:36 +09:00
  a1c5eda05b
• Change default for null screen parallax, apply reviews
  David Zhao · 2019-03-24 16:21:43 +09:00
  5169f7a43c
• Merge pull request #2 from ppy/master

  merge from upstream-master

  Nathan Alo · 2019-03-24 15:02:28 +08:00
  06fd735190
• Merge pull request #4169 from Scotsoo/menu-globalaction-select

  Add support for key bindings in gameplay menus
  
  Co-authored-by: Dean Herbert <pe@ppy.sh>

  Dean Herbert · 2019-03-24 12:29:50 +09:00
  8c8c761e02
• Handle released for safety
  Dean Herbert · 2019-03-24 12:19:09 +09:00
  11b474e194
• Fix test
  Dean Herbert · 2019-03-24 12:09:18 +09:00
  1e0027e4f2
• Refactor for formatting sanity
  Dean Herbert · 2019-03-24 12:03:06 +09:00
  0d72104235
• Merge branch 'master' into menu-globalaction-select
  Dean Herbert · 2019-03-24 11:58:52 +09:00
  8ad19fc2d4
• Merge pull request #4513 from peppy/update-framework

  Update framework

  Dan Balasescu · 2019-03-23 02:40:42 +09:00
  ddc0177821
• Update textbox usages
  Dean Herbert · 2019-03-23 02:00:27 +09:00
  9a11a08acc
• Update framework
  Dean Herbert · 2019-03-23 00:55:31 +09:00
  97675f6495
• Merge remote-tracking branch 'upstream/master' into multi-background-stack
  Dean Herbert · 2019-03-22 16:05:39 +09:00
  db89796752
• Refactor test
  Dean Herbert · 2019-03-22 16:03:08 +09:00
  670c25d5e8
• Merge pull request #4487 from peppy/pause-logic-simplification

  Simplify and centralise pause logic
  
  Co-authored-by: Dan Balasescu <1329837+smoogipoo@users.noreply.github.com>

  Dean Herbert · 2019-03-22 15:28:16 +09:00
  2019.323.0 123dbb2c5c
• Use is loaded instead
  David Zhao · 2019-03-22 15:23:18 +09:00
  c43b1afa30
• Wait for screen current
  David Zhao · 2019-03-22 15:20:06 +09:00
  8fb4de101f
• Merge branch 'master' into pause-logic-simplification
  Dan Balasescu · 2019-03-22 15:11:34 +09:00
  b4954c5a7f
• Merge pull request #4511 from peppy/better-dummy-api

  Fix AccountCreationOverlay tests and better complete dummy api's behaviour

  Dan Balasescu · 2019-03-22 15:11:29 +09:00
  9d32b97b81
• Add texts to make test more visually confirmable, add no parallax screen.
  David Zhao · 2019-03-22 15:08:47 +09:00
  9a466d97ed
• Merge branch 'master' into better-dummy-api
  Dan Balasescu · 2019-03-22 14:51:11 +09:00
  e09c107f38
• Merge pull request #4508 from peppy/upgrade-nuget-packages

  Bring nuget packages up to date

  Dan Balasescu · 2019-03-22 14:51:03 +09:00
  118ddb7ba6
• Combine conditionals and clarify comment
  Dean Herbert · 2019-03-22 14:42:51 +09:00
  9e6cdd7bd5
• Move storyboard logic region down
  Dean Herbert · 2019-03-22 14:39:20 +09:00
  5b8fd6822e
• Merge branch 'master' into upgrade-nuget-packages
  Dan Balasescu · 2019-03-22 14:37:58 +09:00
  a9975e845c
• Merge pull request #4505 from peppy/fix-random-select-crash

  Fix random select crashing

  Dan Balasescu · 2019-03-22 14:36:20 +09:00
  a95b3c8685
• Cleanup other instance of same function
  Dean Herbert · 2019-03-22 14:31:54 +09:00
  59d0996c8d
• Cleanup
  smoogipoo · 2019-03-22 14:20:53 +09:00
  860999ad29
• Merge branch 'master' into fix-random-select-crash
  Dan Balasescu · 2019-03-22 14:11:06 +09:00
  5de99f3f5b
• Add a new test for OsuScreenStack, fix parallax
  David Zhao · 2019-03-22 14:10:38 +09:00
  dcae86e39a
• Merge pull request #4504 from peppy/fix-song-select-bindable-issues

  Fix song select bindable crashes

  Dan Balasescu · 2019-03-22 14:10:26 +09:00
  5e909096c3
• Merge branch 'master' into fix-song-select-bindable-issues
  Dan Balasescu · 2019-03-22 13:57:13 +09:00
  c383705fe6
• Merge pull request #4497 from peppy/fix-editor-cursor

  Fix gameplay cursor showing in editor

  Dan Balasescu · 2019-03-22 13:14:07 +09:00
  4fa6afdb1f
• Merge branch 'master' into fix-editor-cursor
  Dan Balasescu · 2019-03-22 12:36:36 +09:00
  e40f77cbeb
• Fix AccountCreationOverlay tests and better complete dummy api's behaviour
  Dean Herbert · 2019-03-22 11:55:35 +09:00
  dc004910d7
• Bring nuget packages up to date
  Dean Herbert · 2019-03-22 02:41:21 +09:00
  d6f17a5ecd
• Fix random select crashing

  Closes #3383.

  Dean Herbert · 2019-03-21 21:02:54 +09:00
  37010f97d7
• Fix song select potentially starting play before the carousel (and bindables) have been initialised
  Dean Herbert · 2019-03-21 20:52:34 +09:00
  a10e43410a
• Add an explicit flag for tracking song select's bindable binding

  Not required (this change does not affect logic) but improves clarity.

  Dean Herbert · 2019-03-21 20:52:15 +09:00
  4789aa81cb
• Move nested method to bottom of class
  Dean Herbert · 2019-03-21 20:51:21 +09:00
  96dba6a20d
• Expose carousel's loaded flag
  Dean Herbert · 2019-03-21 20:51:06 +09:00
  e2503888a4
• Extract logic shared between tests
  Dean Herbert · 2019-03-21 16:33:34 +09:00
  aa1dfdd663