Commit Graph

17840 Commits

Author SHA1 Message Date
ebec944bb8 Use actual song select for test case with beatmap import 2019-02-27 14:15:45 +09:00
5b4319a80f Fix home button being cancelled by mod select again 2019-02-26 21:01:28 -08:00
a07d797d75 Merge remote-tracking branch 'Joehuu/master' into use-lifetime-optimization 2019-02-27 12:08:43 +09:00
56697339b3 Merge branch 'master' into fix-disabled-set-crash 2019-02-27 11:14:42 +09:00
109abf4d28 Merge pull request #4338 from jorolf/disable-auto-dectect
Add flag to osu.iOS.sln.DotSettings as well
2019-02-27 05:35:07 +09:00
26b74ad46a Add flag to osu.iOS.sln.DotSettings 2019-02-26 16:24:23 +01:00
6f1a1432f5 Merge pull request #4337 from jorolf/disable-auto-dectect
Disable auto detected rules
2019-02-27 00:13:13 +09:00
2784df3b68 Disable auto detected rules 2019-02-26 15:36:07 +01:00
4c10185f5b Fade out text instead of removing it immediately 2019-02-26 15:26:00 +01:00
cacef7421d Merge branch 'master' of git://github.com/ppy/osu into supporter-disclaimer 2019-02-26 14:09:12 +01:00
bf6815b2a7 Fix OsuGame test case not working 2019-02-26 18:02:24 +09:00
59fca568c9 Remove null checks for synchronous loads 2019-02-26 17:56:42 +09:00
d23f399375 Add back song select wait 2019-02-26 17:43:42 +09:00
60ecb99dfb Have test cases create a new screen stack each time 2019-02-26 17:31:21 +09:00
a11a7fa6f1 Merge pull request #4240 from ThePyrotechnic/MissingSource
Improve layout of beatmap details pane when source is unknown
2019-02-26 16:20:23 +09:00
5b88c2ea0f Add visual test 2019-02-26 16:12:40 +09:00
d9872dda12 Use fade instead of negative margin 2019-02-26 16:10:06 +09:00
2d6d9dd723 Add better easing 2019-02-26 16:09:45 +09:00
c1432b2ed5 Add back newline 2019-02-26 15:48:34 +09:00
2fc34496fd Merge branch 'master' into MissingSource 2019-02-26 15:38:51 +09:00
19d62f76ba Merge pull request #4329 from swoolcock/hide-exit-button
Hide exit button if the host does not support exiting
2019-02-26 13:42:13 +09:00
d2dc38f298 Merge branch 'master' into hide-exit-button 2019-02-26 13:25:47 +09:00
3213a9a443 Merge pull request #4334 from smoogipoo/fix-negative-score
Fix scores being stored as ints
2019-02-26 13:18:47 +09:00
8a943a6e65 Fix scores being stored as ints 2019-02-26 13:10:59 +09:00
32b8bb2ccc Fix broken grammar
Co-Authored-By: peppy <pe@ppy.sh>
2019-02-26 12:28:49 +09:00
3549369822 Restore previous wait time
For whatever reason, this is required?
2019-02-26 10:27:54 +09:00
217f692798 Extract wait logic into separate method
Also reduces the required wait time.
2019-02-26 10:11:36 +09:00
c58d305fc6 private goes after public 2019-02-26 09:56:22 +09:00
e91c07209f Move MainMenu initialisation from ctor to load 2019-02-26 09:54:42 +09:00
14e427fed7 Rename some methods (they weren't Asserting) 2019-02-26 09:54:28 +09:00
796044ee7d *I should've rechecked the code after the master merge* 2019-02-25 23:53:44 +01:00
501dab7b32 Merge branch 'master' of git://github.com/ppy/osu into supporter-disclaimer 2019-02-25 23:49:01 +01:00
c680d63694 Don't show the supporter text if the user already has supporter status 2019-02-25 23:44:43 +01:00
568e90c70b Merge branch 'master' into UserDimLogic 2019-02-25 22:35:48 +09:00
a7585dea21 Make screen stack readonly 2019-02-25 22:17:51 +09:00
d750023c52 Fix TestCasePlayerLoader not having a background stack 2019-02-25 22:05:49 +09:00
bebb635ca1 Merge branch 'master' into hide-exit-button
# Conflicts:
#	osu.Game/Screens/Menu/MainMenu.cs
2019-02-25 21:48:42 +09:00
2bd5bb3f69 Move all MainMenu button creation into load 2019-02-25 21:41:41 +09:00
d6cfce8bce Merge pull request #3732 from UselessToucan/notify_track_completion_failure
Use `Track.Completed` event
2019-02-25 20:48:03 +09:00
97dc7f9819 Merge branch 'master' into MissingSource 2019-02-25 19:35:44 +09:00
2fbb0b4e6f Don't use this 2019-02-25 19:34:03 +09:00
140de26a56 Merge remote-tracking branch 'upstream/master' into notify_track_completion_failure 2019-02-25 19:30:35 +09:00
638e89effa Merge pull request #4331 from nyquillerium/ScrollingExitFix
Fix song select background not being exited in time for main menu
2019-02-25 19:29:23 +09:00
ed10024b22 Fix some formatting / variable naming 2019-02-25 19:29:09 +09:00
a4e119786f Fix some weird formatting 2019-02-25 19:19:28 +09:00
6881563346 Merge branch 'master' into ScrollingExitFix 2019-02-25 19:11:05 +09:00
f84a84edaa Fix oops 2019-02-25 18:59:28 +09:00
314f35b0c5 Further simplify import messaging 2019-02-25 18:42:08 +09:00
59ad470eed Clean up test code 2019-02-25 18:41:13 +09:00
ad1bce3585 Fix song select backround not being exited in time 2019-02-25 18:40:19 +09:00