19539 Commits

This Branch

This Branch

All Branches

• 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
• Merge branch 'master' of git://github.com/ppy/osu into screen-title-class
  jorolf · 2019-03-21 22:18:59 +01:00
  7873022a8b
• Don't go outside of the container bounds
  jorolf · 2019-03-21 22:18:45 +01:00
  454c82c49e
• Rename "urgent" to "topMost"
  Joseph Madamba · 2019-03-21 11:16:10 -07:00
  d5272a83cf
• 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
• Add more tests for exitability
  Dean Herbert · 2019-03-21 16:12:14 +09:00
  b17c5c0bb3
• Merge remote-tracking branch 'upstream/master' into pause-logic-simplification
  Dean Herbert · 2019-03-21 16:04:18 +09:00
  15f9a6b9df
• Merge remote-tracking branch 'upstream/master' into multi-background-stack
  David Zhao · 2019-03-21 15:35:14 +09:00
  ee0d7b6c6d
• Merge pull request #4500 from peppy/update-framework

  Update framework

  Dean Herbert · 2019-03-20 23:59:45 +09:00
  2019.321.0 6058f994e1
• Update framework
  Dean Herbert · 2019-03-20 22:50:50 +09:00
  c555019692
• Merge pull request #4466 from nyquillerium/visual-settings-container

  Move user blurring logic into UserDimContainer

  Dean Herbert · 2019-03-20 22:22:11 +09:00
  42cb80e068
• Merge branch 'master' into visual-settings-container
  Dean Herbert · 2019-03-20 20:48:30 +09:00
  67a65b80fc
• Do less import work in [SetUp] step
  Dean Herbert · 2019-03-20 20:47:25 +09:00
  6a7ab6a001
• Actually add the background
  Dean Herbert · 2019-03-20 20:18:08 +09:00
  298c98871d
• Define explicit method to add background

  Also cleans up some redundant/misplaced comments.

  Dean Herbert · 2019-03-20 20:16:45 +09:00
  ba89bfee0c
• Reword comment
  Dean Herbert · 2019-03-20 20:04:07 +09:00
  8865d53992
• Add comment regarding HandlePositionalInput
  David Zhao · 2019-03-20 19:59:54 +09:00
  2e9d823af4
• Remove handle positional input
  David Zhao · 2019-03-20 19:49:37 +09:00
  2ff7aa6c2e
• Merge branch 'visual-settings-container' of https://github.com/nyquillerium/osu into visual-settings-container
  David Zhao · 2019-03-20 19:48:57 +09:00
  bc6e8ce7b4
• Make restart public rather than reimplementing
  Dean Herbert · 2019-03-20 19:45:04 +09:00
  01f795b046
• Put loadcomplete next to other protected overrides
  David Zhao · 2019-03-20 19:42:39 +09:00
  8543e8c36f
• Add proper comment
  Dean Herbert · 2019-03-20 19:41:20 +09:00
  cda5bc28c8
• Formatting and naming improvements
  Dean Herbert · 2019-03-20 19:39:03 +09:00
  18de9e51c5
• Query for input manager once
  David Zhao · 2019-03-20 19:35:40 +09:00
  9013afe412
• Fix gameplay cursor showing in editor
  Dean Herbert · 2019-03-20 19:26:24 +09:00
  7254b765b0
• Merge branch 'master' into multi-background-stack
  Dean Herbert · 2019-03-20 19:11:27 +09:00
  acbcca4462
• Merge pull request #4496 from smoogipoo/reinstantiate-mods

  Fix mods being reused for difficulty calculation

  Dean Herbert · 2019-03-20 19:10:52 +09:00
  fe255c54d0
• Merge pull request #4495 from smoogipoo/fix-spinner-conversion

  Fix catch spinners not being allowed for conversion
  
  Co-authored-by: Dean Herbert <pe@ppy.sh>

  Dean Herbert · 2019-03-20 19:10:31 +09:00
  2118d50bae
• Wait for dim
  David Zhao · 2019-03-20 17:31:06 +09:00
  b5e8eb2a4a
• Add test case for resuming PlayerLoader
  David Zhao · 2019-03-20 17:18:42 +09:00
  fbfef844de
• Rename DrawableScore
  smoogipoo · 2019-03-20 17:15:38 +09:00
  f7016e1d2c
• Fix post-merge errors
  smoogipoo · 2019-03-20 17:15:21 +09:00
  41d25c7d19
• Merge branch 'timed-difficulty-attributes' into update-beatmap-scores-design

  # Conflicts:
  #	osu.Game/Overlays/BeatmapSet/Scores/ScoresContainer.cs

  smoogipoo · 2019-03-20 17:12:34 +09:00
  ce57bdb8db