Dean Herbert
|
107ad8cfff
|
Merge remote-tracking branch 'FreezyLemon/master' into more-skinning
|
2018-03-12 22:01:59 +09:00 |
|
Dean Herbert
|
3354849cc9
|
Fix code formatting regression
|
2018-03-12 22:01:18 +09:00 |
|
Dean Herbert
|
3e313a1f44
|
Merge pull request #2204 from smoogipoo/fix-slider-circle-overlay
Fix slider circle overlays moving with the endpoints
|
2018-03-12 19:44:48 +09:00 |
|
smoogipoo
|
2d9fcdcbd0
|
Fix slider circle overlays moving with the endpoints
|
2018-03-12 17:18:50 +09:00 |
|
Dan Balasescu
|
d88fb7608f
|
Merge pull request #2124 from Poyo-SSB/mania-difficulty
Implement mania star difficulty calculation
|
2018-03-12 14:44:06 +09:00 |
|
Dean Herbert
|
8cbcdeb665
|
Merge branch 'master' into mania-difficulty
|
2018-03-12 14:07:14 +09:00 |
|
Dean Herbert
|
1af6a1c377
|
Merge pull request #2191 from peppy/decoders
Rework decoders to be more flexible
|
2018-03-12 14:04:24 +09:00 |
|
Dean Herbert
|
ab4c527ebc
|
Merge branch 'master' into decoders
|
2018-03-12 13:38:22 +09:00 |
|
Dean Herbert
|
9f644571ea
|
Merge branch 'master' into mania-difficulty
|
2018-03-12 13:31:48 +09:00 |
|
Dean Herbert
|
147396f9ca
|
Merge pull request #2188 from tgi74/mania_mirror
Add Mirror Mod for Mania
|
2018-03-12 13:19:48 +09:00 |
|
smoogipoo
|
3cd203699b
|
Apply beatmap converter mods in PerformanceCalculator
|
2018-03-12 13:09:19 +09:00 |
|
Dean Herbert
|
f8eace352e
|
Merge branch 'master' into mania_mirror
|
2018-03-12 13:08:01 +09:00 |
|
Dean Herbert
|
67212f3abe
|
Merge pull request #2197 from peppy/update-issue
Update ISSUE_TEMPLATE
|
2018-03-12 13:07:25 +09:00 |
|
smoogipoo
|
81186f8423
|
Apply beatmap converter mods in DifficultyCalculator
|
2018-03-12 13:06:42 +09:00 |
|
smoogipoo
|
fbb80edde1
|
Minor cleanups
|
2018-03-12 13:01:29 +09:00 |
|
Dean Herbert
|
78ed8448e6
|
Merge branch 'master' into update-issue
|
2018-03-12 12:57:03 +09:00 |
|
Dean Herbert
|
c965f3af86
|
Merge pull request #2198 from peppy/fix-login-failure
Fix login failure for users with no country rank
|
2018-03-12 12:56:28 +09:00 |
|
Dan Balasescu
|
282301e563
|
Merge branch 'master' into update-issue
|
2018-03-12 12:47:27 +09:00 |
|
Dean Herbert
|
1d0a44a0bb
|
Merge branch 'master' into fix-login-failure
|
2018-03-12 12:41:45 +09:00 |
|
Dean Herbert
|
268ff49652
|
Merge pull request #2189 from peppy/smoother-parallax-scale
Interpolate ParallaxContainer's scale
|
2018-03-12 12:41:12 +09:00 |
|
Dan Balasescu
|
fce61943bd
|
Merge branch 'master' into smoother-parallax-scale
|
2018-03-12 12:12:01 +09:00 |
|
Dan Balasescu
|
555e939933
|
Merge pull request #2185 from peppy/relative-date-drawable
Add drawable to display (and update) relative dates
|
2018-03-12 12:10:44 +09:00 |
|
smoogipoo
|
46caab6310
|
Reorder arithmetic operation
|
2018-03-12 11:56:49 +09:00 |
|
Dean Herbert
|
eb643b690a
|
Merge branch 'master' into more-skinning
|
2018-03-12 11:55:50 +09:00 |
|
Dan Balasescu
|
dc85067b8c
|
Merge branch 'master' into mania_mirror
|
2018-03-12 11:52:38 +09:00 |
|
Dean Herbert
|
1bcda4930e
|
Add back beatmap version set
|
2018-03-12 11:33:12 +09:00 |
|
Dean Herbert
|
c70be29eda
|
Move legacy conversion to LegacySkin
|
2018-03-12 11:30:13 +09:00 |
|
Dan Balasescu
|
50acab8d86
|
Merge branch 'master' into relative-date-drawable
|
2018-03-12 11:28:43 +09:00 |
|
Dan Balasescu
|
09b13ee618
|
Merge pull request #2182 from peppy/fix-duplicate-judgements
Remove judgements when deciding a new judgement for a HitObject
|
2018-03-12 11:28:34 +09:00 |
|
Dan Balasescu
|
0da407f75c
|
Merge branch 'master' into fix-duplicate-judgements
|
2018-03-12 11:02:54 +09:00 |
|
Dan Balasescu
|
89582f7afe
|
Merge pull request #2160 from peppy/rewrite-break-overlay
Rewrite BreakOverlay to work with rewinding
|
2018-03-12 11:02:40 +09:00 |
|
Dean Herbert
|
1447ca55a3
|
Add xmldoc, make restrictSize private
|
2018-03-12 11:02:02 +09:00 |
|
smoogipoo
|
86d93ffe3c
|
Fix tooltip not working due to not handling input
|
2018-03-12 10:49:50 +09:00 |
|
Dean Herbert
|
d27cf16bf9
|
Merge remote-tracking branch 'ppy/master' into more-skinning
|
2018-03-12 10:46:37 +09:00 |
|
Dan Balasescu
|
96e2aca1ba
|
Merge branch 'master' into relative-date-drawable
|
2018-03-12 10:36:43 +09:00 |
|
smoogipoo
|
209d91fe21
|
Fix duplicate item in csproj
|
2018-03-12 10:35:37 +09:00 |
|
Dan Balasescu
|
8ba87dfdbd
|
Merge branch 'master' into fix-duplicate-judgements
|
2018-03-12 10:29:50 +09:00 |
|
smoogipoo
|
33c721bcbb
|
Fix post-merge errors
|
2018-03-12 09:51:32 +09:00 |
|
smoogipoo
|
6e51b74890
|
Merge remote-tracking branch 'origin/master' into rewrite-break-overlay
|
2018-03-12 09:47:05 +09:00 |
|
Dean Herbert
|
7bf38eb1ad
|
Merge pull request #2200 from HoLLy-HaCKeR/fix-legacyid-check
Fix check against LegacyID for non-default rulesets
|
2018-03-12 09:06:53 +09:00 |
|
HoLLy
|
9c75c392f2
|
Only check by null instead of sign
|
2018-03-11 21:27:49 +01:00 |
|
HoLLy
|
a321bcf3af
|
Fix check against LegacyID for non-default rulesets
|
2018-03-11 20:19:03 +01:00 |
|
Dean Herbert
|
3a5283f96d
|
Merge pull request #2159 from naoey/fix-unplayable-beatmaps
Make song select ensure current beatmap is always playable in the active ruleset
|
2018-03-11 01:38:11 +09:00 |
|
Dean Herbert
|
db2a663234
|
Use private instead of protected
|
2018-03-11 01:26:03 +09:00 |
|
Dean Herbert
|
d1ab52e7bc
|
Merge branch 'master' into fix-unplayable-beatmaps
|
2018-03-11 01:19:54 +09:00 |
|
Dean Herbert
|
c346638459
|
Merge branch 'master' into decoders
|
2018-03-11 01:04:28 +09:00 |
|
Dean Herbert
|
9233266fe1
|
Fix login failure for users with no country rank
Closes #2148.
|
2018-03-11 00:44:16 +09:00 |
|
Dean Herbert
|
709fcf9552
|
Update ISSUE_TEMPLATE
|
2018-03-10 20:01:36 +09:00 |
|
Dean Herbert
|
a9327eac8f
|
Merge pull request #2194 from smoogipoo/drawableslider-cleanup
Split out the slider head into a separate drawable hitobject
|
2018-03-10 18:50:55 +09:00 |
|
tgi74000
|
a29189ff84
|
Merge remote-tracking branch 'upstream/master'
|
2018-03-10 08:46:00 +01:00 |
|