ScCN/scratch-vm
2
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
2,777 Commits 1 Branch 0 Tags
eeac4e62f65f623b5f82cb2d2254488f0e5e188a
Commit Graph
240 Commits
Author SHA1 Message Date
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
Karishma Chadha fe186913ac Merge pull request #1742 from kchadha/multi-monitors 
Multi monitors
 2018-11-08 14:44:22 -05:00
Karishma Chadha 87244b4110 Normalize capitalization of sensing_current block fields during sb2 import and during monitor id generation. Update monitors integration test to include sensing_current block monitors. 2018-11-08 14:11:30 -05:00
Ray Schamp 4f5aba4fe6 Merge pull request #1727 from paulkaplan/add-ext-on-share 
Add unloaded extensions on block sharing
 2018-11-08 10:15:58 +00:00
Karishma Chadha 5db3db3a92 monitor id getter should use block fields instead of a list of strings 2018-11-08 01:33:26 -05:00
Karishma Chadha 7d1226458f Fix import of current day of week block from sb2. 2018-11-08 00:37:49 -05:00
Karishma Chadha 0e7eae98d5 Separate out monitors for blocks reporter blocks that have parameters. 2018-11-08 00:37:28 -05:00
Karishma Chadha 8aa0fa11aa Merge pull request #1649 from mzgoddard/get-attribute-stage-alt-name 
Get attribute stage alt name
 2018-11-07 17:47:44 -05:00
Paul Kaplan ce94144051 Fixup from comments 2018-11-07 10:11:16 -05:00
DD 2bd468950f Why do our lint rules require such weird formatting 2018-11-06 16:54:41 -05:00
DD e538800293 Merge branch 'pull915' into textLayer 2018-11-06 10:39:43 -05:00
DD 876139847a Merge branch 'develop' into pull915 2018-11-06 10:39:27 -05:00
DD 88b6bdd06c Get text assets from zip 2018-11-05 18:07:56 -05:00
DD 86149325b1 Try to make loadCostume more readable, and revert deserializeCostume to changing the costume object directly 2018-11-05 17:11:07 -05:00
Paul Kaplan bc1da9fa44 Move extension ID parsing into a helper and add test 2018-11-05 12:57:09 -05:00
Karishma Chadha d64322a110 Merge pull request #1719 from rschamp/hotfix/sprite-upload-from-image 
Handle images uploaded as sprites
 2018-11-01 18:18:52 -04:00
Ray Schamp 3d06f0e633 Handle images uploaded as sprites 
The sprite upload code in GUI serializes asset data, flattening it. We need to rehydrate the asset.
 2018-11-01 18:28:54 +00:00
Michael "Z" Goddard bca01a9ed2 rename Stage to _stage_ when its the OBJECT input for getAttributeOf 2018-11-01 12:33:56 -04:00
Valerie R Young 26c928d10b Handle unknown opcode in input 2018-10-31 17:40:08 -04:00
Karishma Chadha 1df6743a5f Refactor cloud data manager to break out cloud data limit check vs. limit update. 2018-10-31 13:40:05 -04:00
Karishma Chadha 848deaff30 Track whether a project has cloud data and enforce a cloud data limit on projects being loaded into the runtime. 2018-10-30 18:53:57 -04:00
Ray Schamp de86eb3f19 Merge pull request #1691 from rschamp/storage-no-cache 
Store asset objects on costumes and sounds
 2018-10-25 10:15:47 +01:00
Katie Broida 18c83dcc67 Prevent non-core extensions from adding monitors (#1688) 2018-10-24 16:43:01 -04:00
Ray Schamp 902aee48ee Merge branch 'develop' of https://github.com/LLK/scratch-vm into storage-no-cache 
# Conflicts:
#	package-lock.json
 2018-10-24 12:09:06 +01:00
Ray Schamp b47912dce4 Store asset objects on costumes and sounds 
Stop using storage for in-memory storage, and keep these on the vm objects. Towards https://github.com/LLK/scratch-vm/issues/1577
 2018-10-23 11:10:50 +01:00
DD 91e2f3a935 Revert 1643 Confirm extension in use in sb2 serialization 2018-10-18 11:06:13 -04:00
Eric Rosenbaum 891f696570 Save and load the language setting for Text to Speech (#1670) 
* Use scratch locales internally, with adapter for polly

* Save and load text2pseech language

* Only localize default input to “speak” if in a supported language
 2018-10-17 17:34:12 -04:00
Katie Broida 899ce56214 Confirm extension in use in sb2 serialization (#1643) 
Add a check when serializing sb2 projects to see whether an extension is actually in use in a block or a visible monitor.
 2018-10-17 10:49:08 -04:00
Andrew Sliwinski 7a28d5e41d Merge pull request #1586 from mzgoddard/variable-id-type 
conflict workaround for variables and lists of the same name
 2018-10-01 18:27:59 -04:00