From d6b165ad653ba1fc7cd401e81fef248bc4fa9fc6 Mon Sep 17 00:00:00 2001 From: Kiki Prottsman Date: Mon, 9 Dec 2024 11:39:58 -0800 Subject: [PATCH 01/10] Adding Tracking Pixel (#6577) --- docs/tutorials/bubbles.md | 2 +- docs/tutorials/lyla-jr.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/tutorials/bubbles.md b/docs/tutorials/bubbles.md index ee2073fa3e..f3721e4309 100644 --- a/docs/tutorials/bubbles.md +++ b/docs/tutorials/bubbles.md @@ -11,7 +11,7 @@ Disney and Pixar's Inside Out 2? Click **Next** to make your own game! ![Play Bubble Stacking with Joy](/static/tutorials/bubbles/io2_title.jpg "How many memories can you store?") - +![ ](https://code.org/api/hour/begin_bubble_popping) diff --git a/docs/tutorials/lyla-jr.md b/docs/tutorials/lyla-jr.md index 5dc8d0eb20..50ef6ef314 100644 --- a/docs/tutorials/lyla-jr.md +++ b/docs/tutorials/lyla-jr.md @@ -10,7 +10,7 @@ ![Lyla intro](youtube:43Pp_KVsFIc) - +![ ](https://code.org/api/hour/begin_snack_chase.png) ## {Step 2} From 1e6ee167da8103c9f6830900f9c8f9bc212d0b31 Mon Sep 17 00:00:00 2001 From: Pedro Baracho Date: Mon, 9 Dec 2024 12:50:19 -0800 Subject: [PATCH 02/10] Fix typo (#6574) --- docs/skillmap/mole/mole1.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/skillmap/mole/mole1.md b/docs/skillmap/mole/mole1.md index c4cce9975a..e494ec7109 100644 --- a/docs/skillmap/mole/mole1.md +++ b/docs/skillmap/mole/mole1.md @@ -198,7 +198,7 @@ game.onUpdateInterval(1000, function () {
and drop it onto **an empty area** of the workspace. -The is an **EVENT** block and it will cause the **ACTION** inside to happen each time a second passes. +This is an **EVENT** block and it will cause the **ACTION** inside to happen each time a second passes. ~hint Tell me about events! 💡 @@ -298,4 +298,4 @@ mole-images=github:microsoft/arcade-tutorial-extensions/mole-images#v0.0.11 "main.ts": "", "pxt.json": "{\n \"name\": \"Whackem2 - Assets Only\",\n \"description\": \"\",\n \"dependencies\": {\n \"device\": \"*\"\n },\n \"files\": [\n \"main.blocks\",\n \"main.ts\",\n \"README.md\",\n \"assets.json\",\n \"images.g.jres\",\n \"images.g.ts\",\n \"custom.ts\"\n ],\n \"targetVersions\": {\n \"branch\": \"v1.8.26\",\n \"tag\": \"v1.8.26\",\n \"commits\": \"https://github.com/microsoft/pxt-arcade/commits/6434cb63948fe7c1d1a7498115a4bc495495512c\",\n \"target\": \"1.8.26\",\n \"pxt\": \"7.4.27\"\n },\n \"preferredEditor\": \"tsprj\"\n}\n" } -``` \ No newline at end of file +``` From bc1527fd938da0380b3808c86a77c260f02e25b5 Mon Sep 17 00:00:00 2001 From: Kiki Prottsman Date: Tue, 10 Dec 2024 11:14:12 -0800 Subject: [PATCH 03/10] Added missing png from Code.org (#6581) --- docs/tutorials/bubbles.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/tutorials/bubbles.md b/docs/tutorials/bubbles.md index f3721e4309..04f08cbd16 100644 --- a/docs/tutorials/bubbles.md +++ b/docs/tutorials/bubbles.md @@ -11,7 +11,7 @@ Disney and Pixar's Inside Out 2? Click **Next** to make your own game! ![Play Bubble Stacking with Joy](/static/tutorials/bubbles/io2_title.jpg "How many memories can you store?") -![ ](https://code.org/api/hour/begin_bubble_popping) +![ ](https://code.org/api/hour/begin_bubble_popping.png) From 00eab72d9f2aa384f1624bc4a65fe9c92f20d695 Mon Sep 17 00:00:00 2001 From: Thomas Sparks <69657545+thsparks@users.noreply.github.com> Date: Wed, 11 Dec 2024 09:46:34 -0800 Subject: [PATCH 04/10] Bump pxt core 11.3.6 -> 11.3.7 (#6583) --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index f5e45a4f6a..27a8324bcb 100644 --- a/package.json +++ b/package.json @@ -32,7 +32,7 @@ }, "dependencies": { "pxt-common-packages": "12.2.2", - "pxt-core": "11.3.6" + "pxt-core": "11.3.7" }, "optionalDependencies": { "pxt-arcade-sim": "microsoft/pxt-arcade-sim.git#v0.11.12" From 2758c702f9e7f1deafdc89d7ae6e52af612b30a9 Mon Sep 17 00:00:00 2001 From: Abhijith Chatra Date: Wed, 11 Dec 2024 14:10:35 -0800 Subject: [PATCH 05/10] allow listing codeninja camp tutorial (#6586) --- targetconfig.json | 3 +++ 1 file changed, 3 insertions(+) diff --git a/targetconfig.json b/targetconfig.json index 1339e0e3c1..088e159446 100644 --- a/targetconfig.json +++ b/targetconfig.json @@ -140,6 +140,9 @@ }, "code-ninjas-home-office/scott-kelly-games": { "tutorial" : true + }, + "code-ninjas-home-office/camps": { + "tutorial" : true } }, "builtinExtensionsLib": { From ea70fa93ebb7bed225911b4a2d6fbb144d3f7524 Mon Sep 17 00:00:00 2001 From: Hassan Sufi Date: Thu, 19 Dec 2024 12:26:51 -0700 Subject: [PATCH 06/10] Update CDN for ts and tsx files (#6594) * Update CDN for ts and tsx files * Update CDN for markdown files * Update CDN for html files --- docs/courses/summer-training.md | 16 +++++++-------- docs/game-jam.md | 20 +++++++++---------- docs/gamejam/cozy.html | 6 +++--- docs/gamejam/female-gamechangers.html | 6 +++--- docs/gamejam/garden.html | 6 +++--- docs/gamejam/global-2021.html | 6 +++--- docs/gamejam/ocean.html | 6 +++--- docs/gamejam/prehistoric.html | 6 +++--- docs/gamejam/time.html | 6 +++--- docs/gamejam/traffic.html | 6 +++--- docs/hour-of-code-2021.html | 2 +- docs/hour-of-code/educators-2021.html | 2 +- docs/projects.md | 2 +- .../gamejam/jams/female-gamechangers/rules.md | 8 ++++---- docs/static/gamejam/jams/ocean/rules.md | 14 ++++++------- docs/static/gamejam/jams/prehistoric/rules.md | 8 ++++---- docs/static/gamejam/jams/traffic/rules.md | 12 +++++------ docs/static/gamejam/lib/gamejam.js | 2 +- docs/static/gamejam/lib/gamejam.ts | 2 +- share/src/components/HeaderBar.tsx | 2 +- share/src/telemetry/appinsights.ts | 2 +- 21 files changed, 70 insertions(+), 70 deletions(-) diff --git a/docs/courses/summer-training.md b/docs/courses/summer-training.md index 68e37a481e..e1f394b5b6 100644 --- a/docs/courses/summer-training.md +++ b/docs/courses/summer-training.md @@ -1,5 +1,5 @@ -![MakeCode Hero Image](https://pxt.azureedge.net/blob/67e56508413dd82807151fefa88b9c8cb2f03392/static/images/hero.png) +![MakeCode Hero Image](https://cdn.makecode.com/blob/67e56508413dd82807151fefa88b9c8cb2f03392/static/images/hero.png) @@ -36,7 +36,7 @@ We will be hosting three **free** online trainings, leading up to a special in-p "name": "Micro:bit at CSTA", "description": "Join us in Vegas on 7/16/24 for an introduction to using micro:bit in the classroom", "url":"https://aka.ms/CSTA24reg", - "imageUrl": "https://pxt.azureedge.net/blob/ce157b871e8d7330375d8dc8ade57d7426259ef4/static/electron-icons.icns", + "imageUrl": "https://cdn.makecode.com/blob/ce157b871e8d7330375d8dc8ade57d7426259ef4/static/electron-icons.icns", "label": "In Person on 7/16/24", "labelClass": "black ribbon large" } @@ -52,14 +52,14 @@ This year, we will be hosting two separate cohorts of each session for both the "name": "Intro to CS PD #1", "description": "Click here to register through Infosys Pathfinders to take part in this online 40-hour professional learning introduction to our entry level Intro to CS with MakeCode Arcade curriculum", "url":"https://pathfinders.onwingspan.com/web/en/app/event-details/makeCode", - "imageUrl": "https://pxt.azureedge.net/blob/6fc548f43baa08998bdc2bd7221cc740244d65f5/static/courses/teals-introcs.jpg", + "imageUrl": "https://cdn.makecode.com/blob/6fc548f43baa08998bdc2bd7221cc740244d65f5/static/courses/teals-introcs.jpg", "label": "Online 6/3/24 - 6/7/24", "labelClass": "orange ribbon large" }, { "name": "Intro to CS PD #2", "description": "Click here to register through Infosys Pathfinders to take part in this online 40-hour professional learning introduction to our entry level Intro to CS with MakeCode Arcade curriculum", "url":"https://pathfinders.onwingspan.com/web/en/app/event-details/makeCode", - "imageUrl": "https://pxt.azureedge.net/blob/6fc548f43baa08998bdc2bd7221cc740244d65f5/static/courses/teals-introcs.jpg", + "imageUrl": "https://cdn.makecode.com/blob/6fc548f43baa08998bdc2bd7221cc740244d65f5/static/courses/teals-introcs.jpg", "label": "Online 7/29/24 - 8/2/24", "labelClass": "orange ribbon large" } @@ -71,14 +71,14 @@ This year, we will be hosting two separate cohorts of each session for both the "name": "AP CS Prinicples #1", "description": "Click here to register for this online professional learning opportunity for the MakeCode AP CS Principles course. (Session #1)", "url": "https://events.teams.microsoft.com/event/068ed173-0075-493a-be29-8d9784b2717f@38dd6634-1031-4c50-a9b4-d16cd9d97d57", - "imageUrl": "https://pxt.azureedge.net/blob/2f29e06f0ce78fc647a0f19ea4acadd0ea29563c/static/courses/csp.png", + "imageUrl": "https://cdn.makecode.com/blob/2f29e06f0ce78fc647a0f19ea4acadd0ea29563c/static/courses/csp.png", "label": "Online 6/17/24 - 6/22/24", "labelClass": "orange ribbon large" },{ "name": "AP CS Prinicples #2", "description": "Click here to register for this online professional learning opportunity for the MakeCode AP CS Principles course. (Session #2)", "url": "https://events.teams.microsoft.com/event/ee217aa0-7581-432b-b828-b0972328b25d@38dd6634-1031-4c50-a9b4-d16cd9d97d57", - "imageUrl": "https://pxt.azureedge.net/blob/2f29e06f0ce78fc647a0f19ea4acadd0ea29563c/static/courses/csp.png", + "imageUrl": "https://cdn.makecode.com/blob/2f29e06f0ce78fc647a0f19ea4acadd0ea29563c/static/courses/csp.png", "label": "Online 7/22/24 - 7/26/24", "labelClass": "orange ribbon large" } @@ -93,14 +93,14 @@ This year, we will be hosting two separate cohorts of each session for both the "name": "Teach Minecraft Code", "description": "All you need to know has been presented in this easy to follow PDF.", "url":"https://aka.ms/carnivalGuide", - "imageUrl": "https://pxt.azureedge.net/blob/67b55f01ae0289333b6900632b6edc08d74462a8/static/live-coding/eO8cXUjwrmM.jpg", + "imageUrl": "https://cdn.makecode.com/blob/67b55f01ae0289333b6900632b6edc08d74462a8/static/live-coding/eO8cXUjwrmM.jpg", "label": "Online 6/17/24 - 6/22/24", "labelClass": "green ribbon large" }, { "name": "Resources Drive", "description": "This is home base for all of the resources that accompany the Code a Carnival Lesson", "url":"https://aka.ms/carnivalDrive", - "imageUrl": "https://pxt.azureedge.net/blob/6ad07456e1cb95a5339fb6562e1589cc9d65608d/static/mods/gladiator.jpg", + "imageUrl": "https://cdn.makecode.com/blob/6ad07456e1cb95a5339fb6562e1589cc9d65608d/static/mods/gladiator.jpg", "label": "Online 6/17/24 - 6/22/24", "labelClass": "green ribbon large" } diff --git a/docs/game-jam.md b/docs/game-jam.md index 8cda4ee8e8..9f30785595 100644 --- a/docs/game-jam.md +++ b/docs/game-jam.md @@ -9,70 +9,70 @@ Check out the winners of the 9th Official Microsoft MakeCode Game Jam, featuring * author: Peppercorn Studios * url: https://arcade.makecode.com/98537-40423-47522-15861 * cardType: sharedExample -* imageUrl: https://pxt.azureedge.net/api/98537-40423-47522-15861/thumb +* imageUrl: https://cdn.makecode.com/api/98537-40423-47522-15861/thumb --- * name: Lady Lovelace's Time Machine * description: Repair your time machine with the help of Ada Lovelace and other Women from history! Created by verisutha * author: verisutha * url: https://arcade.makecode.com/58950-52861-22099-51073 * cardType: sharedExample -* imageUrl: https://pxt.azureedge.net/api/58950-52861-22099-51073/thumb +* imageUrl: https://cdn.makecode.com/api/58950-52861-22099-51073/thumb --- * name: The Adventures of Frances Perkins * description: Play as civil rights activist Frances Perkins as she saves children from being forced into child labor! Created by Brohann * author: Brohann * url: https://arcade.makecode.com/24653-68670-93715-48748 * cardType: sharedExample -* imageUrl: https://pxt.azureedge.net/api/24653-68670-93715-48748/thumb +* imageUrl: https://cdn.makecode.com/api/24653-68670-93715-48748/thumb --- * name: Grace Hopper's Hop-O-Matic * description: Take on the role of Grace Hopper's compiler as it processes source code into ones and zeroes! Created by rymc88 * author: rymc88 * url: https://arcade.makecode.com/14599-75222-61879-27532 * cardType: sharedExample -* imageUrl: https://pxt.azureedge.net/api/14599-75222-61879-27532/thumb +* imageUrl: https://cdn.makecode.com/api/14599-75222-61879-27532/thumb --- * name: Blast and Slash * 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! Created by Lucas_M/DangerKitty * author: Lucas_M/DangerKitty * url: https://arcade.makecode.com/98398-96774-94162-09922 * cardType: sharedExample -* imageUrl: https://pxt.azureedge.net/api/98398-96774-94162-09922/thumb +* imageUrl: https://cdn.makecode.com/api/98398-96774-94162-09922/thumb --- * name: Amanda Gorman and "The Hill We Climb" * description: Play as poet Amanda Gorman as she composes her poem for President Biden's inauguration! Created by Ceggiebear * author: Ceggiebear * url: https://arcade.makecode.com/81763-74727-74866-09375 * cardType: sharedExample -* imageUrl: https://pxt.azureedge.net/api/81763-74727-74866-09375/thumb +* imageUrl: https://cdn.makecode.com/api/81763-74727-74866-09375/thumb --- * name: Megan Rapinoe * 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! Created by GoMustangs * author: GoMustangs * url: https://arcade.makecode.com/38226-95731-47070-73388 * cardType: sharedExample -* imageUrl: https://pxt.azureedge.net/api/38226-95731-47070-73388/thumb +* imageUrl: https://cdn.makecode.com/api/38226-95731-47070-73388/thumb --- * name: Amelia Earhart: Aviator Extraordinaire * description: Recreate famous flights from Amelia Earhart's life in this flight simulator! Created by Blobbey * author: Blobbey * url: https://arcade.makecode.com/75876-49918-50592-15147 * cardType: sharedExample -* imageUrl: https://pxt.azureedge.net/api/75876-49918-50592-15147/thumb +* imageUrl: https://cdn.makecode.com/api/75876-49918-50592-15147/thumb --- * name: FOR ALL WOMANKIND * description: Play as a team of astronauts trying to land their shuttlecraft in this game dedicated to Katherine Johnson! Created by Oscar * author: Oscar * url: https://arcade.makecode.com/76909-17578-71814-49492 * cardType: sharedExample -* imageUrl: https://pxt.azureedge.net/api/76909-17578-71814-49492/thumb +* imageUrl: https://cdn.makecode.com/api/76909-17578-71814-49492/thumb --- * name: Infiltration * description: Stand up to the tyranny of megacorporations and save your family in the metroidvania game! Created by M1nt-Phoen1x * author: M1nt-Phoen1x * url: https://arcade.makecode.com/49970-33654-67029-92638 * cardType: sharedExample -* imageUrl: https://pxt.azureedge.net/api/49970-33654-67029-92638/thumb +* imageUrl: https://cdn.makecode.com/api/49970-33654-67029-92638/thumb --- * name: See more... * description: Check out all the entries on the official game jam page! diff --git a/docs/gamejam/cozy.html b/docs/gamejam/cozy.html index c31d288cf6..a920d95301 100644 --- a/docs/gamejam/cozy.html +++ b/docs/gamejam/cozy.html @@ -11,7 +11,7 @@ - + + src="https://cdn.makecode.com/blob/555c1dc1d9da18154cb48388d5e494f3f16119f8/marked/marked.min.js"> + src="https://cdn.makecode.com/blob/3c168a772b9e4cbf3ecb648148cfb2f966e8a578/pxtembed.js"> + src="https://cdn.makecode.com/blob/555c1dc1d9da18154cb48388d5e494f3f16119f8/marked/marked.min.js"> + src="https://cdn.makecode.com/blob/3c168a772b9e4cbf3ecb648148cfb2f966e8a578/pxtembed.js"> + src="https://cdn.makecode.com/blob/555c1dc1d9da18154cb48388d5e494f3f16119f8/marked/marked.min.js"> + src="https://cdn.makecode.com/blob/3c168a772b9e4cbf3ecb648148cfb2f966e8a578/pxtembed.js"> + src="https://cdn.makecode.com/blob/555c1dc1d9da18154cb48388d5e494f3f16119f8/marked/marked.min.js"> + src="https://cdn.makecode.com/blob/3c168a772b9e4cbf3ecb648148cfb2f966e8a578/pxtembed.js"> + src="https://cdn.makecode.com/blob/555c1dc1d9da18154cb48388d5e494f3f16119f8/marked/marked.min.js"> + src="https://cdn.makecode.com/blob/3c168a772b9e4cbf3ecb648148cfb2f966e8a578/pxtembed.js"> + src="https://cdn.makecode.com/blob/555c1dc1d9da18154cb48388d5e494f3f16119f8/marked/marked.min.js"> + src="https://cdn.makecode.com/blob/3c168a772b9e4cbf3ecb648148cfb2f966e8a578/pxtembed.js"> + src="https://cdn.makecode.com/blob/555c1dc1d9da18154cb48388d5e494f3f16119f8/marked/marked.min.js"> + src="https://cdn.makecode.com/blob/3c168a772b9e4cbf3ecb648148cfb2f966e8a578/pxtembed.js">