Merge branch 'master' into master

This commit is contained in:
Milan 2017-11-11 13:21:48 +01:00 committed by GitHub
commit e856898571
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -19,6 +19,7 @@ formatsExcluded = 0x41A # exclude the intro background texture
overwriteWidth = <?=round($scaleFactorX*1920)?> overwriteWidth = <?=round($scaleFactorX*1920)?>
overwriteHeight = <?=round($scaleFactorY*1080)?> overwriteHeight = <?=round($scaleFactorY*1080)?>
[TextureRedefine] # game half res upscaling [TextureRedefine] # game half res upscaling
width = 960 width = 960
height = 540 height = 540