ScCN/scratch-vm
2
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
2,399 Commits 1 Branch 0 Tags
7d32c8107e7552b4cd4ff61537d0633cce47ebfd
Commit Graph
180 Commits
Author SHA1 Message Date
Ray Schamp 9c556219ce Merge pull request #1528 from kchadha/fix-comment-import 
Fix Comment import/save/load issue
 2018-08-28 16:04:53 -04:00
Karishma Chadha 2c24ef37a0 Fix issue where block comments converted to workspace comments import correctly when there are no scripts on the workspace. 2018-08-24 14:29:10 -04:00
Karishma Chadha 0532f9a80a Fix issue where a c-block that contained only blocks with unknown opcodes, was causing an import error. 2018-08-23 18:20:45 -04:00
Karishma Chadha 5e1dd8a7cf Fix issue with importing projects from 2.0 where block comments were converted to workspace comments and the corresponding block was deleted. 2018-08-22 18:41:47 -04:00
Karishma Chadha 6f9367a8e2 Merge pull request #1468 from gnarf/serialization-util 
export deserializeBlocks method
 2018-08-20 19:58:19 -04:00
Corey Frang ae219e361a Add comments for deserialization and add tests 2018-08-20 13:25:24 -04:00
Eric Rosenbaum 825035f503 Fix importing WeDo 2.0 blocks from SB2 (#1487) 
* Fix wedo2 import from sb2

* Hide wedo play note block
 2018-08-16 14:24:19 -04:00
Corey Frang 896e62d2c4 Also export serializeBlocks for round-tripping 2018-08-15 17:06:30 -04:00
Corey Frang df9dbd112a Make importing with deserialized stuff okay 2018-08-15 17:04:49 -04:00
Corey Frang fe46a81cc9 export deserializeBlocks method 2018-08-14 11:17:47 -04:00
Ray Schamp 4b5cf6505a Merge pull request #1398 from paulkaplan/publish-docs 
Publish jsdoc to gh-pages
 2018-08-08 16:46:48 -04:00
Paul Kaplan 98e45ecdfe Import current block menu as field not input 2018-08-02 13:45:00 -04:00
Paul Kaplan 138d7136af Fix various jsdoc issues preventing the docs from building 2018-07-31 11:22:42 -04:00
Karishma Chadha 53ccb8d709 Don't serialize layerOrder when exporting a sprite. 2018-07-24 16:11:18 -04:00
Karishma Chadha 812e7a3772 Preserve sprite layer order information across saving and loading an sb3. 2018-07-24 11:00:48 -04:00
Karishma Chadha b3ee2c439d Remove layerOrder property, sprites are rendered in the order the targets are listed in in the .sb2 file. 2018-07-23 15:48:27 -04:00
Karishma Chadha 2508dc46ca Order sprites in 2.0 projects based on the serailzied indexInLibrary property. Store original ordering (e.g. layer order of sprites on the stage) to use when installing targets. 2018-07-23 15:25:05 -04:00
Paul Kaplan 0e3413e6bd Fix comment 2018-06-27 14:17:33 -04:00
Paul Kaplan 4967155285 Fix nits 2018-06-27 10:44:28 -04:00
Paul Kaplan 9f517bd483 Deal with comments attached to undefined blocks 
Also fix an issue where you couldn't save/load projects that had multiple comments linked to a single block.
 2018-06-26 16:41:10 -04:00
Paul Kaplan e7e300caeb Skip unknown opcode blocks while parsing 2018-06-26 15:58:43 -04:00
Connor Hudson 0bed25e01b Merge develop into feature/extension-serialization 2018-06-26 08:56:42 -04:00
kchadha d187517d85 Merge pull request #1256 from kchadha/sprite-save-load 
Sprite save load
 2018-06-25 11:21:01 -04:00
Corey Frang 4431b43e45 A few leftover loadSound that werent updated 2018-06-22 09:45:23 -04:00
Michael "Z" Goddard c268bbae47 add decoded SoundPlayer's to a Sprite's SoundBank (#1260) 2018-06-21 17:23:33 -04:00
Connor Hudson befcbec393 Create extensions list in serialize function 
Removed runtime argument from serializeTarget call because it wasn't used
 2018-06-21 15:01:00 -04:00
Connor Hudson 026dd96491 Modify serializeTarget function to take an extension set as an argument 
This allows the serialize function to build a list of all extensions used
 2018-06-21 15:00:17 -04:00
Connor Hudson 17679340f9 Return extension ids from serializeBlocks instead of modifying Set passed to it 2018-06-20 15:42:56 -04:00
Connor Hudson 15de2eaa68 Remove extension deserialization 2018-06-20 14:33:01 -04:00
Karishma Chadha b40ac54fdd Remove stray newline. 2018-06-20 13:37:31 -04:00
Karishma Chadha b75a779540 Call fixUpVariableReferences in installTargets, before emitting the workspace update. 2018-06-20 12:12:33 -04:00
Karishma Chadha 9646e3d11e Refactor and move variable reference fixup function into target. 2018-06-19 15:31:08 -04:00
Karishma Chadha f2aacbc79c Fix up variable references after deserializing a .sprite2 or .sprite3 to avoid conflicts with pre-existing variables. 2018-06-19 14:02:54 -04:00
Karishma Chadha 5cc48b6ef3 Provide global vars to sb2 import when deserializing a single sprite. 2018-06-19 08:52:22 -04:00
Karishma Chadha 86a8d93eb6 Sprite3 Export/Import. 2018-06-19 08:51:16 -04:00
Connor Hudson aa16930e34 Add initial implementation of extension serialization/deserialization 2018-06-18 15:00:33 -04:00
Karishma Chadha f3d49f75c8 Clean up comment serialization, add tests for new and old serialization (old is still valid, just more verbose). 2018-06-15 14:57:49 -04:00
Karishma Chadha e2eadbf603 Comment save and load. 2018-06-14 14:11:20 -04:00
Florrie 24c6338302 Map costumeName -> costumenumbername [name] 
...instead of mapping to a new obsolete/hidden block 'costumename'.
Thanks to @kchadha for helping with this!
 2018-06-12 19:27:36 -03:00
Florrie 404834018b Implement costume name block 2018-06-09 21:34:21 -03:00
Karishma Chadha 537dc9bcd5 Addressing PR comments. 2018-05-31 16:33:42 -04:00
Karishma Chadha f079eb4bbd Don't serialize x and y for sb2 comments so that they can be auto positioned. 2018-05-30 21:18:45 -04:00
Karishma Chadha 1401d54add Parse SB2 comments and attach block comments to the blocks they belong to. Send comment xml on workspace update so they can be rendered. 2018-05-30 21:15:14 -04:00
kchadha a85f641d25 Merge pull request #1148 from kchadha/stage-layering 
Layer group ordering.
 2018-05-25 09:10:05 -04:00
DD Liu 10aa6979ed Multiply by bitmap resolution 2018-05-23 14:18:22 -04:00
DD Liu 85689201ed Always give backdrops a certain rotation center 2018-05-23 14:06:23 -04:00
Karishma Chadha 64c8484066 Refactor so that layer group is optionally passed into createClone (and initDrawable) instead of isStage property getting stored on a sprite. 2018-05-18 10:11:59 -04:00
Karishma Chadha 67b114b9c9 Layer group ordering. 2018-05-15 22:22:44 -04:00
DD Liu 5c003641f9 Merge pull request #1126 from fsih/fixQuirksOnLoadCostume 
Run quirks mode fixes on costumes loaded from sb2s
 2018-05-10 13:42:48 -04:00
DD aae1e083bc Switched textEncoder to costumeAsset.encodeTextData, and pass in version as an argument instead of in costume 2018-05-09 15:48:49 -04:00