Merge branch 'develop' of https://github.com/LLK/scratch-vm into develop

This commit is contained in:
Moran 2017-03-03 15:23:43 -05:00
commit d8e1d42bf2
33 changed files with 1689 additions and 92 deletions
src/serialization

View file

@ -104,6 +104,9 @@ var parseScratchObject = function (object, runtime, topLevel) {
if (object.hasOwnProperty('direction')) {
target.direction = object.direction;
}
if (object.hasOwnProperty('isDraggable')) {
target.draggable = object.isDraggable;
}
if (object.hasOwnProperty('scale')) {
// SB2 stores as 1.0 = 100%; we use % in the VM.
target.size = object.scale * 100;