Merge branch 'release' into develop

This commit is contained in:
SabreCat
2017-10-31 01:03:07 +00:00
9 changed files with 1314 additions and 1314 deletions

View File

@@ -78,7 +78,7 @@ function cssVarMap (sprite) {
};
}
if (sprite.name.indexOf('shirt') !== -1)
sprite.custom.px.offsetY = `-${ sprite.y + 30 }px`; // even more for shirts
sprite.custom.px.offsetY = `-${ sprite.y + 35 }px`; // even more for shirts
if (sprite.name.indexOf('hair_base') !== -1) {
let styleArray = sprite.name.split('_').slice(2, 3);
if (Number(styleArray[0]) > 14)