1
0
mirror of https://github.com/ppy/osu.git synced 2024-12-16 05:42:54 +08:00
Commit Graph

10442 Commits

Author SHA1 Message Date
Dan Balasescu
f5def7bb0a
Merge pull request #1952 from peppy/catch-autoplay-advanced
Add more human-like catch autoplay support
2018-01-22 19:39:45 +09:00
Dean Herbert
76eac9057d
Merge branch 'master' into mania_stage_fix 2018-01-22 19:06:00 +09:00
Dean Herbert
32b540268e Add more human-like catch autoplay support
Closes #1611
2018-01-22 18:46:59 +09:00
Dean Herbert
58b5e2c01b
Merge pull request #1939 from Aergwyn/direct-show-deleted-sets
Allow re-downloading of beatmaps pending deletion in osu!direct
2018-01-22 17:16:23 +09:00
Dean Herbert
95f941163b
Merge branch 'master' into direct-show-deleted-sets 2018-01-22 17:08:10 +09:00
Dean Herbert
30987f2f71
Merge pull request #1948 from peppy/fix-user-download-cancel
Don't show error messages when a download is user-cancelled
2018-01-22 17:07:32 +09:00
Dan Balasescu
73799832ef
Merge branch 'master' into direct-show-deleted-sets 2018-01-22 16:54:32 +09:00
Dean Herbert
a931d6e381
Merge branch 'master' into fix-user-download-cancel 2018-01-22 16:27:26 +09:00
Dean Herbert
3c9bf4df29
Merge pull request #1947 from peppy/fix-downloads-during-import
Keep downloads active until their associated import operation finishes
2018-01-22 16:27:17 +09:00
smoogipoo
68a6323168 Remove SpecialColumnPosition for now
This needs to be re-implemented in the future, perhaps in a way that allows it to be dynamically changed.
2018-01-22 16:19:05 +09:00
smoogipoo
8a8b3f25e7 SpecialColumn -> SpecialColumnPosition 2018-01-22 16:12:45 +09:00
smoogipoo
351be4308f Oops, forgot to commit OnJudgement change 2018-01-22 16:12:35 +09:00
smoogipoo
90d8ee8d36 Fix stage background being too transparent
This is the original colour for the background. Not sure why this was changed.
2018-01-22 16:12:15 +09:00
smoogipoo
3d36fd3676 Update xmldoc to be more descriptive of single/dual stages 2018-01-22 16:11:26 +09:00
smoogipoo
0ef6384de0 Fix hitexplosions not working in the testcase 2018-01-22 16:11:06 +09:00
Aergwyn
82c8822888 we need to go back
reverted change and instead check `DeletePending` when retrieving existing online IDs
2018-01-22 08:04:14 +01:00
smoogipoo
c1331cef1b Disallow DualStages for non-converted beatmaps 2018-01-22 15:52:54 +09:00
smoogipoo
ba58b25f01 Fix showing too many keybindings 2018-01-22 15:47:31 +09:00
Dean Herbert
56c001fd29
Merge branch 'master' into fix-downloads-during-import 2018-01-22 15:43:39 +09:00
Dean Herbert
85d1e81a92
Merge pull request #1946 from peppy/better-direct-progress-bar
Continue showing progress bar on direct panels when importing
2018-01-22 15:43:24 +09:00
Michael Manis
64d7868c03 Update APi.Username in APIAccess intead of ignoring it. 2018-01-22 01:19:22 -05:00
smoogipoo
1350b68f15 DualStages always doubles the column count in lazer 2018-01-22 15:18:39 +09:00
smoogipoo
eede8333ba getVariantType -> getPlayfieldType 2018-01-22 15:18:11 +09:00
smoogipoo
17d75b349d Dual stages is not ranked ಠ_ಠ 2018-01-22 15:11:45 +09:00
smoogipoo
77c4da5f0f KeyCoop -> DualStages 2018-01-22 15:11:15 +09:00
smoogipoo
583aa9922f IKeyBindingMod -> IPlayfieldTypeMod 2018-01-22 15:07:14 +09:00
Michael Manis
794ae5380a Intverted conditionals. 2018-01-22 01:06:27 -05:00
Dan Balasescu
d81fb9ef0d
Merge branch 'master' into better-direct-progress-bar 2018-01-22 15:03:34 +09:00
Dean Herbert
723f31815a
Merge pull request #1949 from smoogipoo/disable-waveform-testcase
Disable TestCaseWaveform
2018-01-22 15:03:23 +09:00
smoogipoo
65a2e09593 Privatise VariantMappingGenerator to ManiaRuleset 2018-01-22 15:03:05 +09:00
smoogipoo
2674859b54 ManiaKeyBindingVariantType -> PlayfieldType 2018-01-22 14:59:17 +09:00
smoogipoo
286b1bb81f Solo -> Single, Coop -> Dual 2018-01-22 14:57:25 +09:00
smoogipoo
3b47c0fea0 Remove versus-mode variant 2018-01-22 14:54:47 +09:00
Michael Manis
ef7e6071dd Merge branch 'local-name-fix' of https://github.com/ThePyrotechnic/osu into local-name-fix 2018-01-22 00:52:05 -05:00
Michael Manis
87ec36060d Save the obtained username when online. 2018-01-22 00:50:31 -05:00
Michael Manis
c4252ee022 Use obtained value for displayed name. 2018-01-22 00:50:31 -05:00
smoogipoo
293023d99a Fix keybinding offsets due to special keys 2018-01-22 14:38:41 +09:00
Dean Herbert
86769a521c
Merge branch 'master' into disable-waveform-testcase 2018-01-22 14:25:53 +09:00
Dan Balasescu
152475858b
Merge branch 'master' into fix-downloads-during-import 2018-01-22 14:25:24 +09:00
Dan Balasescu
20be4bbbcd
Merge branch 'master' into better-direct-progress-bar 2018-01-22 14:25:23 +09:00
Dan Balasescu
2e2fc4be57
Merge pull request #1938 from Shawdooow/overall-difficulty
Overall difficulty
2018-01-22 14:25:19 +09:00
Michael Manis
19321ca880 Save the obtained username when online. 2018-01-22 00:16:38 -05:00
Michael Manis
b98d8361bd Use obtained value for displayed name. 2018-01-21 23:59:35 -05:00
Michael Manis
35e7399bef Merge branch 'master' of https://github.com/ppy/osu into restart-crashfix 2018-01-21 23:56:16 -05:00
Dean Herbert
410cd0c7fb
Merge branch 'master' into disable-waveform-testcase 2018-01-22 13:53:59 +09:00
Dean Herbert
3d4e2d400c Remove unused using 2018-01-22 13:52:10 +09:00
Dan Balasescu
81635c8310
Merge branch 'master' into overall-difficulty 2018-01-22 13:50:37 +09:00
Dean Herbert
1200ee5a54
Merge pull request #1937 from peppy/resume-audio-after-download
Ensure previews stop playing when they are removed from the draw hierarchy
2018-01-22 13:50:16 +09:00
smoogipoo
4780c3f8c6 Disable TestCaseWaveform 2018-01-22 13:41:47 +09:00
Dean Herbert
53e40a77dc Don't show error messages when a download is user-cancelled
Resolves #1941.
2018-01-22 13:25:49 +09:00