Commit graph

268 commits

Author SHA1 Message Date
Christopher Willis-Ford
90b9da45f4 sanitize extension ID in getExtensionIdForOpcode 2020-06-15 17:59:15 -07:00
adroitwhiz
48088f40f8 Fix up list monitor names during deserialization 2020-02-17 01:39:02 -05:00
Michael "Z" Goddard
f4e49563d6
start loading sb3 assets before handling sb3 data 2019-03-12 17:16:13 -04:00
Michael "Z" Goddard
146e93e4ec
start loading sb2 sounds before handling sb2 data 2019-02-15 17:43:55 -05:00
Michael "Z" Goddard
d4320f1c26
start loading sb2 assets before handling sb2 data 2019-02-15 17:34:14 -05:00
Paul Kaplan
3b203a2a9b
Merge pull request #1995 from paulkaplan/is-discrete
Support isDiscrete flag on monitors
2019-02-13 11:19:51 -05:00
Paul Kaplan
6754fa9334 Add isDiscrete to monitor record, update sb2,3 and conversion tests 2019-02-11 11:09:01 -05:00
chrisgarrity
a4b0550013 handle sb2 files zipped in a folder
If the asset can’t be found by name, look for the same asset in a folder within the zipfile.
2019-02-08 15:03:27 +01:00
picklesrus
b904f19c1d Fix loading broadcast messages with special characters for projects that were converted from 2.0. 2019-02-06 16:58:46 -05:00
picklesrus
ecbfcd78bd Fix sb2 loading of broadcast messages with special characters. 2019-02-06 16:48:39 -05:00
Karishma Chadha
d91c19434f Rename util function to be more descriptive. Refactor parameters to remove unused code. 2019-02-04 19:05:28 -05:00
Karishma Chadha
7faddb6c8f Replace xml-unsafe chars in sb3 variables. 2019-02-04 15:32:01 -05:00
Karishma Chadha
57f112cbfd Remove unsafe chars from variable ids when importing from 2.0. 2019-02-04 10:29:24 -05:00
Karishma Chadha
a9cf509a55
Merge pull request #1941 from kchadha/add-runtime-to-blocks
Add reference for `runtime` to blocks container
2019-01-30 10:57:45 -05:00
Karishma Chadha
94fa3d56c8 Fix saving and loading of slider min max values. Add test for sb2 to sb3 conversion that tests all montior properties remain the same after save and load. 2019-01-25 14:14:46 -05:00
Karishma Chadha
e5723e299a Add runtime to blocks container since it was getting passed in everywhere where it was being referenced. Update calls to blocks constructor. 2019-01-23 18:18:38 -05:00
Karishma Chadha
fbee37e915 Populate executable targets when runtime.targets is populated so that scripts don't run before they are supposed to (e.g. before targets are done getting installed). 2019-01-11 14:52:34 -05:00
Paul Kaplan
c33d6caa2b
Merge pull request #1902 from picklesrus/unknown-monitors
Allow projects with unknown monitors to load.
2019-01-09 14:50:25 -05:00
Eric Rosenbaum
aebc0d25be
Merge pull request #1903 from ericrosenbaum/bugfix/midi-drum-import
Add legacy drum block to specmap
2019-01-08 18:07:43 -05:00
picklesrus
cdec5a1cef Allow projects with unknown monitors to load. 2019-01-08 15:00:00 -05:00
Eric Rosenbaum
a6421b91f8 Add legacy drum block to specmap 2019-01-08 14:49:34 -05:00
Karishma Chadha
bb8463f14a Log a warning for currentCostume out of range when incorrect project is being serialized. 2019-01-08 13:26:06 -05:00
Karishma Chadha
c27b624401 When loading a project, clamp the currentCostume number to an appropriate value. 2019-01-08 13:07:46 -05:00
Paul Kaplan
fd2723ff7d Do not deep clone before serializing.
This was ok when we did not attach assets, but it is not cool now. With large assets, this made saving extremely slow
2019-01-07 13:02:30 -05:00
Ray Schamp
80ff7e6756 Generate md5s for uploaded assets
Without this, we were erroneously setting uploaded assets as clean, so they wouldn't be saved when uploaded from an .sb2/3 file.
2019-01-02 11:46:47 -05:00
julescubtree
040aeaa44e
enable loading draggability
in sb3.js, parseScratchObject()
2018-12-14 16:17:36 -08:00
Karishma Chadha
dfd4735871
Merge pull request #1833 from kchadha/fix-sb2-from-sb1-import
Fix issue importing some sb2s that were originally sb1s, with baseLayerMd5 property formatted differently.
2018-12-13 15:59:44 -05:00
Karishma Chadha
95dafb43c4 Serialize x and y for topLevel blocks even if one or both of the values is 0. 2018-12-12 18:51:36 -05:00
Karishma Chadha
eeac4e62f6 Fix issue where sb2s originally from sb1s sometimes have baseLayerMd5 formatted incorrectly. 2018-12-10 18:17:24 -05:00
Paul Kaplan
4756726e43
Merge pull request #1816 from paulkaplan/do-save-tl-var-blocks
Add a test and fix for not serializing top-level variable reporters
2018-12-06 05:32:23 -05:00
Paul Kaplan
809d2de9f2 Fix typo uncovered by loading lonely variable reporters 2018-12-05 16:59:47 -05:00
Paul Kaplan
be65b615a2 Add a test and fix for not serializing top-level variable reporters 2018-12-05 11:35:22 -05:00
Katie Broida
ef8bbb7186 Set video state after project load event, adding extension for the first time 2018-12-05 11:08:00 -05:00
Paul Kaplan
7e96ef2985 Serialize Infinity and NaN to 0 2018-12-04 10:52:49 -05:00
DD Liu
5802723dc7
Merge pull request #1737 from fsih/textLayer
Support text layer in sb2 files
2018-11-21 13:18:47 -05:00
DD Liu
17d0033f1c Remove conditional because text layer file name always comes from sb2 2018-11-21 12:03:52 -05:00
Valerie Young
2ca735eab4
Merge pull request #1716 from bocoup/unknown-block-input-fix
Handle unknown opcode in input
2018-11-15 10:09:46 -05:00
Eric Rosenbaum
26ced0dd58
Use note picker in imported play note blocks (#1757)
* Use note picker in imported play note blocks

* Set default for obscured note shadows to 60
2018-11-14 14:55:12 -05:00
Valerie R Young
ebd3b46cc2 Address feedback 2018-11-14 14:24:09 -05:00
Karishma Chadha
3dd0d0a657
Merge pull request #1686 from kchadha/monitor-save-load
Monitor save & load
2018-11-14 13:23:10 -05:00
Karishma Chadha
5b2667556c Comment cleanup 2018-11-14 13:15:36 -05:00
Karishma Chadha
dccb41e3c4 Comment and test cleanup. 2018-11-14 10:42:52 -05:00
DD
679ddf9fb7 Comment fixes and instantiate textImageElement only as necessary 2018-11-13 15:31:00 -05:00
DD
0b72608624 Remove swp file 2018-11-13 15:09:47 -05:00
Karishma Chadha
14bee14d8c Update extensions to load when deserializing monitors. This is necessary when the monitor is the only part of the project that uses the extension. Update extension monitor color category. 2018-11-09 23:45:49 -05:00
Karishma Chadha
df24ca7b46 Refactor sb3 monitor deserialization. Create monitor blocks with the relevant info if they don't exist. 2018-11-09 23:45:49 -05:00
Karishma Chadha
1b9b3ac909 Revert changes that were made to leverage the monitor blocks getting created when the toolbox is loaded. This approach does not work when viewing the project detached from scratch-blocks (e.g. player mode). 2018-11-09 23:45:48 -05:00
Karishma Chadha
d690c76a34 Update sb2 deserialization of monitors. 2018-11-09 23:45:48 -05:00
Karishma Chadha
1a4f0a75f2 Serialize and deserialize monitors. Obtain monitor block information from runtime. Fix issue where stage monitors weren't getting loaded correctly. 2018-11-09 23:45:48 -05:00
Karishma Chadha
cfa71723eb Ignore video sensing monitor and import music tempo monitor unless it is hidden. Load extensions for visible monitors. Add tests for new functionality. 2018-11-09 00:09:54 -05:00