Commit Graph

3648 Commits

Author SHA1 Message Date
5b53cf0961 Merge branch 'master' into hide-desktop-only-elements 2019-02-28 18:50:16 +09:00
99812bd448 Apply suggestions from code review
Co-Authored-By: nyquillerium <nyquill@ppy.sh>
2019-02-28 18:25:58 +09:00
a37445a938 Merge branch 'master' into better-mp-songselect-deletion-handling 2019-02-28 17:35:08 +09:00
921346d303 Rename a few more members 2019-02-28 17:27:28 +09:00
b2872b47d0 Merge branch 'master' into UserDimLogic 2019-02-28 17:18:04 +09:00
4c8aa65200 private + renaming 2019-02-28 17:02:45 +09:00
69b1c76dce Actually implement blurring fix 2019-02-28 16:51:17 +09:00
3a1066ff02 Merge branch 'master' into toquantity-1 2019-02-28 15:57:51 +09:00
6e821a426d Fix restoration of enabled mods when cancelling song select 2019-02-28 15:06:11 +09:00
cf2feec7df Fix multiplayer enabled mods check 2019-02-28 15:02:22 +09:00
2241e1af9d Use ToQuantity for words with number prefixes 2019-02-27 21:55:45 -08:00
2dbf7d122c Merge branch 'master' into use-pattern-matching 2019-02-28 14:53:07 +09:00
e2c6a8bc07 Use pattern matching wherever possible 2019-02-28 14:35:00 +09:00
0788a7e9f1 Merge branch 'master' into more-inspections 2019-02-28 14:32:57 +09:00
42be7857d1 Use expression body for property get/set where possible 2019-02-28 13:58:19 +09:00
26d53d06a9 Fix remaining issues 2019-02-28 13:31:40 +09:00
ce17e37c74 Conditionally add some UI elements only on desktop
Prevents crashes from trying to access features that are not applicable to mobile.
2019-02-28 13:10:53 +09:00
3e1f283281 Merge remote-tracking branch 'upstream/master' into more-inspections 2019-02-28 13:09:18 +09:00
76ec5868da Merge branch 'master' into fix-square-graph-overhead 2019-02-28 12:23:37 +09:00
c8793911a8 Enable more stringent inspectcode style inspections 2019-02-27 21:25:40 +09:00
3af7d4939c Add debounce testing 2019-02-27 19:11:09 +09:00
43a1df6e5c Inline cancellation token source creation 2019-02-27 18:58:53 +09:00
6f5d4ce2e2 Debounce SquareGraph some more 2019-02-27 18:58:45 +09:00
8c4a59e57e Fix SquareGraph more 2019-02-27 18:58:34 +09:00
882fff1631 Assert storyboard visibilty at both steps of toggle 2019-02-27 17:56:44 +09:00
14ffd9efe8 Add fake storyboard to visually assess storyboard dim 2019-02-27 17:02:04 +09:00
c59d84fd21 Add sanity check to prevent TimeshiftPlayer from starting with incorrect beatmap/ruleset/mods 2019-02-27 16:21:14 +09:00
a3f71d69a9 Ensure ruleset and mods are set correctly when leaving MatchSongSelect 2019-02-27 16:16:13 +09:00
7c2ffb1826 Fix MatchSongSelect not handling beatmapset deletions 2019-02-27 14:34:39 +09:00
5b4319a80f Fix home button being cancelled by mod select again 2019-02-26 21:01:28 -08:00
56697339b3 Merge branch 'master' into fix-disabled-set-crash 2019-02-27 11:14:42 +09: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
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
e91c07209f Move MainMenu initialisation from ctor to load 2019-02-26 09:54:42 +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
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
97dc7f9819 Merge branch 'master' into MissingSource 2019-02-25 19:35:44 +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
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