Skip to content
Snippets Groups Projects
Unverified Commit 8e3603aa authored by Eric Rosenbaum's avatar Eric Rosenbaum Committed by GitHub
Browse files

Merge pull request #5395 from ericrosenbaum/feature/full-library-update

Asset library update
parents 7912e430 a5baf0cf
No related branches found
No related tags found
No related merge requests found
...@@ -164,7 +164,7 @@ ...@@ -164,7 +164,7 @@
}, },
{ {
"name": "Blue Sky", "name": "Blue Sky",
"md5": "e7c147730f19d284bcd7b3f00af19bb6.svg", "md5": "11b62fc61d191b1bae0800f78c2f8c60.svg",
"type": "backdrop", "type": "backdrop",
"tags": [ "tags": [
"outdoors", "outdoors",
...@@ -178,7 +178,7 @@ ...@@ -178,7 +178,7 @@
}, },
{ {
"name": "Blue Sky 2 ", "name": "Blue Sky 2 ",
"md5": "5a906c2f272b77f59f0ef207857a8b3a.svg", "md5": "8eb8790be5507fdccf73e7c1570bbbab.svg",
"type": "backdrop", "type": "backdrop",
"tags": [ "tags": [
"outdoors", "outdoors",
...@@ -286,7 +286,7 @@ ...@@ -286,7 +286,7 @@
}, },
{ {
"name": "Circles", "name": "Circles",
"md5": "4e29033ec2b891a8f1ca21242811d403.svg", "md5": "c9847be305920807c5597d81576dd0c4.svg",
"type": "backdrop", "type": "backdrop",
"tags": [ "tags": [
"patterns" "patterns"
...@@ -491,7 +491,7 @@ ...@@ -491,7 +491,7 @@
}, },
{ {
"name": "Hearts", "name": "Hearts",
"md5": "26d3418b2fbc1af2c5fea82e1c3df1db.svg", "md5": "f98526ccb0eec3ac7d6c8f8ab502825e.svg",
"type": "backdrop", "type": "backdrop",
"tags": [ "tags": [
"patterns" "patterns"
...@@ -548,7 +548,7 @@ ...@@ -548,7 +548,7 @@
}, },
{ {
"name": "Light", "name": "Light",
"md5": "4b98c07876ed8997c3762e75790507b4.svg", "md5": "a7eb02ece0a521a6dfb5361ce0bdd7cc.svg",
"type": "backdrop", "type": "backdrop",
"tags": [ "tags": [
"patterns" "patterns"
...@@ -687,7 +687,7 @@ ...@@ -687,7 +687,7 @@
}, },
{ {
"name": "Party", "name": "Party",
"md5": "108160d0e44d1c340182e31c9dc0758a.svg", "md5": "d26e9e304872fccd5d84a70b94daf8e2.svg",
"type": "backdrop", "type": "backdrop",
"tags": [ "tags": [
"indoors", "indoors",
...@@ -995,7 +995,7 @@ ...@@ -995,7 +995,7 @@
}, },
{ {
"name": "Stripes", "name": "Stripes",
"md5": "a6a21f5c08d586e8daaebde37c97fb6f.svg", "md5": "c71bd957a3381eba291494a0decbf890.svg",
"type": "backdrop", "type": "backdrop",
"tags": [ "tags": [
"patterns" "patterns"
...@@ -1050,7 +1050,7 @@ ...@@ -1050,7 +1050,7 @@
}, },
{ {
"name": "Underwater 1", "name": "Underwater 1",
"md5": "fb907f72b310acc8b95cbf2d2cccabc9.svg", "md5": "d3344650f594bcecdf46aa4a9441badd.svg",
"type": "backdrop", "type": "backdrop",
"tags": [ "tags": [
"ocean", "ocean",
...@@ -1175,7 +1175,7 @@ ...@@ -1175,7 +1175,7 @@
}, },
{ {
"name": "Witch House", "name": "Witch House",
"md5": "597b9a9813fe5d8d387283138a0b8f2b.svg", "md5": "30085b2d27beb5acdbe895d8b3e64b04.svg",
"type": "backdrop", "type": "backdrop",
"tags": [ "tags": [
"fantasy", "fantasy",
...@@ -1190,7 +1190,7 @@ ...@@ -1190,7 +1190,7 @@
}, },
{ {
"name": "Woods", "name": "Woods",
"md5": "d26cfd278999c9e37d6af75c296a58df.svg", "md5": "f3eb165d6f3fd23370f97079f2e631bf.svg",
"type": "backdrop", "type": "backdrop",
"tags": [ "tags": [
"fantasy", "fantasy",
......
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
...@@ -4,8 +4,8 @@ const randomizeSpritePosition = spriteObject => { ...@@ -4,8 +4,8 @@ const randomizeSpritePosition = spriteObject => {
const randomY = Math.floor((100 * Math.random()) - 50); const randomY = Math.floor((100 * Math.random()) - 50);
if (spriteObject.hasOwnProperty('json')) { if (spriteObject.hasOwnProperty('json')) {
// Library sprite object // Library sprite object
spriteObject.json.scratchX = randomX; spriteObject.json.x = randomX;
spriteObject.json.scratchY = randomY; spriteObject.json.y = randomY;
} else if (spriteObject.hasOwnProperty('x') && spriteObject.hasOwnProperty('y')) { } else if (spriteObject.hasOwnProperty('x') && spriteObject.hasOwnProperty('y')) {
// Scratch 3 sprite object // Scratch 3 sprite object
spriteObject.x = randomX; spriteObject.x = randomX;
......
...@@ -193,7 +193,7 @@ describe('Working with costumes', () => { ...@@ -193,7 +193,7 @@ describe('Working with costumes', () => {
.mouseMove(abbyElement) .mouseMove(abbyElement)
.perform(); .perform();
// wait for one of Abby's alternate costumes to appear // wait for one of Abby's alternate costumes to appear
await findByXpath('//img[@src="https://cdn.assets.scratch.mit.edu/internalapi/asset/b6e23922f23b49ddc6f62f675e77417c.svg/get/"]'); await findByXpath('//img[@src="https://cdn.assets.scratch.mit.edu/internalapi/asset/45de34b47a2ce22f6f5d28bb35a44ff5.svg/get/"]');
const logs = await getLogs(); const logs = await getLogs();
await expect(logs).toEqual([]); await expect(logs).toEqual([]);
}); });
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment