1
0
mirror of https://github.com/ppy/osu.git synced 2024-12-17 02:12:56 +08:00
Commit Graph

17227 Commits

Author SHA1 Message Date
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
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
4e33a98dbc Move gameplay clock to own class 2019-03-05 13:53:47 +09:00
Dean Herbert
c5cd9972c4 Make restart private 2019-03-05 13:37:51 +09:00
Dean Herbert
01f1018d02 Tidy up clock logic using DI and a GameplayClock 2019-03-05 13:37:51 +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
David Zhao
aecbc31ffa Use BeatmapSetCoverType.List for lobby listing 2019-03-05 12:08:14 +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
LeNitrous
74a23edaf7 no longer adjust the clock rate 2019-03-04 17:48:51 +08:00
LeNitrous
86e861ddeb update mod descriptions 2019-03-04 17:39:13 +08:00
LeNitrous
c271a3a781 remove ruleset specific mods 2019-03-04 17:36:44 +08: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
b83d44c316 use ternary operator instead 2019-03-03 16:50:31 +08:00
LeNitrous
a1a8246c05 trim whitespace 2019-03-03 16:30:08 +08:00
LeNitrous
5af5a76e87 Merge branch 'master' of https://github.com/LeNitrous/osu into mod-wind 2019-03-03 16:25:49 +08:00