diff options
| author | Valerio Virgillito | 2012-03-23 15:32:47 -0700 |
|---|---|---|
| committer | Valerio Virgillito | 2012-03-23 15:32:47 -0700 |
| commit | 7ee75fef18c21275cf29740a6fdd81ea90e41f45 (patch) | |
| tree | c480e35abe9065733be9dd6326b91b46896b9e3a /js/lib/drawing/world.js | |
| parent | bc8b0c17023ddea6d77150694a777e104ef99cbc (diff) | |
| parent | 86770d0dba6b137e651cbf5c8d240856be65857c (diff) | |
| download | ninja-7ee75fef18c21275cf29740a6fdd81ea90e41f45.tar.gz | |
Merge pull request #140 from ericmueller/integration
Integration
Diffstat (limited to 'js/lib/drawing/world.js')
| -rwxr-xr-x | js/lib/drawing/world.js | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/js/lib/drawing/world.js b/js/lib/drawing/world.js index b87c6272..73273adc 100755 --- a/js/lib/drawing/world.js +++ b/js/lib/drawing/world.js | |||
| @@ -736,6 +736,8 @@ World.prototype.getShapeFromPoint = function( offsetX, offsetY ) { | |||
| 736 | } | 736 | } |
| 737 | }; | 737 | }; |
| 738 | 738 | ||
| 739 | |||
| 740 | |||
| 739 | World.prototype.exportJSON = function() | 741 | World.prototype.exportJSON = function() |
| 740 | { | 742 | { |
| 741 | // world properties | 743 | // world properties |