Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Port Docs Changes #6462

Merged
merged 1 commit into from
Jun 27, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions docs/courses.md
Original file line number Diff line number Diff line change
Expand Up @@ -51,13 +51,15 @@ The games they make in the course can run on the GameGo device! Courses are free
"url": "https://make2learn.tinkergen.com/course/?sku=604182001",
"imageUrl": "/static/courses/gamego-beginner.png",
"largeImageUrl": "/static/courses/gamego-beginner.png",
"cardType": "link",
"directOpen": true
}, {
"name": "GameGo Intermediate Programming Course",
"description": "TinkerGen's intermediate game development course covers more topics like animations and multiplayer. Games made in the course can run on the GameGo device! Course is free after log in.",
"url": "https://make2learn.tinkergen.com/course/?sku=604182003",
"imageUrl": "/static/courses/gamego-intermediate.png",
"largeImageUrl": "/static/courses/gamego-intermediate.png",
"cardType": "link",
"directOpen": true
}
]
Expand Down
16 changes: 1 addition & 15 deletions docs/gamejam/female-gamechangers.html
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@
or on handheld game devices.
</p>
</div>
<div class="timer-container">
<div class="timer-container" style="display: none">
<div class="spacer"></div>
<div class="timer-outer">
<div id="timer"></div>
Expand All @@ -64,20 +64,6 @@
<div class="segment">
<div id="rules"></div>
</div>
<div class="segment submit">
<h2>Submit</h2>
<p>Ready to submit your game? Use the button below!</p>
<div class="actions">
<a class="button" href="https://aka.ms/GJForm" target="_blank"
rel="noopener noreferrer">Submit a Game</a>
</div>
<br/>
<p>Are you age 16 or younger? Then make sure you also submit your game to the Code Ninja's game jam and be entered to win fabulous prizes!</p>
<div class="actions">
<a class="button" href="https://forms.codeninjas.com/femalegamechangers" target="_blank"
rel="noopener noreferrer">Visit Code Ninjas</a>
</div>
</div>
<div class="segment gallery">
<h2>Gallery</h2>
<p class="description">Check out the submitted games!</p>
Expand Down
19 changes: 17 additions & 2 deletions docs/hardware.md
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,17 @@ These boards run MakeCode Arcade games. They are based on our guidelines, adhere
"imageUrl": "/static/hardware/adafruitm4.jpg",
"url": "https://learn.adafruit.com/makecode-arcade-m4",
"variant": "hw---samd51"
},
}
]
```
## micro:bit shields for Arcade

You can use micro:bit V2 with an accessory shield to play MakeCode Arcade games as well! Connecting the new micro:bit to a MakeCode Arcade compatible shield allows the micro:bit to become its own retro gaming handheld. The micro:bit acts like a game cartridge that contains all of your game code, all the shield does is enhance the micro:bit with a full colour LCD, additional buttons for game input. In addition to these awesome new features, micro:bit accessory manufacturers can augment their shields with their own custom Arcade shield designs and unique capabilities.

Shields are based on our guidelines, adhere to open source hardware reference designs, and have been user tested. However, each hardware manufacturer is responsible for ensuring the compatibility, reliability, safety and compliance of their products. Microsoft provides no representations or warranties on these products and disclaims liability for any risks associated with their use.

```codecard
[
{
"name": "micro:bit Newbit Shield",
"description": "Use the micro:bit with an expansion board from Kittenbot",
Expand All @@ -100,10 +110,15 @@ These boards run MakeCode Arcade games. They are based on our guidelines, adhere
"description": "Use the micro:bit with an expansion board from iCShop",
"imageUrl": "/static/hardware/bit-shield.png",
"url": "https://www.icshop.com.tw/products/368112100137?locale=en"
},
{
"name": "Kitronik Arcade for micro:bit",
"description": "Use the micro:bit with an expansion board from Kitronik",
"imageUrl": "/static/hardware/kitronik-shield.png",
"url": "http://www.kitronik.co.uk/56116"
}
]
```

## Other ways to play Arcade

```codecard
Expand Down
2 changes: 1 addition & 1 deletion docs/hardware/dbg.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

It's often needed to connect a SWD debugger to a board.

We found [Black Magic Probe](https://github.com/blacksphere/blackmagic/wiki) to work well,
We found [Black Magic Probe](https://github.com/blackmagic-debug/blackmagic) to work well,
for a variety of MCUs, and it doesn't require openocd.
You can use their beautifully made hardware, or flash an existing
board with Black Magic firmware.
Expand Down
2 changes: 1 addition & 1 deletion docs/hour-of-code/all.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ Join us in celebrating Computer Science Education Week by playing, designing, an
{
"name": "Sparks Flying",
"description": "Create a game that challenges you to light a fire to keep yourself warm, but be careful! It's not as easy as it sounds.",
"url": "/#tutorial:/tutorials/sparks",
"url": "https://arcade.makecode.com/--skillmap#docs:/skillmap/sparks",
"imageUrl": "/static/hour-of-code/2023/sparks.gif"
}, {
"name": "Sparks Flying (Jr)",
Expand Down
2 changes: 1 addition & 1 deletion docs/index-ref.json
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
{
"appref": "v1.12.49"
"appref": "v1.12.53"
}
2 changes: 1 addition & 1 deletion docs/projects.md
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@
{
"name": "Game Jam",
"url": "/game-jam",
"imageUrl": "https://pxt.azureedge.net/api/22414-21049-08990-36399/thumb"
"imageUrl": "https://pxt.azureedge.net/api/98537-40423-47522-15861/thumb"
},
{
"name": "Advanced Livestream",
Expand Down
12 changes: 1 addition & 11 deletions docs/skillmap/balloon/balloon1.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,18 +4,8 @@

## Burstin' Balloons Intro @showdialog

![balloon intro](azuremedia:64101234-a394-4f89-98af-b4edfd11143a/BurstinBalloonsIntro.ism)
![balloon intro](youtube:jZGvmt6X880)

~hint Click here view the intro video with ASL

![ASL Whack-the-Mole Intro](azuremedia:6026eebb-7d56-450e-9c25-5bbaac549f3f/balloon-asl.ism)

hint~

---

Thank you to Deaf Kids Code for providing ASL video translations.
![Deaf Kids Code Logo](/static/skillmap/assets/dkc-logo-small.png " ")



Expand Down
11 changes: 1 addition & 10 deletions docs/skillmap/mole/mole1.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,22 +4,13 @@

## Whack-the-Mole Intro @showdialog

![whack-the-mole](azuremedia:eb645602-3355-4aa7-a756-0ea205b2ce80/Whack-the-Mole-Intro.ism)

~hint Click here view the intro video with ASL

![ASL Whack-the-Mole Intro](azuremedia:02104365-8137-40f6-9de6-3920afaf5f42/mole-asl.ism)

hint~
![whack-the-mole](youtube:UKYPIXl7agI)

---

Special thanks to MakeCode forum User _SoftTalker_ for this submission.

---

Thank you to Deaf Kids Code for providing ASL video translations.
![Deaf Kids Code Logo](/static/skillmap/assets/dkc-logo-small.png " ")



Expand Down
196 changes: 196 additions & 0 deletions docs/static/gamejam/jams/female-gamechangers/info.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,202 @@
"path": "/static/gamejam/jams/female-gamechangers/rules.md"
},
"featured": [
{
"id": "81763-74727-74866-09375",
"title": "Amanda Gorman and \"The Hill We Climb\"",
"author": "Ceggiebear",
"description": "Play as poet Amanda Gorman as she composes her poem for President Biden's inauguration!"
},
{
"id": "38226-95731-47070-73388",
"title": "Megan Rapinoe",
"author": "GoMustangs",
"description": "Play as Megan Rapinoe in this classic shmup game with a twist! Switch your hair color to wrack up a score multiplier for major points!"
},
{
"id": "75876-49918-50592-15147",
"title": "Amelia Earhart: Aviator Extraordinaire",
"author": "Blobbey",
"description": "Recreate famous flights from Amelia Earhart's life in this flight simulator!"
},
{
"id": "98398-96774-94162-09922",
"title": "Blast and Slash",
"author": "Lucas_M/DangerKitty",
"description": "Blast and slash your way through the desert in this addictive female-led roguelike game! Collect money to unlock upgrades in preparation for the climactic boss battle!"
},
{
"id": "76909-17578-71814-49492",
"title": "FOR ALL WOMANKIND",
"author": "Oscar",
"description": "Play as a team of astronauts trying to land their shuttlecraft in this game dedicated to Katherine Johnson!"
},
{
"id": "49970-33654-67029-92638",
"title": "Infiltration",
"author": "M1nt-Phoen1x",
"description": "Stand up to the tyranny of megacorporations and save your family in the metroidvania game!"
},
{
"id": "07354-43385-19795-87252",
"title": "BootlegMan",
"author": "Joe N"
},
{
"id": "84156-59508-41689-02284",
"title": "The Adventures of Julia the Superhero 1: Attack of the Jet-pack Men!",
"author": "Awesomefreez"
},
{
"id": "99147-48113-12204-08825",
"title": "Find your child",
"author": "Pins"
},
{
"id": "83889-78877-67770-53113",
"title": "Portal: Space edition",
"author": "PizzaNinja17"
},
{
"id": "94396-37551-34311-26986",
"title": "Rosa Park",
"author": "Anonymous"
},
{
"id": "46063-04959-16640-73087",
"title": "Voting Run",
"author": "I-am-cool"
},
{
"id": "09630-91455-62775-31183",
"title": "Marie Curie's Impact",
"author": "Aeth"
},
{
"id": "13291-46234-96045-98750",
"title": "Monika's Literature club activity",
"author": "Scott144"
},
{
"id": "93229-68745-57700-24671",
"title": "Earhart's Adventure!",
"author": "lazyfrog"
},
{
"id": "56948-93110-46205-88931",
"title": "Goal Keeper",
"author": "Arthur G"
},
{
"id": "07772-79468-80619-15682",
"title": "Women suffrage moment. ",
"author": "Muhammad Mr. Ahmed"
},
{
"id": "33348-22247-29839-27999",
"title": "damsel vs distress",
"author": "Louie"
},
{
"id": "01281-83250-56636-84525",
"title": "rachels adventure home",
"author": "wingweird"
},
{
"id": "66892-29375-71260-87726",
"title": "Knightnapped!",
"author": "Bugoi"
},
{
"id": "17426-35827-39847-31722",
"title": "Tu You You ",
"author": "ZiKk_l"
},
{
"id": "85019-68993-24232-29047",
"title": "Ghost Clone Invaders",
"author": "Monishka S"
},
{
"id": "14704-73542-39194-29081",
"title": "Jump Simone Jump",
"author": "Adrian"
},
{
"id": "33056-90694-14517-53070",
"title": "Be careful Marie",
"author": "Pablo"
},
{
"id": "37154-72490-65681-90108",
"title": "Cleopatra in trouble",
"author": "Pablo"
},
{
"id": "38756-57065-05774-13832",
"title": "Amelia Earhart",
"author": "Jose A"
},
{
"id": "36694-24124-09993-26840",
"title": "Cleopatra kill the snakes",
"author": "Clara"
},
{
"id": "61123-99901-00377-67993",
"title": "Valentina Tereshkova in space",
"author": "Jaime"
},
{
"id": "64477-56549-76019-31922",
"title": "Olga's goal",
"author": "Ismael"
},
{
"id": "65510-15821-73818-83251",
"title": "Valentina Tereshkova",
"author": "Diego - Alonso - Alvaro"
},
{
"id": "26967-12412-92781-54833",
"title": "Edurne Pasaban climb Everest",
"author": "Tomás"
},
{
"id": "72000-97996-42180-66653",
"title": "Teresa de Calcuta",
"author": "Javier"
},
{
"id": "96472-56984-79717-25218",
"title": "car racing(Danica Patrick)",
"author": "Grames"
},
{
"id": "51609-67658-77207-04230",
"title": "Hilma af Klint, true or false",
"author": "Bruno"
},
{
"id": "36472-43140-05348-98070",
"title": "Mission 79",
"author": "Octodemon6611"
},
{
"id": "72592-49869-73785-95313",
"title": "very fun cave game :):)",
"author": "gideon_loves_cats :):)"
},
{
"id": "86994-86785-55167-78927",
"title": "Annie and Mary",
"author": "hanki"
},
{
"id": "39130-17586-84955-97935",
"title": "ZANDOX",
"author": "NOVABOY"
}
],
"start": "2024-3-1 00:00:01 GMT-0700",
"end": "2024-3-31 23:59:59 GMT-0700"
Expand Down
Loading
Loading