Skip to content

Commit

Permalink
Merge branch 'master' of https://github.com/microsoft/pxt-arcade into…
Browse files Browse the repository at this point in the history
… dev/riknoll/winter-game-jam2024
  • Loading branch information
riknoll committed Nov 18, 2024
2 parents f38199e + 67d1624 commit 13d1085
Show file tree
Hide file tree
Showing 10 changed files with 79 additions and 57 deletions.
50 changes: 27 additions & 23 deletions docs/educators.md

Large diffs are not rendered by default.

7 changes: 6 additions & 1 deletion docs/gamejam/all.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,12 @@ The MakeCode Team regularly hosts game jams – keep an eye on the [MakeCode For
## Previous Game Jams

```codecard
[
[ {
"name": "Female Gamechangers",
"description": "Celebrate Women's History Month with Microsoft MakeCode Arcade!",
"url": "/gamejam/female-gamechangers",
"imageUrl": "/static/gamejam/jams/female-gamechangers/assets/preview.png"
},
{
"name": "Five Second Games",
"description": "A combination of micro-games that can be played in 5 seconds!",
Expand Down
14 changes: 8 additions & 6 deletions docs/hero-banner.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,13 @@ Here are some cool activities to get you started!
* url: https://arcade.makecode.com/#tutorial:/tutorials/intro
* cardType: link
---
* name: Snack Chase
* buttonLabel: Code Now
* description: Code with friends from Lyla in the Loop!
* imageUrl: /static/hero-gallery/lyla-hero.jpg
* url: https://arcade.makecode.com/#tutorial:/tutorials/lyla-jr
* cardType: link
---
* name: Mission to Hubble
* buttonLabel: Code Now
* description: Help Scott Kelly reach the Hubble!
Expand All @@ -29,11 +36,6 @@ Here are some cool activities to get you started!
* name: How To Code a Video Game
* imageUrl: /static/hero-gallery/how-to-code.png
* youTubePlaylistId: PLMMBk9hE-SepfPK6z19t6aAfwbOQNY6K7
---
* name: Join the Live Stream
* buttonLabel: Watch Stream
* imageUrl: /static/hero-gallery/stream.png
* url: https://www.twitch.tv/msmakecode
* cardType: link


### ~
17 changes: 14 additions & 3 deletions docs/hour-of-code/all.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,16 +7,27 @@ Join us in celebrating Computer Science Education Week by playing, designing, an
```codecard
[
{
"name": "Snack Chase",
"description": "Code a snack chase game with characters from Lyla in the Loop on PBS KIDS",
"url": "https://arcade.makecode.com/#tutorial:/tutorials/lyla-jr",
"imageUrl": "/static/tutorials/lyla/card.jpg",
"label": "JUNIOR",
"labelClass": "orange ribbon large"
}, {
"name": "Inside Out 2",
"description": "Create a bubble popping game, featuring the stars of Disney and Pixar's Inside Out 2",
"url": "https://arcade.makecode.com/#tutorial:/tutorials/bubbles",
"imageUrl": "/static/tutorials/bubbles/card.jpg"
"imageUrl": "/static/tutorials/bubbles/card.jpg",
"label": "BEGINNER",
"labelClass": "orange ribbon large"
},
{
"name": "Scott Kelly - Mission to Hubble",
"name": "Mission to Hubble",
"description": "Follow along with the steps of this tutorial to create a game based on Scott Kelly's first space flight",
"url": "https://forms.codeninjas.com/back-to-school-game-building-session/?utm-source=makecode&utm_medium=partner&utm_campaign=bts_gbs",
"imageUrl": "/static/tutorials/hubble/hubble_4x3.jpg"
"imageUrl": "/static/tutorials/hubble/hubble_4x3.jpg",
"label": "INTERMEDIATE",
"labelClass": "orange ribbon large"
}
]
```
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added docs/static/hero-gallery/lyla-hero.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added docs/static/tutorials/lyla/card.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified docs/static/tutorials/lyla/key.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
24 changes: 12 additions & 12 deletions docs/test/tutorials/lyla-jr.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,7 @@

**Let's code a video game with Lyla, Everett, Luke and Stu!**

![Pickle Party Game](/static/tutorials/lyla/lyla.gif "Characters chasing pickle slices." )

![Lyla intro](youtube:d8f-PtWSuKk)


## {Step 2}
Expand Down Expand Up @@ -68,6 +67,8 @@ scene.setBG(lyla_imgs.diner)

**Try your game!**

![Lyla intro](youtube:d8f-PtWSuKk?start=53)

---

Press A (or the space bar) to clear the message, then use the arrow keys to
Expand Down Expand Up @@ -104,10 +105,10 @@ game.gameCountdown(30)



## {Step 7}
## 🥒 You did it! 🥒



🥒 You did it! 🥒


You made a video game!
Expand All @@ -117,7 +118,6 @@ You made a video game!




## Play with Friends @showdialog


Expand All @@ -127,11 +127,11 @@ You can play your game with one other friend using the same keyboard.

---

~hint Click here to learn how to play online with more friends.
~hint Parents, click here for more ways to share.

---

![balloon intro](youtube:jZGvmt6X880)
![Sharing Multiplayer](youtube:dGaG_b2y33I)

hint~

Expand All @@ -143,7 +143,8 @@ hint~

---

Add more blocks to change players, change snacks, or add music!
Add more blocks!
You can change players, change snacks, or add music!

![Add something special](/static/tutorials/lyla/more.gif "Add something special")

Expand All @@ -163,21 +164,20 @@ music.play(music.createSong(assets.song`countdown`), music.PlaybackMode.InBackgr





```blockconfig.global
scene.setBG(lyla_imgs.diner)
game.gameCountdown(30)
sprites.sendFlying(lyla_imgs.picklechip, 1)
music.play(music.createSong(assets.song`countdown`), music.PlaybackMode.InBackground)
music.play(music.melodyPlayable(music.baDing), music.PlaybackMode.InBackground)
```


```ghost
scene.setBG(lyla_imgs.diner)
game.gameCountdown(30)
sprites.sendFlying(lyla_imgs.picklechip, 1)
music.play(music.melodyPlayable(music.baDing), music.PlaybackMode.InBackground)
```


Expand Down
24 changes: 12 additions & 12 deletions docs/tutorials/lyla-jr.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,7 @@

**Let's code a video game with Lyla, Everett, Luke and Stu!**

![Pickle Party Game](/static/tutorials/lyla/lyla.gif "Characters chasing pickle slices." )

![Lyla intro](youtube:d8f-PtWSuKk)


## {Step 2}
Expand Down Expand Up @@ -68,6 +67,8 @@ scene.setBG(lyla_imgs.diner)

**Try your game!**

![Lyla intro](youtube:d8f-PtWSuKk?start=53)

---

Press A (or the space bar) to clear the message, then use the arrow keys to
Expand Down Expand Up @@ -104,10 +105,10 @@ game.gameCountdown(30)



## {Step 7}
## 🥒 You did it! 🥒



🥒 You did it! 🥒


You made a video game!
Expand All @@ -117,7 +118,6 @@ You made a video game!




## Play with Friends @showdialog


Expand All @@ -127,11 +127,11 @@ You can play your game with one other friend using the same keyboard.

---

~hint Click here to learn how to play online with more friends.
~hint Parents, click here for more ways to share.

---

![balloon intro](youtube:jZGvmt6X880)
![Sharing Multiplayer](youtube:dGaG_b2y33I)

hint~

Expand All @@ -143,7 +143,8 @@ hint~

---

Add more blocks to change players, change snacks, or add music!
Add more blocks!
You can change players, change snacks, or add music!

![Add something special](/static/tutorials/lyla/more.gif "Add something special")

Expand All @@ -163,21 +164,20 @@ music.play(music.createSong(assets.song`countdown`), music.PlaybackMode.InBackgr





```blockconfig.global
scene.setBG(lyla_imgs.diner)
game.gameCountdown(30)
sprites.sendFlying(lyla_imgs.picklechip, 1)
music.play(music.createSong(assets.song`countdown`), music.PlaybackMode.InBackground)
music.play(music.melodyPlayable(music.baDing), music.PlaybackMode.InBackground)
```


```ghost
scene.setBG(lyla_imgs.diner)
game.gameCountdown(30)
sprites.sendFlying(lyla_imgs.picklechip, 1)
music.play(music.melodyPlayable(music.baDing), music.PlaybackMode.InBackground)
```


Expand Down

0 comments on commit 13d1085

Please sign in to comment.