1
0
mirror of https://github.com/ppy/osu.git synced 2025-03-17 23:27:24 +08:00

17107 Commits

Author SHA1 Message Date
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
smoogipoo
76aca738a9 Revert "Use same size labels from song select"
This reverts commit 7077e405ab4d55bda7874af558150e8b901ff76f.
2019-03-05 16:02:07 +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
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
Dean Herbert
000d5843b4
Merge pull request #4407 from peppy/fix-square-graph
Fix SquareGraph not correctly filling columns when loaded with a non-zero time
2019-03-05 14:37:51 +09:00
Dan Balasescu
86b75a8581
Merge branch 'master' into fix-square-graph 2019-03-05 14:29:54 +09:00
Dean Herbert
5bb0511f0a Fix SquareGraph not correctly filling columns when loaded with a non-zero time 2019-03-05 13:37:28 +09:00
smoogipoo
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
Dean Herbert
47f41128e5
Merge pull request #4392 from HoLLy-HaCKeR/ctb-hyperdash-fix
Add 1/4th of a frame of grace time to hyperdash calculation
2019-03-05 12:47:20 +09:00
Dan Balasescu
6e7232bcec
Merge branch 'master' into ctb-hyperdash-fix 2019-03-05 12:30:50 +09:00
Dean Herbert
7c54e67b6e
Merge pull request #4250 from Poyo-SSB/update-difficulty-brackets
Update difficulty color bracket thresholds
2019-03-05 12:01:06 +09:00
Dean Herbert
0ff17103e8
Merge branch 'master' into update-difficulty-brackets 2019-03-05 10:16:18 +09:00
Dean Herbert
3f197935d7 Fix remaining case 2019-03-04 14:03:59 +09:00
Dean Herbert
b076ac95f0 Enforce max consecutive blank lines 2019-03-04 13:20:26 +09:00
Dean Herbert
35ffccc2a5
Merge pull request #4332 from jorolf/supporter-disclaimer
Don't show the supporter text if the user already has supporter status
2019-03-03 20:22:11 +09:00
HoLLy
679d30d08a
Fix comment mentioning 4 frames instead of 1/4 2019-03-03 11:21:39 +00:00
Dean Herbert
08e153208d Unbinds are automatic 2019-03-03 20:03:22 +09:00
Dean Herbert
6ffa139ea8 Adjust transition length slightly 2019-03-03 20:02:56 +09:00
Dean Herbert
46b618d80c Merge remote-tracking branch 'Joehuu/master' into supporter-disclaimer 2019-03-03 19:18:16 +09:00
LeNitrous
4c67d27e84 Merge branch 'master' of https://github.com/ppy/osu 2019-03-03 16:22:43 +08:00
Dean Herbert
1ea4781188
Fix code styling 2019-03-03 13:50:36 +09:00
Dean Herbert
fdf346e1a2
Merge branch 'master' into ctb-hyperdash-fix 2019-03-03 13:07:24 +09:00
Dean Herbert
c7da18f500
Merge pull request #4369 from Joehuu/taskbar-tooltip-fade-out
Fade out taskbar tooltip after clicking
2019-03-03 13:01:13 +09:00
Dean Herbert
456c5be50c
Merge branch 'master' into taskbar-tooltip-fade-out 2019-03-03 12:47:37 +09:00
jorolf
e8d568470d use a bindable instead 2019-03-02 19:13:38 +01:00
jorolf
176cbc7f2e Merge branch 'master' of git://github.com/ppy/osu into supporter-disclaimer 2019-03-02 19:04:48 +01:00
HoLLy
5ff47924ab Add missing grace time in hyperdash calculation 2019-03-02 14:06:53 +01:00
HoLLy
73ba91bbad Add failing test case 2019-03-02 14:05:56 +01:00