Commit Graph

10753 Commits

Author SHA1 Message Date
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
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
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
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
f0b26550d1 Merge branch 'master' into slider-fix 2019-02-25 16:12:52 +09:00
7fde21b51a Rename testcase 2019-02-25 16:09:12 +09:00
22a68d7bea Perform new migration 2019-02-25 15:25:22 +09:00
4475643726 Revert database migration 2019-02-25 14:40:44 +09:00
8da671fa6c Check if a user exists before creating new user 2019-02-25 13:58:19 +09:00
16fa30f71e Fix bindable 2019-02-25 13:27:44 +09:00
ccc86b66fa Use local private bindable in Player.cs 2019-02-25 13:15:37 +09:00
af4606f3d2 Create new test for StoryboardReplacesBackground 2019-02-25 12:35:01 +09:00
61be4f2695 Conditionally add ExitConfirmOverlay and disable back action 2019-02-25 10:43:47 +09:00
add8b8e9c4 Only add Exit button if the GameHost supports it 2019-02-25 09:56:00 +09:00
287870f1e1 Remove limitation stopping search updates when no query present in direct
Closes #4310.
2019-02-24 23:35:18 +09:00
24f5bc7a75 Add documentation and move storyboard init logic 2019-02-24 20:03:24 +09:00
3a9835fcdd Merge branch 'UserDimLogic' of https://github.com/nyquillerium/osu into UserDimLogic 2019-02-24 18:11:08 +09:00
f4acd6e48f Move PlayerLoader tests out of constructor, Improve Documentation 2019-02-24 18:10:59 +09:00
b140fc973a Merge branch 'master' into UserDimLogic 2019-02-24 17:48:59 +09:00
bd83a95a4f Merge branch 'master' into fix-download-failure-exception 2019-02-24 16:01:18 +09:00
2281a0235d Fix regression causing playback rate to display incorrectly 2019-02-24 15:27:06 +09:00
4e06d5c7cd Avoid fatal exceptions being thrown on download failure
Closes #4313.
2019-02-24 00:33:11 +09:00
69b9de5acd Update framework 2019-02-23 21:13:53 +09:00
809ab86ed0 Fix user ID not being added to database
Needed for avatar retrieval
2019-02-23 17:04:02 +09:00
90cae0a69c Simplify RulesetInputManager further 2019-02-23 15:48:34 +09:00
f8d18285a8 Fix backgrounds not properly being faded in song select 2019-02-23 14:59:54 +09:00
6d3c0e3191 Holy sheet 2019-02-23 14:39:55 +09:00
0c218eb0d5 Apply new RulesetInputManager logic
Run UpdateSubTree twice to ensure correctness
2019-02-23 14:14:41 +09:00
490fb86f9e Make base class abstract and add documentation 2019-02-23 14:14:34 +09:00
3495aa645f Update headers 2019-02-23 14:14:34 +09:00
d59ba8cfe9 Rename base player test class to RateAdjustedBeatmap, refactor input tests 2019-02-23 14:14:34 +09:00
1fdb8ca37a Fix auto-generated lisence header 2019-02-23 14:14:34 +09:00
8e09c66cbb Split out testcase player for use in slider input tests 2019-02-23 14:14:34 +09:00
8b4aa708fa Resolve merge conflict 2019-02-22 23:04:45 +03:00
bb01948283 Use .Value with new bindable changes 2019-02-22 20:44:02 +09:00
ab3fa91a2f Merge branch 'master' into UserDimLogic 2019-02-22 20:38:10 +09:00
76de39a344 Put user dim logic in yet another container inside UserDimContainer 2019-02-22 20:34:51 +09:00
367bc53a06 Revert some more instances of 'e' variable names 2019-02-22 20:15:25 +09:00
a0dae820ee Woops 2019-02-22 19:49:37 +09:00
d61dfe888e Fix venera fonts not being correctly specified 2019-02-22 19:42:09 +09:00
3015d40f8f Merge branch 'master' into osu-fontusage 2019-02-22 18:09:23 +09:00
a4162a69fb Remove leftover usage of dimlevel in BackgroundScreenBeatmap 2019-02-22 18:01:50 +09:00
0431582959 Remove excess new line 2019-02-22 17:57:49 +09:00
3fe4b8fd1c Update variable names
Also cleans up some weird code
2019-02-22 17:51:39 +09:00