Dean Herbert
|
5a00ae36d1
|
Add database-based configuration for rulesets
|
2018-01-24 17:45:28 +09:00 |
|
Dean Herbert
|
b197cd56af
|
Allow DI'd OnScreenDisplay to be null
|
2018-01-23 16:42:31 +09:00 |
|
Dean Herbert
|
1fda45fe10
|
Fix broken formatting
|
2018-01-23 16:40:18 +09:00 |
|
Dean Herbert
|
5689e93bed
|
Update framework
|
2018-01-23 16:24:08 +09:00 |
|
Dean Herbert
|
c01f67b0d8
|
Merge remote-tracking branch 'upstream/master' into ruleset-configs
|
2018-01-23 16:23:25 +09:00 |
|
Dean Herbert
|
098cfa7107
|
Merge pull request #1957 from smoogipoo/fix-repeat-confusion
Clean up off-by-one offsets from repeat-related properties
|
2018-01-23 16:14:59 +09:00 |
|
Dean Herbert
|
384dc162b3
|
Merge branch 'master' into fix-repeat-confusion
|
2018-01-23 16:06:07 +09:00 |
|
Dean Herbert
|
68161fa543
|
Merge pull request #1956 from peppy/allow-quick-retry-key
Allow user choice of the quick retry hotkey
|
2018-01-23 15:58:48 +09:00 |
|
Dean Herbert
|
52805cd82b
|
Merge branch 'master' into fix-repeat-confusion
|
2018-01-23 15:22:37 +09:00 |
|
Dan Balasescu
|
fcea12f83d
|
Merge branch 'master' into allow-quick-retry-key
|
2018-01-23 14:59:15 +09:00 |
|
Dean Herbert
|
0edcf1690b
|
Merge pull request #1945 from smoogipoo/bdl-cache-changes
Update usage of DI in-line with framework changes
|
2018-01-23 14:31:05 +09:00 |
|
Dean Herbert
|
2a9b773b49
|
Update framework
|
2018-01-23 14:10:51 +09:00 |
|
Dean Herbert
|
b793c2ec93
|
Merge branch 'master' into bdl-cache-changes
|
2018-01-23 14:10:35 +09:00 |
|
smoogipoo
|
33c52ba30f
|
Fix off-by-ones in RepeatPoint code
|
2018-01-23 13:58:43 +09:00 |
|
smoogipoo
|
d37844c068
|
Clean up off-by-one offsets from repeat-related properties
|
2018-01-23 13:37:25 +09:00 |
|
Dean Herbert
|
fa1f4304f6
|
Remove usings
|
2018-01-23 13:24:04 +09:00 |
|
Dean Herbert
|
f823650b10
|
Allow user choice of the quick retry hotkey
|
2018-01-23 13:05:07 +09:00 |
|
Dean Herbert
|
4f360eac56
|
Merge pull request #1908 from andy840119/mania_stage_fix
Split the playfield columns and change the key number by mod
|
2018-01-23 11:03:56 +09:00 |
|
Dean Herbert
|
b799dac5ac
|
Merge branch 'master' into mania_stage_fix
|
2018-01-23 10:55:33 +09:00 |
|
Dan Balasescu
|
9b471dea33
|
Back to max 10 special keys for now, change xmldoc to normal comment
|
2018-01-23 10:51:01 +09:00 |
|
Dan Balasescu
|
2bc67629b8
|
Improve xmldoc + remove explicit Special2 value
Special2 value is implicit at Special1 + 1 (2).
|
2018-01-23 10:03:34 +09:00 |
|
Dan Balasescu
|
8f4d62ec25
|
Merge pull request #1955 from fangerm/license-year
Update license year
|
2018-01-23 09:36:58 +09:00 |
|
Felix Ang
|
d294fcfb0b
|
Merge branch 'master' of https://github.com/ppy/osu into license-year (AppVeyor?)
|
2018-01-22 18:42:03 +01:00 |
|
Felix Ang
|
423559ec6c
|
Update license year.
|
2018-01-22 18:22:38 +01:00 |
|
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 |
|
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 |
|
Dan Balasescu
|
d81fb9ef0d
|
Merge branch 'master' into better-direct-progress-bar
|
2018-01-22 15:03:34 +09:00 |
|