1
0
mirror of https://github.com/ppy/osu.git synced 2024-12-14 10:52:53 +08:00
Commit Graph

17137 Commits

Author SHA1 Message Date
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
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
Dean Herbert
c8cf966e81
Merge pull request #4386 from Joehuu/readme-format-1
Normalize repo readme format
2019-03-02 20:21:07 +09:00
Dean Herbert
687d5d5ff1
Merge pull request #4387 from smoogipoo/fix-fonts
Fix a few incorrect fonts
2019-03-02 20:07:26 +09:00
Dan Balasescu
e0add7abba
Merge pull request #4390 from peppy/fix-mod-overlay-dim
Fix mod select overlay dimming itself
2019-03-02 16:11:34 +09:00
Dan Balasescu
f13901cc19
Merge branch 'master' into fix-mod-overlay-dim 2019-03-02 16:04:44 +09:00
Dan Balasescu
7f6e084d40
Merge pull request #4389 from peppy/fix-rider-inspections
Fix some inspections rider isn't able to deal with automatically
2019-03-02 16:04:15 +09:00
Dean Herbert
b7126b3efb Fix mod select overlay dimming itself 2019-03-02 14:48:05 +09:00
Dean Herbert
5487b011d6 Fix some inspections rider isn't able to deal with automatically 2019-03-02 14:34:56 +09:00
smoogipoo
268ea6a836 Wrong line 2019-03-02 13:28:16 +09:00
smoogipoo
83a02d32f7 Fix a few incorrect fonts 2019-03-02 13:25:59 +09:00
Joehu
7151fe06dc Normalize repo readme format 2019-03-01 19:24:28 -08:00
Joehu
7077e405ab Use same size labels from song select 2019-03-01 15:48:58 -08:00
Nitrous
0be9f81310
Merge branch 'master' into show-mods-on-loader 2019-03-02 06:40:45 +08:00
Dean Herbert
c5011de774
Merge pull request #4382 from peppy/update-framework
Update framework
2019-03-01 23:58:43 +09:00
Dean Herbert
180aee6048 Fix iOS build 2019-03-01 23:20:34 +09:00
Dean Herbert
7f1f812f29 Update framework 2019-03-01 22:06:42 +09:00
Dean Herbert
c9bd4f6c4c
Merge pull request #4380 from peppy/fastlane
Add iOS build automation via fastlane
2019-03-01 21:44:53 +09:00
Dan Balasescu
10a3b409b2
Merge pull request #4000 from m2307/master
Implement clear scores on beatmap
2019-03-01 21:39:21 +09:00
Dean Herbert
1871e8bb2c
Merge branch 'master' into master 2019-03-01 21:22:34 +09:00
Dean Herbert
c01990d005 Fix callback potentially not getting fired 2019-03-01 20:52:34 +09:00
Nitrous
7a47173f3e
Merge branch 'master' into show-mods-on-loader 2019-03-01 19:30:46 +08:00