Merge branch 'master' of github.com:logsol/chuck.js

This commit is contained in:
Jeena 2014-01-12 16:50:03 +01:00
commit 383eaa93bf
4 changed files with 32 additions and 4 deletions

View file

@ -246,6 +246,20 @@ microwave: 3.744
y:0,
rotation: 0,
grabAngle: -1.5
},
{
name:'Football',
image:'football.gif',
type:'circle',
category:'outdoor',
weight: 2,
width:10,
height:10,
x:350,
y:0,
rotation: 0,
grabAngle: -1.5,
bounce: 6
}
],
tiles: /*