Commit graph

2855 commits

Author SHA1 Message Date
Paul Kaplan
2346f440c8
Merge pull request #1898 from paulkaplan/re-enable-tests
Re enable tests that were unavailable during maintenance
2019-01-08 13:45:17 -05:00
Karishma Chadha
01970fa6f0
Update test/unit/util_task-queue.js
Co-Authored-By: paulkaplan <pkaplan@media.mit.edu>
2019-01-08 13:29:04 -05:00
Karishma Chadha
36fe6378db
Merge pull request #1899 from paulkaplan/less-cloning
Do not deep clone before serializing.
2019-01-07 13:36:34 -05:00
Paul Kaplan
94240d743e
Merge pull request #1897 from kchadha/fix-cloud-var-limit
Fix cloud variable limit
2019-01-07 13:28:47 -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
Paul Kaplan
cba3eefb52 Re enable tests that were unavailable during maintenance 2019-01-07 12:59:33 -05:00
Karishma Chadha
85843e5d6f Fix cloud variable limit 2019-01-07 11:12:47 -05:00
Eric Rosenbaum
ad6f15bfa1
Merge pull request #1869 from apple502j/english-meow-meow
Always use English for kitten
2019-01-07 10:54:14 -05:00
Karishma Chadha
808cb2cd60
Merge pull request #1878 from towerofnix/clamp-ghost
Clamp ghost effect
2019-01-06 17:42:43 -05:00
Ray Schamp
3f4b1465ff
Merge pull request #1884 from rschamp/fix-asset-uploads
Generate md5s for uploaded assets
2019-01-02 12:44:22 -05:00
Ray Schamp
11546c7f0d Skip failing tests, this is @thisandagain's fault :) 2019-01-02 12:41:09 -05:00
Ray Schamp
2406286180 Fix test expectation, this is @kchadha's fault :) 2019-01-02 12:13:43 -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
Florrie
fbb6d63e03 Clamp ghost effect
Cherry-picked from 35c8890425 (#1887)
2018-12-28 10:39:42 -04:00
Karishma Chadha
c449f14280
Merge pull request #1874 from kchadha/prevent-installing-broken-target
Reject errors from loadCostume instead of logging
2018-12-26 16:32:20 -05:00
Karishma Chadha
ed21af577c Let errors from loadCostume bubble up so that we do not attempt to call installTargets on an invalid target (e.g. one that has no costumes). 2018-12-26 14:15:57 -05:00
Karishma Chadha
c5284469d3
Merge pull request #1831 from apple502j/stop-ask
Clear ask bubble when stopForTarget
2018-12-26 10:29:23 -05:00
Karishma Chadha
bba95be5c0
Merge pull request #1872 from LLK/greenkeeper/scratch-sb1-converter-0.2.5
Update scratch-sb1-converter to the latest version 🚀
2018-12-26 10:25:42 -05:00
greenkeeper[bot]
cc6d371ff5 chore(package): update lockfile package-lock.json 2018-12-26 14:33:14 +00:00
greenkeeper[bot]
29d229c1db fix(package): update scratch-sb1-converter to version 0.2.5 2018-12-26 14:33:11 +00:00
apple502j
a22d7dd6de
remove todo 2018-12-23 00:22:41 +09:00
apple502j
cbf70d9609 This kitten speaks only English 2018-12-22 17:59:57 +09:00
apple502j
87df9610a6
Also here and there 2018-12-22 16:57:20 +09:00
apple502j
e11ff6ba19
Fix test 2018-12-22 16:56:45 +09:00
Paul Kaplan
c26eeaede7
Merge pull request #1868 from kchadha/fix-sb1-jpg-upload
Fix issue where uploading an sb with jpg images wasn't saving and loading
2018-12-21 16:08:12 -05:00
Karishma Chadha
23298bd18f Fix issue where uploading an sb with jpg images wasn't saving and loading properly. 2018-12-21 16:04:39 -05:00
Karishma Chadha
75bd89d992
Merge pull request #1867 from kchadha/update-package-lock
Update package lock file
2018-12-21 14:32:16 -05:00
Karishma Chadha
278e19f56e Update package lock file 2018-12-21 14:30:32 -05:00
Karishma Chadha
5ddc5dba4d
Merge pull request #1866 from kchadha/update-sb1-converter
Update sb1-converter and add an sb import integration test.
2018-12-21 14:26:22 -05:00
Karishma Chadha
397711b822 Update sb1-converter and add an sb import integration test. 2018-12-21 14:22:33 -05:00
Karishma Chadha
b36cc940bc
Merge pull request #1865 from LLK/greenkeeper/scratch-sb1-converter-0.2.2
Update scratch-sb1-converter to the latest version 🚀
2018-12-20 22:00:50 -05:00
greenkeeper[bot]
f7a21b8789 chore(package): update lockfile package-lock.json 2018-12-21 02:17:03 +00:00
greenkeeper[bot]
58c9f4eb3b fix(package): update scratch-sb1-converter to version 0.2.2 2018-12-21 02:16:59 +00:00
Karishma Chadha
cb9a8f99eb
Merge pull request #1864 from kchadha/fix-default-vector-fix
Fix issue with uploading default vector image
2018-12-20 21:11:24 -05:00
Karishma Chadha
c38a054d4a Fix issue where uploading the default vector image in place of a broken image was not correctly setting the costume's md5. 2018-12-20 19:29:37 -05:00
Michael "Z" Goddard
9ce8c43a14
Merge pull request #1852 from mzgoddard/sb1-convert
depend on scratch-sb1-converter and convert sb1 files to sb2
2018-12-20 14:42:35 -05:00
Karishma Chadha
4ad101f5d4
Apply suggestions from code review
Co-Authored-By: mzgoddard <mzgoddard@gmail.com>
2018-12-20 14:12:33 -05:00
Karishma Chadha
f1a24e3296
Update src/virtual-machine.js
Co-Authored-By: mzgoddard <mzgoddard@gmail.com>
2018-12-20 14:11:58 -05:00
Michael "Z" Goddard
5593b28984
try handling as a Scratch 1 file after scratch-parser validation fails 2018-12-20 13:55:49 -05:00
Michael "Z" Goddard
a92f33960f
fix: use ValidationError to determine if an SB1File error should throw 2018-12-20 13:32:30 -05:00
Michael "Z" Goddard
f43163fc73
depend on scratch-sb1-converter and convert sb1 files to sb2 2018-12-20 12:09:58 -05:00
Karishma Chadha
ba915cb318
Merge pull request #1861 from LLK/greenkeeper/scratch-parser-4.3.3
Update scratch-parser to the latest version 🚀
2018-12-20 09:52:28 -05:00
Katie Broida
3dcee7b1ad
Merge pull request #1840 from ktbee/default-asset-for-broken-svg
Use default builtin SVG asset when an SVG can't be loaded
2018-12-19 14:54:15 -05:00
Katie Broida
5941b9173e Use default builtin SVG asset for SVGs that can't be loaded for some reason 2018-12-19 14:34:18 -05:00
greenkeeper[bot]
9dd430b5f4 chore(package): update lockfile package-lock.json 2018-12-19 16:50:08 +00:00
greenkeeper[bot]
641c2f398d fix(package): update scratch-parser to version 4.3.3 2018-12-19 16:50:04 +00:00
DD Liu
fe375fa672
Merge pull request #1849 from fsih/addCostumeFromLibrary
Add addCostumeFromLibrary
2018-12-18 12:12:18 -05:00
picklesrus
fee248cd98
Merge pull request #1853 from mzgoddard/fix-execute-last-operation
Always pop the stack when the promised value is from the last op
2018-12-18 11:13:57 -05:00
picklesrus
178bdbd81b
Fix typo in comment 2018-12-18 11:01:53 -05:00
Eric Rosenbaum
cf5e07a42e
Merge pull request #1857 from ericrosenbaum/bugfix/makey-key-menu-order
For order of Makey Makey extension's key pressed menu
2018-12-18 09:52:55 -05:00