Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #23614 from code-dot-org/staging
DTT (Staging > Test) [robo-dtt]
- Loading branch information
Showing
71 changed files
with
219 additions
and
80 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,16 @@ | ||
function bounce(sprite){ | ||
if(sprite.isTouching(bottomEdge)){ | ||
console.log("bottom!"); | ||
} | ||
else if(sprite.isTouching(rightEdge)){ | ||
console.log("Right!"); | ||
} | ||
else if(sprite.isTouching(topEdge)){ | ||
console.log("Top!"); | ||
} | ||
else{ | ||
console.log("Left"); | ||
} | ||
console.log(sprite.touching); | ||
sprite.direction += sprite.direction * 1.45; | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,13 @@ | ||
{ | ||
"category": "Sprites", | ||
"config": { | ||
"func": "bounce", | ||
"blockText": "{SPRITE} bounces", | ||
"args": [ | ||
{ | ||
"name": "SPRITE", | ||
"type": "Sprite" | ||
} | ||
] | ||
} | ||
} |
This file was deleted.
Oops, something went wrong.
24 changes: 24 additions & 0 deletions
24
dashboard/config/blocks/GamelabJr/gamelab_joystickDirection.js
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,24 @@ | ||
function joystickDirection() { | ||
var x = 0, y = 0; | ||
if (keyDown("right")) { | ||
x += 1; | ||
} | ||
if (keyDown("left")) { | ||
x -= 1; | ||
} | ||
if (keyDown("up")) { | ||
y -= 1; | ||
} | ||
if (keyDown("down")) { | ||
y += 1; | ||
} | ||
if (x !== 0) { | ||
x *= Infinity; | ||
} | ||
if (y !== 0) { | ||
y *= Infinity; | ||
} | ||
if (x || y) { | ||
return createVector(x, y); | ||
} | ||
} |
9 changes: 9 additions & 0 deletions
9
dashboard/config/blocks/GamelabJr/gamelab_joystickDirection.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,9 @@ | ||
{ | ||
"category": "", | ||
"config": { | ||
"func": "joystickDirection", | ||
"name": "joystickDirection", | ||
"blockText": "joystick direction", | ||
"returnType": "Location" | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,16 @@ | ||
{ | ||
"category": "", | ||
"config": { | ||
"func": "keyDown", | ||
"name": "keyDown", | ||
"blockText": "key is down {KEY}", | ||
"returnType": "Boolean", | ||
"args": [ | ||
{ | ||
"name": "KEY", | ||
"field": true, | ||
"type": "String" | ||
} | ||
] | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,9 @@ | ||
{ | ||
"category": "", | ||
"config": { | ||
"expression": "mouseDown('leftButton')", | ||
"name": "mouseDown", | ||
"blockText": "mouse is down", | ||
"returnType": "Boolean" | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,6 @@ | ||
function whenJoystick(callback) { | ||
whenLeftArrow(callback); | ||
whenRightArrow(callback); | ||
whenUpArrow(callback); | ||
whenDownArrow(callback); | ||
} |
16 changes: 16 additions & 0 deletions
16
dashboard/config/blocks/GamelabJr/gamelab_whenJoystick.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,16 @@ | ||
{ | ||
"category": "", | ||
"config": { | ||
"color": [ | ||
140, | ||
1, | ||
0.74 | ||
], | ||
"func": "whenJoystick", | ||
"blockText": "when joystick", | ||
"args": [ | ||
|
||
], | ||
"eventBlock": true | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,6 @@ | ||
function whileJoystick(callback) { | ||
whileLeftArrow(callback); | ||
whileRightArrow(callback); | ||
whileUpArrow(callback); | ||
whileDownArrow(callback); | ||
} |
16 changes: 16 additions & 0 deletions
16
dashboard/config/blocks/GamelabJr/gamelab_whileJoystick.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,16 @@ | ||
{ | ||
"category": "", | ||
"config": { | ||
"color": [ | ||
322, | ||
0.9, | ||
0.95 | ||
], | ||
"func": "whileJoystick", | ||
"blockText": "while joystick", | ||
"args": [ | ||
|
||
], | ||
"eventLoopBlock": true | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
2 changes: 1 addition & 1 deletion
2
pegasus/sites.v3/code.org/public/advocacy/state-facts/AK.pdf.fetch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1 +1 @@ | ||
https://cdo-fetch.s3.amazonaws.com/9a566dadb6bbf34b113ecc8e7f65783f-AK.pdf | ||
https://cdo-fetch.s3.amazonaws.com/2591b0f205791bc63561d4466d16fa4c-AK.pdf |
2 changes: 1 addition & 1 deletion
2
pegasus/sites.v3/code.org/public/advocacy/state-facts/AL.pdf.fetch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1 +1 @@ | ||
https://cdo-fetch.s3.amazonaws.com/3f80cafd803df0c67d97c1c18e5166fc-AL.pdf | ||
https://cdo-fetch.s3.amazonaws.com/c9b1e8e7e3eb2230a6c615c8bb6e8e93-AL.pdf |
2 changes: 1 addition & 1 deletion
2
pegasus/sites.v3/code.org/public/advocacy/state-facts/AR.pdf.fetch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1 +1 @@ | ||
https://cdo-fetch.s3.amazonaws.com/23c636734525fdf2f91c10a46ba241d2-AR.pdf | ||
https://cdo-fetch.s3.amazonaws.com/1a2381fefd1033eaffac46c22039b7d1-AR.pdf |
2 changes: 1 addition & 1 deletion
2
pegasus/sites.v3/code.org/public/advocacy/state-facts/AZ.pdf.fetch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1 +1 @@ | ||
https://cdo-fetch.s3.amazonaws.com/885973683baf8b24e85a899ec2f09e00-AZ.pdf | ||
https://cdo-fetch.s3.amazonaws.com/57abbad8e10ecc2d6f24848aa63c9cc2-AZ.pdf |
2 changes: 1 addition & 1 deletion
2
pegasus/sites.v3/code.org/public/advocacy/state-facts/CA.pdf.fetch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1 +1 @@ | ||
https://cdo-fetch.s3.amazonaws.com/a45f1ac37c7598b2137d864d5271601d-CA.pdf | ||
https://cdo-fetch.s3.amazonaws.com/f23149cd74cdee4698f527938e6d8169-CA.pdf |
2 changes: 1 addition & 1 deletion
2
pegasus/sites.v3/code.org/public/advocacy/state-facts/CO.pdf.fetch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1 +1 @@ | ||
https://cdo-fetch.s3.amazonaws.com/38de57e7db7c1dcf16fa7f6cf11a4677-CO.pdf | ||
https://cdo-fetch.s3.amazonaws.com/12695637cf0f25d85f15fa55fa53a863-CO.pdf |
2 changes: 1 addition & 1 deletion
2
pegasus/sites.v3/code.org/public/advocacy/state-facts/CT.pdf.fetch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1 +1 @@ | ||
https://cdo-fetch.s3.amazonaws.com/08ca4236b1f76181f1c54a703a170ce5-CT.pdf | ||
https://cdo-fetch.s3.amazonaws.com/a877867b36cc5192290a9491c2b42c62-CT.pdf |
2 changes: 1 addition & 1 deletion
2
pegasus/sites.v3/code.org/public/advocacy/state-facts/DC.pdf.fetch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1 +1 @@ | ||
https://cdo-fetch.s3.amazonaws.com/32b15c4df73dfad7b6fb79d878d2dd9e-DC.pdf | ||
https://cdo-fetch.s3.amazonaws.com/369f47cb11c6d7256aa402f505c7306e-DC.pdf |
2 changes: 1 addition & 1 deletion
2
pegasus/sites.v3/code.org/public/advocacy/state-facts/DE.pdf.fetch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1 +1 @@ | ||
https://cdo-fetch.s3.amazonaws.com/9e7a5ea75fd3dfbbdf8d354eb6b2c1ac-DE.pdf | ||
https://cdo-fetch.s3.amazonaws.com/ec8a0f7218166fe262a02677f6922f4a-DE.pdf |
2 changes: 1 addition & 1 deletion
2
pegasus/sites.v3/code.org/public/advocacy/state-facts/FL.pdf.fetch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1 +1 @@ | ||
https://cdo-fetch.s3.amazonaws.com/632802cc56bcb0fa4f9b5518af719325-FL.pdf | ||
https://cdo-fetch.s3.amazonaws.com/73e7eed2c324ee0b61e8adedfe904444-FL.pdf |
2 changes: 1 addition & 1 deletion
2
pegasus/sites.v3/code.org/public/advocacy/state-facts/GA.pdf.fetch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1 +1 @@ | ||
https://cdo-fetch.s3.amazonaws.com/f98ef60a5ff22c379a4e9394434ec7ff-GA.pdf | ||
https://cdo-fetch.s3.amazonaws.com/e48fba3ca2a8a4f88bcd1e9070d883fd-GA.pdf |
2 changes: 1 addition & 1 deletion
2
pegasus/sites.v3/code.org/public/advocacy/state-facts/HI.pdf.fetch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1 +1 @@ | ||
https://cdo-fetch.s3.amazonaws.com/ff6324eb8a793b9ebffff576a585a6de-HI.pdf | ||
https://cdo-fetch.s3.amazonaws.com/58d60e9f06178df1407067cb9610ef60-HI.pdf |
2 changes: 1 addition & 1 deletion
2
pegasus/sites.v3/code.org/public/advocacy/state-facts/IA.pdf.fetch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1 +1 @@ | ||
https://cdo-fetch.s3.amazonaws.com/6ef5c81dca8dcad5595c0ace7ad97c01-IA.pdf | ||
https://cdo-fetch.s3.amazonaws.com/1298305b969f2a97010aa576556a7587-IA.pdf |
2 changes: 1 addition & 1 deletion
2
pegasus/sites.v3/code.org/public/advocacy/state-facts/ID.pdf.fetch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1 +1 @@ | ||
https://cdo-fetch.s3.amazonaws.com/b9defdd7adde9e94b7bdb722bd38e49e-ID.pdf | ||
https://cdo-fetch.s3.amazonaws.com/35a3a014f4403d18c0cc41be802b280f-ID.pdf |
2 changes: 1 addition & 1 deletion
2
pegasus/sites.v3/code.org/public/advocacy/state-facts/IL.pdf.fetch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1 +1 @@ | ||
https://cdo-fetch.s3.amazonaws.com/25831b6fadf9a8692a53389a19a0df65-IL.pdf | ||
https://cdo-fetch.s3.amazonaws.com/247921111493c7aff36c0d34dd5141e6-IL.pdf |
2 changes: 1 addition & 1 deletion
2
pegasus/sites.v3/code.org/public/advocacy/state-facts/IN.pdf.fetch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1 +1 @@ | ||
https://cdo-fetch.s3.amazonaws.com/cde6dceb05a4dcc65974c1f88389ee3c-IN.pdf | ||
https://cdo-fetch.s3.amazonaws.com/4752d942066528eb940c576e38a390ca-IN.pdf |
Oops, something went wrong.