Merge branch 'master' into kiki-lee-midweek

docs/gamejam/all.md

@@ -1,22 +1,27 @@
-# Game Jams
+# MakeCode Arcade Game Jam
 
-Past game jams that have been held in Arcade.
+A game jam is a friendly competition where participants are challenged to make a game centered around a specific theme within a certain amount of time. Game Jams are a great way to learn, express your creativity, connect and collaborate with others, and get recognition for bringing your amazing ideas to life!
 
-### ~ hint
+You can host your own Game Jams using the materials from the [Game Jam in a Box](/gamejam/lessons/box) resources.
 
-#### Blocks are covered up?
+The MakeCode Team regularly hosts game jams – keep an eye on the [MakeCode Forum](https://forum.makecode.com/c/share-your-arcade-projects-here/5) for the next game jam announcement. Check out some of the previous MakeCode hosted game jams below.
 
-If you see blocks overlapping each other in the editor workspace, you can
-reformat them by selecting **Format Code** from the menu when you right-click
-on the workspace background.
-
-### ~
-
-
-## Game Jams
+## Previous Game Jams
 
 ```codecard
 [
+    {
+        "name": "Five Second Games",
+        "description": "A combination of micro-games that can be played in 5 seconds!",
+        "url": "https://itch.io/jam/makecode-game-jam",
+        "imageUrl": "/static/gamejam/jams/five-second/assets/preview.png"
+    },
+    {
+        "name": "One Room",
+        "description": "Games that take place in one room and use just one tilemap",
+        "url": "https://itch.io/jam/makecode-arcade-game-jam-2",
+        "imageUrl": "/static/gamejam/jams/one-room/assets/preview.png"
+    },
     {
         "name": "Time Jam",
         "description": "Time themed jam hosted in Arcade",
@@ -40,13 +45,29 @@ on the workspace background.
         "description": "Garden themed jam hosted in Arcade",
         "url": "/gamejam/garden",
         "imageUrl": "/static/gamejam/jams/garden/assets/garden.gif"
+    },
+    {
+        "name": "Climate Jam",
+        "description": "Games focused on human inpact in the global climate crisis",
+        "url": "/gamejam/global-2021",
+        "imageUrl": "/static/gamejam/jams/global-2021/assets/preview.png"
+    },
+    {
+        "name": "Prehistoric Jam",
+        "description": "A prehistoric themed jam in a land before time",
+        "url": "/gamejam/prehistoric",
+        "imageUrl": "/static/gamejam/jams/prehistoric/assets/preview.png"
     }
 ]
 ```
 
 ## See also
 
+[Five Second Games](https://itch.io/jam/makecode-game-jam),
+[One Room](https://itch.io/jam/makecode-arcade-game-jam-2),
 [Time Jam](/gamejam/time),
 [Ocean Jam](/gamejam/ocean),
 [Traffic Jam](/gamejam/traffic),
-[Garden Jam](/gamejam/garden)
+[Garden Jam](/gamejam/garden),
+[Climate Jam](/gamejam/global-2021),
+[Prehistoric Jam](/gamejam/prehistoric)

docs/index-ref.json

@@ -1,3 +1,3 @@
 {
-    "appref": "v1.12.46"
-}
+    "appref": "v1.12.47"
+}

docs/tutorials/froggy.md

@@ -401,19 +401,17 @@ fly.setBounceOnWall(true)
 
 controller.A.onEvent(ControllerButtonEvent.Pressed, function () { })
 frog.overlapsWith(fly)
-if () { } else { }
+if (false) { } else { }
 game.over(true)
 
-list = sprites.allOfKind(SpriteKind.Food)
-    list.pop().destroy()
-    for (let index = 0; index <= 4; index++) {
-
-    }
-    for (let index = 0; index < 4; index++) {
-
-    }
+let list = sprites.allOfKind(SpriteKind.Food)
+list.pop().destroy()
+for (let index = 0; index <= 4; index++) {
 
+}
+for (let index = 0; index < 4; index++) {
 
+}
 ```
 
 

editor/extension.ts

@@ -1,4 +1,4 @@
-/// <reference path="../node_modules/pxt-core/built/pxteditor.d.ts" />
+/// <reference path="../node_modules/pxt-core/localtypings/pxteditor.d.ts" />
 
 namespace pxt.editor {
     function patchBlocks(pkgTargetVersion: string, dom: Element) {

package.json

@@ -1,6 +1,6 @@
 {
     "name": "pxt-arcade",
-    "version": "1.13.55",
+    "version": "1.13.57",
     "description": "Small arcade editor for MakeCode",
     "keywords": [
         "JavaScript",
@@ -32,7 +32,7 @@
     },
     "dependencies": {
         "pxt-common-packages": "11.1.6",
-        "pxt-core": "9.3.10"
+        "pxt-core": "9.3.15"
     },
     "optionalDependencies": {
         "pxt-arcade-sim": "microsoft/pxt-arcade-sim.git#v0.11.12"

pxtarget.json

@@ -577,7 +577,8 @@
             "ja",
             "ko",
             "es-ES",
-            "es-MX"
+            "es-MX",
+            "ru"
         ],
         "invertedMenu": true,
         "showHomeScreen": true,