smoogipoo
|
e3d463a141
|
Formatting fixes
|
2019-03-06 19:26:48 +09:00 |
|
smoogipoo
|
3c999d64d4
|
Fix post-merge errors
|
2019-03-06 16:09:21 +09:00 |
|
smoogipoo
|
ee1f9d4981
|
Merge remote-tracking branch 'origin/master' into profile-header-update
# Conflicts:
# osu-resources
# osu.Game/Overlays/Profile/Components/GradeBadge.cs
# osu.Game/Overlays/Profile/Header/BadgeContainer.cs
# osu.Game/Overlays/Profile/Header/RankGraph.cs
# osu.Game/Overlays/Profile/Header/SupporterIcon.cs
# osu.Game/Overlays/Profile/ProfileHeader.cs
|
2019-03-06 15:53:30 +09:00 |
|
Dean Herbert
|
00cdb3a44a
|
Merge pull request #4400 from nyquillerium/LobbyList
Use correct background display type for multiplayer lobby listing
|
2019-03-06 13:34:15 +09:00 |
|
Dean Herbert
|
9441f88033
|
Use actual reference to default beatmap for fallback
Co-Authored-By: nyquillerium <nyquill@ppy.sh>
|
2019-03-06 13:01:37 +09:00 |
|
Dean Herbert
|
b94d080b1c
|
Merge branch 'master' into LobbyList
|
2019-03-06 12:34:36 +09:00 |
|
Dan Balasescu
|
60af8e2820
|
Merge pull request #4408 from peppy/simplify-gameplay-clock
Simplify gameplay clocks
|
2019-03-05 20:43:44 +09:00 |
|
Dean Herbert
|
8a6fa0915e
|
Merge branch 'master' into simplify-gameplay-clock
|
2019-03-05 20:22:46 +09:00 |
|
Dean Herbert
|
558dbafb71
|
Use a safer method of setting the clock
|
2019-03-05 20:14:04 +09:00 |
|
Dean Herbert
|
d5943330b1
|
Fix potential infinite loop
|
2019-03-05 20:06:04 +09:00 |
|
Dean Herbert
|
cc855a8dcc
|
Merge pull request #4412 from LeNitrous/local-leaderboard-display
Fix local leaderboard not displaying when logged out
|
2019-03-05 19:33:17 +09:00 |
|
Dean Herbert
|
76ce3954a0
|
Rename PauseContainer
|
2019-03-05 19:30:55 +09:00 |
|
David Zhao
|
89987210c3
|
Merge remote-tracking branch 'upstream/master' into LobbyList
|
2019-03-05 18:59:38 +09:00 |
|
David Zhao
|
34b2553b95
|
Remove redundant boolean
|
2019-03-05 18:59:25 +09:00 |
|
Dan Balasescu
|
fafc80818c
|
Fix typo
Co-Authored-By: peppy <pe@ppy.sh>
|
2019-03-05 18:50:46 +09:00 |
|
Dean Herbert
|
f98d55531f
|
Add documentation for FetchScores
|
2019-03-05 18:48:59 +09:00 |
|
Nathan Alo
|
2a741d5853
|
Merge branch 'master' into local-leaderboard-display
|
2019-03-05 17:43:28 +08:00 |
|
Dean Herbert
|
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 |
|
LeNitrous
|
8ad258f426
|
only check IsLoggedIn after requesting scores
|
2019-03-05 17:34:23 +08:00 |
|
Dean Herbert
|
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 |
|
Dan Balasescu
|
0f6f8c5af5
|
Merge pull request #4158 from LeNitrous/show-mods-on-loader
Show mods on player loading screen
|
2019-03-05 18:22:14 +09:00 |
|
smoogipoo
|
a08086cc8a
|
Fix volume not being considered for file samples
|
2019-03-05 18:21:29 +09:00 |
|
smoogipoo
|
aefaceb397
|
Merge remote-tracking branch 'origin/master' into show-mods-on-loader
|
2019-03-05 18:08:11 +09:00 |
|
LeNitrous
|
d66b0e3039
|
Merge branch 'master' of https://github.com/ppy/osu
|
2019-03-05 17:01:04 +08:00 |
|
smoogipoo
|
c06dac5b1a
|
Remove null check (beatmap cannot be null)
|
2019-03-05 17:58:30 +09:00 |
|
smoogipoo
|
2fee7276ae
|
Combine creation + assignment
|
2019-03-05 17:58:05 +09:00 |
|
Dean Herbert
|
34ae3c111c
|
Merge pull request #4101 from Joehuu/update-beatmap-sections
Update osu!direct beatmap categories sorting
|
2019-03-05 17:52:46 +09:00 |
|
Dan Balasescu
|
bb6c83ab25
|
Merge branch 'master' into show-mods-on-loader
|
2019-03-05 17:46:35 +09:00 |
|
Dan Balasescu
|
8e99f54fed
|
Merge branch 'master' into update-beatmap-sections
|
2019-03-05 17:39:47 +09:00 |
|
Dan Balasescu
|
ebd9eb35e3
|
Merge pull request #4320 from peppy/fix-disabled-set-crash
Ensure beatmap is not disabled before continuing with present
|
2019-03-05 17:34:49 +09:00 |
|
Dan Balasescu
|
fd147dae21
|
Merge branch 'master' into fix-disabled-set-crash
|
2019-03-05 17:25:13 +09:00 |
|
smoogipoo
|
896088bc02
|
Remove using
|
2019-03-05 17:23:11 +09:00 |
|
smoogipoo
|
d01ec59acb
|
Fix sizings
|
2019-03-05 17:14:49 +09:00 |
|
smoogipoo
|
4764a771d0
|
Add testcase
|
2019-03-05 17:14:30 +09:00 |
|
smoogipoo
|
e73cef5f94
|
Prefill some more properties of TestWorkingBeatmap
|
2019-03-05 17:14:24 +09:00 |
|
David Zhao
|
52558c5cf6
|
Fix metadata potentially being null
|
2019-03-05 16:59:02 +09:00 |
|
David Zhao
|
166a8c8bbb
|
Add back fallback behavior for match creation
|
2019-03-05 16:41:59 +09:00 |
|
Dean Herbert
|
9a9b4efb8d
|
Fix excess line
|
2019-03-05 16:41:11 +09:00 |
|
Dean Herbert
|
93c79023dc
|
Merge remote-tracking branch 'upstream/master' into simplify-gameplay-clock
|
2019-03-05 16:41:01 +09:00 |
|
Dean Herbert
|
ec063a13db
|
Update RulesetInputManager to support new clock structure more accurately
|
2019-03-05 16:34:50 +09:00 |
|
smoogipoo
|
76aca738a9
|
Revert "Use same size labels from song select"
This reverts commit 7077e405ab.
|
2019-03-05 16:02:07 +09:00 |
|
David Zhao
|
11e353c152
|
Use local class instead of having a separate file
|
2019-03-05 15:55:37 +09:00 |
|
David Zhao
|
fc62877fdc
|
Fall back to default background
|
2019-03-05 15:51:43 +09:00 |
|
Dean Herbert
|
a676eed2f9
|
Merge pull request #4398 from peppy/limit-blank-lines
Enforce max consecutive blank lines
|
2019-03-05 15:45:10 +09:00 |
|
Dan Balasescu
|
b5fb6e2a59
|
Merge branch 'master' into limit-blank-lines
|
2019-03-05 15:40:11 +09:00 |
|
Dan Balasescu
|
0267ed855a
|
Merge pull request #4134 from Aergwyn/move-osu-settings
Move osu! specific settings into its own ConfigManager
|
2019-03-05 15:40:01 +09:00 |
|
David Zhao
|
7c53c7b602
|
Remove local background logic
|
2019-03-05 15:33:39 +09:00 |
|
Dan Balasescu
|
07c7d03a04
|
Merge branch 'master' into move-osu-settings
|
2019-03-05 15:32:54 +09:00 |
|
Dean Herbert
|
34f0967873
|
Merge branch 'master' into limit-blank-lines
|
2019-03-05 14:51:56 +09:00 |
|
smoogipoo
|
0322bd8812
|
Make config nullable, removing testcase code
|
2019-03-05 14:40:27 +09:00 |
|