From 8ae632b583cd29327651697bc941902c77a5fd72 Mon Sep 17 00:00:00 2001 From: Thomas Sparks <69657545+thsparks@users.noreply.github.com> Date: Thu, 27 Jun 2024 09:57:38 -0700 Subject: [PATCH] Port docs changes (#6462) --- docs/courses.md | 2 + docs/gamejam/female-gamechangers.html | 16 +- docs/hardware.md | 19 +- docs/hardware/dbg.md | 2 +- docs/hour-of-code/all.md | 2 +- docs/index-ref.json | 2 +- docs/projects.md | 2 +- docs/skillmap/balloon/balloon1.md | 12 +- docs/skillmap/mole/mole1.md | 11 +- .../jams/female-gamechangers/info.json | 196 ++++++++++++++++++ .../gamejam/jams/female-gamechangers/rules.md | 65 +++--- docs/static/hardware/kitronik-shield.png | Bin 0 -> 125333 bytes docs/static/tutorials/bubbles/io2.gif | Bin 217770 -> 0 bytes docs/static/tutorials/bubbles/io2_title.jpg | Bin 0 -> 133463 bytes docs/test/tutorials/bubbles.md | 7 +- docs/tutorials/music.md | 2 +- docs/tutorials/target.md | 2 +- 17 files changed, 254 insertions(+), 86 deletions(-) create mode 100644 docs/static/hardware/kitronik-shield.png delete mode 100644 docs/static/tutorials/bubbles/io2.gif create mode 100644 docs/static/tutorials/bubbles/io2_title.jpg diff --git a/docs/courses.md b/docs/courses.md index b605bde8f69..ec46912b3e2 100644 --- a/docs/courses.md +++ b/docs/courses.md @@ -51,6 +51,7 @@ 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", @@ -58,6 +59,7 @@ The games they make in the course can run on the GameGo device! Courses are free "url": "https://make2learn.tinkergen.com/course/?sku=604182003", "imageUrl": "/static/courses/gamego-intermediate.png", "largeImageUrl": "/static/courses/gamego-intermediate.png", + "cardType": "link", "directOpen": true } ] diff --git a/docs/gamejam/female-gamechangers.html b/docs/gamejam/female-gamechangers.html index e7b2b0a2a68..85c333eff78 100644 --- a/docs/gamejam/female-gamechangers.html +++ b/docs/gamejam/female-gamechangers.html @@ -54,7 +54,7 @@ or on handheld game devices.
-Ready to submit your game? Use the button below!
-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!
- -Check out the submitted games!
diff --git a/docs/hardware.md b/docs/hardware.md index d2172f287a5..ddfb70e6405 100644 --- a/docs/hardware.md +++ b/docs/hardware.md @@ -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", @@ -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 diff --git a/docs/hardware/dbg.md b/docs/hardware/dbg.md index 777804a3da7..6f9ddb6c514 100644 --- a/docs/hardware/dbg.md +++ b/docs/hardware/dbg.md @@ -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. diff --git a/docs/hour-of-code/all.md b/docs/hour-of-code/all.md index c1c2c2b0142..65d2e5ba8f8 100644 --- a/docs/hour-of-code/all.md +++ b/docs/hour-of-code/all.md @@ -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)", diff --git a/docs/index-ref.json b/docs/index-ref.json index 49aebf06284..571af5a9ae8 100644 --- a/docs/index-ref.json +++ b/docs/index-ref.json @@ -1,3 +1,3 @@ { - "appref": "v1.12.49" + "appref": "v1.12.53" } diff --git a/docs/projects.md b/docs/projects.md index c74588d7162..0482be0bcd1 100644 --- a/docs/projects.md +++ b/docs/projects.md @@ -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", diff --git a/docs/skillmap/balloon/balloon1.md b/docs/skillmap/balloon/balloon1.md index 3e654459fc0..3704df5e5a9 100644 --- a/docs/skillmap/balloon/balloon1.md +++ b/docs/skillmap/balloon/balloon1.md @@ -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 " ") diff --git a/docs/skillmap/mole/mole1.md b/docs/skillmap/mole/mole1.md index f1b8f98b527..c4cce9975a9 100644 --- a/docs/skillmap/mole/mole1.md +++ b/docs/skillmap/mole/mole1.md @@ -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 " ") diff --git a/docs/static/gamejam/jams/female-gamechangers/info.json b/docs/static/gamejam/jams/female-gamechangers/info.json index 339418273d9..93da2bbd97e 100644 --- a/docs/static/gamejam/jams/female-gamechangers/info.json +++ b/docs/static/gamejam/jams/female-gamechangers/info.json @@ -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" diff --git a/docs/static/gamejam/jams/female-gamechangers/rules.md b/docs/static/gamejam/jams/female-gamechangers/rules.md index 78c234c2427..9460e48d5ce 100644 --- a/docs/static/gamejam/jams/female-gamechangers/rules.md +++ b/docs/static/gamejam/jams/female-gamechangers/rules.md @@ -2,55 +2,42 @@ -- | -- ![Microsoft logo](/static/gamejam/jams/female-gamechangers/assets/msft-makecode-logo.png) | ![Code ninjas logo](/static/gamejam/jams/female-gamechangers/assets/code-ninjas-logo.svg) | ![Girls Who Code logo](/static/gamejam/jams/female-gamechangers/assets/girls-who-code-logo.png) -This Women's History Month, we are excited to partner with Girls Who Code and Code Ninjas to celebrate women who have made an impact in your life through the Female Gamechangers Game Jam! +# Female Gamechangers Jam Winners! -The theme for this jam is "Women who impacted your life". Your game could include a famous woman from history, someone you know personally, or even an original character you create! +## First Place: Marie Curie +| | +| -- | +| [![Marie Curie game screenshot](https://pxt.azureedge.net/api/98537-40423-47522-15861/thumb)](https://arcade.makecode.com/98537-40423-47522-15861) | +| | -Some examples of good interpretations of this theme: +[Marie Curie](https://arcade.makecode.com/98537-40423-47522-15861) by **Peppercorn Studios** lets you play as Marie Curie as she searches for new elements to discover and name! Mix different chemicals to try and create interesting combinations. When you have something that you think might be a new element, press Menu and try submitting it to the Nobel committee! This game wowed us with it's charming art and inventive gameplay! Also, kudos to KiwiPhoenix for creating the game's music. -1. A game that traces the journey of Amelia Earhart -2. A sports game featuring female athletes -3. A space exploration game inspired by the life of NASA mathematician Katherine Johnson +## Second Place: Lady Lovelace's Time Machine -DEMO GIF 1 | DEMO GIF 2 | DEMO GIF 3 --- | -- -![](/static/gamejam/jams/female-gamechangers/assets/demo-1.gif) | ![](/static/gamejam/jams/female-gamechangers/assets/demo-3.gif) | ![](/static/gamejam/jams/female-gamechangers/assets/demo-2.gif) - -You can interpret the theme however you want, but someone playing your game should be able to see how it relates to the theme without extra explanation. - -Be sure to also check out the [official Code Ninja's page for this jam](https://forms.codeninjas.com/femalegamechangers) to learn about how you can be entered to win prizes if you're under 16! - -## Important Dates - -The game jam will run from **March 1, 2024** to **March 31, 2024** - -You will have one month to build and submit your games for the competition! For you procrastinators out there, we will accept games up until 11:59pm on March 31st. - -## Getting started +| | +| -- | +| [![Lady Lovelace's Time Machine game screenshot](https://pxt.azureedge.net/api/58950-52861-22099-51073/thumb)](https://arcade.makecode.com/58950-52861-22099-51073) | +| | -Never programmed in Microsoft MakeCode Arcade before? No problem! Check out our [beginner skillmaps](https://arcade.makecode.com/--skillmap#dino) to learn the basics of making a game! +[Lady Lovelace's Time Machine](https://arcade.makecode.com/58950-52861-22099-51073) by **verisutha** tasks you with helping Ada Lovelace repair your time machine after an accident strands you in the past! Luckily, you have the help of other women from history including Mary Shelley, Grace Hopper, Marie Curie, and Katherine Johnson in your quest! Everything about this game impressed our judges especially its use of custscenes, art, and storytelling. Best of all, this game includes no less than *four* other games for you to play through (and they're all fun!). Make sure to stick around to the end for a great finale cutscene! -## Rules +## Third Place (tie): The Adventures of Frances Perkins -1. Games should be built in MakeCode Arcade -2. Your game must relate to the jam theme. Someone playing your game should be able to see how it relates to the theme without extra explanation. -3. Keep the games PG: no NSFW, offensive, or excessively violent content. -4. You must be at least 9 years old to participate. -5. All games must be submitted by someone who is at least 13 years old. Younger students are welcome to participate, but it must be in partnership with an adult and with parent permission. +| | +| -- | +| [![The Adventures of Frances Perkins game screenshot](https://pxt.azureedge.net/api/24653-68670-93715-48748/thumb)](https://arcade.makecode.com/24653-68670-93715-48748) | +| | -## Join the community +[The Adventures of Frances Perkins](https://arcade.makecode.com/24653-68670-93715-48748) by **Brohann** is a terrific platformer where you play as civil rights activist Frances Perkins as she saves children from being forced into child labor. This game wowed our judges with its level of polish: the art, sounds, and text/lighting effects really made it stand out from the crowd! We also loved that the gameplay switches up as the game goes on (be sure to check out the minecart levels!). -This game jam is designed to be an easy introduction to making games, even for folks without prior programming experience! We highly encourage parents and educators to work with interested students to bring their games to life. +## Third Place (tie): Grace Hopper's Hop-O-Matic -Join our [forums](https://forum.makecode.com) to chat with other coders, brainstorm ideas, or form a game jam team. You can hang out with the MakeCode team there too! +| | +| -- | +| [![Grace Hopper's Hop-O-Matic game screenshot](https://pxt.azureedge.net/api/14599-75222-61879-27532/thumb)](https://arcade.makecode.com/14599-75222-61879-27532) | +| | -## Tips and tricks +[Grace Hopper's Hop-O-Matic](https://arcade.makecode.com/14599-75222-61879-27532) by **rymc88** lets you take on the role of Grace Hopper's compiler as it processes source code into ones and zeroes. Our judges loved how this game interpreted the theme as well as the amazing animation it plays when you finish encoding a character. This game is surprisingly addictive even though it only uses two buttons! -* When designing your game, keep in mind that Arcade is restricted to a 160x120 16-color screen -* See [these instructions](https://arcade.makecode.com/developer/images) for information on importing images and color palettes into Arcade. -* Check out the [developer documentation](https://arcade.makecode.com/developer) for more advanced tips to use in Arcade. -* Also make sure you check out the winners of [our past jams!](/gamejam/all) +Be sure to also check out the [official Code Ninja's page for this jam](https://forms.codeninjas.com/femalegamechangers), where they will host a separate round of judging and prizes! -[traffic-jam]: https://arcade.makecode.com/gamejam/traffic -[ocean-jam]: https://arcade.makecode.com/gamejam/ocean -[garden-jam]: https://arcade.makecode.com/gamejam/garden \ No newline at end of file diff --git a/docs/static/hardware/kitronik-shield.png b/docs/static/hardware/kitronik-shield.png new file mode 100644 index 0000000000000000000000000000000000000000..ba29bac722e772c170c29a2df6568aa5edd0b1cf GIT binary patch literal 125333 zcmeFYWl&sQ&@M`F5AN;*BuH=#?(XjH?hq`vy9XE`1Q~3Q;5N7i*C4^&{m%QHs#A4u z)%|(?otoOU_g;JTmR_rS_0vyJjHn%zHM}{dUb|-3Cy&rMh1KBew?&
zC@5UZQu9BL`Z*hS#9`v1B7D@kib;)l`X^$?Tc+tgWCUnP6xu=&!;`ixu<8~0F0k~%
z+V)H3X3oYWKPUW@Uz5(=Ta1$a=>28uyS~nZJ`~gTgMgNS?&;$ErU80i1pOk~aIMTk
z($(9>2maty3FgHsE4yy*$~mvc{=8-Ob&qW^?vN5hWlGY)_DV5(FE`Obnsq&T!&DKO
zv-ai@^W&$N4$E*}HzOvlA0Lk-6J57*D1{6*TCBAROQrfF@7bDm@-eKfL4z7S-CQf{
zV8lwiQ)@I)Rn1?tLAEf|Oj@Ig Wj{c|>69TA3M>hz?o0JOLx@n?vlklS~@
zWqW&z|N4LT&zPFIz|hF2Z0{Z
Z
z&6SkWp^Fx2E?Dw;h0ww#p*fsp(Sga?aikTK$>tdv9HdgI{Dte;-`GM68qb`bo+Fnl
z5XEgWS;@(91K$ty3U2O&nBGN>V@>C>jB{7l^Efy-qT3A_9vPurDl#xwA@n-z?{2fR
zv&+H3A%X7!A!DNze&_dp#MJB@wOWG*_n-0b{xd%L