19824 Commits

This Branch

This Branch

All Branches

• Fix home button being cancelled by mod select again
  Joehu · 2019-02-26 21:01:28 -08:00
  5b4319a80f
• Merge remote-tracking branch 'Joehuu/master' into use-lifetime-optimization
  smoogipoo · 2019-02-27 12:08:43 +09:00
  a07d797d75
• Merge branch 'master' into fix-disabled-set-crash
  Dean Herbert · 2019-02-27 11:14:42 +09:00
  56697339b3
• Merge pull request #4338 from jorolf/disable-auto-dectect

  Add flag to osu.iOS.sln.DotSettings as well

  Dean Herbert · 2019-02-27 05:35:07 +09:00
  109abf4d28
• Add flag to osu.iOS.sln.DotSettings
  jorolf · 2019-02-26 16:24:23 +01:00
  26b74ad46a
• Merge pull request #4337 from jorolf/disable-auto-dectect

  Disable auto detected rules

  Dean Herbert · 2019-02-27 00:13:13 +09:00
  6f1a1432f5
• Disable auto detected rules
  jorolf · 2019-02-26 15:36:07 +01:00
  2784df3b68
• Fade out text instead of removing it immediately
  jorolf · 2019-02-26 15:26:00 +01:00
  4c10185f5b
• Merge branch 'master' of git://github.com/ppy/osu into supporter-disclaimer
  jorolf · 2019-02-26 14:09:12 +01:00
  cacef7421d
• Fix OsuGame test case not working
  Dean Herbert · 2019-02-26 18:02:24 +09:00
  bf6815b2a7
• Remove null checks for synchronous loads
  David Zhao · 2019-02-26 17:56:42 +09:00
  59fca568c9
• Add back song select wait
  David Zhao · 2019-02-26 17:43:42 +09:00
  d23f399375
• Have test cases create a new screen stack each time
  David Zhao · 2019-02-26 17:31:21 +09:00
  60ecb99dfb
• Merge pull request #4240 from ThePyrotechnic/MissingSource

  Improve layout of beatmap details pane when source is unknown

  Dean Herbert · 2019-02-26 16:20:23 +09:00
  2019.226.0 a11a7fa6f1
• Add visual test
  Dean Herbert · 2019-02-26 16:12:40 +09:00
  5b88c2ea0f
• Use fade instead of negative margin
  Dean Herbert · 2019-02-26 16:10:06 +09:00
  d9872dda12
• Add better easing
  Dean Herbert · 2019-02-26 16:09:45 +09:00
  2d6d9dd723
• Add back newline
  Dean Herbert · 2019-02-26 15:48:34 +09:00
  c1432b2ed5
• Merge branch 'master' into MissingSource
  Dean Herbert · 2019-02-26 15:38:51 +09:00
  2fc34496fd
• Merge pull request #4329 from swoolcock/hide-exit-button

  Hide exit button if the host does not support exiting

  Dean Herbert · 2019-02-26 13:42:13 +09:00
  19d62f76ba
• Merge branch 'master' into hide-exit-button
  Dean Herbert · 2019-02-26 13:25:47 +09:00
  d2dc38f298
• Merge pull request #4334 from smoogipoo/fix-negative-score

  Fix scores being stored as ints

  Dean Herbert · 2019-02-26 13:18:47 +09:00
  3213a9a443
• Fix scores being stored as ints
  smoogipoo · 2019-02-26 13:10:59 +09:00
  8a943a6e65
• Fix broken grammar

  Co-Authored-By: peppy <pe@ppy.sh>

  Dan Balasescu · 2019-02-26 12:28:49 +09:00
  32b8bb2ccc
• Restore previous wait time

  For whatever reason, this is required?

  Dean Herbert · 2019-02-26 10:27:54 +09:00
  3549369822
• Extract wait logic into separate method

  Also reduces the required wait time.

  Dean Herbert · 2019-02-26 10:11:36 +09:00
  217f692798
• private goes after public
  Dean Herbert · 2019-02-26 09:56:22 +09:00
  c58d305fc6
• Move MainMenu initialisation from ctor to load
  Shane Woolcock · 2019-02-26 09:54:42 +09:00
  e91c07209f
• Rename some methods (they weren't Asserting)
  Dean Herbert · 2019-02-26 09:54:28 +09:00
  14e427fed7
• *I should've rechecked the code after the master merge*
  jorolf · 2019-02-25 23:53:44 +01:00
  796044ee7d
• Merge branch 'master' of git://github.com/ppy/osu into supporter-disclaimer
  jorolf · 2019-02-25 23:49:01 +01:00
  501dab7b32
• Don't show the supporter text if the user already has supporter status
  jorolf · 2019-02-25 23:44:43 +01:00
  c680d63694
• Merge branch 'master' into UserDimLogic
  Dean Herbert · 2019-02-25 22:35:48 +09:00
  568e90c70b
• Make screen stack readonly
  David Zhao · 2019-02-25 22:17:51 +09:00
  a7585dea21
• Fix TestCasePlayerLoader not having a background stack
  David Zhao · 2019-02-25 22:05:49 +09:00
  d750023c52
• Merge branch 'master' into hide-exit-button

  # Conflicts:
  #	osu.Game/Screens/Menu/MainMenu.cs

  Shane Woolcock · 2019-02-25 21:48:42 +09:00
  bebb635ca1
• Move all MainMenu button creation into load
  Shane Woolcock · 2019-02-25 21:41:41 +09:00
  2bd5bb3f69
• Merge pull request #3732 from UselessToucan/notify_track_completion_failure

  Use `Track.Completed` event

  Dean Herbert · 2019-02-25 20:48:03 +09:00
  d6cfce8bce
• Merge branch 'master' into MissingSource
  Dean Herbert · 2019-02-25 19:35:44 +09:00
  97dc7f9819
• Don't use this
  Dean Herbert · 2019-02-25 19:34:03 +09:00
  2fbb0b4e6f
• Merge remote-tracking branch 'upstream/master' into notify_track_completion_failure
  Dean Herbert · 2019-02-25 19:30:35 +09:00
  140de26a56
• Merge pull request #4331 from nyquillerium/ScrollingExitFix

  Fix song select background not being exited in time for main menu

  Dean Herbert · 2019-02-25 19:29:23 +09:00
  638e89effa
• Fix some formatting / variable naming
  Dean Herbert · 2019-02-25 19:29:09 +09:00
  ed10024b22
• Fix some weird formatting
  Dean Herbert · 2019-02-25 19:19:28 +09:00
  a4e119786f
• Merge branch 'master' into ScrollingExitFix
  Dean Herbert · 2019-02-25 19:11:05 +09:00
  6881563346
• Fix oops
  Dean Herbert · 2019-02-25 18:59:28 +09:00
  f84a84edaa
• Further simplify import messaging
  Dean Herbert · 2019-02-25 18:42:08 +09:00
  314f35b0c5
• Clean up test code
  David Zhao · 2019-02-25 18:41:13 +09:00
  59ad470eed
• Fix song select backround not being exited in time
  David Zhao · 2019-02-25 18:40:19 +09:00
  ad1bce3585
• Remove "silent" parameter; consolidate import logic
  Dean Herbert · 2019-02-25 18:24:06 +09:00
  80737b9ef8