wip not working

Do not show in changelog

.github/workflows/build-storybook.yml

@@ -57,8 +57,8 @@ jobs:
 
       - name: Log urls to the Storybook
         run: |
-          echo "Find the latest Storybook for this branch on http://gdevelop-storybook.s3-website-us-east-1.amazonaws.com/$(git rev-parse --abbrev-ref HEAD)/latest/index.html"
-          echo "Find the Storybook for this commit on http://gdevelop-storybook.s3-website-us-east-1.amazonaws.com/$(git rev-parse --abbrev-ref HEAD)/commit/$(git rev-parse HEAD)/index.html"
+          echo "Find the latest Storybook for this branch on https://gdevelop-storybook.s3.amazonaws.com/$(git rev-parse --abbrev-ref HEAD)/latest/index.html"
+          echo "Find the Storybook for this commit on https://gdevelop-storybook.s3.amazonaws.com/$(git rev-parse --abbrev-ref HEAD)/commit/$(git rev-parse HEAD)/index.html"
 
       # Publish on Chromatic, only when manually launched (too costly to run on every commit).
       - name: Publish Storybook to Chromatic

Core/GDCore/Extensions/Builtin/AsyncExtension.cpp

@@ -15,11 +15,13 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsAsyncExtension(
   extension
       .SetExtensionInformation(
           "BuiltinAsync",
-          _("Async functions"),
+          _("Asynchronous functions"),
           _("Functions that defer the execution of the events after it."),
           "Arthur Pacaud (arthuro555)",
           "Open source (MIT License)")
       .SetCategory("Advanced");
+  extension.AddInstructionOrExpressionGroupMetadata(_("Asynchronous functions"))
+      .SetIcon("res/function32.png");
 
   extension.AddEvent("Async",
                      _("Async event"),
@@ -27,6 +29,18 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsAsyncExtension(
                      "",
                      "res/eventaddicon.png",
                      std::make_shared<gd::AsyncEvent>());
+
+  extension
+      .AddAction(
+          "ResolveAsyncEventsFunction",
+          _("End asynchronous function"),
+          _("Mark an asynchronous function as finished. This will allow the "
+            "actions and subevents following it to be run."),
+          "Mark asynchronous function as ended",
+          "",
+          "res/actions/quit24.png",
+          "res/actions/quit.png")
+      .AddCodeOnlyParameter("eventsFunctionContext", "");
 }
 
 }  // namespace gd

Core/GDCore/Extensions/Builtin/AudioExtension.cpp

@@ -23,6 +23,8 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsAudioExtension(
       .SetCategory("Audio");
   extension.AddInstructionOrExpressionGroupMetadata(_("Sounds and music"))
       .SetIcon("res/actions/music24.png");
+  extension.AddInstructionOrExpressionGroupMetadata(_("Sounds on channels"))
+      .SetIcon("res/actions/son24.png");
 
   extension
       .AddAction("PlaySoundCanal",

Core/GDCore/Extensions/Builtin/BaseObjectExtension.cpp

@@ -406,8 +406,8 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
       .MarkAsAdvanced();
 
   obj.AddAction("ModVarObjet",
-                _("Value of an object variable"),
-                _("Change the value of an object variable."),
+                _("Change number variable"),
+                _("Modify the number value of an object variable."),
                 _("the variable _PARAM1_"),
                 _("Variables"),
                 "res/actions/var24.png",
@@ -419,8 +419,8 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
                                      ParameterOptions::MakeNewOptions());
 
   obj.AddAction("ModVarObjetTxt",
-                _("Text of an object variable"),
-                _("Change the text of an object variable."),
+                _("Change text variable"),
+                _("Modify the text of an object variable."),
                 _("the text of variable _PARAM1_"),
                 _("Variables"),
                 "res/actions/var24.png",
@@ -432,8 +432,8 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
                                      ParameterOptions::MakeNewOptions());
 
   obj.AddAction("SetObjectVariableAsBoolean",
-                _("Boolean value of an object variable"),
-                _("Change the boolean value of an object variable."),
+                _("Change boolean variable"),
+                _("Modify the boolean value of an object variable."),
                 _("Set the boolean value of variable _PARAM1_ of "
                   "_PARAM0_ to _PARAM2_"),
                 _("Variables"),
@@ -446,7 +446,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
 
   obj.AddAction(
          "ToggleObjectVariableAsBoolean",
-         _("Toggle the boolean value of an object variable"),
+         _("Toggle boolean variable"),
          _("Toggles the boolean value of an object variable.") + "\n" +
              _("If it was true, it will become false, and if it was false "
                "it will become true."),
@@ -461,37 +461,39 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
 
   obj.AddCondition("ObjectVariableChildExists",
                    _("Child existence"),
-                   _("Check if the specified child of the variable exists."),
+                   _("Check if the specified child of the object "
+                     "structure variable exists."),
                    _("Child _PARAM2_ of variable _PARAM1_ of _PARAM0_ exists"),
-                   _("Variables/Collections/Structures"),
+                   _("Variables/Arrays and structures"),
                    "res/conditions/var24.png",
                    "res/conditions/var.png")
       .AddParameter("object", _("Object"))
-      .AddParameter("objectvar", _("Variable"))
+      .AddParameter("objectvar", _("Structure variable"))
       .AddParameter("string", _("Name of the child"))
       .MarkAsAdvanced();
 
   obj.AddAction("ObjectVariableRemoveChild",
                 _("Remove a child"),
-                _("Remove a child from an object variable."),
+                _("Remove a child from an object structure variable."),
                 _("Remove child _PARAM2_ from variable _PARAM1_ of _PARAM0_"),
-                _("Variables/Collections/Structures"),
+                _("Variables/Arrays and structures"),
                 "res/actions/var24.png",
                 "res/actions/var.png")
       .AddParameter("object", _("Object"))
-      .AddParameter("objectvar", _("Variable"))
+      .AddParameter("objectvar", _("Structure variable"))
       .AddParameter("string", _("Child's name"))
       .MarkAsAdvanced();
 
   obj.AddAction("ObjectVariableClearChildren",
-                _("Clear variable"),
-                _("Remove all the children from the object variable."),
+                _("Clear children"),
+                _("Remove all the children from the object array or structure "
+                  "variable."),
                 _("Clear children from variable _PARAM1_ of _PARAM0_"),
-                _("Variables/Collections"),
+                _("Variables/Arrays and structures"),
                 "res/actions/var24.png",
                 "res/actions/var.png")
       .AddParameter("object", _("Object"))
-      .AddParameter("objectvar", _("Variable"))
+      .AddParameter("objectvar", _("Array or structure variable"))
       .MarkAsAdvanced();
 
   obj.AddAction("Cache",
@@ -619,8 +621,8 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
       .MarkAsAdvanced();
 
   obj.AddCondition("VarObjet",
-                   _("Value of an object variable"),
-                   _("Compare the value of an object variable."),
+                   _("Number variable"),
+                   _("Compare the number value of an object variable."),
                    _("the variable _PARAM1_"),
                    _("Variables"),
                    "res/conditions/var24.png",
@@ -632,7 +634,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
           "number", ParameterOptions::MakeNewOptions());
 
   obj.AddCondition("VarObjetTxt",
-                   _("Text of an object variable"),
+                   _("Text variable"),
                    _("Compare the text of an object variable."),
                    _("the text of variable _PARAM1_"),
                    _("Variables"),
@@ -645,7 +647,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
           "string", ParameterOptions::MakeNewOptions());
 
   obj.AddCondition("ObjectVariableAsBoolean",
-                   _("Boolean value of an object variable"),
+                   _("Boolean variable"),
                    _("Compare the boolean value of an object variable."),
                    _("The boolean value of variable _PARAM1_ of object "
                      "_PARAM0_ is _PARAM2_"),
@@ -659,7 +661,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
 
   obj.AddCondition("VarObjetDef",
                    "Variable defined",
-                   "Check if the variable is defined.",
+                   "Check if the object variable is defined.",
                    "Variable _PARAM1 of _PARAM0_ is defined",
                    _("Variables"),
                    "res/conditions/var24.png",
@@ -667,78 +669,131 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
 
       .AddParameter("object", _("Object"))
       .AddParameter("string", _("Variable"))
-      .SetHidden();
+      .SetHidden();  // Deprecated.
 
   obj.AddAction(
          "ObjectVariablePush",
-         _("Append variable to an object array"),
-         _("Appends a variable to the end of an object array variable."),
-         _("Append variable _PARAM2_ to array variable _PARAM1_ of _PARAM0_"),
-         _("Variables/Collections/Arrays"),
+         _("Add existing variable"),
+         _("Adds an existing variable to the end of an object array variable."),
+         _("Add variable _PARAM2_ to array variable _PARAM1_ of _PARAM0_"),
+         _("Variables/Arrays and structures"),
          "res/actions/var24.png",
          "res/actions/var.png")
       .AddParameter("object", _("Object"))
       .AddParameter("objectvar", _("Array variable"))
-      .AddParameter("scenevar", _("Scene variable with the content to append"))
-      .SetParameterLongDescription(
-          _("The content of the variable will *be copied* and appended at the "
-            "end of the array."))
+      .AddParameter("scenevar", _("Scene variable with the content to add"))
+      .SetParameterLongDescription(_("The content of the object variable will "
+                                     "*be copied* and added at the "
+                                     "end of the array."))
       .MarkAsAdvanced();
 
   obj.AddAction(
          "ObjectVariablePushString",
-         _("Append a string to an object array"),
-         _("Appends a string to the end of an object array variable."),
-         _("Append string _PARAM2_ to array variable _PARAM1_ of _PARAM0_"),
-         _("Variables/Collections/Arrays"),
+         _("Add text variable"),
+         _("Adds a text (string) to the end of an object array variable."),
+         _("Add text _PARAM2_ to array variable _PARAM1_ of _PARAM0_"),
+         _("Variables/Arrays and structures"),
          "res/actions/var24.png",
          "res/actions/var.png")
       .AddParameter("object", _("Object"))
       .AddParameter("objectvar", _("Array variable"))
-      .AddParameter("string", _("String to append"))
+      .AddParameter("string", _("Text to add"))
       .MarkAsAdvanced();
 
-  obj.AddAction(
-         "ObjectVariablePushNumber",
-         _("Append a number to an object array"),
-         _("Appends a number to the end of an object array variable."),
-         _("Append number _PARAM2_ to array variable _PARAM1_ of _PARAM0_"),
-         _("Variables/Collections/Arrays"),
-         "res/actions/var24.png",
-         "res/actions/var.png")
+  obj.AddAction("ObjectVariablePushNumber",
+                _("Add number variable"),
+                _("Adds a number to the end of an object array variable."),
+                _("Add number _PARAM2_ to array variable _PARAM1_ of _PARAM0_"),
+                _("Variables/Arrays and structures"),
+                "res/actions/var24.png",
+                "res/actions/var.png")
       .AddParameter("object", _("Object"))
       .AddParameter("objectvar", _("Array variable"))
-      .AddParameter("expression", _("Number to append"))
+      .AddParameter("expression", _("Number to add"))
       .MarkAsAdvanced();
 
   obj.AddAction(
          "ObjectVariablePushBool",
-         _("Append a boolean to an object array"),
-         _("Appends a boolean to the end of an object array variable."),
-         _("Append boolean _PARAM2_ to array variable _PARAM1_ of _PARAM0_"),
-         _("Variables/Collections/Arrays"),
+         _("Add boolean variable"),
+         _("Adds a boolean to the end of an object array variable."),
+         _("Add boolean _PARAM2_ to array variable _PARAM1_ of _PARAM0_"),
+         _("Variables/Arrays and structures"),
          "res/actions/var24.png",
          "res/actions/var.png")
       .AddParameter("object", _("Object"))
       .AddParameter("objectvar", _("Array variable"))
-      .AddParameter("trueorfalse", _("Boolean to append"))
+      .AddParameter("trueorfalse", _("Boolean to add"))
       .MarkAsAdvanced();
 
   obj.AddAction(
          "ObjectVariableRemoveAt",
-         _("Remove variable from an object array (by index)"),
+         _("Remove variable by index"),
          _("Removes a variable at the specified index of an object array "
            "variable."),
          _("Remove variable at index _PARAM2_ from array variable _PARAM1_ of "
            "_PARAM0_"),
-         _("Variables/Collections/Arrays"),
+         _("Variables/Arrays and structures"),
          "res/actions/var24.png",
          "res/actions/var.png")
       .AddParameter("object", _("Object"))
-      .AddParameter("objectvar", _("Variable"))
+      .AddParameter("objectvar", _("Array variable"))
       .AddParameter("expression", _("Index to remove"))
       .MarkAsAdvanced();
 
+  obj.AddCondition(
+         "ObjectVariableChildCount",
+         _("Number of children"),
+         _("Compare the number of children in an object array variable."),
+         _("The number of children in the array variable _PARAM1_"),
+         _("Variables/Arrays and structures"),
+         "res/conditions/var24.png",
+         "res/conditions/var.png")
+      .AddParameter("object", _("Object"))
+      .AddParameter("objectvar", _("Variable"))
+      .UseStandardRelationalOperatorParameters(
+          "number", ParameterOptions::MakeNewOptions())
+      .MarkAsAdvanced();
+
+  obj.AddStrExpression(
+         "ArrayVariableFirstString",
+         _("First text child"),
+         _("Get the value of the first element of an object array variable, if "
+           "it is a text (string) variable."),
+         _("Variables/Arrays and structures"),
+         "res/actions/var.png")
+      .AddParameter("object", _("Object"))
+      .AddParameter("objectvar", _("Array variable"));
+
+  obj.AddExpression(
+         "ArrayVariableFirstNumber",
+         _("First number child"),
+         _("Get the value of the first element of an object array variable, if "
+           "it is a number variable."),
+         _("Variables/Arrays and structures"),
+         "res/actions/var.png")
+      .AddParameter("object", _("Object"))
+      .AddParameter("objectvar", _("Array variable"));
+
+  obj.AddStrExpression(
+         "ArrayVariableLastString",
+         _("Last text child"),
+         _("Get the value of the last element of an object array variable, if "
+           "it is a text (string) variable."),
+         _("Variables/Arrays and structures"),
+         "res/actions/var.png")
+      .AddParameter("object", _("Object"))
+      .AddParameter("objectvar", _("Array variable"));
+
+  obj.AddExpression(
+         "ArrayVariableLastNumber",
+         _("Last number child"),
+         _("Get the value of the last element of an object array variable, if "
+           "it is a number variable."),
+         _("Variables/Arrays and structures"),
+         "res/actions/var.png")
+      .AddParameter("object", _("Object"))
+      .AddParameter("objectvar", _("Array variable"));
+
   obj.AddCondition("BehaviorActivated",
                    _("Behavior activated"),
                    _("Check if the behavior is activated for the object."),
@@ -1115,23 +1170,24 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
       .AddParameter("expression", _("Target Y position"));
 
   obj.AddExpression("Variable",
-                    _("Value of an object variable"),
-                    _("Value of an object variable"),
+                    _("Number variable"),
+                    _("Number value of an object variable"),
                     _("Variables"),
                     "res/actions/var.png")
       .AddParameter("object", _("Object"))
       .AddParameter("objectvar", _("Variable"));
 
-  obj.AddExpression("VariableChildCount",
-                    _("Number of children of an object variable"),
-                    _("Number of children of an object variable"),
-                    _("Variables"),
-                    "res/actions/var.png")
+  obj.AddExpression(
+         "VariableChildCount",
+         _("Number of children"),
+         _("Number of children in an object array or structure variable"),
+         _("Variables/Arrays and structures"),
+         "res/actions/var.png")
       .AddParameter("object", _("Object"))
-      .AddParameter("objectvar", _("Variable"));
+      .AddParameter("objectvar", _("Array or structure variable"));
 
   obj.AddStrExpression("VariableString",
-                       _("Text of an object variable"),
+                       _("Text variable"),
                        _("Text of an object variable"),
                        _("Variables"),
                        "res/actions/var.png")
@@ -1293,7 +1349,8 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
                  "res/actions/create24.png",
                  "res/actions/create24.png")
       .AddCodeOnlyParameter("objectsContext", "")
-      .AddParameter("objectListOrEmptyIfJustDeclared", _("Group of potential objects"))
+      .AddParameter("objectListOrEmptyIfJustDeclared",
+                    _("Group of potential objects"))
       .SetParameterLongDescription(
           _("Group containing objects that can be created by the action."))
       .AddParameter("string", _("Name of the object to create"))

Core/GDCore/Extensions/Builtin/CameraExtension.cpp

@@ -26,6 +26,8 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsCameraExtension(
       .SetExtensionHelpPath("/interface/scene-editor/layers-and-cameras");
   extension.AddInstructionOrExpressionGroupMetadata(_("Layers and cameras"))
       .SetIcon("res/conditions/camera24.png");
+  extension.AddInstructionOrExpressionGroupMetadata(_("Effects"))
+      .SetIcon("res/actions/effect24.png");
 
   extension
       .AddExpressionAndConditionAndAction(
@@ -453,8 +455,8 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsCameraExtension(
                 "names) in the effects window."),
           _("Set _PARAM3_ to _PARAM4_ for effect _PARAM2_ of layer _PARAM1_"),
           _("Effects"),
-          "res/conditions/camera24.png",
-          "res/conditions/camera.png")
+          "res/actions/effect24.png",
+          "res/actions/effect.png")
       .AddCodeOnlyParameter("currentScene", "")
       .AddParameter("layer", _("Layer (base layer if empty)"), "", true)
       .SetDefaultValue("\"\"")
@@ -472,8 +474,8 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsCameraExtension(
                 "names) in the effects window."),
           _("Set _PARAM3_ to _PARAM4_ for effect _PARAM2_ of layer _PARAM1_"),
           _("Effects"),
-          "res/conditions/camera24.png",
-          "res/conditions/camera.png")
+          "res/actions/effect24.png",
+          "res/actions/effect.png")
       .AddCodeOnlyParameter("currentScene", "")
       .AddParameter("layer", _("Layer (base layer if empty)"), "", true)
       .SetDefaultValue("\"\"")
@@ -491,8 +493,8 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsCameraExtension(
                 "names) in the effects window."),
           _("Enable _PARAM3_ for effect _PARAM2_ of layer _PARAM1_: _PARAM4_"),
           _("Effects"),
-          "res/conditions/camera24.png",
-          "res/conditions/camera.png")
+          "res/actions/effect24.png",
+          "res/actions/effect.png")
       .AddCodeOnlyParameter("currentScene", "")
       .AddParameter("layer", _("Layer (base layer if empty)"), "", true)
       .SetDefaultValue("\"\"")
@@ -506,9 +508,9 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsCameraExtension(
                     _("Layer effect is enabled"),
                     _("The effect on a layer is enabled"),
                     _("Effect _PARAM2_ on layer _PARAM1_ is enabled"),
-                    _("Effects"),
-                    "res/conditions/camera24.png",
-                    "res/conditions/camera.png")
+                    _(""),
+                    "res/actions/effect24.png",
+                    "res/actions/effect.png")
       .AddCodeOnlyParameter("currentScene", "")
       .AddParameter("layer", _("Layer (base layer if empty)"), "", true)
       .SetDefaultValue("\"\"")
@@ -521,8 +523,8 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsCameraExtension(
                  _("Enable an effect on a layer"),
                  _("Enable effect _PARAM2_ on layer _PARAM1_: _PARAM3_"),
                  _("Effects"),
-                 "res/conditions/camera24.png",
-                 "res/conditions/camera.png")
+                 "res/actions/effect24.png",
+                 "res/actions/effect.png")
       .AddCodeOnlyParameter("currentScene", "")
       .AddParameter("layer", _("Layer (base layer if empty)"), "", true)
       .SetDefaultValue("\"\"")
@@ -601,7 +603,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsCameraExtension(
           _("Set the ambient light color of the lighting layer in format "
             "\"R;G;B\" string."),
           _("Set the ambient color of the lighting layer _PARAM1_ to _PARAM2_"),
-          _("Lighting"),
+          _(""),
           "res/actions/color24.png",
           "res/actions/color.png")
       .AddCodeOnlyParameter("currentScene", "")

Core/GDCore/Extensions/Builtin/MouseExtension.cpp

@@ -27,6 +27,8 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsMouseExtension(
       .SetCategory("Input");
   extension.AddInstructionOrExpressionGroupMetadata(_("Mouse and touch"))
       .SetIcon("res/actions/mouse24.png");
+  extension.AddInstructionOrExpressionGroupMetadata(_("Multitouch"))
+      .SetIcon("res/conditions/touch24.png");
 
   extension
       .AddCondition(
@@ -153,7 +155,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsMouseExtension(
   extension
       .AddExpressionAndCondition(
           "number",
-          "MouseX",
+          "CursorX",
           _("Cursor X position"),
           _("the X position of the cursor or of a touch"),
           _("the cursor (or touch) X position"),
@@ -167,13 +169,15 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsMouseExtension(
       .SetDefaultValue("0");
 
   // Support for deprecated names:
-  extension.AddDuplicatedCondition("SourisX", "MouseX").SetHidden();
-  extension.AddDuplicatedExpression("SourisX", "MouseX").SetHidden();
+  extension.AddDuplicatedCondition("MouseX", "CursorX").SetHidden();
+  extension.AddDuplicatedExpression("MouseX", "CursorX").SetHidden();
+  extension.AddDuplicatedCondition("SourisX", "CursorX").SetHidden();
+  extension.AddDuplicatedExpression("SourisX", "CursorX").SetHidden();
 
   extension
       .AddExpressionAndCondition(
           "number",
-          "MouseY",
+          "CursorY",
           _("Cursor Y position"),
           _("the Y position of the cursor or of a touch"),
           _("the cursor (or touch) Y position"),
@@ -187,8 +191,44 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsMouseExtension(
       .SetDefaultValue("0");
 
   // Support for deprecated names:
-  extension.AddDuplicatedCondition("SourisY", "MouseY").SetHidden();
-  extension.AddDuplicatedExpression("SourisY", "MouseY").SetHidden();
+  extension.AddDuplicatedCondition("MouseY", "CursorY").SetHidden();
+  extension.AddDuplicatedExpression("MouseY", "CursorY").SetHidden();
+  extension.AddDuplicatedCondition("SourisY", "CursorY").SetHidden();
+  extension.AddDuplicatedExpression("SourisY", "CursorY").SetHidden();
+
+  extension
+      .AddExpressionAndCondition("number",
+                                 "MouseOnlyCursorX",
+                                 _("Mouse cursor X position"),
+                                 _("the X position of the mouse cursor"),
+                                 _("the mouse cursor X position"),
+                                 "",
+                                 "res/conditions/mouse24.png")
+      .AddCodeOnlyParameter("currentScene", "")
+      .UseStandardParameters("number", ParameterOptions::MakeNewOptions())
+      .AddParameter("layer", _("Layer (base layer if empty)"), "", true)
+      .SetDefaultValue("\"\"")
+      .AddParameter("expression", _("Camera number (default : 0)"), "", true)
+      .SetDefaultValue("0")
+      // It's only useful for extensions as they can't use TouchSimulateMouse.
+      .SetHidden();
+
+  extension
+      .AddExpressionAndCondition("number",
+                                 "MouseOnlyCursorY",
+                                 _("Mouse cursor Y position"),
+                                 _("the Y position of the mouse cursor"),
+                                 _("the mouse cursor Y position"),
+                                 "",
+                                 "res/conditions/mouse24.png")
+      .AddCodeOnlyParameter("currentScene", "")
+      .UseStandardParameters("number", ParameterOptions::MakeNewOptions())
+      .AddParameter("layer", _("Layer (base layer if empty)"), "", true)
+      .SetDefaultValue("\"\"")
+      .AddParameter("expression", _("Camera number (default : 0)"), "", true)
+      .SetDefaultValue("0")
+      // It's only useful for extensions as they can't use TouchSimulateMouse.
+      .SetHidden();
 
   extension
       .AddCondition("IsMouseInsideCanvas",
@@ -334,44 +374,85 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsMouseExtension(
       .AddCondition(
           "HasAnyTouchStarted",
           _("A new touch has started"),
-          _("Check if a touch has just started on this frame. The touch identifiers can be "
+          _("Check if a touch has just started on this frame. The touch "
+            "identifiers can be "
             "accessed using StartedTouchId() and StartedTouchCount()."),
           _("A new touch has started"),
           _("Multitouch"),
           "res/conditions/touch24.png",
           "res/conditions/touch.png")
+      .AddCodeOnlyParameter("currentScene", "")
+      .SetHidden();
+
+  extension
+      .AddExpression("StartedTouchCount",
+                     _("Started touch count"),
+                     _("The number of touches that have just started on this "
+                       "frame. The touch identifiers can be "
+                       "accessed using StartedTouchId()."),
+                     _("Multitouch"),
+                     "res/conditions/touch.png")
+      .AddCodeOnlyParameter("currentScene", "")
+      .SetHidden();
+
+  extension
+      .AddExpression("StartedTouchId",
+                     _("Started touch identifier"),
+                     _("The identifier of the touch that has just started on "
+                       "this frame. The number of touches can be "
+                       "accessed using StartedTouchCount()."),
+                     _("Multitouch"),
+                     "res/conditions/touch.png")
+      .AddCodeOnlyParameter("currentScene", "")
+      .AddParameter("expression", _("Touch index"))
+      .SetHidden();
+
+  extension
+      .AddCondition(
+          "HasAnyTouchOrMouseStarted",
+          _("A new touch has started"),
+          _("Check if a touch has just started or the mouse left button has "
+            "been pressed on this frame. The touch identifiers can be "
+            "accessed using StartedTouchOrMouseId() and "
+            "StartedTouchOrMouseCount()."),
+          _("A new touch has started"),
+          _("Multitouch"),
+          "res/conditions/touch24.png",
+          "res/conditions/touch.png")
       .AddCodeOnlyParameter("currentScene", "");
 
   extension
       .AddExpression(
-          "StartedTouchCount",
+          "StartedTouchOrMouseCount",
           _("Started touch count"),
-          _("The number of touches that have just started on this frame. The touch identifiers can be "
-            "accessed using StartedTouchId()."),
+          _("The number of touches (including the mouse) that have just "
+            "started on this frame. The touch identifiers can be "
+            "accessed using StartedTouchOrMouseId()."),
           _("Multitouch"),
           "res/conditions/touch.png")
       .AddCodeOnlyParameter("currentScene", "");
 
   extension
       .AddExpression(
-          "StartedTouchId",
+          "StartedTouchOrMouseId",
           _("Started touch identifier"),
-          _("The identifier of the touch that has just started on this frame. The touch number of touches can be "
-            "accessed using StartedTouchCount()."),
+          _("The identifier of the touch or mouse that has just started on "
+            "this frame. The number of touches can be "
+            "accessed using StartedTouchOrMouseCount()."),
           _("Multitouch"),
           "res/conditions/touch.png")
       .AddCodeOnlyParameter("currentScene", "")
       .AddParameter("expression", _("Touch index"));
 
   extension
-      .AddCondition(
-          "HasTouchEnded",
-          _("A touch has ended"),
-          _("Check if a touch has ended."),
-          _("The touch with identifier _PARAM1_ has ended"),
-          _("Multitouch"),
-          "res/conditions/touch24.png",
-          "res/conditions/touch.png")
+      .AddCondition("HasTouchEnded",
+                    _("A touch has ended"),
+                    _("Check if a touch has ended or a mouse left button has "
+                      "been released."),
+                    _("The touch with identifier _PARAM1_ has ended"),
+                    _("Multitouch"),
+                    "res/conditions/touch24.png",
+                    "res/conditions/touch.png")
       .AddCodeOnlyParameter("currentScene", "")
       .AddParameter("expression", _("Touch identifier"));
 

Core/GDCore/Extensions/Builtin/SceneExtension.cpp

@@ -136,6 +136,20 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsSceneExtension(
       .AddCodeOnlyParameter("currentScene", "")
       .AddParameter("yesorno", _("Deactivate input when focus is lost"))
       .MarkAsAdvanced();
+
+  extension
+      .AddCondition(
+          "HasGameJustResumed",
+          _("Game has just resumed"),
+          _("Check if the game has just resumed from being hidden. It "
+            "happens when the game tab is selected, a minimized window is "
+            "restored or the application is put back on front."),
+          _("Game has just resumed"),
+          "",
+          "res/actions/window24.png",
+          "res/actions/window.png")
+      .SetHelpPath("/interface/scene-editor/events")
+      .AddCodeOnlyParameter("currentScene", "");
 }
 
 }  // namespace gd

Core/GDCore/Extensions/Builtin/StringInstructionsExtension.cpp

@@ -183,6 +183,26 @@ BuiltinExtensionsImplementer::ImplementsStringInstructionsExtension(
                     _("Position of the last character in the string to be "
                       "considered in the search"));
 
+  extension
+      .AddStrExpression("StrReplaceOne",
+                        _("Replace the first occurrence of a text by another."),
+                        _("Replace the first occurrence of a text by another."),
+                        "",
+                        "res/conditions/toujours24_black.png")
+      .AddParameter("string", _("Text in which the replacement must be done"))
+      .AddParameter("string", _("Text to find inside the first text"))
+      .AddParameter("string", _("Replacement to put instead of the text to find"));
+
+  extension
+      .AddStrExpression("StrReplaceAll",
+                        _("Replace all occurrences of a text by another."),
+                        _("Replace all occurrences of a text by another."),
+                        "",
+                        "res/conditions/toujours24_black.png")
+      .AddParameter("string", _("Text in which the replacement(s) must be done"))
+      .AddParameter("string", _("Text to find inside the first text"))
+      .AddParameter("string", _("Replacement to put instead of the text to find"));
+
 }
 
 }  // namespace gd

Core/GDCore/Extensions/Builtin/VariablesExtension.cpp

@@ -27,9 +27,9 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsVariablesExtension(
 
   extension
       .AddCondition("VarScene",
-                    _("Value of a scene variable"),
-                    _("Compare the value of a scene variable."),
-                    _("the scene variable _PARAM0_"),
+                    _("Number variable"),
+                    _("Compare the number value of a scene variable."),
+                    _("The number of scene variable _PARAM0_"),
                     _("Scene variables"),
                     "res/conditions/var24.png",
                     "res/conditions/var.png")
@@ -39,9 +39,9 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsVariablesExtension(
 
   extension
       .AddCondition("VarSceneTxt",
-                    _("Text of a scene variable"),
-                    _("Compare the text of a scene variable."),
-                    _("the text of scene variable _PARAM0_"),
+                    _("Text variable"),
+                    _("Compare the text (string) of a scene variable."),
+                    _("The text of scene variable _PARAM0_"),
                     _("Scene variables"),
                     "res/conditions/var24.png",
                     "res/conditions/var.png")
@@ -52,7 +52,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsVariablesExtension(
   extension
       .AddCondition(
           "SceneVariableAsBoolean",
-          _("Boolean value of a scene variable"),
+          _("Boolean variable"),
           _("Compare the boolean value of a scene variable."),
           _("The boolean value of scene variable _PARAM0_ is _PARAM1_"),
           _("Scene variables"),
@@ -63,14 +63,14 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsVariablesExtension(
       .SetDefaultValue("true");
 
   extension
-      .AddCondition(
-          "VariableChildExists",
-          _("Child existence"),
-          _("Check if the specified child of the scene variable exists."),
-          _("Child _PARAM1_ of scene variable _PARAM0_ exists"),
-          _("Scene variables/Collections/Structures"),
-          "res/conditions/var24.png",
-          "res/conditions/var.png")
+      .AddCondition("VariableChildExists",
+                    _("Child existence"),
+                    _("Check if the specified child of the scene structure "
+                      "variable exists."),
+                    _("Child _PARAM1_ of scene variable _PARAM0_ exists"),
+                    _("Scene variables/Arrays and structures"),
+                    "res/conditions/var24.png",
+                    "res/conditions/var.png")
       .AddParameter("scenevar", _("Variable"))
       .AddParameter("string", _("Name of the child"))
       .MarkAsAdvanced();
@@ -78,10 +78,10 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsVariablesExtension(
   extension
       .AddCondition("GlobalVariableChildExists",
                     _("Child existence"),
-                    _("Check if the specified child of the global "
+                    _("Check if the specified child of the global structure "
                       "variable exists."),
                     _("Child _PARAM1_ of global variable _PARAM0_ exists"),
-                    _("Global variables/Collections/Structures"),
+                    _("Global variables/Arrays and structures"),
                     "res/conditions/var24.png",
                     "res/conditions/var.png")
       .AddParameter("globalvar", _("Variable"))
@@ -90,7 +90,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsVariablesExtension(
 
   extension
       .AddCondition("VarSceneDef",
-                    "Test if a scene variable is defined",
+                    "Variable defined",
                     "Test if the scene variable exists.",
                     "Scene variable _PARAM0_ is defined",
                     _("Scene variables"),
@@ -98,12 +98,12 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsVariablesExtension(
                     "res/conditions/var.png")
       .AddCodeOnlyParameter("currentScene", "")
       .AddParameter("string", _("Variable"))
-      .SetHidden();
+      .SetHidden();  // Deprecated.
 
   extension
       .AddCondition("VarGlobal",
-                    _("Value of a global variable"),
-                    _("Compare the value of a global variable."),
+                    _("Number variable"),
+                    _("Compare the number value of a global variable."),
                     _("the global variable _PARAM0_"),
                     _("Global variables"),
                     "res/conditions/var24.png",
@@ -115,8 +115,8 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsVariablesExtension(
 
   extension
       .AddCondition("VarGlobalTxt",
-                    _("Text of a global variable"),
-                    _("Compare the text of a global variable."),
+                    _("Text variable"),
+                    _("Compare the text (string) of a global variable."),
                     _("the text of the global variable _PARAM0_"),
                     _("Global variables"),
                     "res/conditions/var24.png",
@@ -129,7 +129,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsVariablesExtension(
   extension
       .AddCondition(
           "GlobalVariableAsBoolean",
-          _("Boolean value of a global variable"),
+          _("Boolean variable"),
           _("Compare the boolean value of a global variable."),
           _("The boolean value of global variable _PARAM0_ is _PARAM1_"),
           _("Global variables"),
@@ -141,8 +141,8 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsVariablesExtension(
 
   extension
       .AddCondition("VarGlobalDef",
-                    "Test if a global variable is defined",
-                    "Test if a global variable exists",
+                    "Variable defined",
+                    "Test if a global variable exists.",
                     "Global variable _PARAM0_ is defined",
                     _("Global variables"),
                     "res/conditions/var24.png",
@@ -150,12 +150,12 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsVariablesExtension(
       .AddCodeOnlyParameter("currentScene", "")
       .AddParameter("string", _("Variable"))
       .MarkAsAdvanced()
-      .SetHidden();
+      .SetHidden();  // Deprecated.
 
   extension
       .AddAction("ModVarScene",
-                 _("Value of a scene variable"),
-                 _("Change the value of a scene variable."),
+                 _("Change number variable"),
+                 _("Modify the number value of a scene variable."),
                  _("the scene variable _PARAM0_"),
                  _("Scene variables"),
                  "res/actions/var24.png",
@@ -166,8 +166,8 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsVariablesExtension(
 
   extension
       .AddAction("ModVarSceneTxt",
-                 _("String of a scene variable"),
-                 _("Modify the text of a scene variable."),
+                 _("Change text variable"),
+                 _("Modify the text (string) of a scene variable."),
                  _("the text of scene variable _PARAM0_"),
                  _("Scene variables"),
                  "res/actions/var24.png",
@@ -179,7 +179,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsVariablesExtension(
   extension
       .AddAction(
           "SetSceneVariableAsBoolean",
-          _("Boolean value of a scene variable"),
+          _("Change boolean variable"),
           _("Modify the boolean value of a scene variable."),
           _("Set the boolean value of scene variable _PARAM0_ to _PARAM1_"),
           _("Scene variables"),
@@ -190,7 +190,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsVariablesExtension(
 
   extension
       .AddAction("ToggleSceneVariableAsBoolean",
-                 _("Toggle boolean value of a scene variable"),
+                 _("Toggle boolean variable"),
                  _("Toggle the boolean value of a scene variable.") + "\n" +
                      _("If it was true, it will become false, and if it was "
                        "false it will become true."),
@@ -202,8 +202,8 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsVariablesExtension(
 
   extension
       .AddAction("ModVarGlobal",
-                 _("Value of a global variable"),
-                 _("Change the value of a global variable"),
+                 _("Change number variable"),
+                 _("Modify the number value of a global variable."),
                  _("the global variable _PARAM0_"),
                  _("Global variables"),
                  "res/actions/var24.png",
@@ -215,8 +215,8 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsVariablesExtension(
 
   extension
       .AddAction("ModVarGlobalTxt",
-                 _("String of a global variable"),
-                 _("Modify the text of a global variable."),
+                 _("Change text variable"),
+                 _("Modify the text (string) of a global variable."),
                  _("the text of global variable _PARAM0_"),
                  _("Global variables"),
                  "res/actions/var24.png",
@@ -229,7 +229,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsVariablesExtension(
   extension
       .AddAction(
           "SetGlobalVariableAsBoolean",
-          _("Boolean value of a global variable"),
+          _("Change boolean variable"),
           _("Modify the boolean value of a global variable."),
           _("Set the boolean value of global variable _PARAM0_ to _PARAM1_"),
           _("Global variables"),
@@ -240,7 +240,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsVariablesExtension(
 
   extension
       .AddAction("ToggleGlobalVariableAsBoolean",
-                 _("Toggle boolean value of a global variable"),
+                 _("Toggle boolean variable"),
                  _("Toggle the boolean value of a global variable.") + "\n" +
                      _("If it was true, it will become false, and if it was "
                        "false it will become true."),
@@ -251,202 +251,324 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsVariablesExtension(
       .AddParameter("globalvar", _("Variable"));
 
   extension
-      .AddAction("VariableRemoveChild",
-                 _("Remove a child"),
-                 _("Remove a child from a scene variable."),
-                 _("Remove child _PARAM1_ from scene variable _PARAM0_"),
-                 _("Scene variables/Collections/Structures"),
-                 "res/actions/var24.png",
-                 "res/actions/var.png")
-      .AddParameter("scenevar", _("Variable"))
+      .AddAction(
+          "VariableRemoveChild",
+          _("Remove a child"),
+          _("Remove a child from a scene structure variable."),
+          _("Remove child _PARAM1_ from scene structure variable _PARAM0_"),
+          _("Scene variables/Arrays and structures"),
+          "res/actions/var24.png",
+          "res/actions/var.png")
+      .AddParameter("scenevar", _("Structure variable"))
       .AddParameter("string", _("Child's name"))
       .MarkAsAdvanced();
 
   extension
-      .AddAction("GlobalVariableRemoveChild",
-                 _("Remove a child"),
-                 _("Remove a child from a global variable."),
-                 _("Remove child _PARAM1_ from global variable _PARAM0_"),
-                 _("Global variables/Collections/Structures"),
-                 "res/actions/var24.png",
-                 "res/actions/var.png")
-      .AddParameter("globalvar", _("Variable"))
+      .AddAction(
+          "GlobalVariableRemoveChild",
+          _("Remove a child"),
+          _("Remove a child from a global structure variable."),
+          _("Remove child _PARAM1_ from global structure variable _PARAM0_"),
+          _("Global variables/Arrays and structures"),
+          "res/actions/var24.png",
+          "res/actions/var.png")
+      .AddParameter("globalvar", _("Structure variable"))
       .AddParameter("string", _("Child's name"))
       .MarkAsAdvanced();
 
   extension
       .AddAction("VariableClearChildren",
-                 _("Clear scene variable"),
-                 _("Remove all the children from the scene variable."),
+                 _("Clear children"),
+                 _("Remove all the children from the scene structure or array "
+                   "variable."),
                  _("Clear children from scene variable _PARAM0_"),
-                 _("Scene variables/Collections"),
+                 _("Scene variables/Arrays and structures"),
                  "res/actions/var24.png",
                  "res/actions/var.png")
-      .AddParameter("scenevar", _("Variable"))
+      .AddParameter("scenevar", _("Structure or array variable"))
       .MarkAsAdvanced();
 
   extension
       .AddAction("GlobalVariableClearChildren",
-                 _("Clear global variable"),
-                 _("Remove all the children from the global variable."),
+                 _("Clear children"),
+                 _("Remove all the children from the global structure or array "
+                   "variable."),
                  _("Clear children from global variable _PARAM0_"),
-                 _("Global variables/Collections"),
+                 _("Global variables/Arrays and structures"),
                  "res/actions/var24.png",
                  "res/actions/var.png")
-      .AddParameter("globalvar", _("Variable"))
+      .AddParameter("globalvar", _("Structure or array variable"))
       .MarkAsAdvanced();
 
   extension
       .AddAction("SceneVariablePush",
-                 _("Append variable to a scene array"),
-                 _("Appends a variable at the end of a scene array variable."),
-                 _("Append variable _PARAM1_ to array variable _PARAM0_"),
-                 _("Scene variables/Collections/Arrays"),
+                 _("Add existing variable"),
+                 _("Adds an existing variable at the end of a scene array "
+                   "variable."),
+                 _("Add variable _PARAM1_ to array variable _PARAM0_"),
+                 _("Scene variables/Arrays and structures"),
                  "res/actions/var24.png",
                  "res/actions/var.png")
       .AddParameter("scenevar", _("Array variable"))
-      .AddParameter("scenevar", _("Scene variable with the content to append"))
-      .SetParameterLongDescription(_("The content of the variable will *be copied* and appended at the end of the array."))
+      .AddParameter("scenevar", _("Scene variable with the content to add"))
+      .SetParameterLongDescription(
+          _("The content of the variable will *be copied* and added at the "
+            "end of the array."))
       .MarkAsAdvanced();
 
   extension
-      .AddAction("SceneVariablePushString",
-                 _("Append a string to a scene array"),
-                 _("Appends a string at the end of a scene array variable."),
-                 _("Append string _PARAM1_ to array variable _PARAM0_"),
-                 _("Scene variables/Collections/Arrays"),
-                 "res/actions/var24.png",
-                 "res/actions/var.png")
+      .AddAction(
+          "SceneVariablePushString",
+          _("Add text variable"),
+          _("Adds a text (string) at the end of a scene array variable."),
+          _("Add text _PARAM1_ to array variable _PARAM0_"),
+          _("Scene variables/Arrays and structures"),
+          "res/actions/var24.png",
+          "res/actions/var.png")
       .AddParameter("scenevar", _("Array variable"))
-      .AddParameter("string", _("String to append"))
+      .AddParameter("string", _("Text to add"))
       .MarkAsAdvanced();
 
   extension
       .AddAction("SceneVariablePushNumber",
-                 _("Append a number to a scene array"),
-                 _("Appends a number at the end of a scene array variable."),
-                 _("Append number _PARAM1_ to array variable _PARAM0_"),
-                 _("Scene variables/Collections/Arrays"),
+                 _("Add number variable"),
+                 _("Adds a number at the end of a scene array variable."),
+                 _("Add number _PARAM1_ to array variable _PARAM0_"),
+                 _("Scene variables/Arrays and structures"),
                  "res/actions/var24.png",
                  "res/actions/var.png")
       .AddParameter("scenevar", _("Array variable"))
-      .AddParameter("expression", _("Number to append"))
+      .AddParameter("expression", _("Number to add"))
       .MarkAsAdvanced();
 
   extension
       .AddAction("SceneVariablePushBool",
-                 _("Append a boolean to a scene array"),
-                 _("Appends a boolean at the end of a scene array variable."),
-                 _("Append boolean _PARAM1_ to array variable _PARAM0_"),
-                 _("Scene variables/Collections/Arrays"),
+                 _("Add boolean variable"),
+                 _("Adds a boolean at the end of a scene array variable."),
+                 _("Add boolean _PARAM1_ to array variable _PARAM0_"),
+                 _("Scene variables/Arrays and structures"),
                  "res/actions/var24.png",
                  "res/actions/var.png")
       .AddParameter("scenevar", _("Array variable"))
-      .AddParameter("trueorfalse", _("Boolean to append"))
+      .AddParameter("trueorfalse", _("Boolean to add"))
       .MarkAsAdvanced();
 
   extension
-      .AddAction(
-          "SceneVariableRemoveAt",
-          _("Remove variable from a scene array (by index)"),
-          _("Removes a variable at the specified index of a scene array variable."),
-          _("Remove variable at index _PARAM1_ from scene array variable _PARAM0_"),
-          _("Scene variables/Collections/Arrays"),
-          "res/actions/var24.png",
-          "res/actions/var.png")
-      .AddParameter("scenevar", _("Variable"))
+      .AddAction("SceneVariableRemoveAt",
+                 _("Remove variable by index"),
+                 _("Removes a variable at the specified index of a scene array "
+                   "variable."),
+                 _("Remove variable at index _PARAM1_ from scene array "
+                   "variable _PARAM0_"),
+                 _("Scene variables/Arrays and structures"),
+                 "res/actions/var24.png",
+                 "res/actions/var.png")
+      .AddParameter("scenevar", _("Array variable"))
       .AddParameter("expression", _("Index to remove"))
       .MarkAsAdvanced();
 
   extension
-      .AddAction("GlobalVariablePush",
-                 _("Append variable to a global array"),
-                 _("Appends a variable at the end of a global array variable."),
-                 _("Append variable _PARAM1_ to array variable _PARAM0_"),
-                 _("Global variables/Collections/Arrays"),
-                 "res/actions/var24.png",
-                 "res/actions/var.png")
-      .AddParameter("globalvar", _("Array variable"))
-      .AddParameter("scenevar", _("Scene variable with the content to append"))
-      .SetParameterLongDescription(_("The content of the variable will *be copied* and appended at the end of the array."))
+      .AddCondition(
+          "SceneVariableChildCount",
+          _("Number of children"),
+          _("Compare the number of children in a scene array variable."),
+          _("The number of children in the array variable _PARAM0_"),
+          _("Scene variables/Arrays and structures"),
+          "res/conditions/var24.png",
+          "res/conditions/var.png")
+      .AddParameter("scenevar", _("Array variable"))
+      .UseStandardRelationalOperatorParameters(
+          "number", ParameterOptions::MakeNewOptions())
       .MarkAsAdvanced();
 
+  extension
+      .AddStrExpression(
+          "SceneVariableFirstString",
+          _("First text child"),
+          _("Get the value of the first element of a scene array variable, if "
+            "it is a text (string)."),
+          _("Scene variables/Arrays and structures"),
+          "res/actions/var.png")
+      .AddParameter("scenevar", _("Array variable"));
+
+  extension
+      .AddExpression(
+          "SceneVariableFirstNumber",
+          _("First number child"),
+          _("Get the value of the first element of a scene array variable, if "
+            "it is a number."),
+          _("Scene variables/Arrays and structures"),
+          "res/actions/var.png")
+      .AddParameter("scenevar", _("Array variable"));
+
+  extension
+      .AddStrExpression(
+          "SceneVariableLastString",
+          _("Last text child"),
+          _("Get the value of the last element of a scene array variable, if "
+            "it is a text (string)."),
+          _("Scene variables/Arrays and structures"),
+          "res/actions/var.png")
+      .AddParameter("scenevar", _("Array variable"));
+
+  extension
+      .AddExpression(
+          "SceneVariableLastNumber",
+          _("Last number child"),
+          _("Get the value of the last element of a scene array variable, if "
+            "it is a number."),
+          _("Scene variables/Arrays and structures"),
+          "res/actions/var.png")
+      .AddParameter("scenevar", _("Array variable"));
+
   extension
       .AddAction(
-          "GlobalVariableRemoveAt",
-          _("Remove variable from a global array (by index)"),
-          _("Removes a variable at the specified index of a global array variable."),
-          _("Remove variable at index _PARAM1_ from global array variable _PARAM0_"),
-          _("Global variables/Collections/Arrays"),
+          "GlobalVariablePush",
+          _("Add existing variable"),
+          _("Adds an existing variable at the end of a global array variable."),
+          _("Add variable _PARAM1_ to array variable _PARAM0_"),
+          _("Global variables/Arrays and structures"),
           "res/actions/var24.png",
           "res/actions/var.png")
-      .AddParameter("globalvar", _("Variable"))
+      .AddParameter("globalvar", _("Array variable"))
+      .AddParameter("scenevar", _("Scene variable with the content to add"))
+      .SetParameterLongDescription(
+          _("The content of the variable will *be copied* and added at the "
+            "end of the array."))
+      .MarkAsAdvanced();
+
+  extension
+      .AddAction("GlobalVariableRemoveAt",
+                 _("Remove variable by index"),
+                 _("Removes a variable at the specified index of a global "
+                   "array variable."),
+                 _("Remove variable at index _PARAM1_ from global array "
+                   "variable _PARAM0_"),
+                 _("Global variables/Arrays and structures"),
+                 "res/actions/var24.png",
+                 "res/actions/var.png")
+      .AddParameter("globalvar", _("Array variable"))
       .AddParameter("expression", _("Index to remove"))
       .MarkAsAdvanced();
 
   extension
-      .AddAction("GlobalVariablePushString",
-                 _("Append a string to a global array"),
-                 _("Appends a string at the end of a global array variable."),
-                 _("Append string _PARAM1_ to array variable _PARAM0_"),
-                 _("Global variables/Collections/Arrays"),
-                 "res/actions/var24.png",
-                 "res/actions/var.png")
+      .AddAction(
+          "GlobalVariablePushString",
+          _("Add text variable"),
+          _("Adds a text (string) at the end of a global array variable."),
+          _("Add text _PARAM1_ to array variable _PARAM0_"),
+          _("Global variables/Arrays and structures"),
+          "res/actions/var24.png",
+          "res/actions/var.png")
       .AddParameter("globalvar", _("Array variable"))
-      .AddParameter("string", _("String to append"))
+      .AddParameter("string", _("Text to add"))
       .MarkAsAdvanced();
 
   extension
       .AddAction("GlobalVariablePushNumber",
-                 _("Append a number to a global array"),
-                 _("Appends a number at the end of a global array variable."),
-                 _("Append number _PARAM1_ to array variable _PARAM0_"),
-                 _("Global variables/Collections/Arrays"),
+                 _("Add number variable"),
+                 _("Adds a number at the end of a global array variable."),
+                 _("Add number _PARAM1_ to array variable _PARAM0_"),
+                 _("Global variables/Arrays and structures"),
                  "res/actions/var24.png",
                  "res/actions/var.png")
       .AddParameter("globalvar", _("Array variable"))
-      .AddParameter("expression", _("Number to append"))
+      .AddParameter("expression", _("Number to add"))
       .MarkAsAdvanced();
 
   extension
       .AddAction("GlobalVariablePushBool",
-                 _("Append a boolean to a global array"),
-                 _("Appends a boolean at the end of a global array variable."),
-                 _("Append boolean _PARAM1_ to array variable _PARAM0_"),
-                 _("Global variables/Collections/Arrays"),
+                 _("Add boolean variable"),
+                 _("Adds a boolean at the end of a global array variable."),
+                 _("Add boolean _PARAM1_ to array variable _PARAM0_"),
+                 _("Global variables/Arrays and structures"),
                  "res/actions/var24.png",
                  "res/actions/var.png")
       .AddParameter("globalvar", _("Array variable"))
-      .AddParameter("trueorfalse", _("Boolean to append"))
+      .AddParameter("trueorfalse", _("Boolean to add"))
       .MarkAsAdvanced();
 
   extension
-      .AddExpression("GlobalVariableChildCount",
-                     _("Number of children of a global variable"),
-                     _("Number of children of a global variable"),
-                     _("Global variables"),
+      .AddCondition(
+          "GlobalVariableChildCount",
+          _("Number of children"),
+          _("Compare the number of children in a global array variable."),
+          _("The number of children of the array variable _PARAM0_"),
+          _("Global variables/Arrays and structures"),
+          "res/conditions/var24.png",
+          "res/conditions/var.png")
+      .AddParameter("globalvar", _("Array variable"))
+      .UseStandardRelationalOperatorParameters(
+          "number", ParameterOptions::MakeNewOptions())
+      .MarkAsAdvanced();
+
+  extension
+      .AddStrExpression("GlobalVariableFirstString",
+                        _("First text child"),
+                        _("Value of the first element of a global array "
+                          "variable, if it is a text (string) variable."),
+                        _("Global variables/Arrays and structures"),
+                        "res/actions/var.png")
+      .AddParameter("globalvar", _("Array variable"));
+
+  extension
+      .AddExpression("GlobalVariableFirstNumber",
+                     _("First number child"),
+                     _("Value of the first element of a global array "
+                       "variable, if it is a number variable"),
+                     _("Global variables/Arrays and structures"),
                      "res/actions/var.png")
-      .AddParameter("globalvar", _("Variable"));
+      .AddParameter("globalvar", _("Array variable"));
+
+  extension
+      .AddStrExpression(
+          "GlobalVariableLastString",
+          _("Last text child"),
+          _("Value of the last element of a global array variable, if "
+            "it is a text (string) variable."),
+          _("Global variables/Arrays and structures"),
+          "res/actions/var.png")
+      .AddParameter("globalvar", _("Array variable"));
+
+  extension
+      .AddExpression(
+          "GlobalVariableLastNumber",
+          _("Last number child"),
+          _("Value of the last element of a global array variable, if "
+            "it is a number variable"),
+          _("Global variables/Arrays and structures"),
+          "res/actions/var.png")
+      .AddParameter("globalvar", _("Array variable"));
+
+  extension
+      .AddExpression("GlobalVariableChildCount",
+                     _("Number of children"),
+                     _("Number of children in a global array or "
+                       "structure variable"),
+                     _("Global variables/Arrays and structures"),
+                     "res/actions/var.png")
+      .AddParameter("globalvar", _("Array or structure variable"));
 
   extension
       .AddExpression("VariableChildCount",
-                     _("Number of children of a scene variable"),
-                     _("Number of children of a scene variable"),
-                     _("Scene variables"),
+                     _("Number of children"),
+                     _("Number of children in a scene array or "
+                       "structure variable"),
+                     _("Scene variables/Arrays and structures"),
                      "res/actions/var.png")
-      .AddParameter("scenevar", _("Variable"));
+      .AddParameter("scenevar", _("Array or structure variable"));
 
   extension
       .AddExpression("Variable",
-                     _("Value of a scene variable"),
-                     _("Value of a scene variable"),
+                     _("Number variable"),
+                     _("Number value of a scene variable"),
                      _("Scene variables"),
                      "res/actions/var.png")
       .AddParameter("scenevar", _("Variable"));
 
   extension
       .AddStrExpression("VariableString",
-                        _("Text of a scene variable"),
+                        _("Text variable"),
                         _("Text of a scene variable"),
                         _("Scene variables"),
                         "res/actions/var.png")
@@ -454,15 +576,15 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsVariablesExtension(
 
   extension
       .AddExpression("GlobalVariable",
-                     _("Value of a global variable"),
-                     _("Value of a global variable"),
+                     _("Number variable"),
+                     _("Number value of a global variable"),
                      _("Global variables"),
                      "res/actions/var.png")
       .AddParameter("globalvar", _("Name of the global variable"));
 
   extension
       .AddStrExpression("GlobalVariableString",
-                        _("Text of a global variable"),
+                        _("Text variable"),
                         _("Text of a global variable"),
                         _("Global variables"),
                         "res/actions/var.png")

Core/GDCore/Extensions/Metadata/ObjectMetadata.h

@@ -46,7 +46,7 @@ class GD_CORE_API ObjectMetadata {
                  std::shared_ptr<gd::ObjectConfiguration> blueprintObject_);
   /**
    * \brief Construct an object metadata, without "blueprint" object
-   * 
+   *
    * \note This is used by events based objects.
    */
   ObjectMetadata(const gd::String& extensionNamespace_,
@@ -295,6 +295,22 @@ class GD_CORE_API ObjectMetadata {
    */
   std::map<gd::String, gd::ExpressionMetadata>& GetAllStrExpressions() { return strExpressionsInfos; };
 
+  /**
+   * \brief Set the object to be hidden in the IDE.
+   *
+   * Used mainly when an object is deprecated.
+   */
+  ObjectMetadata &SetHidden() {
+    hidden = true;
+    return *this;
+  }
+
+
+  /**
+   * \brief Return true if the instruction must be hidden in the IDE.
+   */
+  bool IsHidden() const { return hidden; }
+
   std::map<gd::String, gd::InstructionMetadata> conditionsInfos;
   std::map<gd::String, gd::InstructionMetadata> actionsInfos;
   std::map<gd::String, gd::ExpressionMetadata> expressionsInfos;
@@ -314,6 +330,7 @@ class GD_CORE_API ObjectMetadata {
   gd::String iconFilename;
   gd::String categoryFullName;
   std::set<gd::String> unsupportedBaseObjectCapabilities;
+  bool hidden = false;
 
   std::shared_ptr<gd::ObjectConfiguration>
       blueprintObject;  ///< The "blueprint" object to be copied when a new

Core/GDCore/IDE/Events/EventsRemover.h

@@ -22,7 +22,7 @@ class EventsList;
 namespace gd {
 
 /**
- * \brief List the values of the parameters of events and their type.
+ * \brief Allow to safely remove a bunch of events.
  *
  * \ingroup IDE
  */

Core/GDCore/IDE/Events/InstructionsCountEvaluator.cpp

@@ -0,0 +1,24 @@
+#include "InstructionsCountEvaluator.h"
+
+#include "GDCore/Events/Instruction.h"
+#include "GDCore/Extensions/PlatformExtension.h"
+#include "GDCore/IDE/WholeProjectRefactorer.h"
+
+namespace gd {
+
+const int InstructionsCountEvaluator::ScanProject(gd::Project &project) {
+  InstructionsCountEvaluator worker(project);
+  gd::WholeProjectRefactorer::ExposeProjectEventsWithoutExtensions(project,
+                                                                   worker);
+  return worker.instructionCount;
+};
+
+// Instructions scanner
+
+bool InstructionsCountEvaluator::DoVisitInstruction(
+    gd::Instruction &instruction, bool isCondition) {
+  instructionCount++;
+  return false;
+}
+
+} // namespace gd

Core/GDCore/IDE/Events/InstructionsCountEvaluator.h

@@ -0,0 +1,50 @@
+/*
+ * GDevelop Core
+ * Copyright 2008-2016 Florian Rival (Florian.Rival@gmail.com). All rights
+ * reserved. This project is released under the MIT License.
+ */
+
+#ifndef GDCORE_INSTRUCTIONS_COUNT_EVALUATOR_H
+#define GDCORE_INSTRUCTIONS_COUNT_EVALUATOR_H
+#include <set>
+
+#include "GDCore/Events/Parsers/ExpressionParser2NodeWorker.h"
+#include "GDCore/IDE/Events/ArbitraryEventsWorker.h"
+#include "GDCore/IDE/Project/ArbitraryObjectsWorker.h"
+#include "GDCore/String.h"
+
+namespace gd {
+class Project;
+class Object;
+class Behavior;
+} // namespace gd
+
+namespace gd {
+
+/**
+ * @brief Count the number of instructions in a project excluding extensions.
+ *
+ * This is used by the examples repository to evaluate examples size.
+ *
+ */
+class GD_CORE_API InstructionsCountEvaluator : public ArbitraryEventsWorker {
+public:
+  /**
+   * Return the number of instructions in the project excluding extensions.
+   */
+  static const int ScanProject(gd::Project &project);
+
+private:
+  InstructionsCountEvaluator(gd::Project &project_)
+      : project(project_), instructionCount(0){};
+  gd::Project &project;
+  int instructionCount;
+
+  // Instructions Visitor
+  bool DoVisitInstruction(gd::Instruction &instruction,
+                          bool isCondition) override;
+};
+
+}; // namespace gd
+
+#endif

Core/GDCore/IDE/Events/UsedExtensionsFinder.cpp

@@ -2,6 +2,7 @@
 
 #include "GDCore/Events/Instruction.h"
 #include "GDCore/Extensions/Metadata/MetadataProvider.h"
+#include "GDCore/Extensions/Metadata/ParameterMetadataTools.h"
 #include "GDCore/Extensions/PlatformExtension.h"
 #include "GDCore/IDE/WholeProjectRefactorer.h"
 #include "GDCore/IDE/Events/ExpressionTypeFinder.h"
@@ -11,30 +12,36 @@
 
 namespace gd {
 
-std::set<gd::String> UsedExtensionsFinder::ScanProject(gd::Project& project) {
+const UsedExtensionsResult UsedExtensionsFinder::ScanProject(gd::Project& project) {
   UsedExtensionsFinder worker(project);
   gd::WholeProjectRefactorer::ExposeProjectObjects(project, worker);
   gd::WholeProjectRefactorer::ExposeProjectEvents(project, worker);
-  return worker.usedExtensions;
+  return worker.result;
 };
 
 // Objects scanner
 
-void UsedExtensionsFinder::DoVisitObject(gd::Object& object) {
-  usedExtensions.insert(gd::MetadataProvider::GetExtensionAndObjectMetadata(
-                            project.GetCurrentPlatform(), object.GetType())
-                            .GetExtension()
-                            .GetName());
+void UsedExtensionsFinder::DoVisitObject(gd::Object &object) {
+  auto metadata = gd::MetadataProvider::GetExtensionAndObjectMetadata(
+      project.GetCurrentPlatform(), object.GetType());
+  result.GetUsedExtensions().insert(metadata.GetExtension().GetName());
+  for (auto &&includeFile : metadata.GetMetadata().includeFiles) {
+    result.GetUsedIncludeFiles().insert(includeFile);
+  }
 };
 
 // Behaviors scanner
 
-void UsedExtensionsFinder::DoVisitBehavior(gd::Behavior& behavior) {
-  usedExtensions.insert(
-      gd::MetadataProvider::GetExtensionAndBehaviorMetadata(
-          project.GetCurrentPlatform(), behavior.GetTypeName())
-          .GetExtension()
-          .GetName());
+void UsedExtensionsFinder::DoVisitBehavior(gd::Behavior &behavior) {
+  auto metadata = gd::MetadataProvider::GetExtensionAndBehaviorMetadata(
+      project.GetCurrentPlatform(), behavior.GetTypeName());
+  result.GetUsedExtensions().insert(metadata.GetExtension().GetName());
+  for (auto &&includeFile : metadata.GetMetadata().includeFiles) {
+    result.GetUsedIncludeFiles().insert(includeFile);
+  }
+  for (auto &&includeFile : metadata.GetMetadata().requiredFiles) {
+    result.GetUsedRequiredFiles().insert(includeFile);
+  }
 };
 
 // Instructions scanner
@@ -46,23 +53,29 @@ bool UsedExtensionsFinder::DoVisitInstruction(gd::Instruction& instruction,
                         project.GetCurrentPlatform(), instruction.GetType())
                   : gd::MetadataProvider::GetExtensionAndActionMetadata(
                         project.GetCurrentPlatform(), instruction.GetType());
-  usedExtensions.insert(metadata.GetExtension().GetName());
+  result.GetUsedExtensions().insert(metadata.GetExtension().GetName());
+  for (auto&& includeFile : metadata.GetMetadata().GetIncludeFiles()) {
+    result.GetUsedIncludeFiles().insert(includeFile);
+  }
 
-  size_t i = 0;
-  for (auto expression : instruction.GetParameters()) {
-    const gd::String& parameterType =
-        metadata.GetMetadata().GetParameter(i).GetType();
-    i++;
+  gd::ParameterMetadataTools::IterateOverParameters(
+      instruction.GetParameters(),
+      metadata.GetMetadata().GetParameters(),
+      [this](const gd::ParameterMetadata& parameterMetadata,
+          const gd::Expression& parameterValue,
+          const gd::String& lastObjectName) {
+    const gd::String& parameterType = parameterMetadata.GetType();
 
     if (gd::ParameterMetadata::IsExpression("string", parameterType)) {
       rootType = "string";
-      expression.GetRootNode()->Visit(*this);
+      parameterValue.GetRootNode()->Visit(*this);
     } else if (gd::ParameterMetadata::IsExpression("number", parameterType)) {
       rootType = "number";
-      expression.GetRootNode()->Visit(*this);
+      parameterValue.GetRootNode()->Visit(*this);
     } else if (gd::ParameterMetadata::IsExpression("variable", parameterType))
-      usedExtensions.insert("BuiltinVariables");
-  }
+      result.GetUsedExtensions().insert("BuiltinVariables");
+  });
+
   return false;
 }
 
@@ -93,31 +106,35 @@ void UsedExtensionsFinder::OnVisitUnaryOperatorNode(UnaryOperatorNode& node) {
 
 // Add variable extension and visit sub-expressions on variable nodes
 void UsedExtensionsFinder::OnVisitVariableNode(VariableNode& node) {
-  usedExtensions.insert("BuiltinVariables");
+  result.GetUsedExtensions().insert("BuiltinVariables");
   if (node.child) node.child->Visit(*this);
 };
 
 void UsedExtensionsFinder::OnVisitVariableAccessorNode(
     VariableAccessorNode& node) {
-  usedExtensions.insert("BuiltinVariables");
+  result.GetUsedExtensions().insert("BuiltinVariables");
   if (node.child) node.child->Visit(*this);
 };
 
 void UsedExtensionsFinder::OnVisitVariableBracketAccessorNode(
     VariableBracketAccessorNode& node) {
-  usedExtensions.insert("BuiltinVariables");
+  result.GetUsedExtensions().insert("BuiltinVariables");
   node.expression->Visit(*this);
   if (node.child) node.child->Visit(*this);
 };
 
 // Add extensions bound to Objects/Behaviors/Functions
-void UsedExtensionsFinder::OnVisitIdentifierNode(IdentifierNode& node) {
-  auto type = gd::ExpressionTypeFinder::GetType(project.GetCurrentPlatform(), GetGlobalObjectsContainer(), GetObjectsContainer(), rootType, node);
+void UsedExtensionsFinder::OnVisitIdentifierNode(IdentifierNode &node) {
+  auto type = gd::ExpressionTypeFinder::GetType(
+      project.GetCurrentPlatform(), GetGlobalObjectsContainer(),
+      GetObjectsContainer(), rootType, node);
   if (gd::ParameterMetadata::IsObject(type)) {
-    usedExtensions.insert(gd::MetadataProvider::GetExtensionAndObjectMetadata(
-                              project.GetCurrentPlatform(), node.identifierName)
-                              .GetExtension()
-                              .GetName());
+    auto metadata = gd::MetadataProvider::GetExtensionAndObjectMetadata(
+        project.GetCurrentPlatform(), node.identifierName);
+    result.GetUsedExtensions().insert(metadata.GetExtension().GetName());
+    for (auto &&includeFile : metadata.GetMetadata().includeFiles) {
+      result.GetUsedIncludeFiles().insert(includeFile);
+    }
   }
 };
 
@@ -138,7 +155,10 @@ void UsedExtensionsFinder::OnVisitFunctionCallNode(FunctionCallNode& node) {
       return;
   }
 
-  usedExtensions.insert(metadata.GetExtension().GetName());
+  result.GetUsedExtensions().insert(metadata.GetExtension().GetName());
+  for (auto&& includeFile : metadata.GetMetadata().GetIncludeFiles()) {
+    result.GetUsedIncludeFiles().insert(includeFile);
+  }
 };
 
 }  // namespace gd

Core/GDCore/IDE/Events/UsedExtensionsFinder.h

@@ -21,18 +21,62 @@ class Behavior;
 
 namespace gd {
 
+class GD_CORE_API UsedExtensionsResult {
+public:
+  /**
+   * The extensions used by the project (or part of it).
+   */
+  const std::set<gd::String> &GetUsedExtensions() const {
+    return usedExtensions;
+  }
+
+  /**
+   * The include files used at runtime by the project (or part of it).
+   */
+  const std::set<gd::String> &GetUsedIncludeFiles() const {
+    return usedIncludeFiles;
+  }
+
+  /**
+   * The additional files required at runtime by the project (or part of it).
+   */
+  const std::set<gd::String> &GetUsedRequiredFiles() const {
+    return usedRequiredFiles;
+  }
+
+  /**
+   * The extensions used by the project (or part of it).
+   */
+  std::set<gd::String> &GetUsedExtensions() { return usedExtensions; }
+
+  /**
+   * The include files used at runtime by the project (or part of it).
+   */
+  std::set<gd::String> &GetUsedIncludeFiles() { return usedIncludeFiles; }
+
+  /**
+   * The additional files required at runtime by the project (or part of it).
+   */
+  std::set<gd::String> &GetUsedRequiredFiles() { return usedRequiredFiles; }
+
+private:
+  std::set<gd::String> usedExtensions;
+  std::set<gd::String> usedIncludeFiles;
+  std::set<gd::String> usedRequiredFiles;
+};
+
 class GD_CORE_API UsedExtensionsFinder
     : public ArbitraryObjectsWorker,
       public ArbitraryEventsWorkerWithContext,
       public ExpressionParser2NodeWorker {
  public:
-  static std::set<gd::String> ScanProject(gd::Project& project);
+  static const UsedExtensionsResult ScanProject(gd::Project& project);
 
  private:
   UsedExtensionsFinder(gd::Project& project_) : project(project_){};
   gd::Project& project;
   gd::String rootType;
-  std::set<gd::String> usedExtensions;
+  UsedExtensionsResult result;
 
   // Object Visitor
   void DoVisitObject(gd::Object& object) override;

Core/GDCore/IDE/PropertyFunctionGenerator.cpp

@@ -12,6 +12,7 @@
 #include "GDCore/Project/EventsBasedBehavior.h"
 #include "GDCore/Project/EventsBasedObject.h"
 #include "GDCore/Project/EventsFunctionsExtension.h"
+#include "GDCore/Project/EventsFunction.h"
 #include "GDCore/Project/Project.h"
 #include "GDCore/Project/PropertyDescriptor.h"
 #include "GDCore/String.h"
@@ -298,4 +299,16 @@ PropertyFunctionGenerator::UnCapitalizeFirstLetter(const gd::String &string) {
   return string.substr(0, 1).LowerCase() + string.substr(1);
 }
 
+void PropertyFunctionGenerator::GenerateConditionSkeleton(
+    gd::Project &project, gd::EventsFunction &eventFunction) {
+  auto &event = dynamic_cast<gd::StandardEvent &>(
+      eventFunction.GetEvents().InsertNewEvent(
+          project, "BuiltinCommonInstructions::Standard", 0));
+
+  gd::Instruction action;
+  action.SetType("SetReturnBoolean");
+  action.AddParameter("True");
+  event.GetActions().Insert(action, 0);
+}
+
 } // namespace gd

Core/GDCore/IDE/PropertyFunctionGenerator.h

@@ -10,6 +10,7 @@ namespace gd {
 class String;
 class Project;
 class EventsFunctionsExtension;
+class EventsFunction;
 class EventsBasedBehavior;
 class EventsBasedObject;
 class AbstractEventsBasedEntity;
@@ -43,6 +44,12 @@ public:
       const gd::AbstractEventsBasedEntity &eventsBasedEntity,
       const gd::NamedPropertyDescriptor &property);
 
+  /**
+   * \brief Generate an event with a "return" action.
+   */
+  static void GenerateConditionSkeleton(gd::Project &project,
+                                        gd::EventsFunction &eventFunction);
+
   ~PropertyFunctionGenerator();
 
 private:

Core/GDCore/IDE/WholeProjectRefactorer.cpp

@@ -49,14 +49,8 @@ void WholeProjectRefactorer::ExposeProjectEvents(
   // See also gd::Project::ExposeResources for a method that traverse the whole
   // project (this time for resources).
 
-  // Add layouts events
-  for (std::size_t s = 0; s < project.GetLayoutsCount(); s++) {
-    worker.Launch(project.GetLayout(s).GetEvents());
-  }
-  // Add external events events
-  for (std::size_t s = 0; s < project.GetExternalEventsCount(); s++) {
-    worker.Launch(project.GetExternalEvents(s).GetEvents());
-  }
+  ExposeProjectEventsWithoutExtensions(project, worker);
+
   // Add events based extensions
   for (std::size_t e = 0; e < project.GetEventsFunctionsExtensionsCount();
        e++) {
@@ -90,6 +84,18 @@ void WholeProjectRefactorer::ExposeProjectEvents(
   }
 }
 
+void WholeProjectRefactorer::ExposeProjectEventsWithoutExtensions(
+    gd::Project& project, gd::ArbitraryEventsWorker& worker) {
+  // Add layouts events
+  for (std::size_t s = 0; s < project.GetLayoutsCount(); s++) {
+    worker.Launch(project.GetLayout(s).GetEvents());
+  }
+  // Add external events events
+  for (std::size_t s = 0; s < project.GetExternalEventsCount(); s++) {
+    worker.Launch(project.GetExternalEvents(s).GetEvents());
+  }
+}
+
 void WholeProjectRefactorer::ExposeProjectEvents(
     gd::Project& project, gd::ArbitraryEventsWorkerWithContext& worker) {
   // See also gd::Project::ExposeResources for a method that traverse the whole

Core/GDCore/IDE/WholeProjectRefactorer.h

@@ -47,6 +47,14 @@ class GD_CORE_API WholeProjectRefactorer {
    */
   static void ExposeProjectEvents(gd::Project& project,
                                   gd::ArbitraryEventsWorker& worker);
+  /**
+   * \brief Call the specified worker on all events of the project (layout and
+   * external events) but not events from extensions.
+   * 
+   * Only use this for stats.
+   */
+  static void ExposeProjectEventsWithoutExtensions(gd::Project& project,
+                                  gd::ArbitraryEventsWorker& worker);
 
   /**
    * \brief Call the specified worker on all events of the project (layout,

Core/GDCore/Project/AbstractEventsBasedEntity.h

@@ -125,6 +125,11 @@ class GD_CORE_API AbstractEventsBasedEntity {
    */
   static gd::String GetPropertyExpressionName(const gd::String& propertyName) { return "Property" + propertyName; };
 
+  /**
+   * \brief Get the name of the action to toggle a boolean property.
+   */
+  static gd::String GetPropertyToggleActionName(const gd::String& propertyName) { return "ToggleProperty" + propertyName; };
+
   /** \name Serialization
    */
   ///@{

Core/GDCore/Project/EventsBasedBehavior.h

@@ -125,6 +125,13 @@ class GD_CORE_API EventsBasedBehavior: public AbstractEventsBasedEntity {
     return "SharedProperty" + propertyName;
   };
 
+  /**
+   * \brief Get the name of the action to toggle a boolean shared property.
+   */
+  static gd::String GetSharedPropertyToggleActionName(const gd::String &propertyName) {
+    return "ToggleSharedProperty" + propertyName;
+  };
+
   void SerializeTo(SerializerElement& element) const override;
 
   void UnserializeFrom(gd::Project& project,

Core/GDCore/Project/EventsFunction.cpp

@@ -72,6 +72,9 @@ void EventsFunction::SerializeTo(SerializerElement& element) const {
   if (isPrivate) {
     element.SetBoolAttribute("private", isPrivate);
   }
+  if (isAsync) {
+    element.SetBoolAttribute("async", isAsync);
+  }
   events.SerializeTo(element.AddChild("events"));
 
   gd::String functionTypeStr = "Action";
@@ -115,6 +118,7 @@ void EventsFunction::UnserializeFrom(gd::Project& project,
   group = element.GetStringAttribute("group");
   getterName = element.GetStringAttribute("getterName");
   isPrivate = element.GetBoolAttribute("private");
+  isAsync = element.GetBoolAttribute("async");
   events.UnserializeFrom(project, element.GetChild("events"));
 
   gd::String functionTypeStr = element.GetStringAttribute("functionType");

Core/GDCore/Project/EventsFunction.h

@@ -211,6 +211,19 @@ class GD_CORE_API EventsFunction {
     return *this;
   }
 
+  /**
+   * \brief Returns true if the function is async.
+   */
+  bool IsAsync() const { return isAsync; }
+
+  /**
+   * \brief Sets the asycronity of the function.
+   */
+  EventsFunction& SetAsync(bool _isAsync) {
+    isAsync = _isAsync;
+    return *this;
+  }
+
   /**
    * \brief Return the events.
    */
@@ -291,6 +304,7 @@ class GD_CORE_API EventsFunction {
   mutable std::vector<gd::ParameterMetadata> actionWithOperationParameters;
   gd::ObjectGroupsContainer objectGroups;
   bool isPrivate = false;
+  bool isAsync = false;
 };
 
 }  // namespace gd

Core/GDCore/Project/LoadingScreen.cpp

@@ -11,7 +11,7 @@
 namespace gd {
 
 LoadingScreen::LoadingScreen()
-    : showGDevelopSplash(true),
+    : showGDevelopLogoDuringLoadingScreen(false),
       gdevelopLogoStyle("light"),
       backgroundImageResourceName(""),
       backgroundColor(0),
@@ -27,7 +27,7 @@ LoadingScreen::LoadingScreen()
       progressBarColor(0xFFFFFF){};
 
 void LoadingScreen::SerializeTo(SerializerElement& element) const {
-  element.SetAttribute("showGDevelopSplash", showGDevelopSplash);
+  element.SetAttribute("showGDevelopSplash", showGDevelopLogoDuringLoadingScreen);
   element.SetAttribute("gdevelopLogoStyle",
                        gdevelopLogoStyle);
   element.SetAttribute("backgroundImageResourceName",
@@ -46,7 +46,7 @@ void LoadingScreen::SerializeTo(SerializerElement& element) const {
 }
 
 void LoadingScreen::UnserializeFrom(const SerializerElement& element) {
-  showGDevelopSplash = element.GetBoolAttribute("showGDevelopSplash", true);
+  showGDevelopLogoDuringLoadingScreen = element.GetBoolAttribute("showGDevelopSplash", true);
   gdevelopLogoStyle =
       element.GetStringAttribute("gdevelopLogoStyle", "light");
   backgroundImageResourceName =

Core/GDCore/Project/LoadingScreen.h

@@ -29,13 +29,13 @@ class GD_CORE_API LoadingScreen {
    * \brief Return true if the GDevelop logo should be shown while loading
    * assets.
    */
-  bool IsGDevelopSplashShown() const { return showGDevelopSplash; };
+  bool IsGDevelopLogoShownDuringLoadingScreen() const { return showGDevelopLogoDuringLoadingScreen; };
 
   /**
    * \brief Set if the GDevelop logo should be shown while loading assets.
    */
-  LoadingScreen& ShowGDevelopSplash(bool show) {
-    showGDevelopSplash = show;
+  LoadingScreen& ShowGDevelopLogoDuringLoadingScreen(bool show) {
+    showGDevelopLogoDuringLoadingScreen = show;
     return *this;
   };
 
@@ -157,7 +157,7 @@ class GD_CORE_API LoadingScreen {
   ///@}
 
  private:
-  bool showGDevelopSplash;
+  bool showGDevelopLogoDuringLoadingScreen;
   gd::String gdevelopLogoStyle;
   gd::String backgroundImageResourceName;
   int backgroundColor;

Core/GDCore/Project/Project.cpp

@@ -636,6 +636,7 @@ void Project::UnserializeFrom(const SerializerElement& element) {
   platformSpecificAssets.UnserializeFrom(
       propElement.GetChild("platformSpecificAssets"));
   loadingScreen.UnserializeFrom(propElement.GetChild("loadingScreen"));
+  watermark.UnserializeFrom(propElement.GetChild("watermark"));
 
   useExternalSourceFiles =
       propElement.GetBoolAttribute("useExternalSourceFiles");
@@ -646,6 +647,13 @@ void Project::UnserializeFrom(const SerializerElement& element) {
   for (std::size_t i = 0; i < authorIdsElement.GetChildrenCount(); ++i) {
     authorIds.push_back(authorIdsElement.GetChild(i).GetStringValue());
   }
+  authorUsernames.clear();
+  auto& authorUsernamesElement = propElement.GetChild("authorUsernames");
+  authorUsernamesElement.ConsiderAsArray();
+  for (std::size_t i = 0; i < authorUsernamesElement.GetChildrenCount(); ++i) {
+    authorUsernames.push_back(
+        authorUsernamesElement.GetChild(i).GetStringValue());
+  }
 
   categories.clear();
   auto& categoriesElement = propElement.GetChild("categories");
@@ -875,6 +883,7 @@ void Project::SerializeTo(SerializerElement& element) const {
   platformSpecificAssets.SerializeTo(
       propElement.AddChild("platformSpecificAssets"));
   loadingScreen.SerializeTo(propElement.AddChild("loadingScreen"));
+  watermark.SerializeTo(propElement.AddChild("watermark"));
   propElement.SetAttribute("useExternalSourceFiles", useExternalSourceFiles);
 
   auto& authorIdsElement = propElement.AddChild("authorIds");
@@ -882,6 +891,11 @@ void Project::SerializeTo(SerializerElement& element) const {
   for (const auto& authorId : authorIds) {
     authorIdsElement.AddChild("").SetStringValue(authorId);
   }
+  auto& authorUsernamesElement = propElement.AddChild("authorUsernames");
+  authorUsernamesElement.ConsiderAsArray();
+  for (const auto& authorUsername : authorUsernames) {
+    authorUsernamesElement.AddChild("").SetStringValue(authorUsername);
+  }
 
   auto& categoriesElement = propElement.AddChild("categories");
   categoriesElement.ConsiderAsArray();
@@ -1097,6 +1111,7 @@ void Project::Init(const gd::Project& game) {
 
   author = game.author;
   authorIds = game.authorIds;
+  authorUsernames = game.authorUsernames;
   isPlayableWithKeyboard = game.isPlayableWithKeyboard;
   isPlayableWithGamepad = game.isPlayableWithGamepad;
   isPlayableWithMobile = game.isPlayableWithMobile;
@@ -1107,6 +1122,7 @@ void Project::Init(const gd::Project& game) {
   latestCompilationDirectory = game.latestCompilationDirectory;
   platformSpecificAssets = game.platformSpecificAssets;
   loadingScreen = game.loadingScreen;
+  watermark = game.watermark;
   objectGroups = game.objectGroups;
 
   extensionProperties = game.extensionProperties;

Core/GDCore/Project/Project.h

@@ -11,6 +11,7 @@
 
 #include "GDCore/Project/ExtensionProperties.h"
 #include "GDCore/Project/LoadingScreen.h"
+#include "GDCore/Project/Watermark.h"
 #include "GDCore/Project/ObjectGroupsContainer.h"
 #include "GDCore/Project/ObjectsContainer.h"
 #include "GDCore/Project/PlatformSpecificAssets.h"
@@ -120,6 +121,16 @@ class GD_CORE_API Project : public ObjectsContainer {
    */
   std::vector<gd::String>& GetAuthorIds() { return authorIds; };
 
+  /**
+   * \brief Get the author usernames of the project.
+   */
+  const std::vector<gd::String>& GetAuthorUsernames() const { return authorUsernames; };
+
+  /**
+   * \brief Get the author usernames of the project, to modify them (non-const).
+   */
+  std::vector<gd::String>& GetAuthorUsernames() { return authorUsernames; };
+
   /**
    * Define the project as playable with a keyboard.
    * \param enable True to define the project as playable with a keyboard.
@@ -256,6 +267,16 @@ class GD_CORE_API Project : public ObjectsContainer {
    */
   const gd::LoadingScreen& GetLoadingScreen() const { return loadingScreen; }
 
+  /**
+   * \brief Return a reference to watermark setup for the project
+   */
+  gd::Watermark& GetWatermark() { return watermark; }
+
+  /**
+   * \brief Return a reference to watermark setup for the project
+   */
+  const gd::Watermark& GetWatermark() const { return watermark; }
+
   /**
    * Change game's main window default width.
    *
@@ -1043,6 +1064,8 @@ class GD_CORE_API Project : public ObjectsContainer {
   gd::String author;        ///< Game author name, for publishing purpose.
   std::vector<gd::String>
       authorIds;           ///< Game author ids, from GDevelop users DB.
+  std::vector<gd::String>
+      authorUsernames;     ///< Game author usernames, from GDevelop users DB.
   std::vector<gd::String>
       categories;           ///< Game categories
   bool isPlayableWithKeyboard; ///< The project is playable with a keyboard.
@@ -1062,6 +1085,7 @@ class GD_CORE_API Project : public ObjectsContainer {
       currentPlatform;  ///< The platform being used to edit the project.
   gd::PlatformSpecificAssets platformSpecificAssets;
   gd::LoadingScreen loadingScreen;
+  gd::Watermark watermark;
   std::vector<std::unique_ptr<gd::ExternalEvents> >
       externalEvents;  ///< List of all externals events
   ExtensionProperties

Core/GDCore/Project/Watermark.cpp

@@ -0,0 +1,24 @@
+/*
+ * GDevelop Core
+ * Copyright 2008-2018 Florian Rival (Florian.Rival@gmail.com). All rights
+ * reserved. This project is released under the MIT License.
+ */
+
+#include "Watermark.h"
+
+#include "GDCore/Serialization/SerializerElement.h"
+
+namespace gd {
+
+Watermark::Watermark() : showWatermark(true), placement("bottom-left"){};
+
+void Watermark::SerializeTo(SerializerElement& element) const {
+  element.SetAttribute("showWatermark", showWatermark);
+  element.SetAttribute("placement", placement);
+}
+
+void Watermark::UnserializeFrom(const SerializerElement& element) {
+  showWatermark = element.GetBoolAttribute("showWatermark", true);
+  placement = element.GetStringAttribute("placement", "bottom-left");
+}
+}  // namespace gd

Core/GDCore/Project/Watermark.h

@@ -0,0 +1,70 @@
+/*
+ * GDevelop Core
+ * Copyright 2008-2018 Florian Rival (Florian.Rival@gmail.com). All rights
+ * reserved. This project is released under the MIT License.
+ */
+
+#ifndef GDCORE_WATERMARK_H
+#define GDCORE_WATERMARK_H
+#include "GDCore/String.h"
+namespace gd {
+class SerializerElement;
+}
+
+namespace gd {
+
+/**
+ * \brief Describe the content and set up of the watermark
+ *
+ * \see gd::Watermark
+ *
+ * \ingroup PlatformDefinition
+ */
+class GD_CORE_API Watermark {
+ public:
+  Watermark();
+  virtual ~Watermark(){};
+
+  /**
+   * \brief Return true if the GDevelop watermark should be shown after
+   * the game has loaded its assets.
+   */
+  bool IsGDevelopWatermarkShown() const { return showWatermark; };
+
+  /**
+   * \brief Set if the GDevelop watermark should be shown after the game
+   * has loaded its assets.
+   */
+  Watermark& ShowGDevelopWatermark(bool show) {
+    showWatermark = show;
+    return *this;
+  };
+
+  const gd::String& GetPlacement() const { return placement; };
+
+  Watermark& SetPlacement(const gd::String& value) {
+    placement = value;
+    return *this;
+  }
+
+  /** \name Saving and loading
+   */
+  ///@{
+  /**
+   * \brief Serialize the watermark setup.
+   */
+  void SerializeTo(SerializerElement& element) const;
+
+  /**
+   * \brief Unserialize the watermark setup.
+   */
+  void UnserializeFrom(const SerializerElement& element);
+  ///@}
+
+ private:
+  bool showWatermark;
+  gd::String placement;
+};
+}  // namespace gd
+
+#endif  // GDCORE_WATERMARK_H

Core/tests/DummyPlatform.cpp

@@ -187,7 +187,7 @@ void SetupProjectWithDummyPlatform(gd::Project& project,
       .SetDefaultValue("\"\"")
       .AddParameter("camera", _("Camera"), "", true)
       .SetDefaultValue("0")
-      .SetFunctionName("getMouseX");
+      .SetFunctionName("getCursorX");
   extension
       ->AddExpression("GetGlobalVariableAsNumber",
                       "Get me a global variable value",

Core/tests/ExpressionCodeGenerator.cpp

@@ -217,7 +217,7 @@ TEST_CASE("ExpressionCodeGenerator", "[common][events]") {
       REQUIRE(node);
       node->Visit(expressionCodeGenerator);
       REQUIRE(expressionCodeGenerator.GetOutput() ==
-              "getMouseX(\"\", \"layer1\", 2 + 2)");
+              "getCursorX(\"\", \"layer1\", 2 + 2)");
       // (first argument is the currentScene)
     }
     SECTION("with last optional parameter omit") {
@@ -231,7 +231,7 @@ TEST_CASE("ExpressionCodeGenerator", "[common][events]") {
       REQUIRE(node);
       node->Visit(expressionCodeGenerator);
       REQUIRE(expressionCodeGenerator.GetOutput() ==
-              "getMouseX(\"\", \"layer1\", 0)");
+              "getCursorX(\"\", \"layer1\", 0)");
       // (first argument is the currentScene)
     }
     SECTION("with last optional parameter omit (deprecated way)") {
@@ -245,7 +245,7 @@ TEST_CASE("ExpressionCodeGenerator", "[common][events]") {
       REQUIRE(node);
       node->Visit(expressionCodeGenerator);
       REQUIRE(expressionCodeGenerator.GetOutput() ==
-              "getMouseX(\"\", \"layer1\", 0)");
+              "getCursorX(\"\", \"layer1\", 0)");
       // (first argument is the currentScene)
     }
     SECTION("with explicit comma (deprecated way)") {
@@ -258,7 +258,7 @@ TEST_CASE("ExpressionCodeGenerator", "[common][events]") {
       REQUIRE(node);
       node->Visit(expressionCodeGenerator);
       REQUIRE(expressionCodeGenerator.GetOutput() ==
-              "getMouseX(\"\", \"\", 0)");
+              "getCursorX(\"\", \"\", 0)");
       // (first argument is the currentScene)
     }
   }
@@ -624,7 +624,7 @@ TEST_CASE("ExpressionCodeGenerator", "[common][events]") {
       REQUIRE(node);
       node->Visit(expressionCodeGenerator);
       REQUIRE(expressionCodeGenerator.GetOutput() ==
-              "-(+(-(getMouseX(\"\", \"\", 0))))");
+              "-(+(-(getCursorX(\"\", \"\", 0))))");
       // (first argument is the currentScene)
     }
   }

Core/tests/InstructionCountEvaluator.cpp

@@ -0,0 +1,40 @@
+/*
+ * GDevelop Core
+ * Copyright 2008-2016 Florian Rival (Florian.Rival@gmail.com). All rights
+ * reserved. This project is released under the MIT License.
+ */
+#include "GDCore/IDE/Events/InstructionsCountEvaluator.h"
+
+#include <algorithm>
+
+#include "DummyPlatform.h"
+#include "GDCore/Events/Builtin/StandardEvent.h"
+#include "GDCore/Events/Event.h"
+#include "GDCore/Extensions/Platform.h"
+#include "GDCore/Project/Layout.h"
+#include "GDCore/Project/Project.h"
+#include "catch.hpp"
+
+namespace {
+
+TEST_CASE("InstructionsCountEvaluator", "[events]") {
+
+  SECTION("Can count 1 action in a layout") {
+    gd::Project project;
+    gd::Platform platform;
+    SetupProjectWithDummyPlatform(project, platform);
+    auto &layout1 = project.InsertNewLayout("Layout1", 0);
+
+    // Add an event with an action.
+    gd::StandardEvent event;
+    gd::Instruction instruction;
+    instruction.SetType("MyExtension::DoSomething");
+    instruction.SetParametersCount(1);
+    event.GetActions().Insert(instruction);
+    layout1.GetEvents().InsertEvent(event);
+
+    REQUIRE(gd::InstructionsCountEvaluator::ScanProject(project) == 1);
+  }
+}
+
+} // namespace

Extensions/AdMob/JsExtension.js

@@ -30,7 +30,7 @@ module.exports = {
         'AdMob',
         _('AdMob'),
         _(
-          'Allow to display AdMob banners, interstitials and reward video ads.'
+          'Allow to display AdMob banners, app open, interstitials, rewarded interstitials and rewarded video ads.'
         ),
         'Florian Rival',
         'MIT'
@@ -57,8 +57,8 @@ module.exports = {
       .addDependency()
       .setName('AdMob Cordova plugin')
       .setDependencyType('cordova')
-      .setExportName('gdevelop-cordova-admob-plus')
-      .setVersion('0.45.0')
+      .setExportName('admob-plus-cordova')
+      .setVersion('1.28.0')
       .setExtraSetting(
         'APP_ID_ANDROID',
         new gd.PropertyDescriptor('AdMobAppIdAndroid').setType(
@@ -100,23 +100,120 @@ module.exports = {
       .setIncludeFile('Extensions/AdMob/admobtools.js')
       .setFunctionName('gdjs.adMob.setTestMode');
 
-    // Banner
+    // App Open
     extension
       .addCondition(
-        'BannerLoading',
-        _('Banner loading'),
-        _(
-          'Check if a banner is currently loading. It will be shown automatically when loaded.'
-        ),
-        _('Banner is loading'),
+        'AppOpenLoading',
+        _('App open loading'),
+        _('Check if an app open is currently loading.'),
+        _('App open is loading'),
         '',
         'JsPlatform/Extensions/admobicon24.png',
         'JsPlatform/Extensions/admobicon16.png'
       )
       .getCodeExtraInformation()
       .setIncludeFile('Extensions/AdMob/admobtools.js')
-      .setFunctionName('gdjs.adMob.isBannerLoading');
+      .setFunctionName('gdjs.adMob.isAppOpenLoading');
 
+    extension
+      .addCondition(
+        'AppOpenReady',
+        _('App open ready'),
+        _('Check if an app open is ready to be displayed.'),
+        _('App open is ready'),
+        '',
+        'JsPlatform/Extensions/admobicon24.png',
+        'JsPlatform/Extensions/admobicon16.png'
+      )
+      .getCodeExtraInformation()
+      .setIncludeFile('Extensions/AdMob/admobtools.js')
+      .setFunctionName('gdjs.adMob.isAppOpenReady');
+
+    extension
+      .addCondition(
+        'AppOpenShowing',
+        _('App open showing'),
+        _('Check if there is an app open being displayed.'),
+        _('App open is showing'),
+        '',
+        'JsPlatform/Extensions/admobicon24.png',
+        'JsPlatform/Extensions/admobicon16.png'
+      )
+      .getCodeExtraInformation()
+      .setIncludeFile('Extensions/AdMob/admobtools.js')
+      .setFunctionName('gdjs.adMob.isAppOpenShowing');
+
+    extension
+      .addCondition(
+        'AppOpenErrored',
+        _('App open errored'),
+        _('Check if there was a error while loading the app open.'),
+        _('App open had an error'),
+        '',
+        'JsPlatform/Extensions/admobicon24.png',
+        'JsPlatform/Extensions/admobicon16.png'
+      )
+      .getCodeExtraInformation()
+      .setIncludeFile('Extensions/AdMob/admobtools.js')
+      .setFunctionName('gdjs.adMob.isAppOpenErrored');
+
+    extension
+      .addAction(
+        'LoadAppOpen',
+        _('Load app open'),
+        _(
+          'Start loading an app open (that can be displayed automatically when the loading is finished).\nIf test mode is set, a test app open will be displayed.'
+        ),
+        _(
+          'Load app open with Android ad unit ID: _PARAM0_, iOS ad unit ID: _PARAM1_ (landscape: _PARAM2_, display automatically when loaded: _PARAM3_)'
+        ),
+        '',
+        'JsPlatform/Extensions/admobicon24.png',
+        'JsPlatform/Extensions/admobicon16.png'
+      )
+      .addParameter('string', _('Android app open ID'), '', false)
+      .setParameterLongDescription(
+        'Get it from your AdMob account. You can use `"ca-app-pub-3940256099942544/3419835294"` for loading a test app open.'
+      )
+      .addParameter('string', _('iOS app open ID'), '', false)
+      .setParameterLongDescription(
+        'Get it from your AdMob account. You can use `"ca-app-pub-3940256099942544/5662855259"` for loading a test app open.'
+      )
+      .addParameter(
+        'yesorno',
+        _('Display in landscape? (portait otherwise)'),
+        '',
+        false
+      )
+      .setDefaultValue('false')
+      .addParameter(
+        'yesorno',
+        _('Displayed automatically when loading is finished?'),
+        '',
+        false
+      )
+      .setDefaultValue('true')
+      .getCodeExtraInformation()
+      .setIncludeFile('Extensions/AdMob/admobtools.js')
+      .setFunctionName('gdjs.adMob.loadAppOpen');
+
+    extension
+      .addAction(
+        'ShowAppOpen',
+        _('Show app open'),
+        _(
+          'Show the app open that was loaded. Will work only when the app open is fully loaded.'
+        ),
+        _('Show the loaded app open'),
+        '',
+        'JsPlatform/Extensions/admobicon24.png',
+        'JsPlatform/Extensions/admobicon16.png'
+      )
+      .getCodeExtraInformation()
+      .setIncludeFile('Extensions/AdMob/admobtools.js')
+      .setFunctionName('gdjs.adMob.showAppOpen');
+
+    // Banner
     extension
       .addCondition(
         'BannerShowing',
@@ -131,6 +228,34 @@ module.exports = {
       .setIncludeFile('Extensions/AdMob/admobtools.js')
       .setFunctionName('gdjs.adMob.isBannerShowing');
 
+    extension
+      .addCondition(
+        'BannerConfigured',
+        _('Banner configured'),
+        _('Check if there is a banner correctly configured ready to be shown.'),
+        _('Banner is configured'),
+        '',
+        'JsPlatform/Extensions/admobicon24.png',
+        'JsPlatform/Extensions/admobicon16.png'
+      )
+      .getCodeExtraInformation()
+      .setIncludeFile('Extensions/AdMob/admobtools.js')
+      .setFunctionName('gdjs.adMob.isBannerConfigured');
+
+    extension
+      .addCondition(
+        'BannerLoaded',
+        _('Banner loaded'),
+        _('Check if there is a banner correctly loaded ready to be shown.'),
+        _('Banner is loaded'),
+        '',
+        'JsPlatform/Extensions/admobicon24.png',
+        'JsPlatform/Extensions/admobicon16.png'
+      )
+      .getCodeExtraInformation()
+      .setIncludeFile('Extensions/AdMob/admobtools.js')
+      .setFunctionName('gdjs.adMob.isBannerLoaded');
+
     extension
       .addCondition(
         'BannerErrored',
@@ -149,6 +274,9 @@ module.exports = {
     extension
       .addDuplicatedCondition('BannerReady', 'BannerShowing')
       .setHidden();
+    extension
+      .addDuplicatedCondition('Bannerloading', 'BannerShowing')
+      .setHidden();
     extension
       .addDuplicatedCondition('BannerExists', 'BannerShowing')
       .setHidden();
@@ -158,7 +286,7 @@ module.exports = {
         'SetupBanner',
         _('Configure the banner'),
         _(
-          "Configure a banner, which can then be displayed.\nIf test mode is set, a test banner will be displayed.\n\nOnce a banner is positioned (at the top or bottom of the game), it can't be moved anymore."
+          "Configure a banner, which can then be displayed.\nIf a banner is already displayed, it will be removed\nIf test mode is set, a test banner will be displayed.\n\nOnce a banner is positioned (at the top or bottom of the game), it can't be moved anymore."
         ),
         _(
           'Configure the banner with Android ad unit ID: _PARAM0_, iOS ad unit ID: _PARAM1_, display at top: _PARAM2_'
@@ -173,7 +301,7 @@ module.exports = {
       )
       .addParameter('string', _('iOS banner ID'), '', false)
       .setParameterLongDescription(
-        'Get it from your AdMob account. You can use `"ca-app-pub-3940256099942544/6300978111"` for showing a test banner.'
+        'Get it from your AdMob account. You can use `"ca-app-pub-3940256099942544/2934735716"` for showing a test banner.'
       )
       .addParameter(
         'yesorno',
@@ -298,7 +426,7 @@ module.exports = {
       )
       .addParameter('string', _('iOS interstitial ID'), '', false)
       .setParameterLongDescription(
-        'Get it from your AdMob account. You can use `"ca-app-pub-3940256099942544/1033173712"` for loading a test interstitial.'
+        'Get it from your AdMob account. You can use `"ca-app-pub-3940256099942544/4411468910"` for loading a test interstitial.'
       )
       .addParameter(
         'yesorno',
@@ -327,90 +455,266 @@ module.exports = {
       .setIncludeFile('Extensions/AdMob/admobtools.js')
       .setFunctionName('gdjs.adMob.showInterstitial');
 
-    // Reward video
+    // Rewarded Interstitial
     extension
       .addCondition(
-        'VideoLoading',
-        _('Video loading'),
-        _('Check if a reward video is currently loading.'),
-        _('Reward video is loading'),
+        'RewardedInterstitialLoading',
+        _('Rewarded interstitial loading'),
+        _('Check if a rewarded interstitial is currently loading.'),
+        _('Rewarded interstitial is loading'),
         '',
         'JsPlatform/Extensions/admobicon24.png',
         'JsPlatform/Extensions/admobicon16.png'
       )
       .getCodeExtraInformation()
       .setIncludeFile('Extensions/AdMob/admobtools.js')
-      .setFunctionName('gdjs.adMob.isVideoLoading');
+      .setFunctionName('gdjs.adMob.isRewardedInterstitialLoading');
 
     extension
       .addCondition(
-        'VideoReady',
-        _('Video ready'),
-        _('Check if a reward video is ready to be displayed.'),
-        _('Reward video is ready'),
+        'RewardedInterstitialReady',
+        _('Rewarded interstitial ready'),
+        _('Check if a rewarded interstitial is ready to be displayed.'),
+        _('Rewarded interstitial is ready'),
         '',
         'JsPlatform/Extensions/admobicon24.png',
         'JsPlatform/Extensions/admobicon16.png'
       )
       .getCodeExtraInformation()
       .setIncludeFile('Extensions/AdMob/admobtools.js')
-      .setFunctionName('gdjs.adMob.isVideoReady');
+      .setFunctionName('gdjs.adMob.isRewardedInterstitialReady');
 
     extension
       .addCondition(
-        'VideoShowing',
-        _('Video showing'),
-        _('Check if there is a reward video being displayed.'),
-        _('Reward video is showing'),
+        'RewardedInterstitialShowing',
+        _('Rewarded interstitial showing'),
+        _('Check if there is a rewarded interstitial being displayed.'),
+        _('Rewarded interstitial is showing'),
         '',
         'JsPlatform/Extensions/admobicon24.png',
         'JsPlatform/Extensions/admobicon16.png'
       )
       .getCodeExtraInformation()
       .setIncludeFile('Extensions/AdMob/admobtools.js')
-      .setFunctionName('gdjs.adMob.isVideoShowing');
+      .setFunctionName('gdjs.adMob.isRewardedInterstitialShowing');
 
     extension
       .addCondition(
-        'VideoErrored',
-        _('Video had an error'),
-        _('Check if there was a error while loading the rewarded video.'),
-        _('Video ad had an error'),
-        '',
-        'JsPlatform/Extensions/admobicon24.png',
-        'JsPlatform/Extensions/admobicon16.png'
-      )
-      .getCodeExtraInformation()
-      .setIncludeFile('Extensions/AdMob/admobtools.js')
-      .setFunctionName('gdjs.adMob.isVideoErrored');
-
-    extension
-      .addCondition(
-        'VideoReward',
-        _('Video reward received'),
+        'RewardedInterstitialErrored',
+        _('Rewarded interstitial had an error'),
         _(
-          'Check if the reward of the video was given to the user.\nYou can mark this reward as cleared, so that the condition will be false and you can show later another reward video.'
+          'Check if there was a error while loading the rewarded interstitial.'
+        ),
+        _('Rewarded Interstitial had an error'),
+        '',
+        'JsPlatform/Extensions/admobicon24.png',
+        'JsPlatform/Extensions/admobicon16.png'
+      )
+      .getCodeExtraInformation()
+      .setIncludeFile('Extensions/AdMob/admobtools.js')
+      .setFunctionName('gdjs.adMob.isRewardedInterstitialErrored');
+
+    extension
+      .addCondition(
+        'RewardedInterstitialRewardReceived',
+        _('Rewarded Interstitial reward received'),
+        _(
+          'Check if the reward of the rewarded interstitial was given to the user.\nYou can mark this reward as cleared, so that the condition will be false and you can show later another rewarded interstitial.'
+        ),
+        _(
+          'User got the reward of the rewarded interstitial (and clear this reward: _PARAM0_)'
         ),
-        _('User got the reward of the video (and clear this reward: _PARAM0_)'),
         '',
         'JsPlatform/Extensions/admobicon24.png',
         'JsPlatform/Extensions/admobicon16.png'
       )
       .addParameter(
         'yesorno',
-        _('Clear the reward (needed to show another video)'),
+        _('Clear the reward (needed to show another rewarded interstitial)'),
         '',
         false
       )
       .setDefaultValue('true')
       .getCodeExtraInformation()
       .setIncludeFile('Extensions/AdMob/admobtools.js')
-      .setFunctionName('gdjs.adMob.wasVideoRewardReceived');
+      .setFunctionName('gdjs.adMob.wasRewardedInterstitialRewardReceived');
 
     extension
       .addAction(
-        'LoadVideo',
-        _('Load video'),
+        'LoadRewardedInterstitial',
+        _('Load rewarded interstitial'),
+        _(
+          'Start loading a rewarded interstitial (that can be displayed automatically when the loading is finished).\nIf test mode is set, a test rewarded interstitial will be displayed.\nThis is similar to a rewarded video, but can be displayed at any time, and the user can close it.'
+        ),
+        _(
+          'Load rewarded interstitial with Android ad unit ID: _PARAM0_, iOS ad unit ID: _PARAM1_ (display automatically when loaded: _PARAM2_)'
+        ),
+        '',
+        'JsPlatform/Extensions/admobicon24.png',
+        'JsPlatform/Extensions/admobicon16.png'
+      )
+      .addParameter('string', _('Android rewarded interstitial ID'), '', false)
+      .setParameterLongDescription(
+        'Get it from your AdMob account. You can use `"ca-app-pub-3940256099942544/5354046379"` for loading a test rewarded interstitial.'
+      )
+      .addParameter('string', _('iOS interstitial ID'), '', false)
+      .setParameterLongDescription(
+        'Get it from your AdMob account. You can use `"ca-app-pub-3940256099942544/6978759866"` for loading a test rewarded interstitial.'
+      )
+      .addParameter(
+        'yesorno',
+        _('Displayed automatically when loading is finished?'),
+        '',
+        false
+      )
+      .setDefaultValue('true')
+      .getCodeExtraInformation()
+      .setIncludeFile('Extensions/AdMob/admobtools.js')
+      .setFunctionName('gdjs.adMob.loadRewardedInterstitial');
+
+    extension
+      .addAction(
+        'ShowRewardedInterstitial',
+        _('Show rewarded interstitial'),
+        _(
+          'Show the rewarded interstitial that was loaded. Will work only when the rewarded interstitial is fully loaded.'
+        ),
+        _('Show the loaded rewarded interstitial'),
+        '',
+        'JsPlatform/Extensions/admobicon24.png',
+        'JsPlatform/Extensions/admobicon16.png'
+      )
+      .getCodeExtraInformation()
+      .setIncludeFile('Extensions/AdMob/admobtools.js')
+      .setFunctionName('gdjs.adMob.showRewardedInterstitial');
+
+    extension
+      .addAction(
+        'ClaimRewardedInterstitialReward',
+        _('Mark the reward of the rewarded interstitial as claimed'),
+        _(
+          'Mark the rewarded interstitial reward as claimed. Useful if you used the condition to check if the reward was given to the user without clearing the reward.'
+        ),
+        _('Mark the reward of the rewarded interstitial as claimed'),
+        '',
+        'JsPlatform/Extensions/admobicon24.png',
+        'JsPlatform/Extensions/admobicon16.png'
+      )
+      .getCodeExtraInformation()
+      .setIncludeFile('Extensions/AdMob/admobtools.js')
+      .setFunctionName('gdjs.adMob.markRewardedInterstitialRewardAsClaimed');
+
+    // Rewarded video
+    extension
+      .addCondition(
+        'RewardedVideoLoading',
+        _('Rewarded video loading'),
+        _('Check if a rewarded video is currently loading.'),
+        _('Rewarded video is loading'),
+        '',
+        'JsPlatform/Extensions/admobicon24.png',
+        'JsPlatform/Extensions/admobicon16.png'
+      )
+      .getCodeExtraInformation()
+      .setIncludeFile('Extensions/AdMob/admobtools.js')
+      .setFunctionName('gdjs.adMob.isRewardedVideoLoading');
+
+    // Deprecated condition (was renamed):
+    extension
+      .addDuplicatedCondition('VideoLoading', 'RewardedVideoLoading')
+      .setHidden();
+
+    extension
+      .addCondition(
+        'RewardedVideoReady',
+        _('Rewarded video ready'),
+        _('Check if a rewarded video is ready to be displayed.'),
+        _('Rewarded video is ready'),
+        '',
+        'JsPlatform/Extensions/admobicon24.png',
+        'JsPlatform/Extensions/admobicon16.png'
+      )
+      .getCodeExtraInformation()
+      .setIncludeFile('Extensions/AdMob/admobtools.js')
+      .setFunctionName('gdjs.adMob.isRewardedVideoReady');
+
+    // Deprecated condition (was renamed):
+    extension
+      .addDuplicatedCondition('VideoReady', 'RewardedVideoReady')
+      .setHidden();
+
+    extension
+      .addCondition(
+        'RewardedVideoShowing',
+        _('Rewarded video showing'),
+        _('Check if there is a rewarded video being displayed.'),
+        _('Rewarded video is showing'),
+        '',
+        'JsPlatform/Extensions/admobicon24.png',
+        'JsPlatform/Extensions/admobicon16.png'
+      )
+      .getCodeExtraInformation()
+      .setIncludeFile('Extensions/AdMob/admobtools.js')
+      .setFunctionName('gdjs.adMob.isRewardedVideoShowing');
+
+    // Deprecated condition (was renamed):
+    extension
+      .addDuplicatedCondition('VideoShowing', 'RewardedVideoShowing')
+      .setHidden();
+
+    extension
+      .addCondition(
+        'RewardedVideoErrored',
+        _('Rewarded video had an error'),
+        _('Check if there was a error while loading the rewarded video.'),
+        _('Rewarded video ad had an error'),
+        '',
+        'JsPlatform/Extensions/admobicon24.png',
+        'JsPlatform/Extensions/admobicon16.png'
+      )
+      .getCodeExtraInformation()
+      .setIncludeFile('Extensions/AdMob/admobtools.js')
+      .setFunctionName('gdjs.adMob.isRewardedVideoErrored');
+
+    // Deprecated condition (was renamed):
+    extension
+      .addDuplicatedCondition('VideoErrored', 'RewardedVideoErrored')
+      .setHidden();
+
+    extension
+      .addCondition(
+        'RewardedVideoRewardReceived',
+        _('Rewarded Video reward received'),
+        _(
+          'Check if the reward of the rewarded video was given to the user.\nYou can mark this reward as cleared, so that the condition will be false and you can show later another rewarded video.'
+        ),
+        _(
+          'User got the reward of the rewarded video (and clear this reward: _PARAM0_)'
+        ),
+        '',
+        'JsPlatform/Extensions/admobicon24.png',
+        'JsPlatform/Extensions/admobicon16.png'
+      )
+      .addParameter(
+        'yesorno',
+        _('Clear the reward (needed to show another rewarded video)'),
+        '',
+        false
+      )
+      .setDefaultValue('true')
+      .getCodeExtraInformation()
+      .setIncludeFile('Extensions/AdMob/admobtools.js')
+      .setFunctionName('gdjs.adMob.wasRewardedVideoRewardReceived');
+
+    // Deprecated condition (was renamed):
+    extension
+      .addDuplicatedCondition('VideoReward', 'RewardedVideoRewardReceived')
+      .setHidden();
+
+    extension
+      .addAction(
+        'LoadRewardedVideo',
+        _('Load rewarded video'),
         _(
           'Start loading a reward video (that can be displayed automatically when the loading is finished).\nIf test mode is set, a test video will be displayed.'
         ),
@@ -427,7 +731,7 @@ module.exports = {
       )
       .addParameter('string', _('iOS reward video ID'), '', false)
       .setParameterLongDescription(
-        'Get it from your AdMob account. You can use `"ca-app-pub-3940256099942544/5224354917"` for loading a test rewarded video.'
+        'Get it from your AdMob account. You can use `"ca-app-pub-3940256099942544/1712485313"` for loading a test rewarded video.'
       )
       .addParameter(
         'yesorno',
@@ -438,12 +742,15 @@ module.exports = {
       .setDefaultValue('true')
       .getCodeExtraInformation()
       .setIncludeFile('Extensions/AdMob/admobtools.js')
-      .setFunctionName('gdjs.adMob.loadVideo');
+      .setFunctionName('gdjs.adMob.loadRewardedVideo');
+
+    // Deprecated action (was renamed):
+    extension.addDuplicatedAction('LoadVideo', 'LoadRewardedVideo').setHidden();
 
     extension
       .addAction(
-        'ShowVideo',
-        _('Show video'),
+        'ShowRewardedVideo',
+        _('Show rewarded video'),
         _(
           'Show the reward video that was loaded. Will work only when the video is fully loaded.'
         ),
@@ -454,23 +761,31 @@ module.exports = {
       )
       .getCodeExtraInformation()
       .setIncludeFile('Extensions/AdMob/admobtools.js')
-      .setFunctionName('gdjs.adMob.showVideo');
+      .setFunctionName('gdjs.adMob.showRewardedVideo');
+
+    // Deprecated action (was renamed):
+    extension.addDuplicatedAction('ShowVideo', 'ShowRewardedVideo').setHidden();
 
     extension
       .addAction(
-        'ClaimReward',
-        _('Mark the reward of the video as claimed'),
+        'ClaimRewardedVideoReward',
+        _('Mark the reward of the rewarded video as claimed'),
         _(
-          'Mark the video reward as claimed. Useful if you used the condition to check if the reward was given to the user without clearing the reward.'
+          'Mark the rewarded video reward as claimed. Useful if you used the condition to check if the reward was given to the user without clearing the reward.'
         ),
-        _('Mark the reward of the video as claimed'),
+        _('Mark the reward of the rewarded video as claimed'),
         '',
         'JsPlatform/Extensions/admobicon24.png',
         'JsPlatform/Extensions/admobicon16.png'
       )
       .getCodeExtraInformation()
       .setIncludeFile('Extensions/AdMob/admobtools.js')
-      .setFunctionName('gdjs.adMob.markVideoRewardAsClaimed');
+      .setFunctionName('gdjs.adMob.markRewardedVideoRewardAsClaimed');
+
+    // Deprecated action (was renamed):
+    extension
+      .addDuplicatedAction('ClaimReward', 'ClaimRewardedVideoReward')
+      .setHidden();
 
     return extension;
   },

Extensions/AnchorBehavior/tests/anchorruntimebehavior.spec.js

@@ -1,10 +1,7 @@
 // @ts-check
 describe('gdjs.AnchorRuntimeBehavior', function () {
-  const runtimeGame = new gdjs.RuntimeGame({
-    variables: [],
-    resources: { resources: [] },
-    // @ts-ignore
-    properties: { windowWidth: 1000, windowHeight: 1000 },
+  const runtimeGame = gdjs.getPixiRuntimeGame({
+    propertiesOverrides: { windowHeight: 1000, windowWidth: 1000 },
   });
   const anchorBehaviorName = 'Anchor';
   const runtimeScene = new gdjs.RuntimeScene(runtimeGame);

Extensions/BBText/JsExtension.js

@@ -36,7 +36,7 @@ module.exports = {
         'Open source (MIT License)'
       )
       .setExtensionHelpPath('/objects/bbtext')
-      .setCategory('User interface');
+      .setCategory('Text');
     extension
       .addInstructionOrExpressionGroupMetadata(_('BBCode Text Object'))
       .setIcon('JsPlatform/Extensions/bbcode32.png');
@@ -174,7 +174,7 @@ module.exports = {
       .addIncludeFile(
         'Extensions/BBText/pixi-multistyle-text/dist/pixi-multistyle-text.umd.js'
       )
-      .setCategoryFullName(_('User interface'));
+      .setCategoryFullName(_('Text'));
 
     /**
      * Utility function to add both a setter and a getter to a property from a list.

Extensions/BitmapText/JsExtension.js

@@ -36,9 +36,10 @@ module.exports = {
         'Open source (MIT License)'
       )
       .setExtensionHelpPath('/objects/bitmap_text')
-      .setCategory('User interface');
-    extension.addInstructionOrExpressionGroupMetadata(_("Bitmap Text"))
-        .setIcon("JsPlatform/Extensions/bitmapfont32.png");
+      .setCategory('Text');
+    extension
+      .addInstructionOrExpressionGroupMetadata(_('Bitmap Text'))
+      .setIcon('JsPlatform/Extensions/bitmapfont32.png');
 
     const bitmapTextObject = new gd.ObjectJsImplementation();
     // $FlowExpectedError
@@ -91,7 +92,7 @@ module.exports = {
         .setType('resource')
         .addExtraInfo('bitmapFont') //fnt or xml files
         .setLabel(_('Bitmap Font'))
-        .setGroup(_("Font"));
+        .setGroup(_('Font'));
 
       objectProperties
         .getOrCreate('textureAtlasResourceName')
@@ -99,7 +100,7 @@ module.exports = {
         .setType('resource')
         .addExtraInfo('image')
         .setLabel(_('Bitmap atlas image'))
-        .setGroup(_("Font"));
+        .setGroup(_('Font'));
 
       objectProperties
         .getOrCreate('scale')
@@ -113,7 +114,7 @@ module.exports = {
         .setValue(objectContent.tint)
         .setType('color')
         .setLabel(_('Font tint'))
-        .setGroup(_("Font"));
+        .setGroup(_('Font'));
 
       objectProperties
         .getOrCreate('wordWrap')
@@ -174,7 +175,7 @@ module.exports = {
       .addIncludeFile(
         'Extensions/BitmapText/bitmaptextruntimeobject-pixi-renderer.js'
       )
-      .setCategoryFullName(_('User interface'));
+      .setCategoryFullName(_('Text'));
 
     object
       .addExpressionAndConditionAndAction(
@@ -652,8 +653,7 @@ module.exports = {
 
     // This is called to update the PIXI object on the scene editor
     RenderedBitmapTextInstance.prototype.update = function () {
-      const properties = this._associatedObjectConfiguration
-        .getProperties();
+      const properties = this._associatedObjectConfiguration.getProperties();
 
       // Update the rendered text properties (note: Pixi is only
       // applying changes if there were changed).

Extensions/DraggableBehavior/draggableruntimebehavior.ts

@@ -57,35 +57,18 @@ namespace gdjs {
       }
       const inputManager = instanceContainer.getGame().getInputManager();
 
-      //Try mouse
-      const mouseDraggableManager = DraggableManager.getMouseManager(
-        instanceContainer
-      );
-      if (
-        inputManager.isMouseButtonPressed(0) &&
-        !mouseDraggableManager.isDragging(this)
-      ) {
-        if (mouseDraggableManager.tryAndTakeDragging(instanceContainer, this)) {
-          this._draggedByDraggableManager = mouseDraggableManager;
-          return true;
+      const touchIds = inputManager.getStartedTouchIdentifiers();
+      for (let i = 0; i < touchIds.length; ++i) {
+        const touchDraggableManager = DraggableManager.getTouchManager(
+          instanceContainer,
+          touchIds[i]
+        );
+        if (touchDraggableManager.isDragging(this)) {
+          continue;
         }
-      } else {
-        //Try touches
-        const touchIds = inputManager.getStartedTouchIdentifiers();
-        for (let i = 0; i < touchIds.length; ++i) {
-          const touchDraggableManager = DraggableManager.getTouchManager(
-            instanceContainer,
-            touchIds[i]
-          );
-          if (touchDraggableManager.isDragging(this)) {
-            continue;
-          }
-          if (
-            touchDraggableManager.tryAndTakeDragging(instanceContainer, this)
-          ) {
-            this._draggedByDraggableManager = touchDraggableManager;
-            return true;
-          }
+        if (touchDraggableManager.tryAndTakeDragging(instanceContainer, this)) {
+          this._draggedByDraggableManager = touchDraggableManager;
+          return true;
         }
       }
       return false;
@@ -121,14 +104,6 @@ namespace gdjs {
     }
 
     doStepPostEvents(instanceContainer: gdjs.RuntimeInstanceContainer) {
-      const mouseDraggableManager = DraggableManager.getMouseManager(
-        instanceContainer
-      );
-      mouseDraggableManager.leftPressedLastFrame = instanceContainer
-        .getGame()
-        .getInputManager()
-        .isMouseButtonPressed(0);
-
       this._justDropped = false;
     }
 
@@ -144,7 +119,8 @@ namespace gdjs {
   /**
    * Handle the dragging
    */
-  abstract class DraggableManager {
+  class DraggableManager {
+    private _touchId: integer;
     /**
      * The object has left its original position.
      * When true, the search for the best object to drag has ended.
@@ -157,24 +133,11 @@ namespace gdjs {
     protected _xOffset: number = 0;
     protected _yOffset: number = 0;
 
-    constructor(instanceContainer: gdjs.RuntimeInstanceContainer) {}
-
-    /**
-     * Get the platforms manager of an instance container.
-     */
-    static getMouseManager(
-      instanceContainer: gdjs.RuntimeInstanceContainer
-    ): MouseDraggableManager {
-      // @ts-ignore
-      if (!instanceContainer.mouseDraggableManager) {
-        //Create the shared manager if necessary.
-        // @ts-ignore
-        instanceContainer.mouseDraggableManager = new MouseDraggableManager(
-          instanceContainer
-        );
-      }
-      // @ts-ignore
-      return instanceContainer.mouseDraggableManager;
+    constructor(
+      instanceContainer: gdjs.RuntimeInstanceContainer,
+      touchId: integer
+    ) {
+      this._touchId = touchId;
     }
 
     /**
@@ -196,7 +159,7 @@ namespace gdjs {
         // @ts-ignore
         instanceContainer.touchDraggableManagers[
           touchId
-        ] = new TouchDraggableManager(instanceContainer, touchId);
+        ] = new DraggableManager(instanceContainer, touchId);
       }
       // @ts-ignore
       return instanceContainer.touchDraggableManagers[touchId];
@@ -263,75 +226,6 @@ namespace gdjs {
       this._draggableBehavior = null;
     }
 
-    abstract isDragging(
-      draggableRuntimeBehavior: DraggableRuntimeBehavior
-    ): boolean;
-    abstract shouldEndDrag(
-      instanceContainer: gdjs.RuntimeInstanceContainer,
-      draggableRuntimeBehavior: DraggableRuntimeBehavior
-    ): boolean;
-    abstract getPosition(
-      instanceContainer: gdjs.RuntimeInstanceContainer,
-      draggableRuntimeBehavior: DraggableRuntimeBehavior
-    ): FloatPoint;
-  }
-
-  /**
-   * Handle the dragging by mouse
-   */
-  class MouseDraggableManager extends DraggableManager {
-    /** Used to only start dragging when clicking. */
-    leftPressedLastFrame = false;
-
-    constructor(instanceContainer: gdjs.RuntimeInstanceContainer) {
-      super(instanceContainer);
-    }
-
-    isDragging(draggableRuntimeBehavior: DraggableRuntimeBehavior): boolean {
-      return this.leftPressedLastFrame || this._draggingSomething;
-    }
-
-    getPosition(
-      instanceContainer: gdjs.RuntimeInstanceContainer,
-      draggableRuntimeBehavior: DraggableRuntimeBehavior
-    ): FloatPoint {
-      const workingPoint: FloatPoint = gdjs.staticArray(
-        MouseDraggableManager.prototype.getPosition
-      ) as FloatPoint;
-      const inputManager = instanceContainer.getGame().getInputManager();
-      return instanceContainer
-        .getLayer(draggableRuntimeBehavior.owner.getLayer())
-        .convertCoords(
-          inputManager.getMouseX(),
-          inputManager.getMouseY(),
-          0,
-          workingPoint
-        );
-    }
-
-    shouldEndDrag(
-      instanceContainer: gdjs.RuntimeInstanceContainer,
-      draggableRuntimeBehavior: DraggableRuntimeBehavior
-    ): boolean {
-      const inputManager = instanceContainer.getGame().getInputManager();
-      return !inputManager.isMouseButtonPressed(0);
-    }
-  }
-
-  /**
-   * Handle the dragging by touch
-   */
-  class TouchDraggableManager extends DraggableManager {
-    private _touchId: integer;
-
-    constructor(
-      instanceContainer: gdjs.RuntimeInstanceContainer,
-      touchId: integer
-    ) {
-      super(instanceContainer);
-      this._touchId = touchId;
-    }
-
     isDragging(draggableRuntimeBehavior: DraggableRuntimeBehavior): boolean {
       return this._draggingSomething;
     }
@@ -341,7 +235,7 @@ namespace gdjs {
       draggableRuntimeBehavior: DraggableRuntimeBehavior
     ): FloatPoint {
       const workingPoint: FloatPoint = gdjs.staticArray(
-        TouchDraggableManager.prototype.getPosition
+        DraggableManager.prototype.getPosition
       ) as FloatPoint;
       const inputManager = instanceContainer.getGame().getInputManager();
       return instanceContainer
@@ -359,9 +253,7 @@ namespace gdjs {
       draggableRuntimeBehavior: DraggableRuntimeBehavior
     ): boolean {
       const inputManager = instanceContainer.getGame().getInputManager();
-      return (
-        inputManager.getAllTouchIdentifiers().indexOf(this._touchId) === -1
-      );
+      return inputManager.hasTouchEnded(this._touchId);
     }
   }
 

Extensions/DraggableBehavior/tests/draggableruntimebehavior.spec.js

@@ -1,11 +1,6 @@
 // @ts-check
 describe('gdjs.DraggableRuntimeBehavior', function () {
-  var runtimeGame = new gdjs.RuntimeGame({
-    variables: [],
-    resources: { resources: [] },
-    // @ts-ignore
-    properties: { windowWidth: 800, windowHeight: 600 },
-  });
+  const runtimeGame = gdjs.getPixiRuntimeGame();
   var runtimeScene = new gdjs.RuntimeScene(runtimeGame);
   runtimeScene.loadFromScene({
     layers: [
@@ -66,17 +61,21 @@ describe('gdjs.DraggableRuntimeBehavior', function () {
 
       // Drag'n'drop
       runtimeScene.renderAndStep(1000 / 60);
+      runtimeGame.getInputManager().onFrameEnded();
       runtimeGame.getInputManager().onMouseMove(450, 500);
       runtimeGame
         .getInputManager()
         .onMouseButtonPressed(gdjs.InputManager.MOUSE_LEFT_BUTTON);
       runtimeScene.renderAndStep(1000 / 60);
+      runtimeGame.getInputManager().onFrameEnded();
       runtimeGame.getInputManager().onMouseMove(750, 600);
       runtimeScene.renderAndStep(1000 / 60);
+      runtimeGame.getInputManager().onFrameEnded();
       runtimeGame
         .getInputManager()
         .onMouseButtonReleased(gdjs.InputManager.MOUSE_LEFT_BUTTON);
       runtimeScene.renderAndStep(1000 / 60);
+      runtimeGame.getInputManager().onFrameEnded();
 
       expect(object.getX()).to.be(750);
       expect(object.getY()).to.be(600);
@@ -84,6 +83,7 @@ describe('gdjs.DraggableRuntimeBehavior', function () {
       // Mouse move without dragging
       runtimeGame.getInputManager().onMouseMove(600, 600);
       runtimeScene.renderAndStep(1000 / 60);
+      runtimeGame.getInputManager().onFrameEnded();
 
       expect(object.getX()).to.be(750);
       expect(object.getY()).to.be(600);
@@ -94,12 +94,15 @@ describe('gdjs.DraggableRuntimeBehavior', function () {
         .getInputManager()
         .onMouseButtonPressed(gdjs.InputManager.MOUSE_LEFT_BUTTON);
       runtimeScene.renderAndStep(1000 / 60);
+      runtimeGame.getInputManager().onFrameEnded();
       runtimeGame.getInputManager().onMouseMove(850, 700);
       runtimeScene.renderAndStep(1000 / 60);
+      runtimeGame.getInputManager().onFrameEnded();
       runtimeGame
         .getInputManager()
         .onMouseButtonReleased(gdjs.InputManager.MOUSE_LEFT_BUTTON);
       runtimeScene.renderAndStep(1000 / 60);
+      runtimeGame.getInputManager().onFrameEnded();
 
       expect(object.getX()).to.be(850);
       expect(object.getY()).to.be(700);
@@ -111,17 +114,21 @@ describe('gdjs.DraggableRuntimeBehavior', function () {
 
       // Dragged point is in the bounding box but not in hitbox
       runtimeScene.renderAndStep(1000 / 60);
+      runtimeGame.getInputManager().onFrameEnded();
       runtimeGame.getInputManager().onMouseMove(450, 500);
       runtimeGame
         .getInputManager()
         .onMouseButtonPressed(gdjs.InputManager.MOUSE_LEFT_BUTTON);
       runtimeScene.renderAndStep(1000 / 60);
+      runtimeGame.getInputManager().onFrameEnded();
       runtimeGame.getInputManager().onMouseMove(750, 600);
       runtimeScene.renderAndStep(1000 / 60);
+      runtimeGame.getInputManager().onFrameEnded();
       runtimeGame
         .getInputManager()
         .onMouseButtonReleased(gdjs.InputManager.MOUSE_LEFT_BUTTON);
       runtimeScene.renderAndStep(1000 / 60);
+      runtimeGame.getInputManager().onFrameEnded();
 
       expect(object.getX()).to.be(750);
       expect(object.getY()).to.be(600);
@@ -135,34 +142,42 @@ describe('gdjs.DraggableRuntimeBehavior', function () {
 
       // Dragged point is in the bounding box but not in hitbox
       runtimeScene.renderAndStep(1000 / 60);
+      runtimeGame.getInputManager().onFrameEnded();
       runtimeGame.getInputManager().onMouseMove(450, 500);
       runtimeGame
         .getInputManager()
         .onMouseButtonPressed(gdjs.InputManager.MOUSE_LEFT_BUTTON);
       runtimeScene.renderAndStep(1000 / 60);
+      runtimeGame.getInputManager().onFrameEnded();
       runtimeGame.getInputManager().onMouseMove(750, 600);
       runtimeScene.renderAndStep(1000 / 60);
+      runtimeGame.getInputManager().onFrameEnded();
       runtimeGame
         .getInputManager()
         .onMouseButtonReleased(gdjs.InputManager.MOUSE_LEFT_BUTTON);
       runtimeScene.renderAndStep(1000 / 60);
+      runtimeGame.getInputManager().onFrameEnded();
 
       expect(object2.getX()).to.be(450);
       expect(object2.getY()).to.be(500);
 
       // Dragged point is in the bounding box and in hitbox
       runtimeScene.renderAndStep(1000 / 60);
+      runtimeGame.getInputManager().onFrameEnded();
       runtimeGame.getInputManager().onMouseMove(455, 505);
       runtimeGame
         .getInputManager()
         .onMouseButtonPressed(gdjs.InputManager.MOUSE_LEFT_BUTTON);
       runtimeScene.renderAndStep(1000 / 60);
+      runtimeGame.getInputManager().onFrameEnded();
       runtimeGame.getInputManager().onMouseMove(855, 705);
       runtimeScene.renderAndStep(1000 / 60);
+      runtimeGame.getInputManager().onFrameEnded();
       runtimeGame
         .getInputManager()
         .onMouseButtonReleased(gdjs.InputManager.MOUSE_LEFT_BUTTON);
       runtimeScene.renderAndStep(1000 / 60);
+      runtimeGame.getInputManager().onFrameEnded();
 
       expect(object2.getX()).to.be(850);
       expect(object2.getY()).to.be(700);
@@ -185,17 +200,21 @@ describe('gdjs.DraggableRuntimeBehavior', function () {
 
         // Drag'n'drop
         runtimeScene.renderAndStep(1000 / 60);
+        runtimeGame.getInputManager().onFrameEnded();
         runtimeGame.getInputManager().onMouseMove(450, 500);
         runtimeGame
           .getInputManager()
           .onMouseButtonPressed(gdjs.InputManager.MOUSE_LEFT_BUTTON);
         runtimeScene.renderAndStep(1000 / 60);
+        runtimeGame.getInputManager().onFrameEnded();
         runtimeGame.getInputManager().onMouseMove(750, 600);
         runtimeScene.renderAndStep(1000 / 60);
+        runtimeGame.getInputManager().onFrameEnded();
         runtimeGame
           .getInputManager()
           .onMouseButtonReleased(gdjs.InputManager.MOUSE_LEFT_BUTTON);
         runtimeScene.renderAndStep(1000 / 60);
+        runtimeGame.getInputManager().onFrameEnded();
 
         if (firstInFront) {
           // The 1st object moved
@@ -220,6 +239,7 @@ describe('gdjs.DraggableRuntimeBehavior', function () {
 
       // Drag'n'drop
       runtimeScene.renderAndStep(1000 / 60);
+      runtimeGame.getInputManager().onFrameEnded();
       runtimeGame.getInputManager().onTouchStart(1, 10, 20);
       runtimeGame.getInputManager().onTouchStart(0, 450, 500);
       runtimeScene.renderAndStep(1000 / 60);
@@ -237,22 +257,25 @@ describe('gdjs.DraggableRuntimeBehavior', function () {
       // Move another unrelated touch
       runtimeGame.getInputManager().onTouchMove(1, 750, 600);
       runtimeScene.renderAndStep(1000 / 60);
+      runtimeGame.getInputManager().onFrameEnded();
       runtimeGame.getInputManager().onTouchMove(1, 850, 700);
       runtimeScene.renderAndStep(1000 / 60);
+      runtimeGame.getInputManager().onFrameEnded();
 
       expect(object.getX()).to.be(750);
       expect(object.getY()).to.be(600);
 
       // Start drag'n'drop with another touch
       runtimeGame.getInputManager().onTouchEnd(1);
-      runtimeGame.getInputManager().onFrameEnded();
       runtimeScene.renderAndStep(1000 / 60);
+      runtimeGame.getInputManager().onFrameEnded();
       runtimeGame.getInputManager().onTouchStart(1, 750, 600);
       runtimeScene.renderAndStep(1000 / 60);
+      runtimeGame.getInputManager().onFrameEnded();
       runtimeGame.getInputManager().onTouchMove(1, 850, 700);
       runtimeScene.renderAndStep(1000 / 60);
-      runtimeGame.getInputManager().onTouchEnd(1);
       runtimeGame.getInputManager().onFrameEnded();
+      runtimeGame.getInputManager().onTouchEnd(1);
 
       expect(object.getX()).to.be(850);
       expect(object.getY()).to.be(700);
@@ -264,12 +287,12 @@ describe('gdjs.DraggableRuntimeBehavior', function () {
 
       // Dragged point is in the bounding box but not in hitbox
       runtimeScene.renderAndStep(1000 / 60);
+      runtimeGame.getInputManager().onFrameEnded();
       runtimeGame.getInputManager().onTouchStart(0, 450, 500);
       runtimeScene.renderAndStep(1000 / 60);
       runtimeGame.getInputManager().onFrameEnded();
       runtimeGame.getInputManager().onTouchMove(0, 750, 600);
       runtimeScene.renderAndStep(1000 / 60);
-      runtimeGame.getInputManager().onFrameEnded();
       runtimeGame.getInputManager().onTouchEnd(0);
       runtimeScene.renderAndStep(1000 / 60);
       runtimeGame.getInputManager().onFrameEnded();
@@ -286,6 +309,7 @@ describe('gdjs.DraggableRuntimeBehavior', function () {
 
       // Dragged point is in the bounding box but not in hitbox
       runtimeScene.renderAndStep(1000 / 60);
+      runtimeGame.getInputManager().onFrameEnded();
       runtimeGame.getInputManager().onTouchStart(0, 450, 500);
       runtimeScene.renderAndStep(1000 / 60);
       runtimeGame.getInputManager().onFrameEnded();
@@ -301,6 +325,7 @@ describe('gdjs.DraggableRuntimeBehavior', function () {
 
       // Dragged point is in the bounding box but not in hitbox
       runtimeScene.renderAndStep(1000 / 60);
+      runtimeGame.getInputManager().onFrameEnded();
       runtimeGame.getInputManager().onTouchStart(0, 455, 505);
       runtimeScene.renderAndStep(1000 / 60);
       runtimeGame.getInputManager().onFrameEnded();
@@ -323,6 +348,7 @@ describe('gdjs.DraggableRuntimeBehavior', function () {
 
       // Drag'n'drop
       runtimeScene.renderAndStep(1000 / 60);
+      runtimeGame.getInputManager().onFrameEnded();
       runtimeGame.getInputManager().onTouchStart(2, 450, 500);
       runtimeGame.getInputManager().onTouchStart(1, 650, 600);
       runtimeScene.renderAndStep(1000 / 60);
@@ -361,6 +387,7 @@ describe('gdjs.DraggableRuntimeBehavior', function () {
         // Drag'n'drop
         runtimeGame.getInputManager().touchSimulateMouse(false);
         runtimeScene.renderAndStep(1000 / 60);
+        runtimeGame.getInputManager().onFrameEnded();
         runtimeGame.getInputManager().onTouchStart(1, 10, 20);
         runtimeGame.getInputManager().onTouchStart(0, 450, 500);
         runtimeScene.renderAndStep(1000 / 60);

Extensions/Effects/JsExtension.js

@@ -176,12 +176,12 @@ module.exports = {
       .setType('number');
     bevelProperties
       .getOrCreate('lightColor')
-      .setValue('#ffffff')
+      .setValue('255;255;255')
       .setLabel(_('Light color (color of the outline)'))
       .setType('color');
     bevelProperties
       .getOrCreate('shadowColor')
-      .setValue('#000000')
+      .setValue('0;0;0')
       .setLabel(_('Shadow color (color of the outline)'))
       .setType('color');
     bevelProperties
@@ -333,13 +333,13 @@ module.exports = {
     const colorReplaceProperties = colorReplaceEffect.getProperties();
     colorReplaceProperties
       .getOrCreate('originalColor')
-      .setValue('#ff0000')
+      .setValue('252;3;65')
       .setLabel(_('Original Color'))
       .setType('color')
       .setDescription('The color that will be changed');
     colorReplaceProperties
       .getOrCreate('newColor')
-      .setValue('#000000')
+      .setValue('255;255;255')
       .setLabel(_('New Color'))
       .setType('color')
       .setDescription('The new color');
@@ -517,7 +517,7 @@ module.exports = {
       .setType('number');
     dropShadowProperties
       .getOrCreate('color')
-      .setValue('#000000')
+      .setValue('255;255;255')
       .setLabel(_('Color of the shadow'))
       .setType('color');
     dropShadowProperties
@@ -646,7 +646,7 @@ module.exports = {
       .setType('number');
     glowProperties
       .getOrCreate('color')
-      .setValue('#ffffff')
+      .setValue('255;255;255')
       .setLabel(_('Color (color of the outline)'))
       .setType('color');
 
@@ -868,7 +868,7 @@ module.exports = {
       .setType('number');
     outlineProperties
       .getOrCreate('color')
-      .setValue('1')
+      .setValue('255;255;255')
       .setLabel(_('Color of the outline'))
       .setType('color');
     outlineProperties

Extensions/ExampleJsExtension/JsExtension.js

@@ -89,7 +89,7 @@ module.exports = {
       .addExtraInfo('image');
     dummyEffectProperties
       .getOrCreate('someColor')
-      .setValue('#0022FF')
+      .setValue('255;3;62')
       .setLabel(_("Color (won't be used, just for demonstration purpose)"))
       .setType('color')
       .setDescription(_('Another optional description.'));

Extensions/Firebase/JsExtension.js

@@ -2037,7 +2037,7 @@ module.exports = {
         _('Update a document in Database'),
         _('Updates a variable on the database.'),
         _(
-          'Update varable _PARAM0_ with _PARAM1_ (store result state in _PARAM2_)'
+          'Update variable _PARAM0_ with _PARAM1_ (store result state in _PARAM2_)'
         ),
         _('Realtime Database'),
         'JsPlatform/Extensions/firebase.png',

Extensions/Firebase/tests/FirebaseExtension.spec.js

@@ -1,17 +1,3 @@
-/**
- * A firebase configuaration of a project made only for those tests.
- */
-const firebaseConfig = {
-  apiKey: 'AIzaSyBwPnGpfEBXDjwQrWfU0wqgp4m9qEt7YM8',
-  authDomain: 'gdtest-e11a5.firebaseapp.com',
-  databaseURL: 'https://gdtest-e11a5.firebaseio.com',
-  projectId: 'gdtest-e11a5',
-  storageBucket: 'gdtest-e11a5.appspot.com',
-  messagingSenderId: '254035412678',
-  appId: '1:254035412678:web:2ddd6b83019b7f259b79c7',
-  measurementId: 'G-4REML26L59',
-};
-
 /**
  * Turns a callback variable into a promise.
  * @param {(callbackVariable: {setString: (result: "ok" | string) => void}, result: gdjs.Variable) => any} executor
@@ -38,6 +24,20 @@ const variable = new gdjs.Variable().fromJSObject({
   it: ['is', true],
 });
 
+/**
+ * A firebase configuration of a project made only for those tests.
+ */
+const firebaseConfig = {
+  apiKey: 'AIzaSyBwPnGpfEBXDjwQrWfU0wqgp4m9qEt7YM8',
+  authDomain: 'gdtest-e11a5.firebaseapp.com',
+  databaseURL: 'https://gdtest-e11a5.firebaseio.com',
+  projectId: 'gdtest-e11a5',
+  storageBucket: 'gdtest-e11a5.appspot.com',
+  messagingSenderId: '254035412678',
+  appId: '1:254035412678:web:2ddd6b83019b7f259b79c7',
+  measurementId: 'G-4REML26L59',
+};
+
 // The tests require an internet connection, as a real Firebase instance is used.
 const describeIfOnline = navigator.onLine ? describe : describe.skip;
 describeIfOnline('Firebase extension end-to-end tests', function () {
@@ -48,8 +48,8 @@ describeIfOnline('Firebase extension end-to-end tests', function () {
     .toString()
     .replace('.', '-')}-${Date.now()}`;
 
-  before(function setupFirebase() {
-    gdjs.evtTools.firebaseTools._setupFirebase({
+  before(async function setupFirebase() {
+    await gdjs.evtTools.firebaseTools._setupFirebase({
       getGame: () => ({
         getExtensionProperty: () => JSON.stringify(firebaseConfig),
       }),

Extensions/Inventory/tests/inventorytools.spec.js

@@ -1,10 +1,6 @@
 describe('Inventory', function () {
   it('Inventories can be serialized then unserialized with no data loss', () => {
-    var runtimeGame = new gdjs.RuntimeGame({
-      variables: [],
-      properties: { windowWidth: 800, windowHeight: 600 },
-      resources: { resources: [] },
-    });
+    const runtimeGame = gdjs.getPixiRuntimeGame();
     var runtimeScene = new gdjs.RuntimeScene(runtimeGame);
 
     gdjs.evtTools.inventory.add(runtimeScene, 'MyInventory', 'sword');

Extensions/Leaderboards/JsExtension.js

@@ -154,6 +154,21 @@ module.exports = {
       .setIncludeFile('Extensions/Leaderboards/leaderboardstools.js')
       .setFunctionName('gdjs.evtTools.leaderboards.isSaving');
 
+      extension
+        .addCondition(
+          'HasPlayerJustClosedLeaderboardView',
+          _('Closed by player'),
+          _('Check if the player has just closed the leaderboard view.'),
+          _('Player has just closed the leaderboard view'),
+          _('Display leaderboard'),
+          'JsPlatform/Extensions/leaderboard.svg',
+          'JsPlatform/Extensions/leaderboard.svg'
+        )
+        .setHelpPath('/all-features/leaderboards')
+        .getCodeExtraInformation()
+        .setIncludeFile('Extensions/Leaderboards/leaderboardstools.js')
+        .setFunctionName('gdjs.evtTools.leaderboards.hasPlayerJustClosedLeaderboardView');
+
     extension
       .addStrExpression(
         'LastSaveError',

Extensions/Leaderboards/leaderboardstools.ts

@@ -5,6 +5,19 @@ namespace gdjs {
   const logger = new gdjs.Logger('Leaderboards');
   export namespace evtTools {
     export namespace leaderboards {
+      let _hasPlayerJustClosedLeaderboardView = false;
+
+      gdjs.registerRuntimeScenePostEventsCallback(() => {
+        // Set it back to false for the next frame.
+        _hasPlayerJustClosedLeaderboardView = false;
+      });
+
+      /**
+       * Returns true if the player has just closed the leaderboard view.
+       */
+      export const hasPlayerJustClosedLeaderboardView = () =>
+        _hasPlayerJustClosedLeaderboardView;
+
       const computeDigest = (payload: string): string => {
         const shaObj = new jsSHA('SHA-256', 'TEXT', { encoding: 'UTF8' });
         shaObj.update(payload);
@@ -521,6 +534,7 @@ namespace gdjs {
       ) {
         switch (event.data) {
           case 'closeLeaderboardView':
+            _hasPlayerJustClosedLeaderboardView = true;
             closeLeaderboardView(runtimeScene);
             break;
           case 'leaderboardViewLoaded':
@@ -672,7 +686,7 @@ namespace gdjs {
         const isDev = runtimeScene
           .getGame()
           .isUsingGDevelopDevelopmentEnvironment();
-        const targetUrl = `https://liluo.io/games/${gameId}/leaderboard/${leaderboardId}?inGameEmbedded=true${
+        const targetUrl = `https://gd.games/games/${gameId}/leaderboard/${leaderboardId}?inGameEmbedded=true${
           isDev ? '&dev=true' : ''
         }`;
         checkLeaderboardAvailability(targetUrl).then(

Extensions/Lighting/tests/lightruntimeobject.spec.js

@@ -56,13 +56,7 @@ const addLightObstacle = (runtimeScene, width, height) => {
 
 describe('gdjs.LightRuntimeObject', function () {
   PIXI.settings.FAIL_IF_MAJOR_PERFORMANCE_CAVEAT = false;
-  const runtimeGame = new gdjs.RuntimeGame({
-    variables: [],
-    resources: {
-      resources: [],
-    },
-    properties: { windowWidth: 800, windowHeight: 600 },
-  });
+  const runtimeGame = gdjs.getPixiRuntimeGame();
   const runtimeScene = new gdjs.RuntimeScene(runtimeGame);
   runtimeScene.loadFromScene({
     layers: [{ name: '', visibility: true, effects: [] }],
@@ -96,13 +90,7 @@ describe('gdjs.LightRuntimeObject', function () {
 
 describe('Light with obstacles around it', function () {
   PIXI.settings.FAIL_IF_MAJOR_PERFORMANCE_CAVEAT = false;
-  const runtimeGame = new gdjs.RuntimeGame({
-    variables: [],
-    resources: {
-      resources: [],
-    },
-    properties: { windowWidth: 800, windowHeight: 600 },
-  });
+  const runtimeGame = gdjs.getPixiRuntimeGame();
   const runtimeScene = new gdjs.RuntimeScene(runtimeGame);
   runtimeScene.loadFromScene({
     layers: [{ name: '', visibility: true, effects: [] }],

Extensions/LinkedObjects/tests/linkedobjects.spec.js

@@ -6,12 +6,7 @@ describe('gdjs.LinksManager', function () {
     object3Names,
     eventsFunctionContext
   ) => {
-    const runtimeGame = new gdjs.RuntimeGame({
-      variables: [],
-      // @ts-ignore - missing properties.
-      properties: { windowWidth: 800, windowHeight: 600 },
-      resources: { resources: [] },
-    });
+    const runtimeGame = gdjs.getPixiRuntimeGame();
     const runtimeScene = new gdjs.RuntimeScene(runtimeGame);
     runtimeScene.loadFromScene({
       layers: [

Extensions/PathfindingBehavior/pathfindingruntimebehavior.ts

@@ -179,9 +179,8 @@ namespace gdjs {
 
     movementAngleIsAround(degreeAngle: float, tolerance: float) {
       return (
-        gdjs.evtTools.common.angleDifference(
-          this._movementAngle,
-          degreeAngle
+        Math.abs(
+          gdjs.evtTools.common.angleDifference(this._movementAngle, degreeAngle)
         ) <= tolerance
       );
     }

Extensions/PathfindingBehavior/tests/FrameRatePathfindingRuntimeBehavior.spec.js

@@ -6,12 +6,7 @@ describe('gdjs.PathfindingRuntimeBehavior', function () {
     const pathFindingName = 'auto1';
 
     const createScene = (framePerSecond = 60) => {
-      const runtimeGame = new gdjs.RuntimeGame({
-        variables: [],
-        // @ts-ignore - missing properties.
-        properties: { windowWidth: 800, windowHeight: 600 },
-        resources: { resources: [] },
-      });
+      const runtimeGame = gdjs.getPixiRuntimeGame();
       const runtimeScene = new gdjs.RuntimeScene(runtimeGame);
       runtimeScene.loadFromScene({
         layers: [

Extensions/PathfindingBehavior/tests/commonpathfindingruntimebehavior.spec.js

@@ -9,12 +9,7 @@ describe('gdjs.PathfindingRuntimeBehavior', function () {
     const pathFindingName = 'auto1';
 
     const createScene = (framePerSecond = 60) => {
-      const runtimeGame = new gdjs.RuntimeGame({
-        variables: [],
-        // @ts-ignore - missing properties.
-        properties: { windowWidth: 800, windowHeight: 600 },
-        resources: { resources: [] },
-      });
+      const runtimeGame = gdjs.getPixiRuntimeGame();
       const runtimeScene = new gdjs.RuntimeScene(runtimeGame);
       runtimeScene.loadFromScene({
         layers: [

Extensions/PathfindingBehavior/tests/legacypathfindingruntimebehavior.spec.js

@@ -11,12 +11,7 @@ describe('gdjs.PathfindingRuntimeBehavior', function () {
     const pathFindingName = 'auto1';
 
     let createScene = () => {
-      const runtimeGame = new gdjs.RuntimeGame({
-        variables: [],
-        // @ts-ignore - missing properties.
-        properties: { windowWidth: 800, windowHeight: 600 },
-        resources: { resources: [] },
-      });
+      const runtimeGame = gdjs.getPixiRuntimeGame();
       const runtimeScene = new gdjs.RuntimeScene(runtimeGame);
       runtimeScene.loadFromScene({
         layers: [

Extensions/Physics2Behavior/JsExtension.js

@@ -426,7 +426,9 @@ module.exports = {
       )
       .setIncludeFile('Extensions/Physics2Behavior/physics2runtimebehavior.js')
       .addIncludeFile('Extensions/Physics2Behavior/Box2D_v2.3.1_min.wasm.js')
-      .addRequiredFile('Extensions/Physics2Behavior/Box2D_v2.3.1_min.wasm.wasm')
+      .addRequiredFile(
+        'Extensions/Physics2Behavior/Box2D_v2.3.1_min.wasm.wasm'
+      );
 
     // Global
     aut
@@ -1361,6 +1363,40 @@ module.exports = {
       .getCodeExtraInformation()
       .setFunctionName('getLinearVelocityLength');
 
+    aut
+      .addCondition(
+        'LinearVelocityAngle',
+        _('Linear velocity angle'),
+        _('Test an object linear velocity angle.'),
+        _('the linear velocity angle'),
+        _('Velocity'),
+        'res/physics32.png',
+        'res/physics32.png'
+      )
+      .addParameter('object', _('Object'), '', false)
+      .addParameter('behavior', _('Behavior'), 'Physics2Behavior')
+      .useStandardRelationalOperatorParameters(
+        'number',
+        gd.ParameterOptions.makeNewOptions().setDescription(
+          _('Angle to compare to (in degrees)')
+        )
+      )
+      .getCodeExtraInformation()
+      .setFunctionName('getLinearVelocityAngle');
+
+    aut
+      .addExpression(
+        'LinearVelocityAngle',
+        _('Linear velocity angle'),
+        _('Get the linear velocity angle of an object.'),
+        _('Velocity'),
+        'res/physics32.png'
+      )
+      .addParameter('object', _('Object'), '', false)
+      .addParameter('behavior', _('Behavior'), 'Physics2Behavior')
+      .getCodeExtraInformation()
+      .setFunctionName('getLinearVelocityAngle');
+
     aut
       .addCondition(
         'AngularVelocity',
@@ -1498,8 +1534,14 @@ module.exports = {
       )
       .addParameter('object', _('Object'), '', false)
       .addParameter('behavior', _('Behavior'), 'Physics2Behavior')
-      .addParameter('expression', _('X component (in Newton * seconds or kilogram * meter per second)'))
-      .addParameter('expression', _('Y component (in Newton * seconds or kilogram * meter per second)'))
+      .addParameter(
+        'expression',
+        _('X component (in Newton * seconds or kilogram * meter per second)')
+      )
+      .addParameter(
+        'expression',
+        _('Y component (in Newton * seconds or kilogram * meter per second)')
+      )
       .addParameter('expression', _('Applying X position'))
       .addParameter('expression', _('Applying Y position'))
       .getCodeExtraInformation()
@@ -1522,7 +1564,10 @@ module.exports = {
       .addParameter('object', _('Object'), '', false)
       .addParameter('behavior', _('Behavior'), 'Physics2Behavior')
       .addParameter('expression', _('Angle'))
-      .addParameter('expression', _('Length (in Newton * seconds or kilogram * meter per second)'))
+      .addParameter(
+        'expression',
+        _('Length (in Newton * seconds or kilogram * meter per second)')
+      )
       .addParameter('expression', _('Applying X position'))
       .addParameter('expression', _('Applying Y position'))
       .getCodeExtraInformation()
@@ -1544,7 +1589,10 @@ module.exports = {
       )
       .addParameter('object', _('Object'), '', false)
       .addParameter('behavior', _('Behavior'), 'Physics2Behavior')
-      .addParameter('expression', _('Length (in Newton * seconds or kilogram * meter per second)'))
+      .addParameter(
+        'expression',
+        _('Length (in Newton * seconds or kilogram * meter per second)')
+      )
       .addParameter('expression', _('X position'))
       .addParameter('expression', _('Y position'))
       .addParameter('expression', _('Applying X position'))
@@ -1601,31 +1649,33 @@ module.exports = {
       .getCodeExtraInformation()
       .setFunctionName('getMass');
 
-      aut
-        .addExpression(
-          'Inertia',
-          _('Inertia'),
-          _('Return the rotational inertia of the object (in kilograms * meters * meters)'),
-          '',
-          'res/physics32.png'
-        )
-        .addParameter('object', _('Object'), '', false)
-        .addParameter('behavior', _('Behavior'), 'Physics2Behavior')
-        .getCodeExtraInformation()
-        .setFunctionName('getInertia');
+    aut
+      .addExpression(
+        'Inertia',
+        _('Inertia'),
+        _(
+          'Return the rotational inertia of the object (in kilograms * meters * meters)'
+        ),
+        '',
+        'res/physics32.png'
+      )
+      .addParameter('object', _('Object'), '', false)
+      .addParameter('behavior', _('Behavior'), 'Physics2Behavior')
+      .getCodeExtraInformation()
+      .setFunctionName('getInertia');
 
-      aut
-        .addExpression(
-          'MassCenterX',
-          _('Mass center X'),
-          _('Mass center X'),
-          '',
-          'res/physics32.png'
-        )
-        .addParameter('object', _('Object'), '', false)
-        .addParameter('behavior', _('Behavior'), 'Physics2Behavior')
-        .getCodeExtraInformation()
-        .setFunctionName('getMassCenterX');
+    aut
+      .addExpression(
+        'MassCenterX',
+        _('Mass center X'),
+        _('Mass center X'),
+        '',
+        'res/physics32.png'
+      )
+      .addParameter('object', _('Object'), '', false)
+      .addParameter('behavior', _('Behavior'), 'Physics2Behavior')
+      .getCodeExtraInformation()
+      .setFunctionName('getMassCenterX');
 
     aut
       .addExpression(

Extensions/Physics2Behavior/physics2runtimebehavior.ts

@@ -1408,6 +1408,22 @@ namespace gdjs {
       ).Length();
     }
 
+    getLinearVelocityAngle(): float {
+      // If there is no body, set a new one
+      if (this._body === null) {
+        if (!this.createBody()) return 0;
+      }
+      const body = this._body!;
+
+      // Get the linear velocity angle
+      return gdjs.toDegrees(
+        Math.atan2(
+          body.GetLinearVelocity().get_y() * this._sharedData.scaleY,
+          body.GetLinearVelocity().get_x() * this._sharedData.scaleX
+        )
+      );
+    }
+
     getAngularVelocity(): float {
       // If there is no body, set a new one
       if (this._body === null) {

Extensions/Physics2Behavior/tests/physics2runtimebehavior.spec.js

@@ -59,11 +59,7 @@ describe('Physics2RuntimeBehavior', () => {
   }
 
   function createGameWithSceneWithPhysics2SharedData() {
-    const runtimeGame = new gdjs.RuntimeGame({
-      variables: [],
-      resources: { resources: [] },
-      properties: { windowWidth: 1000, windowHeight: 1000 },
-    });
+    const runtimeGame = gdjs.getPixiRuntimeGame();
     const runtimeScene = new gdjs.TestRuntimeScene(runtimeGame);
     runtimeScene.loadFromScene({
       layers: [

Extensions/PlatformBehavior/tests/PlatformerTestHelper.js

@@ -1,12 +1,6 @@
 
   const makePlatformerTestRuntimeScene = (timeDelta = 1000 / 60) => {
-    const runtimeGame = new gdjs.RuntimeGame({
-      variables: [],
-      resources: {
-        resources: [],
-      },
-      properties: { windowWidth: 800, windowHeight: 600 },
-    });
+    const runtimeGame = gdjs.getPixiRuntimeGame();
     const runtimeScene = new gdjs.TestRuntimeScene(runtimeGame);
     runtimeScene.loadFromScene({
       layers: [{ name: '', visibility: true, effects: [] }],

Extensions/PlatformBehavior/tests/findHighestFloorAndMoveOnTop.spec.js

@@ -1,12 +1,6 @@
 describe(`gdjs.PlatformerObjectRuntimeBehavior.findHighestFloorAndMoveOnTop`, function () {
   const makeTestRuntimeScene = () => {
-    const runtimeGame = new gdjs.RuntimeGame({
-      variables: [],
-      resources: {
-        resources: [],
-      },
-      properties: { windowWidth: 800, windowHeight: 600 },
-    });
+    const runtimeGame = gdjs.getPixiRuntimeGame();
     const runtimeScene = new gdjs.RuntimeScene(runtimeGame);
     runtimeScene.loadFromScene({
       layers: [{ name: '', visibility: true, effects: [] }],

Extensions/PlayerAuthentication/JsExtension.js

@@ -68,6 +68,29 @@ module.exports = {
       )
       .setFunctionName('gdjs.playerAuthentication.displayAuthenticationBanner');
 
+    extension
+      .addAction(
+        'HideAuthenticationBanner',
+        _('Hide authentication banner'),
+        _(
+          'Hide the authentication banner from the top of the game screen.'
+        ),
+        _('Hide the authentication banner'),
+        '',
+        'JsPlatform/Extensions/authentication.svg',
+        'JsPlatform/Extensions/authentication.svg'
+      )
+      .addCodeOnlyParameter('currentScene', '')
+      .setHelpPath('/all-features/player-authentication')
+      .getCodeExtraInformation()
+      .setIncludeFile(
+        'Extensions/PlayerAuthentication/playerauthenticationcomponents.js'
+      )
+      .addIncludeFile(
+        'Extensions/PlayerAuthentication/playerauthenticationtools.js'
+      )
+      .setFunctionName('gdjs.playerAuthentication.removeAuthenticationBanner');
+
     extension
       .addAction(
         'OpenAuthenticationWindow',

Extensions/PlayerAuthentication/playerauthenticationcomponents.ts

@@ -34,6 +34,7 @@ namespace gdjs {
     ): {
       rootContainer: HTMLDivElement;
       loaderContainer: HTMLDivElement;
+      iframeContainer: HTMLDivElement;
     } {
       const rootContainer = document.createElement('div');
       rootContainer.id = 'authentication-root-container';
@@ -45,17 +46,17 @@ namespace gdjs {
       rootContainer.style.zIndex = '2';
       rootContainer.style.pointerEvents = 'all';
 
-      const subContainer = document.createElement('div');
-      subContainer.id = 'authentication-sub-container';
-      subContainer.style.backgroundColor = '#FFFFFF';
-      subContainer.style.position = 'absolute';
-      subContainer.style.top = '16px';
-      subContainer.style.bottom = '16px';
-      subContainer.style.left = '16px';
-      subContainer.style.right = '16px';
-      subContainer.style.borderRadius = '8px';
-      subContainer.style.boxShadow = '0px 4px 4px rgba(0, 0, 0, 0.25)';
-      subContainer.style.padding = '16px';
+      const frameContainer = document.createElement('div');
+      frameContainer.id = 'authentication-frame-container';
+      frameContainer.style.backgroundColor = '#FFFFFF';
+      frameContainer.style.position = 'absolute';
+      frameContainer.style.top = '16px';
+      frameContainer.style.bottom = '16px';
+      frameContainer.style.left = '16px';
+      frameContainer.style.right = '16px';
+      frameContainer.style.borderRadius = '8px';
+      frameContainer.style.boxShadow = '0px 4px 4px rgba(0, 0, 0, 0.25)';
+      frameContainer.style.padding = '16px';
 
       const _closeContainer: HTMLDivElement = document.createElement('div');
       _closeContainer.style.cursor = 'pointer';
@@ -106,11 +107,57 @@ namespace gdjs {
 
       loaderContainer.appendChild(_loader);
 
-      subContainer.appendChild(_closeContainer);
-      subContainer.appendChild(loaderContainer);
-      rootContainer.appendChild(subContainer);
+      const iframeContainer: HTMLDivElement = document.createElement('div');
+      iframeContainer.style.display = 'flex';
+      iframeContainer.style.flexDirection = 'column';
+      iframeContainer.style.height = '100%';
+      iframeContainer.style.width = '100%';
+      iframeContainer.style.justifyContent = 'stretch';
+      iframeContainer.style.alignItems = 'stretch';
+      iframeContainer.style.display = 'none';
 
-      return { rootContainer, loaderContainer };
+      frameContainer.appendChild(_closeContainer);
+      frameContainer.appendChild(loaderContainer);
+      frameContainer.appendChild(iframeContainer);
+      rootContainer.appendChild(frameContainer);
+
+      return { rootContainer, loaderContainer, iframeContainer };
+    };
+
+    export const displayIframeInsideAuthenticationContainer = (
+      iframeContainer: HTMLDivElement,
+      loaderContainer: HTMLDivElement,
+      textContainer: HTMLDivElement,
+      url: string
+    ) => {
+      const iframe = document.createElement('iframe');
+      iframe.setAttribute(
+        'sandbox',
+        'allow-forms allow-modals allow-orientation-lock allow-popups allow-same-origin allow-scripts'
+      );
+      iframe.addEventListener('load', () => {
+        iframeContainer.style.display = 'flex';
+        loaderContainer.style.display = 'none';
+      });
+      iframe.addEventListener('loaderror', () => {
+        addAuthenticationUrlToTextsContainer(() => {
+          // Try again.
+          iframeContainer.removeChild(iframe);
+          iframeContainer.style.display = 'none';
+          loaderContainer.style.display = 'flex';
+          displayIframeInsideAuthenticationContainer(
+            iframeContainer,
+            loaderContainer,
+            textContainer,
+            url
+          );
+        }, textContainer);
+      });
+      iframe.src = url;
+      iframe.style.flex = '1';
+      iframe.style.border = '0';
+
+      iframeContainer.appendChild(iframe);
     };
 
     /**
@@ -445,7 +492,7 @@ namespace gdjs {
      * Helper to add event listeners on a pressable/clickable element
      * to work on both desktop and mobile.
      */
-    export const addTouchAndClickEventListeners = function (
+    const addTouchAndClickEventListeners = function (
       element: HTMLElement,
       action: () => void
     ) {

Extensions/PlayerAuthentication/playerauthenticationtools.ts

@@ -18,8 +18,10 @@ namespace gdjs {
     let _authenticationInAppWindow: Window | null = null; // For Cordova.
     let _authenticationRootContainer: HTMLDivElement | null = null;
     let _authenticationLoaderContainer: HTMLDivElement | null = null;
+    let _authenticationIframeContainer: HTMLDivElement | null = null;
     let _authenticationTextContainer: HTMLDivElement | null = null;
     let _authenticationBanner: HTMLDivElement | null = null;
+    let _initialAuthenticationTimeoutId: NodeJS.Timeout | null = null;
     let _authenticationTimeoutId: NodeJS.Timeout | null = null;
 
     // Communication methods.
@@ -36,6 +38,43 @@ namespace gdjs {
       _justLoggedIn = false;
     });
 
+    // If the extension is used, register an eventlistener to know if the user is
+    // logged in while playing the game on GDevelop games platform.
+    // Then send a message to the parent iframe to say that the player auth is ready.
+    gdjs.registerFirstRuntimeSceneLoadedCallback(
+      (runtimeScene: RuntimeScene) => {
+        if (getPlatform(runtimeScene) !== 'web') {
+          // Automatic authentication is only valid when the game is hosted on GDevelop games platform.
+          return;
+        }
+        removeAuthenticationCallbacks(); // Remove any callback that could have been registered before.
+        _authenticationMessageCallback = (event: MessageEvent) => {
+          receiveAuthenticationMessage(runtimeScene, event, {
+            checkOrigin: true,
+          });
+        };
+        window.addEventListener(
+          'message',
+          _authenticationMessageCallback,
+          true
+        );
+        logger.info(
+          'Notifying parent window that player authentication is ready.'
+        );
+        window.parent.postMessage(
+          {
+            id: 'playerAuthReady',
+          },
+          '*' // We could restrict to GDevelop games platform but it's not necessary as the message is not sensitive, and it allows easy debugging.
+        );
+        // If no answer after 3 seconds, assume that the game is not embedded in GDevelop games platform, and remove the listener.
+        _initialAuthenticationTimeoutId = setTimeout(() => {
+          logger.info('Removing initial authentication listener.');
+          removeAuthenticationCallbacks();
+        }, 3000);
+      }
+    );
+
     const getLocalStorageKey = (gameId: string) =>
       `${gameId}_authenticatedUser`;
 
@@ -47,12 +86,16 @@ namespace gdjs {
       runtimeGame: gdjs.RuntimeGame;
       gameId: string;
       connectionId?: string;
-    }) =>
-      `https://liluo.io/auth?gameId=${gameId}${
+    }) => {
+      // Uncomment to test the case of a failing loading:
+      // return 'https://gd.games.wronglink';
+
+      return `https://gd.games/auth?gameId=${gameId}${
         connectionId ? `&connectionId=${connectionId}` : ''
       }${
         runtimeGame.isUsingGDevelopDevelopmentEnvironment() ? '&dev=true' : ''
       }`;
+    };
 
     /**
      * Helper returning the platform.
@@ -60,14 +103,31 @@ namespace gdjs {
     const getPlatform = (
       runtimeScene: RuntimeScene
     ): 'electron' | 'cordova' | 'web' => {
-      const electron = runtimeScene.getGame().getRenderer().getElectron();
+      const runtimeGame = runtimeScene.getGame();
+      const electron = runtimeGame.getRenderer().getElectron();
       if (electron) {
         return 'electron';
       }
       if (typeof cordova !== 'undefined') return 'cordova';
+
       return 'web';
     };
 
+    /**
+     * Check if, in some exceptional cases, we allow authentication
+     * to be done through a iframe.
+     * This is usually discouraged as the user can't verify that the authentication
+     * window is a genuine one. It's only to be used in trusted contexts.
+     */
+    const shouldAuthenticationUseIframe = (runtimeScene: RuntimeScene) => {
+      const runtimeGameOptions = runtimeScene.getGame().getAdditionalOptions();
+      return (
+        runtimeGameOptions &&
+        runtimeGameOptions.isPreview &&
+        runtimeGameOptions.allowAuthenticationUsingIframeForPreview
+      );
+    };
+
     /**
      * Returns true if a user token is present in the local storage.
      */
@@ -190,19 +250,26 @@ namespace gdjs {
         logger.error('Missing game id in project properties.');
         return;
       }
-      const authenticatedUserStorageItem = window.localStorage.getItem(
-        getLocalStorageKey(gameId)
-      );
-      if (!authenticatedUserStorageItem) {
-        _checkedLocalStorage = true;
-        return;
-      }
-      const authenticatedUser = JSON.parse(authenticatedUserStorageItem);
+      try {
+        const authenticatedUserStorageItem = window.localStorage.getItem(
+          getLocalStorageKey(gameId)
+        );
+        if (!authenticatedUserStorageItem) {
+          _checkedLocalStorage = true;
+          return;
+        }
+        const authenticatedUser = JSON.parse(authenticatedUserStorageItem);
 
-      _username = authenticatedUser.username;
-      _userId = authenticatedUser.userId;
-      _userToken = authenticatedUser.userToken;
-      _checkedLocalStorage = true;
+        _username = authenticatedUser.username;
+        _userId = authenticatedUser.userId;
+        _userToken = authenticatedUser.userToken;
+        _checkedLocalStorage = true;
+      } catch (err) {
+        logger.warn(
+          'Unable to read authentication details from localStorage. Player authentication will not be available.',
+          err
+        );
+      }
     };
 
     /**
@@ -228,16 +295,15 @@ namespace gdjs {
       }
     };
 
-    /**
-     * When the websocket receives the authentication result, close all the
-     * authentication windows, display the notification and focus on the game.
-     */
-    const handleLoggedInEvent = function (
-      runtimeScene: gdjs.RuntimeScene,
-      userId: string,
-      username: string | null,
-      userToken: string
-    ) {
+    const saveAuthKeyToStorage = ({
+      username,
+      userId,
+      userToken,
+    }: {
+      username: string | null;
+      userId: string;
+      userToken: string;
+    }) => {
       if (!username) {
         logger.warn('The authenticated player does not have a username');
       }
@@ -251,14 +317,34 @@ namespace gdjs {
         logger.error('Missing game id in project properties.');
         return;
       }
-      window.localStorage.setItem(
-        getLocalStorageKey(gameId),
-        JSON.stringify({
-          username: _username,
-          userId: _userId,
-          userToken: _userToken,
-        })
-      );
+      try {
+        window.localStorage.setItem(
+          getLocalStorageKey(gameId),
+          JSON.stringify({
+            username: _username,
+            userId: _userId,
+            userToken: _userToken,
+          })
+        );
+      } catch (err) {
+        logger.warn(
+          'Unable to save the authentication details to localStorage. Player authentication will not be available.',
+          err
+        );
+      }
+    };
+
+    /**
+     * When the game receives the authentication result, close all the
+     * authentication windows, display the notification and focus on the game.
+     */
+    const handleLoggedInEvent = function (
+      runtimeScene: gdjs.RuntimeScene,
+      userId: string,
+      username: string | null,
+      userToken: string
+    ) {
+      saveAuthKeyToStorage({ userId, username, userToken });
       cleanUpAuthWindowAndCallbacks(runtimeScene);
       removeAuthenticationBanner(runtimeScene);
 
@@ -284,15 +370,15 @@ namespace gdjs {
      * Reads the event sent by the authentication window and
      * display the appropriate banner.
      */
-    const receiveMessageFromAuthenticationWindow = function (
+    const receiveAuthenticationMessage = function (
       runtimeScene: gdjs.RuntimeScene,
       event: MessageEvent,
       { checkOrigin }: { checkOrigin: boolean }
     ) {
-      const allowedOrigin = 'https://liluo.io';
+      const allowedOrigins = ['https://liluo.io', 'https://gd.games'];
 
       // Check origin of message.
-      if (checkOrigin && event.origin !== allowedOrigin) {
+      if (checkOrigin && !allowedOrigins.includes(event.origin)) {
         throw new Error(`Unexpected origin: ${event.origin}`);
       }
       // Check that message is not malformed.
@@ -315,6 +401,20 @@ namespace gdjs {
           );
           break;
         }
+        case 'alreadyAuthenticated': {
+          if (!(event.data.body && event.data.body.token)) {
+            throw new Error('Malformed message.');
+          }
+
+          saveAuthKeyToStorage({
+            userId: event.data.body.userId,
+            username: event.data.body.username,
+            userToken: event.data.body.token,
+          });
+          removeAuthenticationCallbacks();
+          refreshAuthenticationBannerIfAny(runtimeScene);
+          break;
+        }
       }
     };
 
@@ -362,15 +462,42 @@ namespace gdjs {
     };
 
     /**
-     * Clear the authentication window timeout.
+     * Clear all existing authentication timeouts.
      * Useful when:
+     * - a new authentication starts
      * - the authentication succeeded
      * - the authentication window is closed
      */
     const clearAuthenticationWindowTimeout = () => {
+      if (_initialAuthenticationTimeoutId)
+        clearTimeout(_initialAuthenticationTimeoutId);
       if (_authenticationTimeoutId) clearTimeout(_authenticationTimeoutId);
     };
 
+    /**
+     * Helper to create the authentication banner based on the authentication status.
+     */
+    const createAuthenticationBanner = function (
+      runtimeScene: gdjs.RuntimeScene
+    ): HTMLDivElement {
+      const onDismissBanner = () => {
+        removeAuthenticationBanner(runtimeScene);
+      };
+      const onOpenAuthenticationWindow = () => {
+        openAuthenticationWindow(runtimeScene);
+      };
+      return _userToken
+        ? authComponents.computeAuthenticatedBanner(
+            onOpenAuthenticationWindow,
+            onDismissBanner,
+            _username
+          )
+        : authComponents.computeNotAuthenticatedBanner(
+            onOpenAuthenticationWindow,
+            onDismissBanner
+          );
+    };
+
     /**
      * Action to display the banner to the user, depending on their authentication status.
      */
@@ -397,26 +524,39 @@ namespace gdjs {
         );
         return;
       }
-      const onDismissBanner = () => {
-        removeAuthenticationBanner(runtimeScene);
-      };
-      const onOpenAuthenticationWindow = () => {
-        openAuthenticationWindow(runtimeScene);
-      };
-      // We display the corresponding banner depending on the authentication status.
-      _authenticationBanner = _userToken
-        ? authComponents.computeAuthenticatedBanner(
-            onOpenAuthenticationWindow,
-            onDismissBanner,
-            _username
-          )
-        : authComponents.computeNotAuthenticatedBanner(
-            onOpenAuthenticationWindow,
-            onDismissBanner
-          );
+
+      _authenticationBanner = createAuthenticationBanner(runtimeScene);
       domElementContainer.appendChild(_authenticationBanner);
     };
 
+    /**
+     * Helper to recompute the authentication banner.
+     * This is useful if the user is already logged on GDevelop games platform
+     * and we want to display the banner with the username.
+     */
+    const refreshAuthenticationBannerIfAny = function (
+      runtimeScene: gdjs.RuntimeScene
+    ) {
+      if (!_authenticationBanner) return;
+      const domElementContainer = runtimeScene
+        .getGame()
+        .getRenderer()
+        .getDomElementContainer();
+      if (!domElementContainer) {
+        handleAuthenticationError(
+          runtimeScene,
+          "The div element covering the game couldn't be found, the authentication banner cannot be displayed."
+        );
+        return;
+      }
+      const oldAuthenticationBanner = _authenticationBanner;
+      _authenticationBanner = createAuthenticationBanner(runtimeScene);
+      domElementContainer.replaceChild(
+        _authenticationBanner,
+        oldAuthenticationBanner
+      );
+    };
+
     /**
      * Helper to handle authentication window on Electron.
      * We open a new window, and create a websocket to know when the user is logged in.
@@ -516,7 +656,7 @@ namespace gdjs {
       // know when the user is authenticated.
       if (_authenticationInAppWindow) {
         _cordovaAuthenticationMessageCallback = (event: MessageEvent) => {
-          receiveMessageFromAuthenticationWindow(runtimeScene, event, {
+          receiveAuthenticationMessage(runtimeScene, event, {
             checkOrigin: false, // For Cordova we don't check the origin, as the message is read from the InAppBrowser directly.
           });
         };
@@ -545,7 +685,7 @@ namespace gdjs {
       // Listen to messages posted by the authentication window, so that we can
       // know when the user is authenticated.
       _authenticationMessageCallback = (event: MessageEvent) => {
-        receiveMessageFromAuthenticationWindow(runtimeScene, event, {
+        receiveAuthenticationMessage(runtimeScene, event, {
           checkOrigin: true,
         });
       };
@@ -567,6 +707,47 @@ namespace gdjs {
       }
     };
 
+    /**
+     * Helper to handle authentication iframe on web.
+     * We open an iframe, and listen to messages posted back to the game window.
+     */
+    const openAuthenticationIframeForWeb = (
+      runtimeScene: gdjs.RuntimeScene,
+      gameId: string
+    ) => {
+      if (
+        !_authenticationIframeContainer ||
+        !_authenticationLoaderContainer ||
+        !_authenticationTextContainer
+      ) {
+        console.error(
+          "Can't open an authentication iframe - no iframe container, loader container or text container was opened for it."
+        );
+        return;
+      }
+
+      const targetUrl = getAuthWindowUrl({
+        runtimeGame: runtimeScene.getGame(),
+        gameId,
+      });
+
+      // Listen to messages posted by the authentication window, so that we can
+      // know when the user is authenticated.
+      _authenticationMessageCallback = (event: MessageEvent) => {
+        receiveAuthenticationMessage(runtimeScene, event, {
+          checkOrigin: true,
+        });
+      };
+      window.addEventListener('message', _authenticationMessageCallback, true);
+
+      authComponents.displayIframeInsideAuthenticationContainer(
+        _authenticationIframeContainer,
+        _authenticationLoaderContainer,
+        _authenticationTextContainer,
+        targetUrl
+      );
+    };
+
     /**
      * Action to display the authentication window to the user.
      */
@@ -607,11 +788,13 @@ namespace gdjs {
       const {
         rootContainer,
         loaderContainer,
+        iframeContainer,
       } = authComponents.computeAuthenticationContainer(
         onAuthenticationContainerDismissed
       );
       _authenticationRootContainer = rootContainer;
       _authenticationLoaderContainer = loaderContainer;
+      _authenticationIframeContainer = iframeContainer;
 
       // Display the authentication window right away, to show a loader
       // while the call for game registration is happening.
@@ -651,7 +834,11 @@ namespace gdjs {
                 break;
               case 'web':
               default:
-                openAuthenticationWindowForWeb(runtimeScene, _gameId);
+                if (shouldAuthenticationUseIframe(runtimeScene)) {
+                  openAuthenticationIframeForWeb(runtimeScene, _gameId);
+                } else {
+                  openAuthenticationWindowForWeb(runtimeScene, _gameId);
+                }
                 break;
             }
           }
@@ -661,7 +848,7 @@ namespace gdjs {
             runtimeScene,
             'Error while checking if the game is registered.'
           );
-          console.error(error);
+          logger.error(error);
         });
     };
 
@@ -678,6 +865,7 @@ namespace gdjs {
     export const removeAuthenticationContainer = function (
       runtimeScene: gdjs.RuntimeScene
     ) {
+      removeAuthenticationCallbacks();
       const domElementContainer = runtimeScene
         .getGame()
         .getRenderer()
@@ -694,6 +882,16 @@ namespace gdjs {
         domElementContainer.removeChild(_authenticationRootContainer);
       }
 
+      _authenticationRootContainer = null;
+      _authenticationLoaderContainer = null;
+      _authenticationIframeContainer = null;
+      _authenticationTextContainer = null;
+    };
+
+    /*
+     * Remove the authentication callbacks from web or cordova.
+     */
+    const removeAuthenticationCallbacks = function () {
       // Remove the authentication callbacks.
       if (_authenticationMessageCallback) {
         window.removeEventListener(
@@ -705,16 +903,12 @@ namespace gdjs {
         // No need to detach the callback from the InAppBrowser, as it's destroyed when the window is closed.
         _cordovaAuthenticationMessageCallback = null;
       }
-
-      _authenticationRootContainer = null;
-      _authenticationLoaderContainer = null;
-      _authenticationTextContainer = null;
     };
 
     /**
      * Remove the banner displaying the authentication status.
      */
-    const removeAuthenticationBanner = function (
+    export const removeAuthenticationBanner = function (
       runtimeScene: gdjs.RuntimeScene
     ) {
       if (!_authenticationBanner) {

Extensions/PrimitiveDrawing/Extension.cpp

@@ -28,9 +28,9 @@ void DeclarePrimitiveDrawingExtension(gd::PlatformExtension& extension) {
           .AddObject<ShapePainterObject>(
               "Drawer",  //"Drawer" is kept for compatibility with GD<=3.6.76
               _("Shape painter"),
-              _("Allows you to draw simple shapes on the screen"),
+              _("Allows you to draw simple shapes on the screen using the events."),
               "CppPlatform/Extensions/primitivedrawingicon.png")
-          .SetCategoryFullName(_("General"));
+          .SetCategoryFullName(_("Advanced"));
 
 #if defined(GD_IDE_ONLY)
   obj.AddAction(
@@ -722,7 +722,7 @@ void DeclarePrimitiveDrawingExtension(gd::PlatformExtension& extension) {
          _("Center of rotation"),
          _("Change the center of rotation of an object relatively to the "
            "object origin."),
-         _("Change the center of rotation of _PARAM0_: _PARAM1_; _PARAM2_"),
+         _("Change the center of rotation of _PARAM0_ to _PARAM1_, _PARAM2_"),
          _("Angle"),
          "res/actions/position24_black.png",
          "res/actions/position_black.png")

Extensions/PrimitiveDrawing/shapepainterruntimeobject.ts

@@ -474,7 +474,7 @@ namespace gdjs {
     /**
      * The center of rotation is defined relatively
      * to the drawing origin (the object position).
-     * This avoid the center to move on the drawing
+     * This avoids the center to move on the drawing
      * when new shapes push the bounds.
      *
      * When no custom center is defined, it will move

Extensions/SystemInfo/Extension.cpp

@@ -9,27 +9,47 @@ This project is released under the MIT License.
 #include "GDCore/Tools/Localization.h"
 
 void DeclareSystemInfoExtension(gd::PlatformExtension& extension) {
-  extension.SetExtensionInformation(
-      "SystemInfo",
-      _("System information"),
-      _("Get information about the system and device running the game."),
-      "Florian Rival",
-      "Open source (MIT License)")
+  extension
+      .SetExtensionInformation(
+          "SystemInfo",
+          _("System information"),
+          _("Get information about the system and device running the game."),
+          "Florian Rival",
+          "Open source (MIT License)")
       .SetCategory("Advanced");
   extension.AddInstructionOrExpressionGroupMetadata(_("System information"))
       .SetIcon("CppPlatform/Extensions/systeminfoicon.png");
 
-  extension
-      .AddCondition(
-          "IsMobile",
-          _("Is a mobile device"),
-          _("Check if the device running the game is a mobile device"),
-          _("The device is a mobile device"),
-          "",
-          "CppPlatform/Extensions/systeminfoicon.png",
-          "CppPlatform/Extensions/systeminfoicon.png")
+  extension.AddCondition(
+      "IsMobile",
+      _("Is a mobile device"),
+      _("Check if the device running the game is a mobile device (phone or "
+        "tablet on iOS, Android or other mobile devices). The game itself "
+        "might be a web game or distributed as a native mobile app (to check "
+        "this precisely, use other conditions)."),
+      _("The device is a mobile device"),
+      "",
+      "CppPlatform/Extensions/systeminfoicon.png",
+      "CppPlatform/Extensions/systeminfoicon.png");
 
-      .SetFunctionName("SystemInfo::IsMobile");
+  extension.AddCondition("IsNativeMobileApp",
+                         _("Is a native mobile app"),
+                         _("Check if the game is running as a native mobile "
+                           "app (iOS or Android app)."),
+                         _("The game is running as a native mobile app"),
+                         "",
+                         "CppPlatform/Extensions/systeminfoicon.png",
+                         "CppPlatform/Extensions/systeminfoicon.png");
+
+  extension
+      .AddCondition("IsNativeDesktopApp",
+                    _("Is a native desktop app"),
+                    _("Check if the game is running as a native desktop app."),
+                    _("The game is running as a native desktop app"),
+                    "",
+                    "CppPlatform/Extensions/systeminfoicon.png",
+                    "CppPlatform/Extensions/systeminfoicon.png")
+      .AddCodeOnlyParameter("currentScene", "");
 
   extension
       .AddCondition("IsWebGLSupported",

Extensions/SystemInfo/JsExtension.cpp

@@ -28,6 +28,14 @@ class SystemInfoJsExtension : public gd::PlatformExtension {
         .codeExtraInformation
         .SetIncludeFile("Extensions/SystemInfo/systeminfotools.js")
         .SetFunctionName("gdjs.evtTools.systemInfo.isMobile");
+    GetAllConditions()["SystemInfo::IsNativeMobileApp"]
+        .codeExtraInformation
+        .SetIncludeFile("Extensions/SystemInfo/systeminfotools.js")
+        .SetFunctionName("gdjs.evtTools.systemInfo.isNativeMobileApp");
+    GetAllConditions()["SystemInfo::IsNativeDesktopApp"]
+        .codeExtraInformation
+        .SetIncludeFile("Extensions/SystemInfo/systeminfotools.js")
+        .SetFunctionName("gdjs.evtTools.systemInfo.isNativeDesktopApp");
     GetAllConditions()["SystemInfo::IsWebGLSupported"]
         .codeExtraInformation
         .SetIncludeFile("Extensions/SystemInfo/systeminfotools.js")

Extensions/SystemInfo/systeminfotools.ts

@@ -59,6 +59,32 @@ namespace gdjs {
         }
         return (cachedIsMobile = checkIsMobile());
       };
+
+      /**
+       * Check if the game is running as a native mobile app - which in the case
+       * of an exported GDevelop game means: running packaged inside Cordova/Capacitor.js.
+       *
+       * Note: this could be improved to also detect running inside an embedded webview.
+       *
+       * @returns true if running inside Cordova (or Capacitor.js).
+       */
+      export const isNativeMobileApp = (): boolean => {
+        return typeof window !== 'undefined' && (window as any).cordova;
+      };
+
+      /**
+       * Check if the game is running as a native desktop app - which in the case
+       * of an exported GDevelop game means: running packaged inside Electron.
+       *
+       * @param instanceContainer The current scene.
+       * @returns true if running inside Electron.
+       */
+      export const isNativeDesktopApp = (
+        instanceContainer: gdjs.RuntimeInstanceContainer
+      ): boolean => {
+        return !!instanceContainer.getGame().getRenderer().getElectron();
+      };
+
       const checkHasTouchScreen = (): boolean => {
         // First check if the device is mobile, as all mobile devices have a touchscreen
         // and some older browsers don't have support for `navigator.maxTouchPoints`

Extensions/TextEntryObject/Extension.cpp

@@ -9,13 +9,14 @@ This project is released under the MIT License.
 #include "GDCore/Tools/Localization.h"
 #include "TextEntryObject.h"
 
+// Deprecated extension - so no translation markers and the object is hidden in the editor.
 void DeclareTextEntryObjectExtension(gd::PlatformExtension& extension) {
   extension
       .SetExtensionInformation(
           "TextEntryObject",
-          _("Text entry object"),
-          _("An object that can be used to capture the text "
-            "entered with a keyboard by a player."),
+          "Text entry object",
+          "Deprecated object that can be used to capture the text "
+            "entered with a keyboard by a player.",
           "Florian Rival",
           "Open source (MIT License)")
       .SetCategory("User interface")
@@ -24,71 +25,72 @@ void DeclareTextEntryObjectExtension(gd::PlatformExtension& extension) {
   gd::ObjectMetadata& obj =
       extension
           .AddObject<TextEntryObject>("TextEntry",
-                                      _("Text entry"),
-                                      _("Invisible object used to get the text "
-                                        "entered with the keyboard."),
+                                      "Text entry",
+                                      "Invisible object used to get the text "
+                                        "entered with the keyboard.",
                                       "CppPlatform/Extensions/textentry.png")
-          .SetCategoryFullName(_("User interface"));
+          .SetCategoryFullName("User interface")
+          .SetHidden(); // Deprecated
 
   obj.AddAction("String",
-                _("Text in memory"),
-                _("Modify text in memory of the object"),
-                _("the text in memory"),
+                "Text in memory",
+                "Modify text in memory of the object",
+                "the text in memory",
                 "",
                 "CppPlatform/Extensions/textentry24.png",
                 "CppPlatform/Extensions/textentryicon.png")
 
-      .AddParameter("object", _("Object"), "TextEntry")
+      .AddParameter("object", "Object", "TextEntry")
       .UseStandardOperatorParameters(
           "string",
-          gd::ParameterOptions::MakeNewOptions().SetDescription(_("Text")))
+          gd::ParameterOptions::MakeNewOptions().SetDescription("Text"))
       .SetFunctionName("SetString")
       .SetGetter("GetString");
 
   obj.AddCondition("String",
-                   _("Text in memory"),
-                   _("Test the text of a Text Entry object."),
-                   _("the text"),
+                   "Text in memory",
+                   "Test the text of a Text Entry object.",
+                   "the text",
                    "",
                    "CppPlatform/Extensions/textentry24.png",
                    "CppPlatform/Extensions/textentryicon.png")
 
-      .AddParameter("object", _("Object"), "TextEntry")
+      .AddParameter("object", "Object", "TextEntry")
       .UseStandardRelationalOperatorParameters(
           "string",
-          gd::ParameterOptions::MakeNewOptions().SetDescription(_("Text to compare to")))
+          gd::ParameterOptions::MakeNewOptions().SetDescription("Text to compare to"))
       .SetFunctionName("GetString");
 
   obj.AddAction(
          "Activate",
-         _("De/activate capturing text input"),
-         _("Activate or deactivate the capture of text entered with keyboard."),
-         _("Activate capture by _PARAM0_ of the text entered with keyboard: "
-           "_PARAM1_"),
-         _("Setup"),
+         "De/activate capturing text input",
+         "Activate or deactivate the capture of text entered with keyboard.",
+         "Activate capture by _PARAM0_ of the text entered with keyboard: "
+           "_PARAM1_",
+         "Setup",
          "CppPlatform/Extensions/textentry24.png",
          "CppPlatform/Extensions/textentryicon.png")
 
-      .AddParameter("object", _("Object"), "TextEntry")
-      .AddParameter("yesorno", _("Activate"))
+      .AddParameter("object", "Object", "TextEntry")
+      .AddParameter("yesorno", "Activate")
       .SetFunctionName("Activate");
 
   obj.AddCondition("Activated",
-                   _("Text input"),
-                   _("Test if the object captured text entered with keyboard."),
-                   _("_PARAM0_ capture the text entered with keyboard"),
-                   _("Setup"),
+                   "Text input",
+                   "Test if the object captured text entered with keyboard.",
+                   "_PARAM0_ capture the text entered with keyboard",
+                   "Setup",
                    "CppPlatform/Extensions/textentry24.png",
                    "CppPlatform/Extensions/textentryicon.png")
 
-      .AddParameter("object", _("Object"), "TextEntry")
+      .AddParameter("object", "Object", "TextEntry")
       .SetFunctionName("IsActivated");
 
   obj.AddStrExpression("String",
-                       _("Text entered with keyboard"),
-                       _("Text entered with keyboard"),
-                       _("Text entered with keyboard"),
+                       "Text entered with keyboard",
+                       "Text entered with keyboard",
+                       "Text entered with keyboard",
                        "res/texteicon.png")
-      .AddParameter("object", _("Object"), "TextEntry")
+      .AddParameter("object", "Object", "TextEntry")
       .SetFunctionName("GetString");
 }

Extensions/TextInput/JsExtension.js

@@ -502,7 +502,10 @@ module.exports = {
         'res/conditions/text24_black.png'
       )
       .addParameter('object', _('Text input'), 'TextInputObject', false)
-      .useStandardParameters('boolean', gd.ParameterOptions.makeNewOptions())
+      .useStandardParameters(
+        'boolean',
+        gd.ParameterOptions.makeNewOptions().setDescription(_('Read-only?'))
+      )
       .setFunctionName('setReadOnly')
       .setGetter('isReadOnly');
 

Extensions/TextObject/Extension.cpp

@@ -23,7 +23,7 @@ void DeclareTextObjectExtension(gd::PlatformExtension& extension) {
                                  "some indicators, menu buttons, dialogues..."),
                                "Florian Rival and Victor Levasseur",
                                "Open source (MIT License)")
-      .SetCategory("User interface")
+      .SetCategory("Text")
       .SetExtensionHelpPath("/objects/text");
   extension.AddInstructionOrExpressionGroupMetadata(_("Text object"))
       .SetIcon("CppPlatform/Extensions/texticon.png");
@@ -34,7 +34,7 @@ void DeclareTextObjectExtension(gd::PlatformExtension& extension) {
                                  _("Text"),
                                  _("Displays a text on the screen."),
                                  "CppPlatform/Extensions/texticon.png")
-          .SetCategoryFullName(_("User interface"));
+          .SetCategoryFullName(_("Text"));
 
   obj.AddAction("String",
                 _("Modify the text"),
@@ -87,7 +87,7 @@ void DeclareTextObjectExtension(gd::PlatformExtension& extension) {
                    "res/conditions/scaleWidth_black.png")
 
       .AddParameter("object", _("Object"), "Text")
-      .UseStandardOperatorParameters(
+      .UseStandardRelationalOperatorParameters(
           "number",
           gd::ParameterOptions::MakeNewOptions().SetDescription(
               _("Scale to compare to (1 by default)")))
@@ -103,7 +103,7 @@ void DeclareTextObjectExtension(gd::PlatformExtension& extension) {
          "res/actions/scaleWidth_black.png")
 
       .AddParameter("object", _("Object"), "Text")
-      .UseStandardRelationalOperatorParameters(
+      .UseStandardOperatorParameters(
           "number",
           gd::ParameterOptions::MakeNewOptions().SetDescription(
               _("Scale (1 by default)")))

Extensions/TileMap/JsExtension.js

@@ -1294,9 +1294,8 @@ module.exports = {
       tilemapJsonFile,
       tilesetJsonFile
     ) {
-      let tileMapJsonData = null;
       try {
-        tileMapJsonData = await this._pixiResourcesLoader.getResourceJsonData(
+        const tileMapJsonData = await this._pixiResourcesLoader.getResourceJsonData(
           this._project,
           tilemapJsonFile
         );
@@ -1320,6 +1319,7 @@ module.exports = {
       } catch (err) {
         console.error('Unable to load a Tilemap JSON data: ', err);
       }
+      return null;
     };
 
     /**
@@ -1540,34 +1540,38 @@ module.exports = {
     // GDJS doesn't use Promise to avoid allocation.
     RenderedCollisionMaskInstance.prototype._loadTiledMapWithCallback =
       function (tilemapJsonFile, tilesetJsonFile, callback) {
-        this._loadTiledMap(tilemapJsonFile, tilesetJsonFile).then(callback);
+        this._loadTileMap(tilemapJsonFile, tilesetJsonFile).then(callback);
       };
 
-    RenderedCollisionMaskInstance.prototype._loadTiledMap = async function (
+    RenderedCollisionMaskInstance.prototype._loadTileMap = async function (
       tilemapJsonFile,
       tilesetJsonFile
     ) {
-      let tileMapJsonData = null;
       try {
-        tileMapJsonData = await this._pixiResourcesLoader.getResourceJsonData(
+        const tileMapJsonData = await this._pixiResourcesLoader.getResourceJsonData(
           this._project,
           tilemapJsonFile
         );
 
-        const tilesetJsonData = tilesetJsonFile
-          ? await this._pixiResourcesLoader.getResourceJsonData(
-              this._project,
-              tilesetJsonFile
-            )
-          : null;
+        const tileMap = TilemapHelper.TileMapManager.identify(tileMapJsonData);
 
-        if (tilesetJsonData) {
-          tileMapJsonData.tilesets = [tilesetJsonData];
+        if (tileMap.kind === 'tiled') {
+          const tilesetJsonData = tilesetJsonFile
+            ? await this._pixiResourcesLoader.getResourceJsonData(
+                this._project,
+                tilesetJsonFile
+              )
+            : null;
+
+          if (tilesetJsonData) {
+            tileMapJsonData.tilesets = [tilesetJsonData];
+          }
         }
+        return tileMap;
       } catch (err) {
         console.error('Unable to load a Tilemap JSON data: ', err);
       }
-      return tileMapJsonData;
+      return null;
     };
 
     /**

Extensions/TileMap/TileMapRuntimeManager.ts

@@ -67,7 +67,9 @@ namespace gdjs {
         tileMapJsonResourceName: string,
         tileSetJsonResourceName: string,
         levelIndex: number,
-        callback: (tileMap: TileMapHelper.EditableTileMap | null) => void
+        callback: (
+          tileMapFileContent: TileMapHelper.EditableTileMap | null
+        ) => void
       ): void {
         this._manager.getOrLoadTileMap(
           this._loadTileMap.bind(this),
@@ -113,7 +115,9 @@ namespace gdjs {
       private _loadTileMap(
         tileMapJsonResourceName: string,
         tileSetJsonResourceName: string,
-        callback: (tileMap: TileMapHelper.TileMap | null) => void
+        callback: (
+          tileMapFileContent: TileMapHelper.TileMapFileContent | null
+        ) => void
       ): void {
         this._instanceContainer
           .getGame()
@@ -127,14 +131,17 @@ namespace gdjs {
               callback(null);
               return;
             }
-            const tileMap = TileMapHelper.TileMapManager.identify(
+            const tileMapFileContent = TileMapHelper.TileMapManager.identify(
               tileMapJsonData
             );
-            if (!tileMap) {
+            if (!tileMapFileContent) {
               callback(null);
               return;
             }
-            if (tileMap.kind === 'tiled' && tileSetJsonResourceName) {
+            if (
+              tileMapFileContent.kind === 'tiled' &&
+              tileSetJsonResourceName
+            ) {
               this._instanceContainer
                 .getGame()
                 .getJsonManager()
@@ -147,14 +154,14 @@ namespace gdjs {
                     callback(null);
                     return;
                   }
-                  const tiledMap = tileMap.data;
+                  const tiledMap = tileMapFileContent.data;
                   const tileSet = tileSetJsonData as TileMapHelper.TiledTileset;
                   tileSet.firstgid = tiledMap.tilesets[0].firstgid;
                   tiledMap.tilesets = [tileSet];
-                  callback(tileMap);
+                  callback(tileMapFileContent);
                 });
             } else {
-              callback(tileMap);
+              callback(tileMapFileContent);
             }
           });
       }

Extensions/TileMap/helper/TileMapHelper.d.ts

@@ -3,7 +3,7 @@ import {
   EditableTileMapLayer,
   PixiTileMapHelper,
   TileDefinition,
-  TileMap,
+  TileMapFileContent,
   TileMapManager,
   TileTextureCache,
   TiledTileset,
@@ -16,7 +16,7 @@ declare global {
       EditableTileMapLayer,
       PixiTileMapHelper,
       TileDefinition,
-      TileMap,
+      TileMapFileContent,
       TileMapManager,
       TileTextureCache,
       TiledTileset,

Extensions/TileMap/helper/dts/index.d.ts

@@ -10,7 +10,7 @@ export {
 export { TileMapManager } from './render/TileMapManager';
 export { TileTextureCache } from './render/TileTextureCache';
 export { PixiTileMapHelper } from './render/TileMapPixiHelper';
-export * from './types/index';
+export * from './load/TileMapFileContent';
 export * from './model/CommonTypes';
 export { TiledTileset } from './load/tiled/TiledFormat';
 //# sourceMappingURL=index.d.ts.map

Extensions/TileMap/helper/dts/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,EACL,eAAe,EACf,oBAAoB,EACpB,cAAc,GACf,MAAM,sBAAsB,CAAC;AAE9B,OAAO,EAAE,cAAc,EAAE,MAAM,yBAAyB,CAAC;AACzD,OAAO,EAAE,gBAAgB,EAAE,MAAM,2BAA2B,CAAC;AAC7D,OAAO,EAAE,iBAAiB,EAAE,MAAM,4BAA4B,CAAC;AAE/D,cAAc,eAAe,CAAC;AAC9B,cAAc,qBAAqB,CAAC;AACpC,OAAO,EAAE,YAAY,EAAE,MAAM,0BAA0B,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,EACL,eAAe,EACf,oBAAoB,EACpB,cAAc,GACf,MAAM,sBAAsB,CAAC;AAE9B,OAAO,EAAE,cAAc,EAAE,MAAM,yBAAyB,CAAC;AACzD,OAAO,EAAE,gBAAgB,EAAE,MAAM,2BAA2B,CAAC;AAC7D,OAAO,EAAE,iBAAiB,EAAE,MAAM,4BAA4B,CAAC;AAE/D,cAAc,2BAA2B,CAAC;AAC1C,cAAc,qBAAqB,CAAC;AACpC,OAAO,EAAE,YAAY,EAAE,MAAM,0BAA0B,CAAC"}

Extensions/TileMap/helper/dts/load/TileMapFileContent.d.ts

@@ -0,0 +1,12 @@
+import { LDtkTileMap } from '../load/ldtk/LDtkFormat';
+import { TiledTileMap } from '../load/tiled/TiledFormat';
+export declare type TileMapFileContent =
+  | {
+      kind: 'tiled';
+      data: TiledTileMap;
+    }
+  | {
+      kind: 'ldtk';
+      data: LDtkTileMap;
+    };
+//# sourceMappingURL=TileMapFileContent.d.ts.map

Extensions/TileMap/helper/dts/load/TileMapFileContent.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"TileMapFileContent.d.ts","sourceRoot":"","sources":["../../src/load/TileMapFileContent.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AACtD,OAAO,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AAEzD,oBAAY,kBAAkB,GAC1B;IACE,IAAI,EAAE,OAAO,CAAC;IACd,IAAI,EAAE,YAAY,CAAC;CACpB,GACD;IACE,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,WAAW,CAAC;CACnB,CAAC"}

Extensions/TileMap/helper/dts/load/TileMapLoader.d.ts

@@ -1,16 +1,16 @@
 import type { EditableTileMap } from '../model/TileMapModel';
-import { TileMap } from '../types';
+import { TileMapFileContent } from './TileMapFileContent';
 export declare namespace TileMapLoader {
   /**
    * Create a {@link EditableTileMap} from the raw data.
    *
-   * @param tiledMap The data exported from Tiled/LDtk.
+   * @param tileMapFileContent The data exported from Tiled/LDtk.
    * @param levelIndex The level of the tile map to load from.
    * @param pako The zlib library.
    * @returns A {@link EditableTileMap}
    */
   function load(
-    tileMap: TileMap,
+    tileMapFileContent: TileMapFileContent,
     levelIndex: number,
     pako: any
   ): EditableTileMap | null;

Extensions/TileMap/helper/dts/load/TileMapLoader.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"TileMapLoader.d.ts","sourceRoot":"","sources":["../../src/load/TileMapLoader.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AAC7D,OAAO,EAAE,OAAO,EAAE,MAAM,UAAU,CAAC;AAInC,yBAAiB,aAAa,CAAC;IAC7B;;;;;;;OAOG;IACH,SAAgB,IAAI,CAClB,OAAO,EAAE,OAAO,EAChB,UAAU,EAAE,MAAM,EAClB,IAAI,EAAE,GAAG,GACR,eAAe,GAAG,IAAI,CAaxB;CACF"}
+{"version":3,"file":"TileMapLoader.d.ts","sourceRoot":"","sources":["../../src/load/TileMapLoader.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AAC7D,OAAO,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;AAI1D,yBAAiB,aAAa,CAAC;IAC7B;;;;;;;OAOG;IACH,SAAgB,IAAI,CAClB,kBAAkB,EAAE,kBAAkB,EACtC,UAAU,EAAE,MAAM,EAClB,IAAI,EAAE,GAAG,GACR,eAAe,GAAG,IAAI,CAaxB;CACF"}

Extensions/TileMap/helper/dts/load/ldtk/LDtkFormat.d.ts

@@ -2,7 +2,7 @@ import { integer } from '../../model/CommonTypes';
 /**
  * version 1.1.3 - https://github.com/deepnight/ldtk/blob/66fff7199932357f3ab9b044c2fc2a856f527831/docs/JSON_SCHEMA.json
  */
-export type LDtkTileMap = {
+export declare type LDtkTileMap = {
   /** LDtk application build identifier.<br/>  This is only used to identify the LDtk version that generated this particular project file, which can be useful for specific bug fixing. Note that the build identifier is just the date of the release, so it's not unique to each user (one single global ID per LDtk public release), and as a result, completely anonymous. */
   appBuildId: number;
   /** Number of backup files to keep, if the `backupOnSave` is TRUE */
@@ -72,7 +72,7 @@ export type LDtkTileMap = {
     | null;
 };
 /** Auto-layer rule group */
-type LDtkAutoLayerRuleGroup = {
+declare type LDtkAutoLayerRuleGroup = {
   /**  */
   active: boolean;
   /** *This field was removed in 1.0.0 and should no longer be used.* */
@@ -87,9 +87,9 @@ type LDtkAutoLayerRuleGroup = {
   uid: integer;
 };
 /** This complex section isn't meant to be used by game devs at all, as these rules are completely resolved internally by the editor before any saving. You should just ignore this part. */
-type LDtkAutoRuleDef = {};
+declare type LDtkAutoRuleDef = {};
 /** If you're writing your own LDtk importer, you should probably just ignore *most* stuff in the `defs` section, as it contains data that are mostly important to the editor. To keep you away from the `defs` section and avoid some unnecessary JSON parsing, important data from definitions is often duplicated in fields prefixed with a double underscore (eg. `__identifier` or `__type`).  The 2 only definition types you might need here are **Tilesets** and **Enums**. */
-type LDtkDefinition = {
+declare type LDtkDefinition = {
   /** All entities definitions, including their custom fields */
   entities: LDtkEntityDef[];
   /** All internal enums */
@@ -104,7 +104,7 @@ type LDtkDefinition = {
   tilesets: LDtkTilesetDef[];
 };
 /** Entity definition */
-type LDtkEntityDef = {
+declare type LDtkEntityDef = {
   /** Base entity color */
   color: string;
   /** Array of field definitions */
@@ -166,7 +166,7 @@ type LDtkEntityDef = {
   width: integer;
 };
 /** Entity instance */
-type LDtkEntityInstance = {
+declare type LDtkEntityInstance = {
   /** Grid-based coordinates (`[x,y]` format) */
   __grid: integer[];
   /** Entity definition identifier */
@@ -193,7 +193,7 @@ type LDtkEntityInstance = {
   width: integer;
 };
 /** Enum definition */
-type LDtkEnumDef = {
+declare type LDtkEnumDef = {
   /**  */
   externalFileChecksum: string | null;
   /** Relative path to the external file providing this Enum */
@@ -210,7 +210,7 @@ type LDtkEnumDef = {
   values: LDtkEnumDefValues[];
 };
 /** Enum value definition */
-type LDtkEnumDefValues = {
+declare type LDtkEnumDefValues = {
   /** An array of 4 Int values that refers to the tile in the tileset image: `[ x, y, width, height ]` */
   __tileSrcRect: integer[] | null;
   /** Optional color */
@@ -221,14 +221,14 @@ type LDtkEnumDefValues = {
   tileId: integer | null;
 };
 /** In a tileset definition, enum based tag infos */
-type LDtkEnumTagValue = {
+declare type LDtkEnumTagValue = {
   /**  */
   enumValueId: string;
   /**  */
   tileIds: integer[];
 };
 /** This section is mostly only intended for the LDtk editor app itself. You can safely ignore it. */
-type LDtkFieldDef = {
+declare type LDtkFieldDef = {
   /** Human readable value type. Possible values: `Int, Float, String, Bool, Color, ExternEnum.XXX, LocalEnum.XXX, Point, FilePath`.<br/>  If the field is an array, this field will look like `Array<...>` (eg. `Array<Int>`, `Array<Point>` etc.)<br/>  NOTE: if you enable the advanced option **Use Multilines type**, you will have \"*Multilines*\" instead of \"*String*\" when relevant. */
   __type: string;
   /** Optional list of accepted file extensions for FilePath value type. Includes the dot: `.ext` */
@@ -310,7 +310,7 @@ type LDtkFieldDef = {
   useForSmartColor: boolean;
 };
 /** Field instance */
-type LDtkFieldInstance = {
+declare type LDtkFieldInstance = {
   /** Field definition identifier */
   __identifier: string;
   /** Optional TilesetRect used to display this field (this can be the field own Tile, or some other Tile guessed from the value, like an Enum). */
@@ -324,7 +324,7 @@ type LDtkFieldInstance = {
   /** Editor internal raw values */
   realEditorValues: any[];
 };
-type LDtkFlag =
+declare type LDtkFlag =
   | 'DiscardPreCsvIntGrid'
   | 'ExportPreCsvIntGridFormat'
   | 'IgnoreBackupSuggest'
@@ -332,7 +332,7 @@ type LDtkFlag =
   | 'MultiWorlds'
   | 'UseMultilinesType';
 /** IntGrid value definition */
-type LDtkIntGridValueDef = {
+declare type LDtkIntGridValueDef = {
   /**  */
   color: string;
   /** User defined unique identifier */
@@ -341,14 +341,14 @@ type LDtkIntGridValueDef = {
   value: integer;
 };
 /** IntGrid value instance */
-type LDtkIntGridValueInstance = {
+declare type LDtkIntGridValueInstance = {
   /** Coordinate ID in the layer grid */
   coordId: integer;
   /** IntGrid value */
   v: integer;
 };
 /** Layer definition */
-type LDtkLayerDef = {
+declare type LDtkLayerDef = {
   /** Type of the layer (*IntGrid, Entities, Tiles or AutoLayer*) */
   __type: string;
   /** Contains all the auto-layer rule definitions. */
@@ -401,7 +401,7 @@ type LDtkLayerDef = {
   uid: integer;
 };
 /** Layer instance */
-type LDtkLayerInstance = {
+declare type LDtkLayerInstance = {
   /** Grid-based height */
   __cHei: integer;
   /** Grid-based width */
@@ -452,7 +452,7 @@ type LDtkLayerInstance = {
   visible: boolean;
 };
 /** This section contains all the level data. It can be found in 2 distinct forms, depending on Project current settings:  - If \"*Separate level files*\" is **disabled** (default): full level data is *embedded* inside the main Project JSON file, - If \"*Separate level files*\" is **enabled**: level data is stored in *separate* standalone `.ldtkl` files (one per level). In this case, the main Project JSON file will still contain most level data, except heavy sections, like the `layerInstances` array (which will be null). The `externalRelPath` string points to the `ldtkl` file.  A `ldtkl` file is just a JSON file containing exactly what is described below. */
-type LDtkLevel = {
+declare type LDtkLevel = {
   /** Background color of the level (same as `bgColor`, except the default value is automatically used here if its value is `null`) */
   __bgColor: string;
   /** Position informations of the background image, if there is one. */
@@ -497,7 +497,7 @@ type LDtkLevel = {
   worldY: integer;
 };
 /** Level background image position info */
-type LDtkLevelBgPosInfos = {
+declare type LDtkLevelBgPosInfos = {
   /** An array of 4 float values describing the cropped sub-rectangle of the displayed background image. This cropping happens when original is larger than the level bounds. Array format: `[ cropX, cropY, cropWidth, cropHeight ]` */
   cropRect: number[];
   /** An array containing the `[scaleX,scaleY]` values of the **cropped** background image, depending on `bgPos` option. */
@@ -506,7 +506,7 @@ type LDtkLevelBgPosInfos = {
   topLeftPx: integer[];
 };
 /** Nearby level info */
-type LDtkNeighbourLevel = {
+declare type LDtkNeighbourLevel = {
   /** A single lowercase character tipping on the level location (`n`orth, `s`outh, `w`est, `e`ast). */
   dir: string;
   /** Neighbour Instance Identifier */
@@ -515,7 +515,7 @@ type LDtkNeighbourLevel = {
   levelUid: integer;
 };
 /** This structure represents a single tile from a given Tileset. */
-type LDtkTile = {
+declare type LDtkTile = {
   /** Internal data used by the editor.<br/>  For auto-layer tiles: `[ruleId, coordId]`.<br/>  For tile-layer tiles: `[coordId]`. */
   d: integer[];
   /** \"Flip bits\", a 2-bits integer to represent the mirror transformations of the tile.<br/>   - Bit 0 = X flip<br/>   - Bit 1 = Y flip<br/>   Examples: f=0 (no flip), f=1 (X flip only), f=2 (Y flip only), f=3 (both flips) */
@@ -528,7 +528,7 @@ type LDtkTile = {
   t: integer;
 };
 /** The `Tileset` definition is the most important part among project definitions. It contains some extra informations about each integrated tileset. If you only had to parse one definition section, that would be the one. */
-export type LDtkTilesetDef = {
+export declare type LDtkTilesetDef = {
   /** Grid-based height */
   __cHei: integer;
   /** Grid-based width */
@@ -565,14 +565,14 @@ export type LDtkTilesetDef = {
   uid: integer;
 };
 /** In a tileset definition, user defined meta-data of a tile. */
-type LDtkTileCustomMetadata = {
+declare type LDtkTileCustomMetadata = {
   /**  */
   data: string;
   /**  */
   tileId: integer;
 };
 /** This object represents a custom sub rectangle in a Tileset image. */
-type LDtkTilesetRect = {
+declare type LDtkTilesetRect = {
   /** Height in pixels */
   h: integer;
   /** UID of the tileset */
@@ -584,6 +584,6 @@ type LDtkTilesetRect = {
   /** Y pixels coordinate of the top-left corner in the Tileset image */
   y: integer;
 };
-type LDtkWorld = {};
+declare type LDtkWorld = {};
 export {};
 //# sourceMappingURL=LDtkFormat.d.ts.map

Extensions/TileMap/helper/dts/load/ldtk/LDtkTileMapLoader.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"LDtkTileMapLoader.d.ts","sourceRoot":"","sources":["../../../src/load/ldtk/LDtkTileMapLoader.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,eAAe,EAAkB,MAAM,0BAA0B,CAAC;AAE3E,OAAO,EAAE,WAAW,EAAE,MAAM,cAAc,CAAC;AAG3C,yBAAiB,iBAAiB,CAAC;IACjC;;;;;;OAMG;IACH,SAAgB,IAAI,CAClB,WAAW,EAAE,WAAW,EACxB,UAAU,EAAE,MAAM,GACjB,eAAe,GAAG,IAAI,CA6IxB;CACF"}
+{"version":3,"file":"LDtkTileMapLoader.d.ts","sourceRoot":"","sources":["../../../src/load/ldtk/LDtkTileMapLoader.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,eAAe,EAAkB,MAAM,0BAA0B,CAAC;AAE3E,OAAO,EAAE,WAAW,EAAE,MAAM,cAAc,CAAC;AAG3C,yBAAiB,iBAAiB,CAAC;IACjC;;;;;;OAMG;IACH,SAAgB,IAAI,CAClB,WAAW,EAAE,WAAW,EACxB,UAAU,EAAE,MAAM,GACjB,eAAe,GAAG,IAAI,CAwJxB;CACF"}

Extensions/TileMap/helper/dts/load/tiled/TiledFormat.d.ts

@@ -2,7 +2,7 @@ import { float, integer } from '../../model/CommonTypes';
 /**
  * Tiled JSON format (https://github.com/mapeditor/tiled/blob/master/docs/reference/json-map-format.rst).
  */
-export type TiledTileMap = {
+export declare type TiledTileMap = {
   /** Hex-formatted color (#RRGGBB or #AARRGGBB) (optional) */
   backgroundcolor?: string;
   /** The compression level to use for tile layer data (defaults to -1, which means to use the algorithm default) */
@@ -44,7 +44,7 @@ export type TiledTileMap = {
   /** Number of tile columns */
   width: integer;
 };
-export type TiledLayer = {
+export declare type TiledLayer = {
   /** Array of {@link TiledChunk} (optional). `tilelayer` only. */
   chunks?: Array<TiledChunk>;
   /** `zlib`, `gzip`, `zstd` (since Tiled 1.3) or empty (default). `tilelayer` only. */
@@ -98,7 +98,7 @@ export type TiledLayer = {
   /** Vertical layer offset in tiles. Always 0. */
   y: integer;
 };
-export type TiledChunk = {
+export declare type TiledChunk = {
   /** Array of `unsigned` `integer` (GIDs) or base64-encoded data */
   data: Array<integer> | string;
   /** Height in tiles */
@@ -110,7 +110,7 @@ export type TiledChunk = {
   /** Y coordinate in tiles */
   y: integer;
 };
-export type TiledObject = {
+export declare type TiledObject = {
   /** The class of the object (renamed from type since 1.9, optional) */
   class?: string;
   /** Used to mark an object as an ellipse */
@@ -146,7 +146,7 @@ export type TiledObject = {
   /** Y coordinate in pixels */
   y: float;
 };
-export type TiledText = {
+export declare type TiledText = {
   /** Whether to use a bold font (default: `false`) */
   bold: boolean;
   /** Hex-formatted color (#RRGGBB or #AARRGGBB) (default: `#000000`) */
@@ -172,7 +172,7 @@ export type TiledText = {
   /** Whether the text is wrapped within the object bounds (default: `false`) */
   wrap: boolean;
 };
-export type TiledTileset = {
+export declare type TiledTileset = {
   /** Hex-formatted color (#RRGGBB or #AARRGGBB) (optional) */
   backgroundcolor?: string;
   /** The number of tile columns in the tileset */
@@ -224,7 +224,7 @@ export type TiledTileset = {
   /** Array of {@link TiledWangSet} (since 1.1.5) */
   wangsets?: Array<TiledWangSet>;
 };
-export type TiledGrid = {
+export declare type TiledGrid = {
   /** Cell height of tile grid */
   height: integer;
   /** `orthogonal` (default) or `isometric` */
@@ -232,13 +232,13 @@ export type TiledGrid = {
   /** Cell width of tile grid */
   width: integer;
 };
-export type TileOffset = {
+export declare type TileOffset = {
   /** Horizontal offset in pixels */
   x: integer;
   /** Vertical offset in pixels (positive is down) */
   y: integer;
 };
-export type TiledTransformations = {
+export declare type TiledTransformations = {
   /** Tiles can be flipped horizontally */
   hflip: boolean;
   /** Tiles can be flipped vertically */
@@ -248,7 +248,7 @@ export type TiledTransformations = {
   /** Whether untransformed tiles remain preferred, otherwise transformed tiles are used to produce more variations */
   preferuntransformed: boolean;
 };
-export type TiledTileDefinition = {
+export declare type TiledTileDefinition = {
   /** Array of {@link TiledTiles} */
   animation?: Array<TiledTileDefinition>;
   /** The class of the tile (renamed from type since 1.9, optional) */
@@ -270,13 +270,13 @@ export type TiledTileDefinition = {
   /** Index of terrain for each corner of tile (optional) */
   terrain?: Array<integer>;
 };
-export type TiledFrame = {
+export declare type TiledFrame = {
   /** Frame duration in milliseconds */
   duration: integer;
   /** Local tile ID representing this frame */
   tileid: integer;
 };
-export type TiledTerrain = {
+export declare type TiledTerrain = {
   /** Name of terrain */
   name: string;
   /** Array of {@link TiledProperty} */
@@ -284,7 +284,7 @@ export type TiledTerrain = {
   /** Local ID of tile representing terrain */
   tile: integer;
 };
-export type TiledWangSet = {
+export declare type TiledWangSet = {
   /** Array of {@link TiledWangColor} */
   colors: Array<TiledWangColor>;
   /** Name of the Wang set */
@@ -296,7 +296,7 @@ export type TiledWangSet = {
   /** Array of {@link TiledWangTile} */
   wangtiles: Array<TiledWangTile>;
 };
-export type TiledWangColor = {
+export declare type TiledWangColor = {
   /** Hex-formatted color (#RRGGBB or #AARRGGBB) */
   color: string;
   /** Name of the Wang color */
@@ -308,13 +308,13 @@ export type TiledWangColor = {
   /** Local ID of tile representing the Wang color */
   tile: integer;
 };
-export type TiledWangTile = {
+export declare type TiledWangTile = {
   /** Local ID of tile */
   tileid: integer;
   /** Array of Wang color indexes (`uchar[8]`) */
   wangid: Array<integer>;
 };
-export type TiledObjectTemplate = {
+export declare type TiledObjectTemplate = {
   /** `template` */
   type: string;
   /** External tileset used by the template (optional) */
@@ -322,7 +322,7 @@ export type TiledObjectTemplate = {
   /** The object instantiated by this template */
   object: Object;
 };
-export type TiledProperty = {
+export declare type TiledProperty = {
   /** Name of the property */
   name: string;
   /** type of the property (`string` (default), `integer`, `float`, `boolean`, `color` or `file` (since 0.16, with `color` and `file` added in 0.17)) */
@@ -330,7 +330,7 @@ export type TiledProperty = {
   /** Value of the property */
   value: string | number;
 };
-export type TiledPoint = {
+export declare type TiledPoint = {
   /** X coordinate in pixels */
   x: float;
   /** Y coordinate in pixels */

Extensions/TileMap/helper/dts/load/tiled/TiledTileMapLoaderHelper.d.ts

@@ -12,7 +12,7 @@ export declare const decodeBase64LayerData: (
   pako: any,
   tiledLayer: TiledLayer
 ) => number[];
-export type TiledGID = {
+export declare type TiledGID = {
   id: integer;
   flippedHorizontally: boolean;
   flippedVertically: boolean;

Extensions/TileMap/helper/dts/load/tiled/TiledTileMapLoaderHelper.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"TiledTileMapLoaderHelper.d.ts","sourceRoot":"","sources":["../../../src/load/tiled/TiledTileMapLoaderHelper.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,OAAO,EAAE,MAAM,yBAAyB,CAAC;AAClD,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAE3C;;;;;;;GAOG;AACH,eAAO,MAAM,qBAAqB,SAAU,GAAG,cAAc,UAAU,aAgDtE,CAAC;AAEF,MAAM,MAAM,QAAQ,GAAG;IACrB,EAAE,EAAE,OAAO,CAAC;IACZ,mBAAmB,EAAE,OAAO,CAAC;IAC7B,iBAAiB,EAAE,OAAO,CAAC;IAC3B,iBAAiB,EAAE,OAAO,CAAC;CAC5B,CAAC;AAEF;;;;GAIG;AACH,eAAO,MAAM,2BAA2B,kBACvB,OAAO,KACrB,QAmBF,CAAC;AAEF;;;;GAIG;AACH,wBAAgB,qBAAqB,CACnC,QAAQ,EAAE,MAAM,GAAG,SAAS,GAC3B,MAAM,GAAG,SAAS,CAEpB"}
+{"version":3,"file":"TiledTileMapLoaderHelper.d.ts","sourceRoot":"","sources":["../../../src/load/tiled/TiledTileMapLoaderHelper.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,OAAO,EAAE,MAAM,yBAAyB,CAAC;AAClD,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAE3C;;;;;;;GAOG;AACH,eAAO,MAAM,qBAAqB,SAAU,GAAG,cAAc,UAAU,aAgDtE,CAAC;AAEF,oBAAY,QAAQ,GAAG;IACrB,EAAE,EAAE,OAAO,CAAC;IACZ,mBAAmB,EAAE,OAAO,CAAC;IAC7B,iBAAiB,EAAE,OAAO,CAAC;IAC3B,iBAAiB,EAAE,OAAO,CAAC;CAC5B,CAAC;AAEF;;;;GAIG;AACH,eAAO,MAAM,2BAA2B,kBACvB,OAAO,KACrB,QAmBF,CAAC;AAEF;;;;GAIG;AACH,wBAAgB,qBAAqB,CACnC,QAAQ,EAAE,MAAM,GAAG,SAAS,GAC3B,MAAM,GAAG,SAAS,CAEpB"}

Extensions/TileMap/helper/dts/model/CommonTypes.d.ts

@@ -1,5 +1,5 @@
 export declare type integer = number;
 export declare type float = number;
-export type FloatPoint = [float, float];
-export type PolygonVertices = FloatPoint[];
+export declare type FloatPoint = [float, float];
+export declare type PolygonVertices = FloatPoint[];
 //# sourceMappingURL=CommonTypes.d.ts.map

Extensions/TileMap/helper/dts/model/CommonTypes.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"CommonTypes.d.ts","sourceRoot":"","sources":["../../src/model/CommonTypes.ts"],"names":[],"mappings":"AAAA,MAAM,CAAC,OAAO,MAAM,OAAO,GAAG,MAAM,CAAC;AACrC,MAAM,CAAC,OAAO,MAAM,KAAK,GAAG,MAAM,CAAC;AACnC,MAAM,MAAM,UAAU,GAAG,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC;AAExC,MAAM,MAAM,eAAe,GAAG,UAAU,EAAE,CAAC"}
+{"version":3,"file":"CommonTypes.d.ts","sourceRoot":"","sources":["../../src/model/CommonTypes.ts"],"names":[],"mappings":"AAAA,MAAM,CAAC,OAAO,MAAM,OAAO,GAAG,MAAM,CAAC;AACrC,MAAM,CAAC,OAAO,MAAM,KAAK,GAAG,MAAM,CAAC;AACnC,oBAAY,UAAU,GAAG,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC;AAExC,oBAAY,eAAe,GAAG,UAAU,EAAE,CAAC"}

Extensions/TileMap/helper/dts/model/TileMapModel.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"TileMapModel.d.ts","sourceRoot":"","sources":["../../src/model/TileMapModel.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,OAAO,EAAE,KAAK,EAAE,MAAM,eAAe,CAAC;AAGhE;;;;;;;GAOG;AACH,qBAAa,eAAe;IAC1B,OAAO,CAAC,uBAAuB,CAAC,CAAS;IACzC,OAAO,CAAC,QAAQ,CAA+B;IAC/C,OAAO,CAAC,OAAO,CAA+B;IAC9C;;OAEG;IACH,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAU;IACpC;;OAEG;IACH,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAU;IACrC;;OAEG;IACH,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAU;IAC/B;;OAEG;IACH,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAU;IAE/B;;;;;;OAMG;gBAED,SAAS,EAAE,OAAO,EAClB,UAAU,EAAE,OAAO,EACnB,IAAI,EAAE,OAAO,EACb,IAAI,EAAE,OAAO,EAGb,OAAO,EAAE,GAAG,CAAC,OAAO,EAAE,cAAc,CAAC;IAUvC;;OAEG;IACH,QAAQ,IAAI,OAAO;IAInB;;OAEG;IACH,SAAS,IAAI,OAAO;IAIpB;;OAEG;IACH,aAAa,IAAI,OAAO;IAIxB;;OAEG;IACH,YAAY,IAAI,OAAO;IAIvB;;OAEG;IACH,aAAa,IAAI,OAAO;IAIxB;;OAEG;IACH,aAAa,IAAI,OAAO;IAIxB;;;OAGG;IACH,iBAAiB,CAAC,MAAM,EAAE,OAAO,GAAG,cAAc,GAAG,SAAS;IAI9D;;OAEG;IACH,kBAAkB,IAAI,QAAQ,CAAC,cAAc,CAAC;IAI9C;;;OAGG;IACH,YAAY,CAAC,EAAE,EAAE,OAAO,GAAG,oBAAoB;IAM/C;;;OAGG;IACH,cAAc,CAAC,EAAE,EAAE,OAAO,GAAG,mBAAmB;IAMhD;;OAEG;IACH,yBAAyB,IAAI,MAAM;IAInC;;OAEG;IACH,SAAS,IAAI,QAAQ,CAAC,qBAAqB,CAAC;IAI5C;;;;;;;;;;OAUG;IACH,iBAAiB,CAAC,CAAC,EAAE,KAAK,EAAE,CAAC,EAAE,KAAK,EAAE,GAAG,EAAE,MAAM,GAAG,OAAO;IAoB3D;;OAEG;IACH,yBAAyB,CAAC,YAAY,EAAE,MAAM,GAAG,IAAI;CAGtD;AAED;;GAEG;AACH,uBAAe,qBAAqB;IAClC;;OAEG;IACH,QAAQ,CAAC,OAAO,EAAE,eAAe,CAAC;IAClC;;OAEG;IACH,QAAQ,CAAC,EAAE,EAAE,OAAO,CAAC;IACrB,OAAO,CAAC,OAAO,CAAiB;IAEhC;;;OAGG;gBACS,OAAO,EAAE,eAAe,EAAE,EAAE,EAAE,OAAO;IAKjD,UAAU,CAAC,OAAO,EAAE,OAAO,GAAG,IAAI;IAIlC;;OAEG;IACH,SAAS,IAAI,OAAO;CAGrB;AAED;;GAEG;AACH,qBAAa,mBAAoB,SAAQ,qBAAqB;IAC5D,QAAQ,CAAC,OAAO,EAAE,UAAU,EAAE,CAAC;IAE/B;;;OAGG;gBACS,OAAO,EAAE,eAAe,EAAE,EAAE,EAAE,OAAO;IAKjD,GAAG,CAAC,MAAM,EAAE,UAAU,GAAG,IAAI;CAG9B;AAED;;GAEG;AACH,qBAAa,UAAU;IACrB;;OAEG;IACH,OAAO,CAAC,MAAM,CAAU;IACxB;;OAEG;IACH,QAAQ,CAAC,CAAC,EAAE,KAAK,CAAC;IAClB;;OAEG;IACH,QAAQ,CAAC,CAAC,EAAE,KAAK,CAAC;IAElB;;;;OAIG;gBACS,CAAC,EAAE,KAAK,EAAE,CAAC,EAAE,KAAK,EAAE,MAAM,EAAE,OAAO;IAM/C;;OAEG;IACH,SAAS,IAAI,OAAO;IAIpB,sBAAsB,CAAC,mBAAmB,EAAE,OAAO,GAAG,IAAI;IAO1D,oBAAoB,CAAC,iBAAiB,EAAE,OAAO,GAAG,IAAI;IAOtD,oBAAoB,CAAC,iBAAiB,EAAE,OAAO,GAAG,IAAI;IAOtD;;OAEG;IACH,qBAAqB,IAAI,OAAO;IAIhC;;OAEG;IACH,mBAAmB,IAAI,OAAO;IAI9B;;OAEG;IACH,mBAAmB,IAAI,OAAO;CAG/B;AAED;;GAEG;AACH,qBAAa,oBAAqB,SAAQ,qBAAqB;IAC7D,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAe;IACtC,OAAO,CAAC,MAAM,CAAQ;IAEtB;;;OAGG;gBACS,OAAO,EAAE,eAAe,EAAE,EAAE,EAAE,OAAO;IAUjD;;OAEG;IACH,QAAQ,IAAI,KAAK;IAIjB;;OAEG;IACH,QAAQ,CAAC,KAAK,EAAE,KAAK;IAIrB;;;;OAIG;IACH,OAAO,CAAC,CAAC,EAAE,OAAO,EAAE,CAAC,EAAE,OAAO,EAAE,MAAM,EAAE,OAAO,GAAG,IAAI;IAUtD;;;OAGG;IACH,UAAU,CAAC,CAAC,EAAE,OAAO,EAAE,CAAC,EAAE,OAAO,GAAG,IAAI;IAKxC;;;;OAIG;IACH,sBAAsB,CACpB,CAAC,EAAE,OAAO,EACV,CAAC,EAAE,OAAO,EACV,mBAAmB,EAAE,OAAO,GAC3B,IAAI;IAWP;;;;OAIG;IACH,oBAAoB,CAClB,CAAC,EAAE,OAAO,EACV,CAAC,EAAE,OAAO,EACV,iBAAiB,EAAE,OAAO,GACzB,IAAI;IAWP;;;;OAIG;IACH,oBAAoB,CAClB,CAAC,EAAE,OAAO,EACV,CAAC,EAAE,OAAO,EACV,iBAAiB,EAAE,OAAO,GACzB,IAAI;IAWP;;;;OAIG;IACH,qBAAqB,CAAC,CAAC,EAAE,OAAO,EAAE,CAAC,EAAE,OAAO,GAAG,OAAO;IAItD;;;;OAIG;IACH,mBAAmB,CAAC,CAAC,EAAE,OAAO,EAAE,CAAC,EAAE,OAAO,GAAG,OAAO;IAIpD;;;;OAIG;IACH,mBAAmB,CAAC,CAAC,EAAE,OAAO,EAAE,CAAC,EAAE,OAAO,GAAG,OAAO;IAIpD;;;;OAIG;IACH,UAAU,CAAC,CAAC,EAAE,OAAO,EAAE,CAAC,EAAE,OAAO,GAAG,OAAO,GAAG,SAAS;IASvD;;;;OAIG;IACH,SAAS,CAAC,CAAC,EAAE,OAAO,EAAE,CAAC,EAAE,OAAO,GAAG,OAAO,GAAG,SAAS;IAUtD;;OAEG;IACH,aAAa,IAAI,OAAO;IAIxB;;OAEG;IACH,aAAa,IAAI,OAAO;IAIxB;;OAEG;IACH,QAAQ,IAAI,OAAO;IAInB;;OAEG;IACH,SAAS,IAAI,OAAO;CAGrB;AAED;;GAEG;AACH,qBAAa,cAAc;IACzB;;;OAGG;IACH,OAAO,CAAC,QAAQ,CAAC,cAAc,CAG3B;IACJ,OAAO,CAAC,QAAQ,CAAC,eAAe,CAAU;IAE1C;;OAEG;IACH,OAAO,CAAC,YAAY,CAAY;IAChC,OAAO,CAAC,WAAW,CAAC,CAAU;IAE9B;;OAEG;gBACS,eAAe,CAAC,EAAE,OAAO;IAMrC;;;;OAIG;IACH,SAAS,CAAC,GAAG,EAAE,MAAM,EAAE,OAAO,EAAE,eAAe,GAAG,IAAI;IAStD;;;;;OAKG;IACH,eAAe,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO;IAIrC;;;;OAIG;IACH,WAAW,CAAC,GAAG,EAAE,MAAM,GAAG,eAAe,EAAE,GAAG,SAAS;IAOvD;;;;;OAKG;IACH,kBAAkB,IAAI,OAAO;IAI7B;;OAEG;IACH,cAAc,IAAI,OAAO;IAIzB;;OAEG;IACH,eAAe,IAAI,OAAO,EAAE;IAI5B;;OAEG;IACH,eAAe,IAAI,OAAO;IAI1B;;;OAGG;IACH,eAAe,CAAC,WAAW,EAAE,OAAO,EAAE,GAAG,KAAK,EAAE,OAAO,EAAE,GAAG,IAAI;CAIjE"}
+{"version":3,"file":"TileMapModel.d.ts","sourceRoot":"","sources":["../../src/model/TileMapModel.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,OAAO,EAAE,KAAK,EAAE,MAAM,eAAe,CAAC;AAGhE;;;;;;;GAOG;AACH,qBAAa,eAAe;IAC1B,OAAO,CAAC,uBAAuB,CAAC,CAAS;IACzC,OAAO,CAAC,QAAQ,CAA+B;IAC/C,OAAO,CAAC,OAAO,CAA+B;IAC9C;;OAEG;IACH,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAU;IACpC;;OAEG;IACH,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAU;IACrC;;OAEG;IACH,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAU;IAC/B;;OAEG;IACH,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAU;IAE/B;;;;;;OAMG;gBAED,SAAS,EAAE,OAAO,EAClB,UAAU,EAAE,OAAO,EACnB,IAAI,EAAE,OAAO,EACb,IAAI,EAAE,OAAO,EAGb,OAAO,EAAE,GAAG,CAAC,OAAO,EAAE,cAAc,CAAC;IAUvC;;OAEG;IACH,QAAQ,IAAI,OAAO;IAInB;;OAEG;IACH,SAAS,IAAI,OAAO;IAIpB;;OAEG;IACH,aAAa,IAAI,OAAO;IAIxB;;OAEG;IACH,YAAY,IAAI,OAAO;IAIvB;;OAEG;IACH,aAAa,IAAI,OAAO;IAIxB;;OAEG;IACH,aAAa,IAAI,OAAO;IAIxB;;;OAGG;IACH,iBAAiB,CAAC,MAAM,EAAE,OAAO,GAAG,cAAc,GAAG,SAAS;IAI9D;;OAEG;IACH,kBAAkB,IAAI,QAAQ,CAAC,cAAc,CAAC;IAI9C;;;OAGG;IACH,YAAY,CAAC,EAAE,EAAE,OAAO,GAAG,oBAAoB;IAM/C;;;OAGG;IACH,cAAc,CAAC,EAAE,EAAE,OAAO,GAAG,mBAAmB;IAMhD;;OAEG;IACH,yBAAyB,IAAI,MAAM;IAInC;;OAEG;IACH,SAAS,IAAI,QAAQ,CAAC,qBAAqB,CAAC;IAI5C;;;;;;;;;;OAUG;IACH,iBAAiB,CAAC,CAAC,EAAE,KAAK,EAAE,CAAC,EAAE,KAAK,EAAE,GAAG,EAAE,MAAM,GAAG,OAAO;IAoB3D;;OAEG;IACH,yBAAyB,CAAC,YAAY,EAAE,MAAM,GAAG,IAAI;CAGtD;AAED;;GAEG;AACH,uBAAe,qBAAqB;IAClC;;OAEG;IACH,QAAQ,CAAC,OAAO,EAAE,eAAe,CAAC;IAClC;;OAEG;IACH,QAAQ,CAAC,EAAE,EAAE,OAAO,CAAC;IACrB,OAAO,CAAC,OAAO,CAAiB;IAEhC;;;OAGG;gBACS,OAAO,EAAE,eAAe,EAAE,EAAE,EAAE,OAAO;IAKjD,UAAU,CAAC,OAAO,EAAE,OAAO,GAAG,IAAI;IAIlC;;OAEG;IACH,SAAS,IAAI,OAAO;CAGrB;AAED;;GAEG;AACH,qBAAa,mBAAoB,SAAQ,qBAAqB;IAC5D,QAAQ,CAAC,OAAO,EAAE,UAAU,EAAE,CAAC;IAE/B;;;OAGG;gBACS,OAAO,EAAE,eAAe,EAAE,EAAE,EAAE,OAAO;IAKjD,GAAG,CAAC,MAAM,EAAE,UAAU,GAAG,IAAI;CAG9B;AAED;;GAEG;AACH,qBAAa,UAAU;IACrB;;OAEG;IACH,OAAO,CAAC,MAAM,CAAU;IACxB;;OAEG;IACH,QAAQ,CAAC,CAAC,EAAE,KAAK,CAAC;IAClB;;OAEG;IACH,QAAQ,CAAC,CAAC,EAAE,KAAK,CAAC;IAElB;;;;OAIG;gBACS,CAAC,EAAE,KAAK,EAAE,CAAC,EAAE,KAAK,EAAE,MAAM,EAAE,OAAO;IAM/C;;OAEG;IACH,SAAS,IAAI,OAAO;IAIpB,sBAAsB,CAAC,mBAAmB,EAAE,OAAO,GAAG,IAAI;IAO1D,oBAAoB,CAAC,iBAAiB,EAAE,OAAO,GAAG,IAAI;IAOtD,oBAAoB,CAAC,iBAAiB,EAAE,OAAO,GAAG,IAAI;IAOtD;;OAEG;IACH,qBAAqB,IAAI,OAAO;IAIhC;;OAEG;IACH,mBAAmB,IAAI,OAAO;IAI9B;;OAEG;IACH,mBAAmB,IAAI,OAAO;CAG/B;AAED;;GAEG;AACH,qBAAa,oBAAqB,SAAQ,qBAAqB;IAC7D,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAe;IACtC,OAAO,CAAC,MAAM,CAAQ;IAEtB;;;OAGG;gBACS,OAAO,EAAE,eAAe,EAAE,EAAE,EAAE,OAAO;IAUjD;;OAEG;IACH,QAAQ,IAAI,KAAK;IAIjB;;OAEG;IACH,QAAQ,CAAC,KAAK,EAAE,KAAK;IAIrB;;;;OAIG;IACH,OAAO,CAAC,CAAC,EAAE,OAAO,EAAE,CAAC,EAAE,OAAO,EAAE,MAAM,EAAE,OAAO,GAAG,IAAI;IAgBtD;;;OAGG;IACH,UAAU,CAAC,CAAC,EAAE,OAAO,EAAE,CAAC,EAAE,OAAO,GAAG,IAAI;IAWxC;;;;OAIG;IACH,sBAAsB,CACpB,CAAC,EAAE,OAAO,EACV,CAAC,EAAE,OAAO,EACV,mBAAmB,EAAE,OAAO,GAC3B,IAAI;IAiBP;;;;OAIG;IACH,oBAAoB,CAClB,CAAC,EAAE,OAAO,EACV,CAAC,EAAE,OAAO,EACV,iBAAiB,EAAE,OAAO,GACzB,IAAI;IAiBP;;;;OAIG;IACH,oBAAoB,CAClB,CAAC,EAAE,OAAO,EACV,CAAC,EAAE,OAAO,EACV,iBAAiB,EAAE,OAAO,GACzB,IAAI;IAiBP;;;;OAIG;IACH,qBAAqB,CAAC,CAAC,EAAE,OAAO,EAAE,CAAC,EAAE,OAAO,GAAG,OAAO;IAUtD;;;;OAIG;IACH,mBAAmB,CAAC,CAAC,EAAE,OAAO,EAAE,CAAC,EAAE,OAAO,GAAG,OAAO;IAUpD;;;;OAIG;IACH,mBAAmB,CAAC,CAAC,EAAE,OAAO,EAAE,CAAC,EAAE,OAAO,GAAG,OAAO;IAUpD;;;;OAIG;IACH,UAAU,CAAC,CAAC,EAAE,OAAO,EAAE,CAAC,EAAE,OAAO,GAAG,OAAO,GAAG,SAAS;IASvD;;;;OAIG;IACH,SAAS,CAAC,CAAC,EAAE,OAAO,EAAE,CAAC,EAAE,OAAO,GAAG,OAAO,GAAG,SAAS;IAUtD;;OAEG;IACH,aAAa,IAAI,OAAO;IAIxB;;OAEG;IACH,aAAa,IAAI,OAAO;IAIxB;;OAEG;IACH,QAAQ,IAAI,OAAO;IAInB;;OAEG;IACH,SAAS,IAAI,OAAO;CAGrB;AAED;;GAEG;AACH,qBAAa,cAAc;IACzB;;;OAGG;IACH,OAAO,CAAC,QAAQ,CAAC,cAAc,CAG3B;IACJ,OAAO,CAAC,QAAQ,CAAC,eAAe,CAAU;IAE1C;;OAEG;IACH,OAAO,CAAC,YAAY,CAAY;IAChC,OAAO,CAAC,WAAW,CAAC,CAAU;IAE9B;;OAEG;gBACS,eAAe,CAAC,EAAE,OAAO;IAMrC;;;;OAIG;IACH,SAAS,CAAC,GAAG,EAAE,MAAM,EAAE,OAAO,EAAE,eAAe,GAAG,IAAI;IAStD;;;;;OAKG;IACH,eAAe,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO;IAIrC;;;;OAIG;IACH,WAAW,CAAC,GAAG,EAAE,MAAM,GAAG,eAAe,EAAE,GAAG,SAAS;IAOvD;;;;;OAKG;IACH,kBAAkB,IAAI,OAAO;IAI7B;;OAEG;IACH,cAAc,IAAI,OAAO;IAIzB;;OAEG;IACH,eAAe,IAAI,OAAO,EAAE;IAI5B;;OAEG;IACH,eAAe,IAAI,OAAO;IAI1B;;;OAGG;IACH,eAAe,CAAC,WAAW,EAAE,OAAO,EAAE,GAAG,KAAK,EAAE,OAAO,EAAE,GAAG,IAAI;CAIjE"}

Extensions/TileMap/helper/dts/render/TileMapManager.d.ts

@@ -1,7 +1,7 @@
 import { EditableTileMap } from '../model/TileMapModel';
 import { TileTextureCache } from './TileTextureCache';
 import PIXI = GlobalPIXIModule.PIXI;
-import { TileMap } from '../types';
+import { TileMapFileContent } from '../load/TileMapFileContent';
 /**
  * A holder to share tile maps across the 2 extension objects.
  *
@@ -23,7 +23,7 @@ export declare class TileMapManager {
    * @param data JSON data.
    * @returns The data enclosed with its detected kind.
    */
-  static identify(data: any): TileMap | null;
+  static identify(data: any): TileMapFileContent | null;
   /**
    * @param loadTileMap The method that loads the Tiled JSON file in memory.
    * @param tileMapJsonResourceName The resource name of the tile map.
@@ -36,7 +36,7 @@ export declare class TileMapManager {
     loadTileMap: (
       tileMapJsonResourceName: string,
       tileSetJsonResourceName: string,
-      callback: (tileMap: TileMap | null) => void
+      callback: (tileMapFileContent: TileMapFileContent | null) => void
     ) => void,
     tileMapJsonResourceName: string,
     tileSetJsonResourceName: string,
@@ -57,7 +57,7 @@ export declare class TileMapManager {
     loadTileMap: (
       tileMapJsonResourceName: string,
       tileSetJsonResourceName: string,
-      callback: (tileMap: TileMap | null) => void
+      callback: (tileMapFileContent: TileMapFileContent | null) => void
     ) => void,
     getTexture: (textureName: string) => PIXI.BaseTexture<PIXI.Resource>,
     atlasImageResourceName: string,

Extensions/TileMap/helper/dts/render/TileMapManager.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"TileMapManager.d.ts","sourceRoot":"","sources":["../../src/render/TileMapManager.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AACxD,OAAO,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AAGtD,OAAO,IAAI,GAAG,gBAAgB,CAAC,IAAI,CAAC;AAEpC,OAAO,EAAE,OAAO,EAAE,MAAM,UAAU,CAAC;AAEnC;;;;;;;GAOG;AACH,qBAAa,cAAc;IACzB,OAAO,CAAC,aAAa,CAAiC;IACtD,OAAO,CAAC,mBAAmB,CAAkC;;IAO7D;;;OAGG;IACH,MAAM,CAAC,UAAU,CAAC,cAAc,EAAE,MAAM,GAAG,cAAc;IAWzD;;;OAGG;IACH,MAAM,CAAC,QAAQ,CAAC,IAAI,EAAE,GAAG,GAAG,OAAO,GAAG,IAAI;IAyB1C;;;;;;;OAOG;IACH,gBAAgB,CACd,WAAW,EAAE,CACX,uBAAuB,EAAE,MAAM,EAC/B,uBAAuB,EAAE,MAAM,EAC/B,QAAQ,EAAE,CAAC,OAAO,EAAE,OAAO,GAAG,IAAI,KAAK,IAAI,KACxC,IAAI,EACT,uBAAuB,EAAE,MAAM,EAC/B,uBAAuB,EAAE,MAAM,EAC/B,UAAU,EAAE,MAAM,EAClB,IAAI,EAAE,GAAG,EACT,QAAQ,EAAE,CAAC,OAAO,EAAE,eAAe,GAAG,IAAI,KAAK,IAAI,GAClD,IAAI;IAiCP;;;;;;;;OAQG;IACH,qBAAqB,CACnB,WAAW,EAAE,CACX,uBAAuB,EAAE,MAAM,EAC/B,uBAAuB,EAAE,MAAM,EAC/B,QAAQ,EAAE,CAAC,OAAO,EAAE,OAAO,GAAG,IAAI,KAAK,IAAI,KACxC,IAAI,EACT,UAAU,EAAE,CAAC,WAAW,EAAE,MAAM,KAAK,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,QAAQ,CAAC,EACpE,sBAAsB,EAAE,MAAM,EAC9B,uBAAuB,EAAE,MAAM,EAC/B,uBAAuB,EAAE,MAAM,EAC/B,UAAU,EAAE,MAAM,EAClB,QAAQ,EAAE,CAAC,YAAY,EAAE,gBAAgB,GAAG,IAAI,KAAK,IAAI,GACxD,IAAI;CAuCR"}
+{"version":3,"file":"TileMapManager.d.ts","sourceRoot":"","sources":["../../src/render/TileMapManager.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AACxD,OAAO,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AAGtD,OAAO,IAAI,GAAG,gBAAgB,CAAC,IAAI,CAAC;AAEpC,OAAO,EAAE,kBAAkB,EAAE,MAAM,4BAA4B,CAAC;AAEhE;;;;;;;GAOG;AACH,qBAAa,cAAc;IACzB,OAAO,CAAC,aAAa,CAAiC;IACtD,OAAO,CAAC,mBAAmB,CAAkC;;IAO7D;;;OAGG;IACH,MAAM,CAAC,UAAU,CAAC,cAAc,EAAE,MAAM,GAAG,cAAc;IAWzD;;;OAGG;IACH,MAAM,CAAC,QAAQ,CAAC,IAAI,EAAE,GAAG,GAAG,kBAAkB,GAAG,IAAI;IAwBrD;;;;;;;OAOG;IACH,gBAAgB,CACd,WAAW,EAAE,CACX,uBAAuB,EAAE,MAAM,EAC/B,uBAAuB,EAAE,MAAM,EAC/B,QAAQ,EAAE,CAAC,kBAAkB,EAAE,kBAAkB,GAAG,IAAI,KAAK,IAAI,KAC9D,IAAI,EACT,uBAAuB,EAAE,MAAM,EAC/B,uBAAuB,EAAE,MAAM,EAC/B,UAAU,EAAE,MAAM,EAClB,IAAI,EAAE,GAAG,EACT,QAAQ,EAAE,CAAC,OAAO,EAAE,eAAe,GAAG,IAAI,KAAK,IAAI,GAClD,IAAI;IAiCP;;;;;;;;OAQG;IACH,qBAAqB,CACnB,WAAW,EAAE,CACX,uBAAuB,EAAE,MAAM,EAC/B,uBAAuB,EAAE,MAAM,EAC/B,QAAQ,EAAE,CAAC,kBAAkB,EAAE,kBAAkB,GAAG,IAAI,KAAK,IAAI,KAC9D,IAAI,EACT,UAAU,EAAE,CAAC,WAAW,EAAE,MAAM,KAAK,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,QAAQ,CAAC,EACpE,sBAAsB,EAAE,MAAM,EAC9B,uBAAuB,EAAE,MAAM,EAC/B,uBAAuB,EAAE,MAAM,EAC/B,UAAU,EAAE,MAAM,EAClB,QAAQ,EAAE,CAAC,YAAY,EAAE,gBAAgB,GAAG,IAAI,KAAK,IAAI,GACxD,IAAI;CAuCR"}

Extensions/TileMap/helper/dts/render/TileMapPixiHelper.d.ts

@@ -1,6 +1,6 @@
 import { integer, float } from '../model/CommonTypes';
 import { EditableTileMap } from '../model/TileMapModel';
-import { TileMap } from '../types';
+import { TileMapFileContent } from '../load/TileMapFileContent';
 import { TileTextureCache } from './TileTextureCache';
 import PIXI = GlobalPIXIModule.PIXI;
 export declare namespace PixiTileMapHelper {
@@ -14,7 +14,7 @@ export declare namespace PixiTileMapHelper {
    * @returns A textures cache.
    */
   function parseAtlas(
-    tileMap: TileMap,
+    tileMap: TileMapFileContent,
     levelIndex: number,
     atlasTexture: PIXI.BaseTexture<PIXI.Resource> | null,
     getTexture: (textureName: string) => PIXI.BaseTexture<PIXI.Resource>

Extensions/TileMap/helper/dts/render/TileMapPixiHelper.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"TileMapPixiHelper.d.ts","sourceRoot":"","sources":["../../src/render/TileMapPixiHelper.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,MAAM,sBAAsB,CAAC;AACtD,OAAO,EAEL,eAAe,EAEhB,MAAM,uBAAuB,CAAC;AAG/B,OAAO,EAAE,OAAO,EAAE,MAAM,UAAU,CAAC;AACnC,OAAO,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AAGtD,OAAO,IAAI,GAAG,gBAAgB,CAAC,IAAI,CAAC;AAEpC,yBAAiB,iBAAiB,CAAC;IACjC;;;;;;;;OAQG;IACH,SAAgB,UAAU,CACxB,OAAO,EAAE,OAAO,EAChB,UAAU,EAAE,MAAM,EAClB,YAAY,EAAE,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,QAAQ,CAAC,GAAG,IAAI,EACpD,UAAU,EAAE,CAAC,WAAW,EAAE,MAAM,KAAK,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,QAAQ,CAAC,GACnE,gBAAgB,GAAG,IAAI,CAuBzB;IAED;;;;;;;;;;;;OAYG;IACH,SAAgB,iBAAiB,CAC/B,kBAAkB,EAAE,GAAG,EACvB,OAAO,EAAE,eAAe,EACxB,YAAY,EAAE,gBAAgB,EAC9B,WAAW,EAAE,OAAO,GAAG,SAAS,GAAG,KAAK,EACxC,UAAU,EAAE,MAAM,GACjB,IAAI,CA0GN;IAED;;OAEG;IACH,SAAgB,uBAAuB,CACrC,YAAY,EAAE,IAAI,CAAC,QAAQ,EAC3B,OAAO,EAAE,eAAe,EACxB,UAAU,EAAE,MAAM,EAClB,WAAW,EAAE,OAAO,EACpB,YAAY,EAAE,OAAO,EACrB,cAAc,EAAE,KAAK,EACrB,SAAS,EAAE,OAAO,EAClB,WAAW,EAAE,KAAK,GACjB,IAAI,CAgEN;CACF"}
+{"version":3,"file":"TileMapPixiHelper.d.ts","sourceRoot":"","sources":["../../src/render/TileMapPixiHelper.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,MAAM,sBAAsB,CAAC;AACtD,OAAO,EAEL,eAAe,EAEhB,MAAM,uBAAuB,CAAC;AAG/B,OAAO,EAAE,kBAAkB,EAAE,MAAM,4BAA4B,CAAC;AAChE,OAAO,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AAGtD,OAAO,IAAI,GAAG,gBAAgB,CAAC,IAAI,CAAC;AAEpC,yBAAiB,iBAAiB,CAAC;IACjC;;;;;;;;OAQG;IACH,SAAgB,UAAU,CACxB,OAAO,EAAE,kBAAkB,EAC3B,UAAU,EAAE,MAAM,EAClB,YAAY,EAAE,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,QAAQ,CAAC,GAAG,IAAI,EACpD,UAAU,EAAE,CAAC,WAAW,EAAE,MAAM,KAAK,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,QAAQ,CAAC,GACnE,gBAAgB,GAAG,IAAI,CAuBzB;IAED;;;;;;;;;;;;OAYG;IACH,SAAgB,iBAAiB,CAC/B,kBAAkB,EAAE,GAAG,EACvB,OAAO,EAAE,eAAe,EACxB,YAAY,EAAE,gBAAgB,EAC9B,WAAW,EAAE,OAAO,GAAG,SAAS,GAAG,KAAK,EACxC,UAAU,EAAE,MAAM,GACjB,IAAI,CA0GN;IAED;;OAEG;IACH,SAAgB,uBAAuB,CACrC,YAAY,EAAE,IAAI,CAAC,QAAQ,EAC3B,OAAO,EAAE,eAAe,EACxB,UAAU,EAAE,MAAM,EAClB,WAAW,EAAE,OAAO,EACpB,YAAY,EAAE,OAAO,EACrB,cAAc,EAAE,KAAK,EACrB,SAAS,EAAE,OAAO,EAClB,WAAW,EAAE,KAAK,GACjB,IAAI,CAgEN;CACF"}

Extensions/TileMap/helper/dts/render/ldtk/LDtkPixiHelper.d.ts

@@ -1,8 +1,10 @@
 import { TileTextureCache } from '../TileTextureCache';
 import { LDtkTileMap } from '../../load/ldtk/LDtkFormat';
 import PIXI = GlobalPIXIModule.PIXI;
-type Texture = PIXI.BaseTexture<PIXI.Resource>;
-type TextureLoader = (textureName: string) => PIXI.BaseTexture<PIXI.Resource>;
+declare type Texture = PIXI.BaseTexture<PIXI.Resource>;
+declare type TextureLoader = (
+  textureName: string
+) => PIXI.BaseTexture<PIXI.Resource>;
 export declare namespace LDtkPixiHelper {
   /**
    * Split an atlas image into Pixi textures.

Extensions/TileMap/helper/dts/render/ldtk/LDtkPixiHelper.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"LDtkPixiHelper.d.ts","sourceRoot":"","sources":["../../../src/render/ldtk/LDtkPixiHelper.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;AACvD,OAAO,EAAE,WAAW,EAAkB,MAAM,4BAA4B,CAAC;AAEzE,OAAO,IAAI,GAAG,gBAAgB,CAAC,IAAI,CAAC;AAEpC,KAAK,OAAO,GAAG,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;AAC/C,KAAK,aAAa,GAAG,CAAC,WAAW,EAAE,MAAM,KAAK,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;AAmC9E,yBAAiB,cAAc,CAAC;IAC9B;;;;;;;;OAQG;IACH,SAAgB,UAAU,CACxB,OAAO,EAAE,WAAW,EACpB,UAAU,EAAE,MAAM,EAClB,YAAY,EAAE,OAAO,GAAG,IAAI,EAC5B,UAAU,EAAE,aAAa,GACxB,gBAAgB,GAAG,IAAI,CAoFzB;CACF"}
+{"version":3,"file":"LDtkPixiHelper.d.ts","sourceRoot":"","sources":["../../../src/render/ldtk/LDtkPixiHelper.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;AACvD,OAAO,EAAE,WAAW,EAAkB,MAAM,4BAA4B,CAAC;AAEzE,OAAO,IAAI,GAAG,gBAAgB,CAAC,IAAI,CAAC;AAEpC,aAAK,OAAO,GAAG,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;AAC/C,aAAK,aAAa,GAAG,CAAC,WAAW,EAAE,MAAM,KAAK,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;AAmC9E,yBAAiB,cAAc,CAAC;IAC9B;;;;;;;;OAQG;IACH,SAAgB,UAAU,CACxB,OAAO,EAAE,WAAW,EACpB,UAAU,EAAE,MAAM,EAClB,YAAY,EAAE,OAAO,GAAG,IAAI,EAC5B,UAAU,EAAE,aAAa,GACxB,gBAAgB,GAAG,IAAI,CAoFzB;CACF"}

Extensions/TileMap/helper/dts/types/index.d.ts

@@ -1,6 +1,6 @@
 import { LDtkTileMap } from '../load/ldtk/LDtkFormat';
 import { TiledTileMap } from '../load/tiled/TiledFormat';
-export type TileMap =
+export declare type TileMap =
   | {
       kind: 'tiled';
       data: TiledTileMap;

Extensions/TileMap/helper/dts/types/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/types/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AACtD,OAAO,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AAEzD,MAAM,MAAM,OAAO,GACf;IACE,IAAI,EAAE,OAAO,CAAC;IACd,IAAI,EAAE,YAAY,CAAC;CACpB,GACD;IACE,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,WAAW,CAAC;CACnB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/types/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AACtD,OAAO,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AAEzD,oBAAY,OAAO,GACf;IACE,IAAI,EAAE,OAAO,CAAC;IACd,IAAI,EAAE,YAAY,CAAC;CACpB,GACD;IACE,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,WAAW,CAAC;CACnB,CAAC"}

Extensions/TileMap/tests/tilemapcollisionmaskruntimeobject.spec.js

@@ -1,10 +1,7 @@
 // @ts-check
 describe('gdjs.TileMapCollisionMaskRuntimeObject', function () {
   const createScene = (framePerSecond = 60) => {
-    const runtimeGame = new gdjs.RuntimeGame({
-      variables: [],
-      // @ts-ignore - missing properties.
-      properties: { windowWidth: 800, windowHeight: 600 },
+    const runtimeGame = gdjs.getPixiRuntimeGame({
       resources: {
         resources: [
           {
@@ -121,7 +118,7 @@ describe('gdjs.TileMapCollisionMaskRuntimeObject', function () {
       // TODO find a clean way to wait for the json to be read.
       for (
         let index = 0;
-        index < 200 && tileMap._collisionTileMap.getDimensionX() === 0;
+        index < 30 && tileMap._collisionTileMap.getDimensionX() === 0;
         index++
       ) {
         await delay(100);
@@ -268,10 +265,10 @@ describe('gdjs.TileMapCollisionMaskRuntimeObject', function () {
       // TODO find a clean way to wait for the json to be read.
       for (
         let index = 0;
-        index < 200 && tileMap._collisionTileMap.getDimensionX() === 0;
+        index < 100 && tileMap._collisionTileMap.getDimensionX() === 0;
         index++
       ) {
-        await delay(5);
+        await delay(50);
       }
       if (tileMap._collisionTileMap.getDimensionX() === 0) {
         throw new Error('Timeout reading the tile map JSON file.');

Extensions/TopDownMovementBehavior/Extension.cpp

@@ -358,7 +358,22 @@ void DeclareTopDownMovementBehaviorExtension(gd::PlatformExtension& extension) {
           gd::ParameterOptions::MakeNewOptions().SetDescription(
               _("Angle to compare to (in degrees)")))
       .MarkAsAdvanced()
+      .SetHidden()
       .SetFunctionName("GetAngle");
+    
+    aut.AddScopedCondition(
+           "IsMovementAngleAround",
+           _("Angle of movement"),
+           _("Compare the angle of the top-down movement of the object."),
+           _("Angle of movement of _PARAM0_ is _PARAM2_ (tolerance"
+             ": _PARAM3_ degrees)"),
+         _("Movement"),
+         "CppPlatform/Extensions/topdownmovementicon24.png",
+         "CppPlatform/Extensions/topdownmovementicon16.png")
+        .AddParameter("object", _("Object"))
+        .AddParameter("behavior", _("Behavior"), "TopDownMovementBehavior")
+        .AddParameter("expression", _("Angle (in degrees)"))
+        .AddParameter("expression", _("Tolerance (in degrees)"));
 
   aut.AddCondition("XVelocity",
                    _("Speed on X axis"),

Extensions/TopDownMovementBehavior/JsExtension.cpp

@@ -68,7 +68,10 @@ class TopDownMovementBehaviorJsExtension : public gd::PlatformExtension {
         .SetGetter("getAngleOffset");
     autConditions["TopDownMovementBehavior::AngleOffset"].SetFunctionName(
         "getAngleOffset");
+    // Deprecated, prefer IsMovementAngleAround instead.
     autConditions["TopDownMovementBehavior::Angle"].SetFunctionName("getAngle");
+    autConditions["TopDownMovementBehavior::TopDownMovementBehavior::IsMovementAngleAround"]
+        .SetFunctionName("isMovementAngleAround");
     autConditions["TopDownMovementBehavior::XVelocity"].SetFunctionName(
         "getXVelocity");
     autConditions["TopDownMovementBehavior::YVelocity"].SetFunctionName(