Commit Graph

10807 Commits

Author SHA1 Message Date
acf518c208 Move cursor inside playfield 2019-03-06 17:41:54 +09:00
5411c63093 Fix menu cursor not displaying outside of gameplay scaling area 2019-03-06 17:14:08 +09:00
9441f88033 Use actual reference to default beatmap for fallback
Co-Authored-By: nyquillerium <nyquill@ppy.sh>
2019-03-06 13:01:37 +09:00
b94d080b1c Merge branch 'master' into LobbyList 2019-03-06 12:34:36 +09:00
8a6fa0915e Merge branch 'master' into simplify-gameplay-clock 2019-03-05 20:22:46 +09:00
558dbafb71 Use a safer method of setting the clock 2019-03-05 20:14:04 +09:00
d5943330b1 Fix potential infinite loop 2019-03-05 20:06:04 +09:00
76ce3954a0 Rename PauseContainer 2019-03-05 19:30:55 +09:00
89987210c3 Merge remote-tracking branch 'upstream/master' into LobbyList 2019-03-05 18:59:38 +09:00
34b2553b95 Remove redundant boolean 2019-03-05 18:59:25 +09:00
fafc80818c Fix typo
Co-Authored-By: peppy <pe@ppy.sh>
2019-03-05 18:50:46 +09:00
f98d55531f Add documentation for FetchScores 2019-03-05 18:48:59 +09:00
2a741d5853 Merge branch 'master' into local-leaderboard-display 2019-03-05 17:43:28 +08:00
424e02f165 Merge pull request #4411 from smoogipoo/fix-custom-sample-volume
Fix volume not being considered for file samples
2019-03-05 18:41:52 +09:00
8ad258f426 only check IsLoggedIn after requesting scores 2019-03-05 17:34:23 +08:00
5aaa2511eb Merge pull request #4374 from Joehuu/status-direct-list
Add beatmap status on direct list panels
2019-03-05 18:22:56 +09:00
a08086cc8a Fix volume not being considered for file samples 2019-03-05 18:21:29 +09:00
aefaceb397 Merge remote-tracking branch 'origin/master' into show-mods-on-loader 2019-03-05 18:08:11 +09:00
c06dac5b1a Remove null check (beatmap cannot be null) 2019-03-05 17:58:30 +09:00
2fee7276ae Combine creation + assignment 2019-03-05 17:58:05 +09:00
bb6c83ab25 Merge branch 'master' into show-mods-on-loader 2019-03-05 17:46:35 +09:00
8e99f54fed Merge branch 'master' into update-beatmap-sections 2019-03-05 17:39:47 +09:00
fd147dae21 Merge branch 'master' into fix-disabled-set-crash 2019-03-05 17:25:13 +09:00
d01ec59acb Fix sizings 2019-03-05 17:14:49 +09:00
e73cef5f94 Prefill some more properties of TestWorkingBeatmap 2019-03-05 17:14:24 +09:00
52558c5cf6 Fix metadata potentially being null 2019-03-05 16:59:02 +09:00
166a8c8bbb Add back fallback behavior for match creation 2019-03-05 16:41:59 +09:00
9a9b4efb8d Fix excess line 2019-03-05 16:41:11 +09:00
93c79023dc Merge remote-tracking branch 'upstream/master' into simplify-gameplay-clock 2019-03-05 16:41:01 +09:00
ec063a13db Update RulesetInputManager to support new clock structure more accurately 2019-03-05 16:34:50 +09:00
76aca738a9 Revert "Use same size labels from song select"
This reverts commit 7077e405ab.
2019-03-05 16:02:07 +09:00
11e353c152 Use local class instead of having a separate file 2019-03-05 15:55:37 +09:00
fc62877fdc Fall back to default background 2019-03-05 15:51:43 +09:00
b5fb6e2a59 Merge branch 'master' into limit-blank-lines 2019-03-05 15:40:11 +09:00
7c53c7b602 Remove local background logic 2019-03-05 15:33:39 +09:00
07c7d03a04 Merge branch 'master' into move-osu-settings 2019-03-05 15:32:54 +09:00
34f0967873 Merge branch 'master' into limit-blank-lines 2019-03-05 14:51:56 +09:00
4e33a98dbc Move gameplay clock to own class 2019-03-05 13:53:47 +09:00
c5cd9972c4 Make restart private 2019-03-05 13:37:51 +09:00
01f1018d02 Tidy up clock logic using DI and a GameplayClock 2019-03-05 13:37:51 +09:00
5bb0511f0a Fix SquareGraph not correctly filling columns when loaded with a non-zero time 2019-03-05 13:37:28 +09:00
78596dfe80 Merge remote-tracking branch 'origin/master' into move-osu-settings
# Conflicts:
#	osu.Game.Rulesets.Mania/UI/ManiaRulesetContainer.cs
#	osu.Game.Rulesets.Osu.Tests/TestCaseSlider.cs
2019-03-05 13:25:03 +09:00
aecbc31ffa Use BeatmapSetCoverType.List for lobby listing 2019-03-05 12:08:14 +09:00
0ff17103e8 Merge branch 'master' into update-difficulty-brackets 2019-03-05 10:16:18 +09:00
3f197935d7 Fix remaining case 2019-03-04 14:03:59 +09:00
08e153208d Unbinds are automatic 2019-03-03 20:03:22 +09:00
6ffa139ea8 Adjust transition length slightly 2019-03-03 20:02:56 +09:00
46b618d80c Merge remote-tracking branch 'Joehuu/master' into supporter-disclaimer 2019-03-03 19:18:16 +09:00
456c5be50c Merge branch 'master' into taskbar-tooltip-fade-out 2019-03-03 12:47:37 +09:00
e8d568470d use a bindable instead 2019-03-02 19:13:38 +01:00