Merge pull request #31 from CrystalPointA4/feature/loadingscreen

Feature/loadingscreen (reverted from commit 316d6c9e14)
This commit is contained in:
jancoow
2016-06-22 03:09:28 +02:00
parent 9a31e09bff
commit 92460b8ca4
25 changed files with 180 additions and 194 deletions
+6 -4
View File
@@ -10,12 +10,13 @@
"collision": [ 0, 0, 0 ],
"maxRotation": [ 170, 70 ],
"minRotation": [ 20, -80 ],
"scale": 0.3,
"left": {
"offset": [ 4.5, -8, -1 ]
"offset": [ 1.5, -2.6, 0 ]
},
"right": {
"offset": [ 0.5, -8, -1 ]
"offset": [ -0.1, -2.6, 0 ]
}
},
{
@@ -28,12 +29,13 @@
"collision": [ 0, 0, 0 ],
"maxRotation": [ 170, 70 ],
"minRotation": [ 20, -80 ],
"scale": 0.3,
"left": {
"offset": [ 4.5, -8, -1 ]
"offset": [ 1.5, -2.6, 0 ]
},
"right": {
"offset": [ 0.5, -8, -1 ]
"offset": [ -0.1, -2.6, 0 ]
}
}
]