Specify filename when generating icons

Do not show in changelog

.circleci/config.yml

@@ -30,7 +30,7 @@ jobs:
 
       - run:
           name: Install Emscripten (for GDevelop.js)
-          command: git clone https://github.com/juj/emsdk.git && cd emsdk && ./emsdk install 1.39.6 && ./emsdk activate 1.39.6 && cd ..
+          command: git clone https://github.com/juj/emsdk.git && cd emsdk && ./emsdk install 3.1.21 && ./emsdk activate 3.1.21 && cd ..
 
       # GDevelop.js dependencies
       - restore_cache:
@@ -107,7 +107,7 @@ jobs:
 
       - run:
           name: Install Emscripten (for GDevelop.js)
-          command: git clone https://github.com/juj/emsdk.git && cd emsdk && ./emsdk install 1.39.6 && ./emsdk activate 1.39.6 && cd ..
+          command: git clone https://github.com/juj/emsdk.git && cd emsdk && ./emsdk install 3.1.21 && ./emsdk activate 3.1.21 && cd ..
 
       - run:
           name: Install system dependencies for Electron builder
@@ -127,7 +127,8 @@ jobs:
       # Build GDevelop.js (and run tests to ensure it works)
       - run:
           name: Build GDevelop.js
-          command: cd GDevelop.js && source ../emsdk/emsdk_env.sh && npm run build && npm test && cd ..
+          # Use "--runInBand" as it's faster and avoid deadlocks on CircleCI Linux machines (probably because limited in processes number).
+          command: cd GDevelop.js && source ../emsdk/emsdk_env.sh && npm run build && npm test -- --runInBand && cd ..
 
       # GDevelop IDE dependencies (after building GDevelop.js to avoid downloading a pre-built version)
       - run:
@@ -184,7 +185,7 @@ jobs:
 
       - run:
           name: Install Emscripten (for GDevelop.js)
-          command: git clone https://github.com/juj/emsdk.git && cd emsdk && ./emsdk install 1.39.6 && ./emsdk activate 1.39.6 && cd ..
+          command: git clone https://github.com/juj/emsdk.git && cd emsdk && ./emsdk install 3.1.21 && ./emsdk activate 3.1.21 && cd ..
 
       # GDevelop.js dependencies
       - restore_cache:
@@ -200,7 +201,8 @@ jobs:
       # Build GDevelop.js (and run tests to ensure it works)
       - run:
           name: Build GDevelop.js
-          command: cd GDevelop.js && source ../emsdk/emsdk_env.sh && npm run build && npm test && cd ..
+          # Use "--runInBand" as it's faster and avoid deadlocks on CircleCI Linux machines (probably because limited in processes number).
+          command: cd GDevelop.js && source ../emsdk/emsdk_env.sh && npm run build && npm test -- --runInBand && cd ..
 
       - save_cache:
           paths:

.github/ISSUE_TEMPLATE/--automatic-crash.yml

@@ -0,0 +1,37 @@
+name: 💥 Automatic crash report
+description: Do not use this template for bug reports. This template is only for automatic crash reports.
+body:
+  - type: textarea
+    id: description
+    attributes:
+      label: Describe what you were doing when the crash happened
+      description: If applicable, add screenshots to help explain your problem.
+      placeholder: |
+        1. Went to '...'
+        2. Clicked on '...'
+        3. Scrolled down to '...'
+        4. Saw error
+  - type: input
+    id: gdevelop_version
+    attributes:
+      label: GDevelop version
+      description: |
+        The version of GDevelop used. Leave the prefilled value.
+    validations:
+      required: true
+  - type: textarea
+    id: platform_info
+    attributes:
+      label: Platform info
+      description: |
+        The platform you are using GDevelop on. Leave the prefilled value.
+  - type: textarea
+    id: error_stack
+    attributes:
+      label: Additional error context
+      description: Additonal context about the problem. Leave the prefilled value.
+  - type: textarea
+    id: component_stack
+    attributes:
+      label: Additional component context
+      description: Additonal context about the problem. Leave the prefilled value.

.github/ISSUE_TEMPLATE/--bug-report.yml

@@ -2,18 +2,21 @@ name: 🐛Bug report
 description: Create a bug report about GDevelop or the game engine
 body:
   - type: checkboxes
+    id: searched_issues
     attributes:
       label: Is there an existing issue for this?
       options:
-      - label: I have searched the [existing issues](https://github.com/4ian/GDevelop/issues)
-        required: true
+        - label: I have searched the [existing issues](https://github.com/4ian/GDevelop/issues)
+          required: true
   - type: textarea
+    id: description
     attributes:
       label: Describe the bug
       description: A clear and concise description of what the bug is.
     validations:
       required: true
   - type: textarea
+    id: reproduction_steps
     attributes:
       label: Steps to reproduce
       description: |
@@ -27,6 +30,7 @@ body:
     validations:
       required: true
   - type: dropdown
+    id: platform
     attributes:
       label: GDevelop platform
       description: Which platform of GDevelop are you using?
@@ -38,6 +42,7 @@ body:
     validations:
       required: true
   - type: input
+    id: gdevelop_version
     attributes:
       label: GDevelop version
       description: |
@@ -47,6 +52,7 @@ body:
     validations:
       required: true
   - type: textarea
+    id: platform_info
     attributes:
       label: Platform info
       value: |
@@ -66,6 +72,7 @@ body:
 
         </details>
   - type: textarea
+    id: additional_context
     attributes:
       label: Additional context
       description: Add any other context about the problem here.

.github/workflows/update-translations.yml

@@ -19,7 +19,7 @@ jobs:
       - uses: actions/checkout@v3
       - uses: actions/setup-node@v3
         with:
-          node-version: 16
+          node-version: 20
           cache: "npm"
           cache-dependency-path: "newIDE/app/package-lock.json"
 
@@ -58,7 +58,7 @@ jobs:
         working-directory: newIDE/app
 
       - name: Create a Pull Request with the changes
-        uses: peter-evans/create-pull-request@v5
+        uses: peter-evans/create-pull-request@v6
         with:
           commit-message: Update translations [skip ci]
           branch: chore/update-translations

.gitpod.yml

@@ -14,7 +14,7 @@ tasks:
     init: |
           sudo apt-get update 
           sudo apt install cmake python-is-python3 python3-distutils -y
-          git clone https://github.com/juj/emsdk.git && cd emsdk && ./emsdk install 1.39.6 && ./emsdk activate 1.39.6 && cd ..
+          git clone https://github.com/juj/emsdk.git && cd emsdk && ./emsdk install 3.1.21 && ./emsdk activate 3.1.21 && cd ..
           cd GDevelop.js
           npm install
           source ../emsdk/emsdk_env.sh && npm run build -- --dev

.semaphore/semaphore.yml

@@ -56,6 +56,7 @@ blocks:
         - name: GDJS typing and documentation generation
           commands:
             - checkout
+            - cache restore newIDE-app-node_modules-$SEMAPHORE_GIT_BRANCH-revision-$(checksum newIDE/app/package-lock.json)
             - cache restore GDJS-node_modules-$SEMAPHORE_GIT_BRANCH-revision-$(checksum GDJS/package-lock.json)
             - cache restore GDJS-tests-node_modules-$SEMAPHORE_GIT_BRANCH-revision-$(checksum GDJS/tests/package-lock.json)
             - cd GDJS

.travis.yml

@@ -39,7 +39,7 @@ install:
   - cd ..
 # Install Emscripten (for GDevelop.js)
   - git clone https://github.com/juj/emsdk.git
-  - cd emsdk && ./emsdk install 1.39.6 && ./emsdk activate 1.39.6 && cd ..
+  - cd emsdk && ./emsdk install 3.1.21 && ./emsdk activate 3.1.21 && cd ..
 # Install GDevelop.js dependencies
   - cd GDevelop.js && npm install && cd ..
 # Build GDevelop.js

.vscode/settings.json

@@ -113,7 +113,8 @@
     "memory_resource": "cpp",
     "__bits": "cpp",
     "__verbose_abort": "cpp",
-    "variant": "cpp"
+    "variant": "cpp",
+    "charconv": "cpp"
   },
   "files.exclude": {
     "Binaries/*build*": true,

.vscode/tasks.json

@@ -8,6 +8,7 @@
       "group": "build",
       "label": "Start development server",
       "detail": "Starts the GDevelop development server.",
+      "options": { "env": { "NODE_OPTIONS": "--max-old-space-size=8192" } },
       "problemMatcher": [
         {
           "owner": "cra",

Core/GDCore/Events/Builtin/LinkEvent.cpp

@@ -164,7 +164,7 @@ void LinkEvent::UnserializeFrom(gd::Project& project,
 }
 
 bool LinkEvent::AcceptVisitor(gd::EventVisitor &eventVisitor) {
-  return BaseEvent::AcceptVisitor(eventVisitor) |
+  return BaseEvent::AcceptVisitor(eventVisitor) ||
          eventVisitor.VisitLinkEvent(*this);
 }
 

Core/GDCore/Events/CodeGeneration/EffectsCodeGenerator.cpp

@@ -46,10 +46,6 @@ void EffectsCodeGenerator::GenerateEffectsIncludeFiles(
   // TODO Add unit tests on this function.
   
   // TODO Merge with UsedExtensionsFinder.
-  // Default lights rely on the fact that UsedExtensionsFinder doesn't find
-  // extension usages for effects. This has the happy side effect of not
-  // including Three.js when no 3D object are in the scenes.
-  // We need to make something explicit to avoid future bugs.
 
   // See also gd::Project::ExposeResources for a method that traverse the whole
   // project (this time for resources) and

Core/GDCore/Events/CodeGeneration/EventsCodeGenerator.cpp

@@ -69,8 +69,36 @@ gd::String EventsCodeGenerator::GenerateRelationalOperatorCall(
     }
   }
 
-  return callStartString + "(" + argumentsStr + ") " + relationalOperator +
-         " " + rhs;
+  auto lhs = callStartString + "(" + argumentsStr + ")";
+  return GenerateRelationalOperation(relationalOperator, lhs, rhs);
+}
+
+/**
+ * @brief Generate a relational operation
+ * 
+ * @param relationalOperator the operator
+ * @param lhs the left hand operand
+ * @param rhs the right hand operand
+ * @return gd::String 
+ */
+gd::String EventsCodeGenerator::GenerateRelationalOperation(
+    const gd::String& relationalOperator,
+    const gd::String& lhs,
+    const gd::String& rhs) {
+  return lhs + " " + GenerateRelationalOperatorCodes(relationalOperator) + " " + rhs;
+}
+
+const gd::String EventsCodeGenerator::GenerateRelationalOperatorCodes(const gd::String &operatorString) {
+    if (operatorString == "=") {
+        return "==";
+    }
+    if (operatorString != "<" && operatorString != ">" &&
+        operatorString != "<=" && operatorString != ">=" && operatorString != "!=" &&
+        operatorString != "startsWith" && operatorString != "endsWith" && operatorString != "contains") {
+      cout << "Warning: Bad relational operator: Set to == by default." << endl;
+      return "==";
+    }
+    return operatorString;
 }
 
 /**
@@ -638,18 +666,6 @@ gd::String EventsCodeGenerator::GenerateActionsListCode(
   return outputCode;
 }
 
-const gd::String EventsCodeGenerator::GenerateRelationalOperatorCodes(const gd::String &operatorString) {
-    if (operatorString == "=") {
-        return "==";
-    }
-    if (operatorString != "<" && operatorString != ">" &&
-        operatorString != "<=" && operatorString != ">=" && operatorString != "!=") {
-      cout << "Warning: Bad relational operator: Set to == by default." << endl;
-      return "==";
-    }
-    return operatorString;
-}
-
 gd::String EventsCodeGenerator::GenerateParameterCodes(
     const gd::Expression& parameter,
     const gd::ParameterMetadata& metadata,
@@ -674,7 +690,7 @@ gd::String EventsCodeGenerator::GenerateParameterCodes(
     argOutput =
         GenerateObject(parameter.GetPlainString(), metadata.GetType(), context);
   } else if (metadata.GetType() == "relationalOperator") {
-    argOutput += GenerateRelationalOperatorCodes(parameter.GetPlainString());
+    argOutput += parameter.GetPlainString();
     argOutput = "\"" + argOutput + "\"";
   } else if (metadata.GetType() == "operator") {
     argOutput += parameter.GetPlainString();
@@ -698,6 +714,8 @@ gd::String EventsCodeGenerator::GenerateParameterCodes(
              metadata.GetType() == "tilesetResource" ||
              metadata.GetType() == "videoResource" ||
              metadata.GetType() == "model3DResource" ||
+             metadata.GetType() == "atlasResource" ||
+             metadata.GetType() == "spineResource" ||
              // Deprecated, old parameter names:
              metadata.GetType() == "password" || metadata.GetType() == "musicfile" ||
              metadata.GetType() == "soundfile" || metadata.GetType() == "police") {

Core/GDCore/Events/CodeGeneration/EventsCodeGenerator.h

@@ -473,10 +473,15 @@ class GD_CORE_API EventsCodeGenerator {
    */
   size_t GenerateSingleUsageUniqueIdForEventsList();
 
+  virtual gd::String GenerateRelationalOperation(
+      const gd::String& relationalOperator,
+      const gd::String& lhs,
+      const gd::String& rhs);
+
+ protected:
   virtual const gd::String GenerateRelationalOperatorCodes(
       const gd::String& operatorString);
 
- protected:
   /**
    * \brief Generate the code for a single parameter.
    *
@@ -732,6 +737,7 @@ class GD_CORE_API EventsCodeGenerator {
       const std::vector<gd::String>& arguments,
       const gd::String& callStartString,
       std::size_t startFromArgument = 0);
+
   gd::String GenerateOperatorCall(const gd::InstructionMetadata& instrInfos,
                                   const std::vector<gd::String>& arguments,
                                   const gd::String& callStartString,

Core/GDCore/Events/Parsers/ExpressionParser2.h

@@ -277,8 +277,11 @@ class GD_CORE_API ExpressionParser2 {
 
   std::unique_ptr<VariableNode> Variable(const gd::String &name, gd::ExpressionParserLocation nameLocation) {
     auto variable = gd::make_unique<VariableNode>(name);
-    variable->child = VariableAccessorOrVariableBracketAccessor();
-    variable->child->parent = variable.get();
+
+    if (CheckIfChar(IsOpeningSquareBracket) || CheckIfChar(IsDot)) {
+      variable->child = VariableAccessorOrVariableBracketAccessor();
+      variable->child->parent = variable.get();
+    }
 
     variable->location = ExpressionParserLocation(
         nameLocation.GetStartPosition(), GetCurrentPosition());
@@ -302,8 +305,12 @@ class GD_CORE_API ExpressionParser2 {
                                "bracket for each opening bracket."));
       }
       SkipIfChar(IsClosingSquareBracket);
-      child->child = VariableAccessorOrVariableBracketAccessor();
-      child->child->parent = child.get();
+
+      SkipAllWhitespaces();
+      if (CheckIfChar(IsOpeningSquareBracket) || CheckIfChar(IsDot)) {
+        child->child = VariableAccessorOrVariableBracketAccessor();
+        child->child->parent = child.get();
+      }
       child->location =
           ExpressionParserLocation(childStartPosition, GetCurrentPosition());
 
@@ -315,8 +322,15 @@ class GD_CORE_API ExpressionParser2 {
       auto identifierAndLocation = ReadIdentifierName(/*allowDeprecatedSpacesInName=*/ false);
       auto child =
           gd::make_unique<VariableAccessorNode>(identifierAndLocation.name);
-      child->child = VariableAccessorOrVariableBracketAccessor();
-      child->child->parent = child.get();
+      if (identifierAndLocation.name.empty()) {
+        child->diagnostic = RaiseSyntaxError(_("A name should be entered after the dot."));
+      }
+
+      SkipAllWhitespaces();
+      if (CheckIfChar(IsOpeningSquareBracket) || CheckIfChar(IsDot)) {
+        child->child = VariableAccessorOrVariableBracketAccessor();
+        child->child->parent = child.get();
+      }
       child->nameLocation = identifierAndLocation.location;
       child->dotLocation = dotLocation;
       child->location =
@@ -325,7 +339,11 @@ class GD_CORE_API ExpressionParser2 {
       return std::move(child);
     }
 
-    return std::move(gd::make_unique<VariableAccessorOrVariableBracketAccessorNode>());
+    // Should never happen, unless a node called this function without checking if the current character
+    // was a dot or an opening bracket - this means there is an error in the grammar.
+    auto unrecognisedNode = gd::make_unique<VariableAccessorOrVariableBracketAccessorNode>();
+    unrecognisedNode->diagnostic = RaiseSyntaxError(_("A dot or bracket was expected here."));
+    return std::move(unrecognisedNode);
   }
 
   std::unique_ptr<FunctionCallNode> FreeFunction(
@@ -361,18 +379,24 @@ class GD_CORE_API ExpressionParser2 {
     const auto &childIdentifierNameLocation =
         childIdentifierAndLocation.location;
 
+    std::unique_ptr<gd::ExpressionParserError> emptyNameError = childIdentifierName.empty() ?
+      RaiseSyntaxError(_("A name should be entered after the dot.")) : nullptr;
+
     SkipAllWhitespaces();
 
     if (IsNamespaceSeparator()) {
       ExpressionParserLocation namespaceSeparatorLocation =
           SkipNamespaceSeparator();
       SkipAllWhitespaces();
-      return BehaviorFunction(parentIdentifier,
+      auto behaviorFunction = BehaviorFunction(parentIdentifier,
                               childIdentifierName,
                               parentIdentifierLocation,
                               parentIdentifierDotLocation,
                               childIdentifierNameLocation,
                               namespaceSeparatorLocation);
+
+      if (emptyNameError) behaviorFunction->diagnostic = std::move(emptyNameError);
+      return std::move(behaviorFunction);
     } else if (CheckIfChar(IsOpeningParenthesis)) {
       ExpressionParserLocation openingParenthesisLocation = SkipChar();
 
@@ -381,7 +405,7 @@ class GD_CORE_API ExpressionParser2 {
           childIdentifierName);
       auto parametersNode = Parameters(function.get(), parentIdentifier);
       function->parameters = std::move(parametersNode.parameters),
-      function->diagnostic = std::move(parametersNode.diagnostic);
+      function->diagnostic = emptyNameError ? std::move(emptyNameError) : std::move(parametersNode.diagnostic);
 
       function->location = ExpressionParserLocation(
           parentIdentifierLocation.GetStartPosition(), GetCurrentPosition());
@@ -394,6 +418,8 @@ class GD_CORE_API ExpressionParser2 {
       return std::move(function);
     } else if (CheckIfChar(IsDot) || CheckIfChar(IsOpeningSquareBracket)) {
       auto variable = gd::make_unique<VariableNode>(parentIdentifier);
+      variable->diagnostic = std::move(emptyNameError);
+
       auto child =
           gd::make_unique<VariableAccessorNode>(childIdentifierName);
       child->child = VariableAccessorOrVariableBracketAccessor();
@@ -419,6 +445,7 @@ class GD_CORE_API ExpressionParser2 {
     node->identifierNameLocation = parentIdentifierLocation;
     node->identifierNameDotLocation = parentIdentifierDotLocation;
     node->childIdentifierNameLocation = childIdentifierNameLocation;
+    node->diagnostic = std::move(emptyNameError);
     return std::move(node);
   }
 
@@ -491,11 +518,6 @@ class GD_CORE_API ExpressionParser2 {
     std::vector<std::unique_ptr<ExpressionNode>> parameters;
     gd::String lastObjectName = "";
 
-    // By convention, object is always the first parameter, and behavior the
-    // second one.
-    size_t parameterIndex =
-        WrittenParametersFirstIndex(objectName, behaviorName);
-
     bool previousCharacterIsParameterSeparator = false;
     while (!IsEndReached()) {
       SkipAllWhitespaces();
@@ -514,7 +536,6 @@ class GD_CORE_API ExpressionParser2 {
       SkipAllWhitespaces();
       previousCharacterIsParameterSeparator = CheckIfChar(IsParameterSeparator);
       SkipIfChar(IsParameterSeparator);
-      parameterIndex++;
     }
 
     ExpressionParserLocation invalidClosingParenthesisLocation;

Core/GDCore/Events/Parsers/ExpressionParser2NodePrinter.h

@@ -8,6 +8,7 @@
 
 #include <memory>
 #include <vector>
+
 #include "GDCore/Events/Parsers/ExpressionParser2Node.h"
 #include "GDCore/Events/Parsers/ExpressionParser2NodeWorker.h"
 namespace gd {
@@ -43,6 +44,11 @@ class GD_CORE_API ExpressionParser2NodePrinter
    */
   const gd::String& GetOutput() { return output; };
 
+  static gd::String PrintStringLiteral(const gd::String& str) {
+    return "\"" +
+           str.FindAndReplace("\\", "\\\\").FindAndReplace("\"", "\\\"") + "\"";
+  }
+
  protected:
   void OnVisitSubExpressionNode(SubExpressionNode& node) override {
     output += "(";
@@ -69,10 +75,7 @@ class GD_CORE_API ExpressionParser2NodePrinter
   }
   void OnVisitNumberNode(NumberNode& node) override { output += node.number; }
   void OnVisitTextNode(TextNode& node) override {
-    output +=
-        "\"" +
-        node.text.FindAndReplace("\\", "\\\\").FindAndReplace("\"", "\\\"") +
-        "\"";
+    output += PrintStringLiteral(node.text);
   }
   void OnVisitVariableNode(VariableNode& node) override {
     output += node.name;
@@ -97,8 +100,8 @@ class GD_CORE_API ExpressionParser2NodePrinter
   }
   void OnVisitObjectFunctionNameNode(ObjectFunctionNameNode& node) override {
     if (!node.behaviorFunctionName.empty()) {
-      output +=
-          node.objectName + "." + node.objectFunctionOrBehaviorName + "::" + node.behaviorFunctionName;
+      output += node.objectName + "." + node.objectFunctionOrBehaviorName +
+                "::" + node.behaviorFunctionName;
     } else {
       output += node.objectName + "." + node.objectFunctionOrBehaviorName;
     }

Core/GDCore/Extensions/Builtin/AdvancedExtension.cpp

@@ -115,21 +115,23 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsAdvancedExtension(
       .AddExpression(
           "GetArgumentAsNumber",
           _("Get function parameter value"),
-          _("Get function parameter (also called \"argument\") value."),
+          _("Get function parameter (also called \"argument\") value. You don't need this most of the time as you can simply write the parameter name in an expression."),
           "",
           "res/function16.png")
       .AddParameter("functionParameterName", _("Parameter name"), "number,string,boolean")
-      .SetRelevantForFunctionEventsOnly();
+      .SetRelevantForFunctionEventsOnly()
+      .SetHidden();
 
   extension
       .AddStrExpression(
           "GetArgumentAsString",
           _("Get function parameter text"),
-          _("Get function parameter (also called \"argument\") text."),
+          _("Get function parameter (also called \"argument\") text. You don't need this most of the time as you can simply write the parameter name in an expression."),
           "",
           "res/function16.png")
       .AddParameter("functionParameterName", _("Parameter name"), "number,string,boolean")
-      .SetRelevantForFunctionEventsOnly();
+      .SetRelevantForFunctionEventsOnly()
+      .SetHidden();
 
   extension
       .AddCondition(

Core/GDCore/Extensions/Builtin/AllBuiltinExtensions.h

@@ -49,6 +49,7 @@ class GD_CORE_API BuiltinExtensionsImplementer {
   static void ImplementsAnimatableExtension(gd::PlatformExtension& extension);
   static void ImplementsEffectExtension(gd::PlatformExtension& extension);
   static void ImplementsOpacityExtension(gd::PlatformExtension& extension);
+  static void ImplementsTextContainerExtension(gd::PlatformExtension& extension);
 };
 
 }  // namespace gd

Core/GDCore/Extensions/Builtin/BaseObjectExtension.cpp

@@ -396,7 +396,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
                 _("Z order"),
                 _("Modify the Z-order of an object"),
                 _("the z-order"),
-                _("Z order"),
+                _("Layers and cameras"),
                 "res/actions/planicon24.png",
                 "res/actions/planicon.png")
 
@@ -550,7 +550,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
                    _("Z-order"),
                    _("Compare the Z-order of the specified object."),
                    _("the Z-order"),
-                   _("Z-order"),
+                   _("Layer"),
                    "res/conditions/planicon24.png",
                    "res/conditions/planicon.png")
 
@@ -617,6 +617,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
           "number", ParameterOptions::MakeNewOptions())
       .MarkAsAdvanced();
 
+  // Deprecated
   obj.AddCondition("AngleOfDisplacement",
                    _("Angle of movement (using forces)"),
                    _("Compare the angle of movement of an object according to "
@@ -626,7 +627,20 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
                    _("Movement using forces"),
                    "res/conditions/vitesse24.png",
                    "res/conditions/vitesse.png")
+      .SetHidden()
+      .AddParameter("object", _("Object"))
+      .AddParameter("expression", _("Angle, in degrees"))
+      .AddParameter("expression", _("Tolerance, in degrees"))
+      .MarkAsAdvanced();
 
+  obj.AddCondition("IsTotalForceAngleAround",
+                   _("Angle of movement (using forces)"),
+                   _("Compare the angle of movement of an object according to "
+                     "the forces applied on it."),
+                   _("Angle of movement of _PARAM0_ is _PARAM1_ ± _PARAM2_°"),
+                   _("Movement using forces"),
+                   "res/conditions/vitesse24.png",
+                   "res/conditions/vitesse.png")
       .AddParameter("object", _("Object"))
       .AddParameter("expression", _("Angle, in degrees"))
       .AddParameter("expression", _("Tolerance, in degrees"))
@@ -1137,7 +1151,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
   obj.AddExpression("ZOrder",
                     _("Z-order"),
                     _("Z-order of an object"),
-                    _("Visibility"),
+                    "",
                     "res/actions/planicon.png")
       .AddParameter("object", _("Object"));
 
@@ -1267,8 +1281,8 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
                 _("Enable an effect on the object"),
                 _("Enable effect _PARAM1_ on _PARAM0_: _PARAM2_"),
                 _("Effects"),
-                "res/actions/effect24.png",
-                "res/actions/effect.png")
+                "res/actions/effect_black.svg",
+                "res/actions/effect_black.svg")
       .AddParameter("object", _("Object"))
       .AddParameter("objectEffectName", _("Effect name"))
       .AddParameter("yesorno", _("Enable?"))
@@ -1283,8 +1297,8 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
                       "names) in the effects window."),
                 _("Set _PARAM2_ to _PARAM3_ for effect _PARAM1_ of _PARAM0_"),
                 _("Effects"),
-                "res/actions/effect24.png",
-                "res/actions/effect.png")
+                "res/actions/effect_black.svg",
+                "res/actions/effect_black.svg")
       .AddParameter("object", _("Object"))
       .AddParameter("objectEffectName", _("Effect name"))
       .AddParameter("objectEffectParameterName", _("Property name"))
@@ -1301,8 +1315,8 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
                       "names) in the effects window."),
                 _("Set _PARAM2_ to _PARAM3_ for effect _PARAM1_ of _PARAM0_"),
                 _("Effects"),
-                "res/actions/effect24.png",
-                "res/actions/effect.png")
+                "res/actions/effect_black.svg",
+                "res/actions/effect_black.svg")
       .AddParameter("object", _("Object"))
       .AddParameter("objectEffectName", _("Effect name"))
       .AddParameter("objectEffectParameterName", _("Property name"))
@@ -1318,8 +1332,8 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
                       "names) in the effects window."),
                 _("Enable _PARAM2_ for effect _PARAM1_ of _PARAM0_: _PARAM3_"),
                 _("Effects"),
-                "res/actions/effect24.png",
-                "res/actions/effect.png")
+                "res/actions/effect_black.svg",
+                "res/actions/effect_black.svg")
       .AddParameter("object", _("Object"))
       .AddParameter("objectEffectName", _("Effect name"))
       .AddParameter("objectEffectParameterName", _("Property name"))
@@ -1333,8 +1347,8 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
                    _("Check if the effect on an object is enabled."),
                    _("Effect _PARAM1_ of _PARAM0_ is enabled"),
                    _("Effects"),
-                   "res/actions/effect24.png",
-                   "res/actions/effect.png")
+                   "res/actions/effect_black.svg",
+                   "res/actions/effect_black.svg")
       .AddParameter("object", _("Object"))
       .AddParameter("objectEffectName", _("Effect name"))
       .MarkAsSimple()
@@ -1610,7 +1624,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
           _("Cast a ray from _PARAM1_;_PARAM2_, angle: _PARAM3_ and max "
             "distance: _PARAM4_px, against _PARAM0_, and save the "
             "result in _PARAM5_, _PARAM6_"),
-          "",
+          _("Collision"),
           "res/conditions/raycast24.png",
           "res/conditions/raycast.png")
       .AddParameter("objectList", _("Objects to test against the ray"))
@@ -1641,7 +1655,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
           _("Cast a ray from _PARAM1_;_PARAM2_ to _PARAM3_;_PARAM4_ "
             "against _PARAM0_, and save the "
             "result in _PARAM5_, _PARAM6_"),
-          "",
+          _("Collision"),
           "res/conditions/raycast24.png",
           "res/conditions/raycast.png")
       .AddParameter("objectList", _("Objects to test against the ray"))

Core/GDCore/Extensions/Builtin/CameraExtension.cpp

@@ -27,7 +27,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsCameraExtension(
   extension.AddInstructionOrExpressionGroupMetadata(_("Layers and cameras"))
       .SetIcon("res/conditions/camera24.png");
   extension.AddInstructionOrExpressionGroupMetadata(_("Effects"))
-      .SetIcon("res/actions/effect24.png");
+      .SetIcon("res/actions/effect_black.svg");
 
   extension
       .AddExpressionAndConditionAndAction(
@@ -327,7 +327,6 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsCameraExtension(
       .AddParameter("expression", _("Camera number (default : 0)"), "", true)
       .SetDefaultValue("0");
 
-  // TODO Deprecated: hide this action in a future release.
   extension
       .AddAction(
           "FixCamera",
@@ -339,6 +338,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsCameraExtension(
           "",
           "res/actions/camera24.png",
           "res/actions/camera.png")
+      .SetHidden()
       .AddCodeOnlyParameter("currentScene", "")
       .AddParameter("objectPtr", _("Object"))
       .AddParameter("expression",
@@ -386,7 +386,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsCameraExtension(
                  _("Center the camera on an object"),
                  _("Center the camera on the specified object."),
                  _("Center camera on _PARAM1_ (layer: _PARAM3_)"),
-                 "",
+                 _("Layers and cameras"),
                  "res/actions/camera24.png",
                  "res/actions/camera.png")
       .AddCodeOnlyParameter("currentScene", "")
@@ -450,8 +450,8 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsCameraExtension(
                 "names) in the effects window."),
           _("Set _PARAM3_ to _PARAM4_ for effect _PARAM2_ of layer _PARAM1_"),
           _("Effects"),
-          "res/actions/effect24.png",
-          "res/actions/effect.png")
+          "res/actions/effect_black.svg",
+          "res/actions/effect_black.svg")
       .AddCodeOnlyParameter("currentScene", "")
       .AddParameter("layer", _("Layer"), "", true)
       .SetDefaultValue("\"\"")
@@ -469,8 +469,8 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsCameraExtension(
                 "names) in the effects window."),
           _("Set _PARAM3_ to _PARAM4_ for effect _PARAM2_ of layer _PARAM1_"),
           _("Effects"),
-          "res/actions/effect24.png",
-          "res/actions/effect.png")
+          "res/actions/effect_black.svg",
+          "res/actions/effect_black.svg")
       .AddCodeOnlyParameter("currentScene", "")
       .AddParameter("layer", _("Layer"), "", true)
       .SetDefaultValue("\"\"")
@@ -488,8 +488,8 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsCameraExtension(
                 "names) in the effects window."),
           _("Enable _PARAM3_ for effect _PARAM2_ of layer _PARAM1_: _PARAM4_"),
           _("Effects"),
-          "res/actions/effect24.png",
-          "res/actions/effect.png")
+          "res/actions/effect_black.svg",
+          "res/actions/effect_black.svg")
       .AddCodeOnlyParameter("currentScene", "")
       .AddParameter("layer", _("Layer"), "", true)
       .SetDefaultValue("\"\"")
@@ -504,8 +504,8 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsCameraExtension(
                     _("The effect on a layer is enabled"),
                     _("Effect _PARAM2_ on layer _PARAM1_ is enabled"),
                     _(""),
-                    "res/actions/effect24.png",
-                    "res/actions/effect.png")
+                    "res/actions/effect_black.svg",
+                    "res/actions/effect_black.svg")
       .AddCodeOnlyParameter("currentScene", "")
       .AddParameter("layer", _("Layer"), "", true)
       .SetDefaultValue("\"\"")
@@ -518,8 +518,8 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsCameraExtension(
                  _("Enable an effect on a layer"),
                  _("Enable effect _PARAM2_ on layer _PARAM1_: _PARAM3_"),
                  _("Effects"),
-                 "res/actions/effect24.png",
-                 "res/actions/effect.png")
+                 "res/actions/effect_black.svg",
+                 "res/actions/effect_black.svg")
       .AddCodeOnlyParameter("currentScene", "")
       .AddParameter("layer", _("Layer"), "", true)
       .SetDefaultValue("\"\"")
@@ -548,7 +548,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsCameraExtension(
   extension
       .AddAction(
           "ChangeLayerTimeScale",
-          _("Change layer time scale"),
+          _("Layer time scale"),
           _("Change the time scale applied to the objects of the layer."),
           _("Set the time scale of layer _PARAM1_ to _PARAM2_"),
           "",
@@ -594,7 +594,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsCameraExtension(
   extension
       .AddAction(
           "SetLayerAmbientLightColor",
-          _("Set the ambient light color"),
+          _("Ambient light color"),
           _("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_"),

Core/GDCore/Extensions/Builtin/Capabilities/AnimatableExtension.cpp

@@ -23,6 +23,8 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsAnimatableExtension(
                                "Florian Rival",
                                "Open source (MIT License)")
       .SetExtensionHelpPath("/objects");
+  extension.AddInstructionOrExpressionGroupMetadata(_("Animatable capability"))
+      .SetIcon("res/actions/animation24.png");
   extension.AddInstructionOrExpressionGroupMetadata(_("Animations and images"))
       .SetIcon("res/actions/animation24.png");
 
@@ -42,7 +44,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsAnimatableExtension(
          "number",
          "Index",
          _("Animation (by number)"),
-         _("the number of the animation played by the object (the number from "
+         _("the animation played by the object using the animation number (from "
            "the animations list)"),
          _("the number of the animation"),
          _("Animations and images"),
@@ -53,6 +55,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsAnimatableExtension(
           "number", gd::ParameterOptions::MakeNewOptions().SetDescription(
                         _("Animation index")))
       .MarkAsSimple();
+  aut.GetAllExpressions()["Index"].SetGroup("");
 
   aut.AddExpressionAndConditionAndAction(
          "string",
@@ -69,6 +72,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsAnimatableExtension(
           "objectAnimationName", gd::ParameterOptions::MakeNewOptions().SetDescription(
                         _("Animation name")))
       .MarkAsSimple();
+  aut.GetAllStrExpressions()["Name"].SetGroup("");
 
   aut.AddScopedAction("PauseAnimation",
                 _("Pause the animation"),
@@ -107,6 +111,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsAnimatableExtension(
           "number", gd::ParameterOptions::MakeNewOptions().SetDescription(
                         _("Speed scale")))
       .MarkAsSimple();
+  aut.GetAllExpressions()["SpeedScale"].SetGroup("");
 
   aut.AddScopedCondition("IsAnimationPaused",
                    _("Animation paused"),
@@ -130,6 +135,31 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsAnimatableExtension(
       .AddParameter("object", _("Object"))
       .AddParameter("behavior", _("Behavior"), "AnimatableBehavior")
       .MarkAsSimple();
+
+  aut.AddExpressionAndConditionAndAction(
+         "number",
+         "ElapsedTime",
+         _("Animation elapsed time"),
+         _("the elapsed time from the beginning of the animation (in seconds)"),
+         _("the animation elapsed time"),
+         _("Animations and images"),
+         "res/actions/animation24.png")
+      .AddParameter("object", _("Object"))
+      .AddParameter("behavior", _("Behavior"), "AnimatableBehavior")
+      .UseStandardParameters(
+          "number", gd::ParameterOptions::MakeNewOptions().SetDescription(
+                        _("Elapsed time (in seconds)")))
+      .MarkAsAdvanced();
+  aut.GetAllExpressions()["ElapsedTime"].SetGroup("");
+
+  aut.AddExpression(
+         "Duration",
+         _("Animation duration"),
+         _("Return the current animation duration (in seconds)."),
+         _("Animations and images"),
+         "res/actions/animation24.png")
+      .AddParameter("object", _("Object"))
+      .AddParameter("behavior", _("Behavior"), "AnimatableBehavior");
 }
 
 }  // namespace gd

Core/GDCore/Extensions/Builtin/Capabilities/EffectExtension.cpp

@@ -24,7 +24,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsEffectExtension(
                                "Open source (MIT License)")
       .SetExtensionHelpPath("/objects");
   extension.AddInstructionOrExpressionGroupMetadata(_("Effects"))
-      .SetIcon("res/actions/effect24.png");
+      .SetIcon("res/actions/effect_black.svg");
 
   gd::BehaviorMetadata& aut = extension.AddBehavior(
       "EffectBehavior",
@@ -32,7 +32,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsEffectExtension(
       "Effect",
       _("Apply visual effects to objects."),
       "",
-      "res/actions/effect24.png",
+      "res/actions/effect_black.svg",
       "EffectBehavior",
       std::make_shared<gd::Behavior>(),
       std::make_shared<gd::BehaviorsSharedData>())
@@ -43,8 +43,8 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsEffectExtension(
                 _("Enable an effect on the object"),
                 _("Enable effect _PARAM2_ on _PARAM0_: _PARAM3_"),
                 _("Effects"),
-                "res/actions/effect24.png",
-                "res/actions/effect.png")
+                "res/actions/effect_black.svg",
+                "res/actions/effect_black.svg")
       .AddParameter("object", _("Object"))
       .AddParameter("behavior", _("Behavior"), "EffectBehavior")
       .AddParameter("objectEffectName", _("Effect name"))
@@ -58,8 +58,8 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsEffectExtension(
                       "names) in the effects window."),
                 _("Set _PARAM3_ to _PARAM4_ for effect _PARAM2_ of _PARAM0_"),
                 _("Effects"),
-                "res/actions/effect24.png",
-                "res/actions/effect.png")
+                "res/actions/effect_black.svg",
+                "res/actions/effect_black.svg")
       .AddParameter("object", _("Object"))
       .AddParameter("behavior", _("Behavior"), "EffectBehavior")
       .AddParameter("objectEffectName", _("Effect name"))
@@ -75,8 +75,8 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsEffectExtension(
                       "names) in the effects window."),
                 _("Set _PARAM3_ to _PARAM4_ for effect _PARAM2_ of _PARAM0_"),
                 _("Effects"),
-                "res/actions/effect24.png",
-                "res/actions/effect.png")
+                "res/actions/effect_black.svg",
+                "res/actions/effect_black.svg")
       .AddParameter("object", _("Object"))
       .AddParameter("behavior", _("Behavior"), "EffectBehavior")
       .AddParameter("objectEffectName", _("Effect name"))
@@ -91,8 +91,8 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsEffectExtension(
                       "names) in the effects window."),
                 _("Enable _PARAM3_ for effect _PARAM2_ of _PARAM0_: _PARAM4_"),
                 _("Effects"),
-                "res/actions/effect24.png",
-                "res/actions/effect.png")
+                "res/actions/effect_black.svg",
+                "res/actions/effect_black.svg")
       .AddParameter("object", _("Object"))
       .AddParameter("behavior", _("Behavior"), "EffectBehavior")
       .AddParameter("objectEffectName", _("Effect name"))
@@ -105,8 +105,8 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsEffectExtension(
                    _("Check if the effect on an object is enabled."),
                    _("Effect _PARAM2_ of _PARAM0_ is enabled"),
                    _("Effects"),
-                   "res/actions/effect24.png",
-                   "res/actions/effect.png")
+                   "res/actions/effect_black.svg",
+                   "res/actions/effect_black.svg")
       .AddParameter("object", _("Object"))
       .AddParameter("behavior", _("Behavior"), "EffectBehavior")
       .AddParameter("objectEffectName", _("Effect name"))

Core/GDCore/Extensions/Builtin/Capabilities/FlippableExtension.cpp

@@ -24,7 +24,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsFlippableExtension(
                                "Open source (MIT License)")
       .SetExtensionHelpPath("/objects");
   extension.AddInstructionOrExpressionGroupMetadata(_("Effects"))
-      .SetIcon("res/actions/effect24.png");
+      .SetIcon("res/actions/effect_black.svg");
 
   gd::BehaviorMetadata& aut = extension.AddBehavior(
       "FlippableBehavior",

Core/GDCore/Extensions/Builtin/Capabilities/OpacityExtension.cpp

@@ -23,6 +23,8 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsOpacityExtension(
                                "Florian Rival",
                                "Open source (MIT License)")
       .SetExtensionHelpPath("/objects");
+  extension.AddInstructionOrExpressionGroupMetadata(_("Opacity capability"))
+      .SetIcon("res/actions/opacity24.png");
   extension.AddInstructionOrExpressionGroupMetadata(_("Visibility"))
       .SetIcon("res/actions/opacity24.png");
 
@@ -54,6 +56,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsOpacityExtension(
                         _("Opacity (0-255)")))
       .SetFunctionName("setOpacity")
       .SetGetter("getOpacity");
+  aut.GetAllExpressions()["Value"].SetGroup("");
 }
 
 }  // namespace gd

Core/GDCore/Extensions/Builtin/Capabilities/ScalableExtension.cpp

@@ -23,6 +23,8 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsScalableExtension(
                                "Florian Rival",
                                "Open source (MIT License)")
       .SetExtensionHelpPath("/objects");
+  extension.AddInstructionOrExpressionGroupMetadata(_("Scalable capability"))
+      .SetIcon("res/actions/scale24_black.png");
   extension.AddInstructionOrExpressionGroupMetadata(_("Size"))
       .SetIcon("res/actions/scale24_black.png");
 
@@ -44,7 +46,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsScalableExtension(
          _("Scale"),
          _("the scale of the object (default scale is 1)"),
          _("the scale"),
-         _("Scale"),
+         _("Size"),
          "res/actions/scale24_black.png")
       .AddParameter("object", _("Object"))
       .AddParameter("behavior", _("Behavior"), "ScalableBehavior")
@@ -53,6 +55,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsScalableExtension(
           gd::ParameterOptions::MakeNewOptions().SetDescription(
               _("Scale (1 by default)")))
       .MarkAsAdvanced();
+  aut.GetAllExpressions()["Value"].SetGroup("");
 
   aut.AddExpressionAndConditionAndAction(
          "number",
@@ -60,7 +63,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsScalableExtension(
          _("Scale on X axis"),
          _("the scale on X axis of the object (default scale is 1)"),
          _("the scale on X axis"),
-         _("Scale"),
+         _("Size"),
          "res/actions/scaleWidth24_black.png")
       .AddParameter("object", _("Object"))
       .AddParameter("behavior", _("Behavior"), "ScalableBehavior")
@@ -69,6 +72,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsScalableExtension(
           gd::ParameterOptions::MakeNewOptions().SetDescription(
               _("Scale (1 by default)")))
       .MarkAsAdvanced();
+  aut.GetAllExpressions()["X"].SetGroup("");
 
   aut.AddExpressionAndConditionAndAction(
          "number",
@@ -76,7 +80,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsScalableExtension(
          _("Scale on Y axis"),
          _("the scale on Y axis of the object (default scale is 1)"),
          _("the scale on Y axis"),
-         _("Scale"),
+         _("Size"),
          "res/actions/scaleHeight24_black.png")
       .AddParameter("object", _("Object"))
       .AddParameter("behavior", _("Behavior"), "ScalableBehavior")
@@ -85,6 +89,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsScalableExtension(
           gd::ParameterOptions::MakeNewOptions().SetDescription(
               _("Scale (1 by default)")))
       .MarkAsAdvanced();
+  aut.GetAllExpressions()["Y"].SetGroup("");
 }
 
 }  // namespace gd

Core/GDCore/Extensions/Builtin/Capabilities/TextContainerExtension.cpp

@@ -0,0 +1,58 @@
+/*
+ * GDevelop Core
+ * Copyright 2008-2016 Florian Rival (Florian.Rival@gmail.com). All rights
+ * reserved. This project is released under the GNU Lesser General Public
+ * License.
+ */
+#include "GDCore/Extensions/Builtin/AllBuiltinExtensions.h"
+#include "GDCore/Extensions/Metadata/MultipleInstructionMetadata.h"
+#include "GDCore/Project/Behavior.h"
+#include "GDCore/Project/BehaviorsSharedData.h"
+#include "GDCore/Project/Object.h"
+#include "GDCore/Tools/Localization.h"
+
+using namespace std;
+namespace gd {
+
+void GD_CORE_API BuiltinExtensionsImplementer::ImplementsTextContainerExtension(
+    gd::PlatformExtension& extension) {
+  extension
+      .SetExtensionInformation("TextContainerCapability",
+                               _("Text capability"),
+                               _("Animate objects."),
+                               "Florian Rival",
+                               "Open source (MIT License)")
+      .SetExtensionHelpPath("/objects");
+  extension.AddInstructionOrExpressionGroupMetadata(_("Text capability"))
+      .SetIcon("res/conditions/text24_black.png");
+
+  gd::BehaviorMetadata& aut = extension.AddBehavior(
+      "TextContainerBehavior",
+      _("Text capability"),
+      "Text",
+      _("Access objects text."),
+      "",
+      "res/conditions/text24_black.png",
+      "TextContainerBehavior",
+      std::make_shared<gd::Behavior>(),
+      std::make_shared<gd::BehaviorsSharedData>())
+    .SetHidden();
+
+  aut.AddExpressionAndConditionAndAction(
+         "string",
+         "Value",
+         _("Text"),
+         _("the text"),
+         _("the text"),
+         "",
+         "res/conditions/text24_black.png")
+      .AddParameter("object", _("Object"))
+      .AddParameter("behavior", _("Behavior"), "TextContainerBehavior")
+      .UseStandardParameters(
+          "string", gd::ParameterOptions::MakeNewOptions().SetDescription(
+                        _("Text")))
+      .MarkAsSimple();
+  aut.GetAllStrExpressions()["Value"].SetGroup("");
+}
+
+}  // namespace gd

Core/GDCore/Extensions/Builtin/SceneExtension.cpp

@@ -5,6 +5,7 @@
  */
 #include "AllBuiltinExtensions.h"
 #include "GDCore/Tools/Localization.h"
+#include "GDCore/Extensions/Metadata/MultipleInstructionMetadata.h"
 
 using namespace std;
 namespace gd {
@@ -57,7 +58,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsSceneExtension(
   extension
       .AddCondition("DoesSceneExist",
                     _("Does scene exist"),
-                    _("Check if scene exists."),
+                    _("Check if a scene exists."),
                     _("Scene _PARAM1_ exists"),
                     "",
                     "res/actions/texte.png",
@@ -163,6 +164,45 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsSceneExtension(
           "res/actions/window.png")
       .SetHelpPath("/interface/scene-editor/events")
       .AddCodeOnlyParameter("currentScene", "");
+
+  extension
+      .AddAction("PrioritizeLoadingOfScene",
+                 _("Preload scene"),
+                 _("Preload a scene resources as soon as possible in background."),
+                 _("Preload scene _PARAM1_ in background"),
+                 "",
+                 "res/actions/hourglass_black.svg",
+                 "res/actions/hourglass_black.svg")
+      .SetHelpPath("/all-features/resources-loading")
+      .AddCodeOnlyParameter("currentScene", "")
+      .AddParameter("sceneName", _("Name of the new scene"))
+      .MarkAsAdvanced();
+
+  extension.AddExpressionAndCondition("number",
+                                "SceneLoadingProgress",
+                                _("Scene loading progress"),
+                                _("The progress of resources loading in background for a scene (between 0 and 1)."),
+                                _("_PARAM0_ loading progress"),
+                                _(""),
+                                "res/actions/hourglass_black.svg")
+      .SetHelpPath("/all-features/resources-loading")
+      .AddCodeOnlyParameter("currentScene", "")
+      .AddParameter("sceneName", _("Scene name"))
+      .UseStandardParameters("number", ParameterOptions::MakeNewOptions())
+      .MarkAsAdvanced();
+
+  extension
+      .AddCondition("AreSceneAssetsLoaded",
+                    _("Scene preloaded"),
+                    _("Check if scene resources have finished to load in background."),
+                    _("Scene _PARAM1_ was preloaded in background"),
+                    "",
+                    "res/actions/hourglass_black.svg",
+                    "res/actions/hourglass_black.svg")
+      .SetHelpPath("/all-features/resources-loading")
+      .AddCodeOnlyParameter("currentScene", "")
+      .AddParameter("sceneName", _("Scene name"))
+      .MarkAsAdvanced();
 }
 
 }  // namespace gd

Core/GDCore/Extensions/Builtin/SpriteExtension/Animation.cpp

@@ -6,8 +6,6 @@
 
 #include "GDCore/Extensions/Builtin/SpriteExtension/Animation.h"
 #include <vector>
-#include "GDCore/Extensions/Builtin/SpriteExtension/Direction.h"
-#include "GDCore/Extensions/Builtin/SpriteExtension/Sprite.h"
 #include "GDCore/String.h"
 
 namespace gd {

Core/GDCore/Extensions/Builtin/SpriteExtension/Animation.h

@@ -4,13 +4,11 @@
  * reserved. This project is released under the MIT License.
  */
 
-#ifndef GDCORE_ANIMATION_H
-#define GDCORE_ANIMATION_H
+#pragma once
+
 #include <vector>
 #include "GDCore/String.h"
-namespace gd {
-class Direction;
-}
+#include "GDCore/Extensions/Builtin/SpriteExtension/Direction.h"
 
 namespace gd {
 
@@ -93,4 +91,3 @@ class GD_CORE_API Animation {
 };
 
 }  // namespace gd
-#endif  // GDCORE_ANIMATION_H

Core/GDCore/Extensions/Builtin/SpriteExtension/Direction.h

@@ -3,12 +3,12 @@
  * Copyright 2008-2016 Florian Rival (Florian.Rival@gmail.com). All rights
  * reserved. This project is released under the MIT License.
  */
-#ifndef GDCORE_DIRECTION_H
-#define GDCORE_DIRECTION_H
+#pragma once
+
 #include <vector>
 #include "GDCore/String.h"
+#include "GDCore/Extensions/Builtin/SpriteExtension/Sprite.h"
 namespace gd {
-class Sprite;
 class SerializerElement;
 }
 
@@ -142,4 +142,3 @@ class GD_CORE_API Direction {
 };
 
 }  // namespace gd
-#endif  // GDCORE_DIRECTION_H

Core/GDCore/Extensions/Builtin/SpriteExtension/SpriteAnimationList.cpp

@@ -0,0 +1,157 @@
+/*
+ * GDevelop Core
+ * Copyright 2008-2016 Florian Rival (Florian.Rival@gmail.com). All rights
+ * reserved. This project is released under the MIT License.
+ */
+
+#include "GDCore/Extensions/Builtin/SpriteExtension/SpriteAnimationList.h"
+
+#include <algorithm>
+
+#include "GDCore/CommonTools.h"
+#include "GDCore/Extensions/Builtin/SpriteExtension/Animation.h"
+#include "GDCore/Extensions/Builtin/SpriteExtension/Direction.h"
+#include "GDCore/IDE/Project/ArbitraryResourceWorker.h"
+#include "GDCore/Project/InitialInstance.h"
+#include "GDCore/Project/Layout.h"
+#include "GDCore/Project/Object.h"
+#include "GDCore/Project/Project.h"
+#include "GDCore/Project/PropertyDescriptor.h"
+#include "GDCore/Serialization/SerializerElement.h"
+#include "GDCore/Tools/Localization.h"
+
+namespace gd {
+
+Animation SpriteAnimationList::badAnimation;
+
+SpriteAnimationList::SpriteAnimationList()
+    : adaptCollisionMaskAutomatically(true) {}
+
+SpriteAnimationList::~SpriteAnimationList(){};
+
+void SpriteAnimationList::UnserializeFrom(const gd::SerializerElement& element) {
+  adaptCollisionMaskAutomatically =
+      element.GetBoolAttribute("adaptCollisionMaskAutomatically", false);
+
+  RemoveAllAnimations();
+  const gd::SerializerElement& animationsElement =
+      element.GetChild("animations", 0, "Animations");
+  animationsElement.ConsiderAsArrayOf("animation", "Animation");
+  for (std::size_t i = 0; i < animationsElement.GetChildrenCount(); ++i) {
+    const gd::SerializerElement& animationElement =
+        animationsElement.GetChild(i);
+    Animation newAnimation;
+
+    newAnimation.useMultipleDirections = animationElement.GetBoolAttribute(
+        "useMultipleDirections", false, "typeNormal");
+    newAnimation.SetName(animationElement.GetStringAttribute("name", ""));
+
+    // Compatibility with GD <= 3.3
+    if (animationElement.HasChild("Direction")) {
+      for (std::size_t j = 0;
+           j < animationElement.GetChildrenCount("Direction");
+           ++j) {
+        Direction direction;
+        direction.UnserializeFrom(animationElement.GetChild("Direction", j));
+
+        newAnimation.SetDirectionsCount(newAnimation.GetDirectionsCount() + 1);
+        newAnimation.SetDirection(direction,
+                                  newAnimation.GetDirectionsCount() - 1);
+      }
+    }
+    // End of compatibility code
+    else {
+      const gd::SerializerElement& directionsElement =
+          animationElement.GetChild("directions");
+      directionsElement.ConsiderAsArrayOf("direction");
+      for (std::size_t j = 0; j < directionsElement.GetChildrenCount(); ++j) {
+        Direction direction;
+        direction.UnserializeFrom(directionsElement.GetChild(j));
+
+        newAnimation.SetDirectionsCount(newAnimation.GetDirectionsCount() + 1);
+        newAnimation.SetDirection(direction,
+                                  newAnimation.GetDirectionsCount() - 1);
+      }
+    }
+
+    AddAnimation(newAnimation);
+  }
+}
+
+void SpriteAnimationList::SerializeTo(gd::SerializerElement& element) const {
+  element.SetAttribute("adaptCollisionMaskAutomatically",
+                       adaptCollisionMaskAutomatically);
+
+  // Animations
+  gd::SerializerElement& animationsElement = element.AddChild("animations");
+  animationsElement.ConsiderAsArrayOf("animation");
+  for (std::size_t k = 0; k < GetAnimationsCount(); k++) {
+    gd::SerializerElement& animationElement =
+        animationsElement.AddChild("animation");
+
+    animationElement.SetAttribute("useMultipleDirections",
+                                  GetAnimation(k).useMultipleDirections);
+    animationElement.SetAttribute("name", GetAnimation(k).GetName());
+
+    gd::SerializerElement& directionsElement =
+        animationElement.AddChild("directions");
+    directionsElement.ConsiderAsArrayOf("direction");
+    for (std::size_t l = 0; l < GetAnimation(k).GetDirectionsCount(); l++) {
+      GetAnimation(k).GetDirection(l).SerializeTo(
+          directionsElement.AddChild("direction"));
+    }
+  }
+}
+
+void SpriteAnimationList::ExposeResources(gd::ArbitraryResourceWorker& worker) {
+  for (std::size_t j = 0; j < GetAnimationsCount(); j++) {
+    for (std::size_t k = 0; k < GetAnimation(j).GetDirectionsCount(); k++) {
+      for (std::size_t l = 0;
+           l < GetAnimation(j).GetDirection(k).GetSpritesCount();
+           l++) {
+        worker.ExposeImage(
+            GetAnimation(j).GetDirection(k).GetSprite(l).GetImageName());
+      }
+    }
+  }
+}
+
+const Animation& SpriteAnimationList::GetAnimation(std::size_t nb) const {
+  if (nb >= animations.size()) return badAnimation;
+
+  return animations[nb];
+}
+
+Animation& SpriteAnimationList::GetAnimation(std::size_t nb) {
+  if (nb >= animations.size()) return badAnimation;
+
+  return animations[nb];
+}
+
+void SpriteAnimationList::AddAnimation(const Animation& animation) {
+  animations.push_back(animation);
+}
+
+bool SpriteAnimationList::RemoveAnimation(std::size_t nb) {
+  if (nb >= GetAnimationsCount()) return false;
+
+  animations.erase(animations.begin() + nb);
+  return true;
+}
+
+void SpriteAnimationList::SwapAnimations(std::size_t firstIndex,
+                                  std::size_t secondIndex) {
+  if (firstIndex < animations.size() && secondIndex < animations.size() &&
+      firstIndex != secondIndex)
+    std::swap(animations[firstIndex], animations[secondIndex]);
+}
+
+void SpriteAnimationList::MoveAnimation(std::size_t oldIndex, std::size_t newIndex) {
+  if (oldIndex >= animations.size() || newIndex >= animations.size()) return;
+
+  auto animation = animations[oldIndex];
+  animations.erase(animations.begin() + oldIndex);
+  animations.insert(animations.begin() + newIndex, animation);
+}
+
+}  // namespace gd

Core/GDCore/Extensions/Builtin/SpriteExtension/SpriteAnimationList.h

@@ -0,0 +1,119 @@
+/*
+ * GDevelop Core
+ * Copyright 2008-2016 Florian Rival (Florian.Rival@gmail.com). All rights
+ * reserved. This project is released under the MIT License.
+ */
+
+#pragma once
+
+#include "GDCore/Extensions/Builtin/SpriteExtension/Animation.h"
+
+namespace gd {
+class InitialInstance;
+class SerializerElement;
+class PropertyDescriptor;
+class ArbitraryResourceWorker;
+}  // namespace gd
+
+namespace gd {
+
+/**
+ * \brief A list of animations, containing directions with images and collision mask.
+ * 
+ * It's used in the configuration of object that implements image-based animations.
+ *
+ * \see Animation
+ * \see Direction
+ * \see Sprite
+ * \ingroup SpriteObjectExtension
+ */
+class GD_CORE_API SpriteAnimationList {
+ public:
+  SpriteAnimationList();
+  virtual ~SpriteAnimationList();
+
+  void ExposeResources(gd::ArbitraryResourceWorker& worker);
+
+  /**
+   * \brief Return the animation at the specified index.
+   * If the index is out of bound, a "bad animation" object is returned.
+   */
+  const Animation& GetAnimation(std::size_t nb) const;
+
+  /**
+   * \brief Return the animation at the specified index.
+   * If the index is out of bound, a "bad animation" object is returned.
+   */
+  Animation& GetAnimation(std::size_t nb);
+
+  /**
+   * \brief Return the number of animations this object has.
+   */
+  std::size_t GetAnimationsCount() const { return animations.size(); };
+
+  /**
+   * \brief Add an animation at the end of the existing ones.
+   */
+  void AddAnimation(const Animation& animation);
+
+  /**
+   * \brief Remove an animation.
+   */
+  bool RemoveAnimation(std::size_t nb);
+
+  /**
+   * \brief Remove all animations.
+   */
+  void RemoveAllAnimations() { animations.clear(); }
+
+  /**
+   * \brief Return true if the object hasn't any animation.
+   */
+  bool HasNoAnimations() const { return animations.empty(); }
+
+  /**
+   * \brief Swap the position of two animations
+   */
+  void SwapAnimations(std::size_t firstIndex, std::size_t secondIndex);
+
+  /**
+   * \brief Change the position of the specified animation
+   */
+  void MoveAnimation(std::size_t oldIndex, std::size_t newIndex);
+
+  /**
+   * \brief Return a read-only reference to the vector containing all the
+   * animation of the object.
+   */
+  const std::vector<Animation>& GetAllAnimations() const { return animations; }
+
+  /**
+   * @brief Check if the collision mask adapts automatically to the animation.
+   */
+  bool AdaptCollisionMaskAutomatically() const {
+    return adaptCollisionMaskAutomatically;
+  }
+
+  /**
+   * @brief Set if the collision mask adapts automatically to the animation.
+   */
+  void SetAdaptCollisionMaskAutomatically(bool enable) {
+    adaptCollisionMaskAutomatically = enable;
+  }
+
+  void UnserializeFrom(const gd::SerializerElement& element);
+  void SerializeTo(gd::SerializerElement& element) const;
+
+ private:
+
+  mutable std::vector<Animation> animations;
+
+  static Animation badAnimation;         //< Bad animation when an out of bound
+                                         // animation is requested.
+  bool adaptCollisionMaskAutomatically;  ///< If set to true, the collision
+                                         ///< mask will be automatically
+                                         ///< adapted to the animation of the
+                                         ///< object.
+};
+
+}  // namespace gd

Core/GDCore/Extensions/Builtin/SpriteExtension/SpriteExtension.cpp

@@ -30,7 +30,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsSpriteExtension(
           .AddObject<SpriteObject>("Sprite",
                                    _("Sprite"),
                                    _("Animated object which can be used for "
-                                     "most elements of a game"),
+                                     "most elements of a game."),
                                    "CppPlatform/Extensions/spriteicon.png")
           .SetCategoryFullName(_("General"))
           .AddDefaultBehavior("EffectCapability::EffectBehavior")
@@ -408,6 +408,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsSpriteExtension(
       .SetHidden()
       .MarkAsSimple();
 
+  // Deprecated
   obj.AddCondition("ScaleWidth",
                    _("Scale on X axis"),
                    _("Compare the scale of the width of an object."),
@@ -415,7 +416,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsSpriteExtension(
                    _("Size"),
                    "res/conditions/scaleWidth24_black.png",
                    "res/conditions/scaleWidth_black.png")
-
+      .SetHidden()
       .AddParameter("object", _("Object"), "Sprite")
       .UseStandardRelationalOperatorParameters(
           "number",
@@ -423,6 +424,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsSpriteExtension(
               _("Scale (1 by default)")))
       .MarkAsAdvanced();
 
+  // Deprecated
   obj.AddCondition("ScaleHeight",
                    _("Scale on Y axis"),
                    _("Compare the scale of the height of an object."),
@@ -430,7 +432,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsSpriteExtension(
                    _("Size"),
                    "res/conditions/scaleHeight24_black.png",
                    "res/conditions/scaleHeight_black.png")
-
+      .SetHidden()
       .AddParameter("object", _("Object"), "Sprite")
       .UseStandardRelationalOperatorParameters(
           "number",

Core/GDCore/Extensions/Builtin/SpriteExtension/SpriteObject.cpp

@@ -23,88 +23,20 @@
 
 namespace gd {
 
-Animation SpriteObject::badAnimation;
-
 SpriteObject::SpriteObject()
-    : updateIfNotVisible(false), adaptCollisionMaskAutomatically(true) {}
+    : updateIfNotVisible(false) {}
 
 SpriteObject::~SpriteObject(){};
 
 void SpriteObject::DoUnserializeFrom(gd::Project& project,
                                      const gd::SerializerElement& element) {
   updateIfNotVisible = element.GetBoolAttribute("updateIfNotVisible", true);
-  adaptCollisionMaskAutomatically =
-      element.GetBoolAttribute("adaptCollisionMaskAutomatically", false);
-
-  RemoveAllAnimations();
-  const gd::SerializerElement& animationsElement =
-      element.GetChild("animations", 0, "Animations");
-  animationsElement.ConsiderAsArrayOf("animation", "Animation");
-  for (std::size_t i = 0; i < animationsElement.GetChildrenCount(); ++i) {
-    const gd::SerializerElement& animationElement =
-        animationsElement.GetChild(i);
-    Animation newAnimation;
-
-    newAnimation.useMultipleDirections = animationElement.GetBoolAttribute(
-        "useMultipleDirections", false, "typeNormal");
-    newAnimation.SetName(animationElement.GetStringAttribute("name", ""));
-
-    // Compatibility with GD <= 3.3
-    if (animationElement.HasChild("Direction")) {
-      for (std::size_t j = 0;
-           j < animationElement.GetChildrenCount("Direction");
-           ++j) {
-        Direction direction;
-        direction.UnserializeFrom(animationElement.GetChild("Direction", j));
-
-        newAnimation.SetDirectionsCount(newAnimation.GetDirectionsCount() + 1);
-        newAnimation.SetDirection(direction,
-                                  newAnimation.GetDirectionsCount() - 1);
-      }
-    }
-    // End of compatibility code
-    else {
-      const gd::SerializerElement& directionsElement =
-          animationElement.GetChild("directions");
-      directionsElement.ConsiderAsArrayOf("direction");
-      for (std::size_t j = 0; j < directionsElement.GetChildrenCount(); ++j) {
-        Direction direction;
-        direction.UnserializeFrom(directionsElement.GetChild(j));
-
-        newAnimation.SetDirectionsCount(newAnimation.GetDirectionsCount() + 1);
-        newAnimation.SetDirection(direction,
-                                  newAnimation.GetDirectionsCount() - 1);
-      }
-    }
-
-    AddAnimation(newAnimation);
-  }
+  animations.UnserializeFrom(element);
 }
 
 void SpriteObject::DoSerializeTo(gd::SerializerElement& element) const {
   element.SetAttribute("updateIfNotVisible", updateIfNotVisible);
-  element.SetAttribute("adaptCollisionMaskAutomatically",
-                       adaptCollisionMaskAutomatically);
-
-  // Animations
-  gd::SerializerElement& animationsElement = element.AddChild("animations");
-  animationsElement.ConsiderAsArrayOf("animation");
-  for (std::size_t k = 0; k < GetAnimationsCount(); k++) {
-    gd::SerializerElement& animationElement =
-        animationsElement.AddChild("animation");
-
-    animationElement.SetAttribute("useMultipleDirections",
-                                  GetAnimation(k).useMultipleDirections);
-    animationElement.SetAttribute("name", GetAnimation(k).GetName());
-
-    gd::SerializerElement& directionsElement =
-        animationElement.AddChild("directions");
-    directionsElement.ConsiderAsArrayOf("direction");
-    for (std::size_t l = 0; l < GetAnimation(k).GetDirectionsCount(); l++) {
-      GetAnimation(k).GetDirection(l).SerializeTo(
-          directionsElement.AddChild("direction"));
-    }
-  }
+  animations.SerializeTo(element);
 }
 
 std::map<gd::String, gd::PropertyDescriptor> SpriteObject::GetProperties()
@@ -127,16 +59,7 @@ bool SpriteObject::UpdateProperty(const gd::String& name,
 }
 
 void SpriteObject::ExposeResources(gd::ArbitraryResourceWorker& worker) {
-  for (std::size_t j = 0; j < GetAnimationsCount(); j++) {
-    for (std::size_t k = 0; k < GetAnimation(j).GetDirectionsCount(); k++) {
-      for (std::size_t l = 0;
-           l < GetAnimation(j).GetDirection(k).GetSpritesCount();
-           l++) {
-        worker.ExposeImage(
-            GetAnimation(j).GetDirection(k).GetSprite(l).GetImageName());
-      }
-    }
-  }
+  animations.ExposeResources(worker);
 }
 
 std::map<gd::String, gd::PropertyDescriptor>
@@ -168,42 +91,12 @@ bool SpriteObject::UpdateInitialInstanceProperty(
   return true;
 }
 
-const Animation& SpriteObject::GetAnimation(std::size_t nb) const {
-  if (nb >= animations.size()) return badAnimation;
-
-  return animations[nb];
+const SpriteAnimationList& SpriteObject::GetAnimations() const {
+  return animations;
 }
 
-Animation& SpriteObject::GetAnimation(std::size_t nb) {
-  if (nb >= animations.size()) return badAnimation;
-
-  return animations[nb];
-}
-
-void SpriteObject::AddAnimation(const Animation& animation) {
-  animations.push_back(animation);
-}
-
-bool SpriteObject::RemoveAnimation(std::size_t nb) {
-  if (nb >= GetAnimationsCount()) return false;
-
-  animations.erase(animations.begin() + nb);
-  return true;
-}
-
-void SpriteObject::SwapAnimations(std::size_t firstIndex,
-                                  std::size_t secondIndex) {
-  if (firstIndex < animations.size() && secondIndex < animations.size() &&
-      firstIndex != secondIndex)
-    std::swap(animations[firstIndex], animations[secondIndex]);
-}
-
-void SpriteObject::MoveAnimation(std::size_t oldIndex, std::size_t newIndex) {
-  if (oldIndex >= animations.size() || newIndex >= animations.size()) return;
-
-  auto animation = animations[oldIndex];
-  animations.erase(animations.begin() + oldIndex);
-  animations.insert(animations.begin() + newIndex, animation);
+SpriteAnimationList& SpriteObject::GetAnimations() {
+  return animations;
 }
 
 }  // namespace gd

Core/GDCore/Extensions/Builtin/SpriteExtension/SpriteObject.h

@@ -4,18 +4,15 @@
  * reserved. This project is released under the MIT License.
  */
 
-#ifndef GDCORE_SPRITEOBJECT_H
-#define GDCORE_SPRITEOBJECT_H
-#include "GDCore/Extensions/Builtin/SpriteExtension/Animation.h"
-#include "GDCore/Extensions/Builtin/SpriteExtension/Direction.h"
-#include "GDCore/Extensions/Builtin/SpriteExtension/Sprite.h"
+#pragma once
+
+#include "GDCore/Extensions/Builtin/SpriteExtension/SpriteAnimationList.h"
 #include "GDCore/Project/Object.h"
+
 namespace gd {
 class InitialInstance;
 class Object;
 class Layout;
-class Sprite;
-class Animation;
 class SerializerElement;
 class PropertyDescriptor;
 }  // namespace gd
@@ -59,76 +56,15 @@ class GD_CORE_API SpriteObject : public gd::ObjectConfiguration {
                                      gd::Project& project,
                                      gd::Layout& scene) override;
 
-  /** \name Animations
-   * Methods related to animations management
-   */
-  ///@{
   /**
-   * \brief Return the animation at the specified index.
-   * If the index is out of bound, a "bad animation" object is returned.
+   * \brief Return the animation configuration.
    */
-  const Animation& GetAnimation(std::size_t nb) const;
+  const SpriteAnimationList& GetAnimations() const;
 
   /**
-   * \brief Return the animation at the specified index.
-   * If the index is out of bound, a "bad animation" object is returned.
+   * @brief Return the animation configuration.
    */
-  Animation& GetAnimation(std::size_t nb);
-
-  /**
-   * \brief Return the number of animations this object has.
-   */
-  std::size_t GetAnimationsCount() const { return animations.size(); };
-
-  /**
-   * \brief Add an animation at the end of the existing ones.
-   */
-  void AddAnimation(const Animation& animation);
-
-  /**
-   * \brief Remove an animation.
-   */
-  bool RemoveAnimation(std::size_t nb);
-
-  /**
-   * \brief Remove all animations.
-   */
-  void RemoveAllAnimations() { animations.clear(); }
-
-  /**
-   * \brief Return true if the object hasn't any animation.
-   */
-  bool HasNoAnimations() const { return animations.empty(); }
-
-  /**
-   * \brief Swap the position of two animations
-   */
-  void SwapAnimations(std::size_t firstIndex, std::size_t secondIndex);
-
-  /**
-   * \brief Change the position of the specified animation
-   */
-  void MoveAnimation(std::size_t oldIndex, std::size_t newIndex);
-
-  /**
-   * \brief Return a read-only reference to the vector containing all the
-   * animation of the object.
-   */
-  const std::vector<Animation>& GetAllAnimations() const { return animations; }
-
-  /**
-   * @brief Check if the collision mask adapts automatically to the animation.
-   */
-  bool AdaptCollisionMaskAutomatically() const {
-    return adaptCollisionMaskAutomatically;
-  }
-
-  /**
-   * @brief Set if the collision mask adapts automatically to the animation.
-   */
-  void SetAdaptCollisionMaskAutomatically(bool enable) {
-    adaptCollisionMaskAutomatically = enable;
-  }
+  SpriteAnimationList& GetAnimations();
 
   /**
    * \brief Set if the object animation should be played even if the object is
@@ -143,25 +79,17 @@ class GD_CORE_API SpriteObject : public gd::ObjectConfiguration {
    * is hidden or far from the camera (false by default).
    */
   bool GetUpdateIfNotVisible() const { return updateIfNotVisible; }
-  ///@}
 
  private:
   void DoUnserializeFrom(gd::Project& project,
                          const gd::SerializerElement& element) override;
   void DoSerializeTo(gd::SerializerElement& element) const override;
 
-  mutable std::vector<Animation> animations;
+  SpriteAnimationList animations;
+
   bool updateIfNotVisible;  ///< If set to true, ask the game engine to play
                             ///< object animation even if hidden or far from
                             ///< the screen.
-
-  static Animation badAnimation;         //< Bad animation when an out of bound
-                                         // animation is requested.
-  bool adaptCollisionMaskAutomatically;  ///< If set to true, the collision
-                                         ///< mask will be automatically
-                                         ///< adapted to the animation of the
-                                         ///< object.
 };
 
 }  // namespace gd
-#endif  // GDCORE_SPRITEOBJECT_H

Core/GDCore/Extensions/Builtin/WindowExtension.cpp

@@ -87,8 +87,8 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsWindowExtension(
   extension
       .AddAction(
           "SetWindowSize",
-          _("Change the size of the game window"),
-          _("This action changes the size of the game window. Note that this "
+          _("Game window size"),
+          _("Changes the size of the game window. Note that this "
             "will only work on platform supporting this operation: games "
             "running in browsers or on mobile phones can not update their "
             "window size. Game resolution can still be updated."),

Core/GDCore/Extensions/Metadata/AbstractFunctionMetadata.h

@@ -114,6 +114,8 @@ public:
 
   /**
    * \brief Erase any existing include file and add the specified include.
+   * \deprecated Use `AddIncludeFile` instead as clearing the list is more
+   * error prone.
    */
   virtual AbstractFunctionMetadata &
   SetIncludeFile(const gd::String &includeFile) = 0;

Core/GDCore/Extensions/Metadata/BehaviorMetadata.cpp

@@ -13,12 +13,15 @@
 #include "GDCore/Extensions/PlatformExtension.h"
 #include "GDCore/Project/Behavior.h"
 #include "GDCore/Project/BehaviorsSharedData.h"
+#include "GDCore/Project/PropertyDescriptor.h"
 #include "GDCore/Tools/Localization.h"
 #include "GDCore/Tools/MakeUnique.h"
 #include "GDCore/Tools/Log.h"
 
 namespace gd {
 
+const std::map<gd::String, gd::PropertyDescriptor> BehaviorMetadata::badProperties;
+
 BehaviorMetadata::BehaviorMetadata(
     const gd::String& extensionNamespace_,
     const gd::String& nameWithNamespace,
@@ -47,8 +50,14 @@ BehaviorMetadata::BehaviorMetadata(
         "BehaviorMetadata is valid for: " + nameWithNamespace);
   }
 
-  if (instance) instance->SetTypeName(nameWithNamespace);
-  if (sharedDatasInstance) sharedDatasInstance->SetTypeName(nameWithNamespace);
+  if (instance) {
+    instance->SetTypeName(nameWithNamespace);
+    instance->InitializeContent();
+  }
+  if (sharedDatasInstance) {
+    sharedDatasInstance->SetTypeName(nameWithNamespace);
+    sharedDatasInstance->InitializeContent();
+  }
 }
 
 gd::InstructionMetadata& BehaviorMetadata::AddCondition(
@@ -405,10 +414,30 @@ gd::Behavior& BehaviorMetadata::Get() const {
   return *instance;
 }
 
+std::map<gd::String, gd::PropertyDescriptor> BehaviorMetadata::GetProperties() const {
+  if (!instance) {
+    return badProperties;
+  }
+  // TODO Properties should be declared on BehaviorMetadata directly.
+  // - Add 2 `properties` members (one for shared properties)
+  // - Add methods to declare new properties
+  return instance->GetProperties();
+}
+
 gd::BehaviorsSharedData* BehaviorMetadata::GetSharedDataInstance() const { 
   return sharedDatasInstance.get();
 }
 
+std::map<gd::String, gd::PropertyDescriptor> BehaviorMetadata::GetSharedProperties() const {
+  if (!sharedDatasInstance) {
+    return badProperties;
+  }
+  // TODO Properties should be declared on BehaviorMetadata directly.
+  // - Add 2 `properties` members (one for shared properties)
+  // - Add methods to declare new properties
+  return sharedDatasInstance->GetProperties();
+}
+
 const std::vector<gd::String>& BehaviorMetadata::GetRequiredBehaviorTypes() const {
   requiredBehaviors.clear();
   for (auto& property : Get().GetProperties()) {

Core/GDCore/Extensions/Metadata/BehaviorMetadata.h

@@ -18,6 +18,7 @@ class BehaviorsSharedData;
 class MultipleInstructionMetadata;
 class InstructionMetadata;
 class ExpressionMetadata;
+class PropertyDescriptor;
 }  // namespace gd
 
 namespace gd {
@@ -204,6 +205,8 @@ class GD_CORE_API BehaviorMetadata : public InstructionOrExpressionContainerMeta
    * \brief Erase any existing include file and add the specified include.
    * \note The requirement may vary depending on the platform: Most of the time,
    * the include file contains the declaration of the behavior.
+   * \deprecated Use `AddIncludeFile` instead as clearing the list is more
+   * error prone.
    */
   BehaviorMetadata& SetIncludeFile(const gd::String& includeFile) override;
 
@@ -302,6 +305,15 @@ class GD_CORE_API BehaviorMetadata : public InstructionOrExpressionContainerMeta
    */
   gd::Behavior& Get() const;
 
+  /**
+   * \brief Called when the IDE wants to know about the custom properties of the
+   * behavior.
+   *
+   * \return a std::map with properties names as key.
+   * \see gd::PropertyDescriptor
+   */
+  std::map<gd::String, gd::PropertyDescriptor> GetProperties() const;
+
   /**
    * \brief Return the associated gd::BehaviorsSharedData, handling behavior
    * shared data, if any (nullptr if none).
@@ -311,6 +323,15 @@ class GD_CORE_API BehaviorMetadata : public InstructionOrExpressionContainerMeta
    */
   gd::BehaviorsSharedData* GetSharedDataInstance() const;
 
+  /**
+   * \brief Called when the IDE wants to know about the custom shared properties
+   * of the behavior.
+   *
+   * \return a std::map with properties names as key.
+   * \see gd::PropertyDescriptor
+   */
+  std::map<gd::String, gd::PropertyDescriptor> GetSharedProperties() const;
+
   /**
    * \brief Return a reference to a map containing the names of the actions
    * (as keys) and the metadata associated with (as values).
@@ -357,6 +378,8 @@ class GD_CORE_API BehaviorMetadata : public InstructionOrExpressionContainerMeta
   // TODO: Nitpicking: convert these to std::unique_ptr to clarify ownership.
   std::shared_ptr<gd::Behavior> instance;
   std::shared_ptr<gd::BehaviorsSharedData> sharedDatasInstance;
+
+  static const std::map<gd::String, gd::PropertyDescriptor> badProperties;
 };
 
 }  // namespace gd

Core/GDCore/Extensions/Metadata/EffectMetadata.h

@@ -65,6 +65,8 @@ class GD_CORE_API EffectMetadata {
 
   /**
    * \brief Clear any existing include file and add the specified include file.
+   * \deprecated Use `AddIncludeFile` instead as clearing the list is more
+   * error prone.
    */
   EffectMetadata& SetIncludeFile(const gd::String& includeFile);
 

Core/GDCore/Extensions/Metadata/ExpressionMetadata.cpp

@@ -5,6 +5,7 @@
  */
 #include "ExpressionMetadata.h"
 #include "GDCore/CommonTools.h"
+#include "GDCore/Extensions/PlatformExtension.h"
 #include "GDCore/String.h"
 
 namespace gd {
@@ -46,16 +47,14 @@ gd::ExpressionMetadata& ExpressionMetadata::AddParameter(
       // For objects/behavior, the supplementary information
       // parameter is an object/behavior type...
       ((gd::ParameterMetadata::IsObject(type) ||
-       gd::ParameterMetadata::IsBehavior(type))
-       // Prefix with the namespace if it's not already there.
-       && !(supplementaryInformation.rfind(extensionNamespace, 0) == 0))
-          ? (supplementaryInformation.empty()
-                 ? ""
-                 : extensionNamespace +
-                       supplementaryInformation  //... so prefix it with the extension
-                                           // namespace.
-             )
-          : supplementaryInformation);  // Otherwise don't change anything
+        gd::ParameterMetadata::IsBehavior(type))
+               // Prefix with the namespace if it's not already there.
+               && (supplementaryInformation.find(
+                       PlatformExtension::GetNamespaceSeparator()) == gd::String::npos)
+           ? (supplementaryInformation.empty()
+                  ? ""
+                  : extensionNamespace + supplementaryInformation)
+           : supplementaryInformation));
 
   // TODO: Assert against supplementaryInformation === "emsc" (when running with
   // Emscripten), and warn about a missing argument when calling addParameter.

Core/GDCore/Extensions/Metadata/ExpressionMetadata.h

@@ -288,6 +288,8 @@ class GD_CORE_API ExpressionMetadata : public gd::AbstractFunctionMetadata {
 
   /**
    * \brief Erase any existing include file and add the specified include.
+   * \deprecated Use `AddIncludeFile` instead as clearing the list is more
+   * error prone.
    */
   ExpressionMetadata& SetIncludeFile(
       const gd::String& includeFile) override {

Core/GDCore/Extensions/Metadata/InstructionMetadata.cpp

@@ -8,6 +8,7 @@
 #include <algorithm>
 
 #include "GDCore/CommonTools.h"
+#include "GDCore/Extensions/PlatformExtension.h"
 #include "GDCore/Serialization/SerializerElement.h"
 #include "GDCore/Tools/Localization.h"
 #include "GDCore/Tools/Log.h"
@@ -64,17 +65,14 @@ InstructionMetadata& InstructionMetadata::AddParameter(
       // For objects/behavior, the supplementary information
       // parameter is an object/behavior type...
       ((gd::ParameterMetadata::IsObject(type) ||
-       gd::ParameterMetadata::IsBehavior(type))
-       // Prefix with the namespace if it's not already there.
-       && !(supplementaryInformation.rfind(extensionNamespace, 0) == 0))
-          ? (supplementaryInformation.empty()
-                 ? ""
-                 : extensionNamespace +
-                       supplementaryInformation  //... so prefix it with the
-                                                 // extension
-                                                 // namespace.
-             )
-          : supplementaryInformation);  // Otherwise don't change anything
+        gd::ParameterMetadata::IsBehavior(type))
+               // Prefix with the namespace if it's not already there.
+               && (supplementaryInformation.find(
+                       PlatformExtension::GetNamespaceSeparator()) == gd::String::npos)
+           ? (supplementaryInformation.empty()
+                  ? ""
+                  : extensionNamespace + supplementaryInformation)
+           : supplementaryInformation));
 
   // TODO: Assert against supplementaryInformation === "emsc" (when running with
   // Emscripten), and warn about a missing argument when calling addParameter.
@@ -190,7 +188,7 @@ InstructionMetadata::UseStandardRelationalOperatorParameters(
       gd::String templateSentence = _("<subject> of _PARAM0_ <operator> <value>");
 
       sentence =
-          templateSentence.FindAndReplace("<subject>", sentence)
+          templateSentence.FindAndReplace("<subject>", sentence.CapitalizeFirstLetter())
               .FindAndReplace(
                   "<operator>",
                   "_PARAM" + gd::String::From(operatorParamIndex) + "_")
@@ -200,7 +198,7 @@ InstructionMetadata::UseStandardRelationalOperatorParameters(
       gd::String templateSentence = _("<subject> <operator> <value>");
 
       sentence =
-          templateSentence.FindAndReplace("<subject>", sentence)
+          templateSentence.FindAndReplace("<subject>", sentence.CapitalizeFirstLetter())
               .FindAndReplace(
                   "<operator>",
                   "_PARAM" + gd::String::From(operatorParamIndex) + "_")

Core/GDCore/Extensions/Metadata/InstructionMetadata.h

@@ -494,6 +494,8 @@ class GD_CORE_API InstructionMetadata : public gd::AbstractFunctionMetadata {
 
   /**
    * \brief Erase any existing include file and add the specified include.
+   * \deprecated Use `AddIncludeFile` instead as clearing the list is more
+   * error prone.
    */
   InstructionMetadata &SetIncludeFile(const gd::String &includeFile) override {
     codeExtraInformation.includeFiles.clear();

Core/GDCore/Extensions/Metadata/InstructionOrExpressionContainerMetadata.h

@@ -142,6 +142,8 @@ public:
    * \brief Erase any existing include file and add the specified include.
    * \note The requirement may vary depending on the platform: Most of the time,
    * the include file contains the declaration of the behavior.
+   * \deprecated Use `AddIncludeFile` instead as clearing the list is more
+   * error prone.
    */
   virtual InstructionOrExpressionContainerMetadata &
   SetIncludeFile(const gd::String &includeFile) = 0;

Core/GDCore/Extensions/Metadata/MultipleInstructionMetadata.h

@@ -150,6 +150,10 @@ class GD_CORE_API MultipleInstructionMetadata : public AbstractFunctionMetadata
     return *this;
   }
 
+  /**
+   * \deprecated Use `AddIncludeFile` instead as clearing the list is more
+   * error prone.
+   */
   MultipleInstructionMetadata &SetIncludeFile(const gd::String &includeFile) override {
     if (expression)
       expression->SetIncludeFile(includeFile);
@@ -191,6 +195,16 @@ class GD_CORE_API MultipleInstructionMetadata : public AbstractFunctionMetadata
     return *this;
   }
 
+  /**
+   * \see gd::InstructionMetadata::SetHelpPath
+   */
+  MultipleInstructionMetadata &SetHelpPath(const gd::String &path) {
+    if (expression) expression->SetHelpPath(path);
+    if (condition) condition->SetHelpPath(path);
+    if (action) action->SetHelpPath(path);
+    return *this;
+  }
+
   /**
    * \see gd::InstructionMetadata::MarkAsSimple
    */

Core/GDCore/Extensions/Metadata/ObjectMetadata.h

@@ -264,6 +264,8 @@ class GD_CORE_API ObjectMetadata : public InstructionOrExpressionContainerMetada
    * \brief Erase any existing include file and add the specified include.
    * \note The requirement may vary depending on the platform: Most of the time,
    * the include file contains the declaration of the object.
+   * \deprecated Use `AddIncludeFile` instead as clearing the list is more
+   * error prone.
    */
   ObjectMetadata& SetIncludeFile(const gd::String& includeFile) override;
 
@@ -303,12 +305,24 @@ class GD_CORE_API ObjectMetadata : public InstructionOrExpressionContainerMetada
     return *this;
   }
 
-
   /**
-   * \brief Return true if the instruction must be hidden in the IDE.
+   * \brief Return true if the object must be hidden in the IDE.
    */
   bool IsHidden() const { return hidden; }
 
+  /**
+   * \brief Declare a usage of the 3D renderer.
+   */
+  ObjectMetadata &MarkAsRenderedIn3D() {
+    isRenderedIn3D = true;
+    return *this;
+  }
+
+  /**
+   * \brief Return true if the object uses the 3D renderer.
+   */
+  bool IsRenderedIn3D() const { return isRenderedIn3D; }
+
   std::map<gd::String, gd::InstructionMetadata> conditionsInfos;
   std::map<gd::String, gd::InstructionMetadata> actionsInfos;
   std::map<gd::String, gd::ExpressionMetadata> expressionsInfos;
@@ -329,6 +343,7 @@ class GD_CORE_API ObjectMetadata : public InstructionOrExpressionContainerMetada
   gd::String categoryFullName;
   std::set<gd::String> defaultBehaviorTypes;
   bool hidden = false;
+  bool isRenderedIn3D = false;
 
   std::shared_ptr<gd::ObjectConfiguration>
       blueprintObject;  ///< The "blueprint" object to be copied when a new

Core/GDCore/Extensions/Metadata/ValueTypeMetadata.h

@@ -217,7 +217,9 @@ class GD_CORE_API ValueTypeMetadata {
              parameterType == "jsonResource" ||
              parameterType == "tilemapResource" ||
              parameterType == "tilesetResource" ||
-             parameterType == "model3DResource";
+             parameterType == "model3DResource" ||
+             parameterType == "atlasResource" ||
+             parameterType == "spineResource";
     }
     return false;
   }

Core/GDCore/Extensions/PlatformExtension.h

@@ -264,8 +264,11 @@ class GD_CORE_API PlatformExtension {
    *
    * \param name The name of the behavior
    * \param fullname The user friendly name of the behavior
+   * \param defaultName The default name of behavior instances
    * \param description The user friendly description of the behavior
+   * \param group The behavior category label
    * \param icon The icon of the behavior.
+   * \param className The name of the class implementing the behavior
    * \param instance An instance of the behavior that
    * will be used to create the behavior
    * \param sharedDatasInstance Optional
@@ -282,21 +285,6 @@ class GD_CORE_API PlatformExtension {
       std::shared_ptr<gd::Behavior> instance,
       std::shared_ptr<gd::BehaviorsSharedData> sharedDatasInstance);
 
-  /**
-   * \brief Declare a new events based behavior as being part of the extension.
-   *
-   * \param name The name of the behavior
-   * \param fullname The user friendly name of the behavior
-   * \param description The user friendly description of the behavior
-   * \param icon The icon of the behavior.
-   */
-  gd::BehaviorMetadata& AddEventsBasedBehavior(
-      const gd::String& name_,
-      const gd::String& fullname_,
-      const gd::String& description_,
-      const gd::String& group_,
-      const gd::String& icon_);
-
   /**
    * \brief Declare a new effect as being part of the extension.
    * \param name The internal name of the effect (also called effect type).

Core/GDCore/IDE/DependenciesAnalyzer.cpp

@@ -4,7 +4,6 @@
  * reserved. This project is released under the MIT License.
  */
 
-#if defined(GD_IDE_ONLY)
 #include "DependenciesAnalyzer.h"
 #include <algorithm>
 #include "GDCore/Events/Builtin/LinkEvent.h"
@@ -29,9 +28,9 @@ DependenciesAnalyzer::DependenciesAnalyzer(const gd::Project& project_,
 
 bool DependenciesAnalyzer::Analyze() {
   if (layout)
-    return Analyze(layout->GetEvents(), true);
+    return Analyze(layout->GetEvents());
   else if (externalEvents)
-    return Analyze(externalEvents->GetEvents(), true);
+    return Analyze(externalEvents->GetEvents());
 
   std::cout << "ERROR: DependenciesAnalyzer called without any layout or "
                "external events.";
@@ -40,63 +39,38 @@ bool DependenciesAnalyzer::Analyze() {
 
 DependenciesAnalyzer::~DependenciesAnalyzer() {}
 
-bool DependenciesAnalyzer::Analyze(const gd::EventsList& events, bool isOnTopLevel) {
+bool DependenciesAnalyzer::Analyze(const gd::EventsList& events) {
   for (unsigned int i = 0; i < events.size(); ++i) {
     const gd::LinkEvent* linkEvent = dynamic_cast<const gd::LinkEvent*>(&events[i]);
     if (linkEvent) {
-      DependenciesAnalyzer analyzer(*this);
-
       gd::String linked = linkEvent->GetTarget();
       if (project.HasExternalEventsNamed(linked)) {
         if (std::find(parentExternalEvents.begin(),
                       parentExternalEvents.end(),
-                      linked) != parentExternalEvents.end())
-          return false;  // Circular dependency!
-
-        externalEventsDependencies.insert(
-            linked);  // There is a direct dependency
-        if (!isOnTopLevel) notTopLevelExternalEventsDependencies.insert(linked);
-        analyzer.AddParentExternalEvents(linked);
-        if (!analyzer.Analyze(project.GetExternalEvents(linked).GetEvents(),
-                              isOnTopLevel))
+                      linked) != parentExternalEvents.end()) {
+          // Circular dependency!
           return false;
-
+        }
+        bool wasDependencyJustAdded = externalEventsDependencies.insert(linked).second;
+        if (wasDependencyJustAdded) {
+          parentExternalEvents.push_back(linked);
+          if (!Analyze(project.GetExternalEvents(linked).GetEvents()))
+            return false;
+          parentExternalEvents.pop_back();
+        }
       } else if (project.HasLayoutNamed(linked)) {
         if (std::find(parentScenes.begin(), parentScenes.end(), linked) !=
-            parentScenes.end())
-          return false;  // Circular dependency!
-
-        scenesDependencies.insert(linked);  // There is a direct dependency
-        if (!isOnTopLevel) notTopLevelScenesDependencies.insert(linked);
-        analyzer.AddParentScene(linked);
-        if (!analyzer.Analyze(project.GetLayout(linked).GetEvents(),
-                              isOnTopLevel))
+            parentScenes.end()) {
+          // Circular dependency!
           return false;
-      }
-
-      // Update with indirect dependencies.
-      scenesDependencies.insert(analyzer.GetScenesDependencies().begin(),
-                                analyzer.GetScenesDependencies().end());
-      externalEventsDependencies.insert(
-          analyzer.GetExternalEventsDependencies().begin(),
-          analyzer.GetExternalEventsDependencies().end());
-      sourceFilesDependencies.insert(
-          analyzer.GetSourceFilesDependencies().begin(),
-          analyzer.GetSourceFilesDependencies().end());
-      notTopLevelScenesDependencies.insert(
-          analyzer.GetNotTopLevelScenesDependencies().begin(),
-          analyzer.GetNotTopLevelScenesDependencies().end());
-      notTopLevelExternalEventsDependencies.insert(
-          analyzer.GetNotTopLevelExternalEventsDependencies().begin(),
-          analyzer.GetNotTopLevelExternalEventsDependencies().end());
-
-      if (!isOnTopLevel) {
-        notTopLevelScenesDependencies.insert(
-            analyzer.GetScenesDependencies().begin(),
-            analyzer.GetScenesDependencies().end());
-        notTopLevelExternalEventsDependencies.insert(
-            analyzer.GetExternalEventsDependencies().begin(),
-            analyzer.GetExternalEventsDependencies().end());
+        }
+        bool wasDependencyJustAdded = scenesDependencies.insert(linked).second;
+        if (wasDependencyJustAdded) {
+          parentScenes.push_back(linked);
+          if (!Analyze(project.GetLayout(linked).GetEvents()))
+            return false;
+          parentScenes.pop_back();
+        }
       }
     }
 
@@ -112,45 +86,9 @@ bool DependenciesAnalyzer::Analyze(const gd::EventsList& events, bool isOnTopLev
 
     // Analyze sub events dependencies
     if (events[i].CanHaveSubEvents()) {
-      if (!Analyze(events[i].GetSubEvents(), false)) return false;
+      if (!Analyze(events[i].GetSubEvents())) return false;
     }
   }
 
   return true;
 }
-
-gd::String DependenciesAnalyzer::ExternalEventsCanBeCompiledForAScene() {
-  if (!externalEvents) {
-    std::cout << "ERROR: ExternalEventsCanBeCompiledForAScene called without "
-                 "external events set!"
-              << std::endl;
-    return "";
-  }
-
-  gd::String sceneName;
-  for (unsigned int i = 0; i < project.GetLayoutsCount(); ++i) {
-    // For each layout, compute the dependencies and the dependencies which are
-    // not coming from a top level event.
-    DependenciesAnalyzer analyzer(project, project.GetLayout(i));
-    if (!analyzer.Analyze()) continue;  // Analyze failed -> Cyclic dependencies
-    const std::set<gd::String>& dependencies =
-        analyzer.GetExternalEventsDependencies();
-    const std::set<gd::String>& notTopLevelDependencies =
-        analyzer.GetNotTopLevelExternalEventsDependencies();
-
-    // Check if the external events is a dependency, and that is is only present
-    // as a link on the top level.
-    if (dependencies.find(externalEvents->GetName()) != dependencies.end() &&
-        notTopLevelDependencies.find(externalEvents->GetName()) ==
-            notTopLevelDependencies.end()) {
-      if (!sceneName.empty())
-        return "";  // External events can be compiled only if one scene is
-                    // including them.
-      else
-        sceneName = project.GetLayout(i).GetName();
-    }
-  }
-
-  return sceneName;  // External events can be compiled and used for the scene.
-}
-#endif

Core/GDCore/IDE/DependenciesAnalyzer.h

@@ -39,11 +39,6 @@ class GD_CORE_API DependenciesAnalyzer {
 
   /**
    * \brief Constructor for analyzing the dependencies of external events.
-   *
-   * You can also call then
-   * DependenciesAnalyzer::ExternalEventsCanBeCompiledForAScene to check if the
-   * external events can be compiled separately and called by a scene. \see
-   * DependenciesAnalyzer::ExternalEventsCanBeCompiledForAScene
    */
   DependenciesAnalyzer(const gd::Project& project_,
                        const gd::ExternalEvents& externalEvents);
@@ -60,18 +55,6 @@ class GD_CORE_API DependenciesAnalyzer {
    */
   bool Analyze();
 
-  /**
-   * Check if the external events (passed in the constructor) can be compiled
-   * and called by a single scene:<br> This is possible when the link calling
-   * the external events does not have any parent event and when this situation
-   * occurs only in a single scene and not in another.
-   *
-   * \return The name of the scene which is able to call the compiled external
-   * events. If empty, no scene is able to call them. (So external events have
-   * to be included directly by links).
-   */
-  gd::String ExternalEventsCanBeCompiledForAScene();
-
   /**
    * \brief Return the scenes being dependencies of the scene or external events
    * passed in the constructor.
@@ -96,25 +79,6 @@ class GD_CORE_API DependenciesAnalyzer {
     return sourceFilesDependencies;
   };
 
-  /**
-   * \brief Return the scenes being dependencies of the scene or external events
-   * passed in the constructor, but being not top level dependencies: The links
-   * including them are not a top level events (i.e: They have a parent event).
-   */
-  const std::set<gd::String>& GetNotTopLevelScenesDependencies() const {
-    return notTopLevelScenesDependencies;
-  };
-
-  /**
-   * \brief Return the external events being dependencies of the scene or
-   * external events passed in the constructor, but being not top level
-   * dependencies: The links including them are not a top level events (i.e:
-   * They have a parent event).
-   */
-  const std::set<gd::String>& GetNotTopLevelExternalEventsDependencies() const {
-    return notTopLevelExternalEventsDependencies;
-  };
-
  private:
   /**
    * \brief Analyze the dependencies of the events.
@@ -124,32 +88,11 @@ class GD_CORE_API DependenciesAnalyzer {
    * (they have no parents). \return false if a circular dependency exists, true
    * otherwise.
    */
-  bool Analyze(const gd::EventsList& events, bool isOnTopLevel);
-
-  void AddParentScene(gd::String parentScene) {
-    parentScenes.push_back(parentScene);
-  };
-  void AddParentExternalEvents(gd::String parentExternalEvents_) {
-    parentExternalEvents.push_back(parentExternalEvents_);
-  };
-
-  /**
-   * Return true if all links pointing to external events called \a
-   * externalEventsName are only at the top level of \a events. The function
-   * return false as soon as it discover a link to external events which is not
-   * at the top level ( i.e: It has a parent event ).
-   *
-   * \warning The function assumes that there are not cyclic dependencies.
-   */
-  bool CheckIfExternalEventsIsLinkedOnlyAtTopLevel(
-      const gd::String& externalEventsName,
-      std::vector<std::shared_ptr<gd::BaseEvent> >& events);
+  bool Analyze(const gd::EventsList& events);
 
   std::set<gd::String> scenesDependencies;
   std::set<gd::String> externalEventsDependencies;
   std::set<gd::String> sourceFilesDependencies;
-  std::set<gd::String> notTopLevelScenesDependencies;
-  std::set<gd::String> notTopLevelExternalEventsDependencies;
   std::vector<gd::String>
       parentScenes;  ///< Used to check for circular dependencies.
   std::vector<gd::String>

Core/GDCore/IDE/Events/EventsIdentifiersFinder.cpp

@@ -226,7 +226,7 @@ void EventsIdentifiersFinder::FindArgumentsInEventsAndDependencies(
   eventWorker.Launch(layout.GetEvents(),
       gd::ProjectScopedContainers::MakeNewProjectScopedContainersForProjectAndLayout(project, layout));
 
-  DependenciesAnalyzer dependenciesAnalyzer = DependenciesAnalyzer(project, layout);
+  DependenciesAnalyzer dependenciesAnalyzer(project, layout);
   dependenciesAnalyzer.Analyze();
   for (const gd::String& externalEventName : dependenciesAnalyzer.GetExternalEventsDependencies()) {
     const gd::ExternalEvents& externalEvents = project.GetExternalEvents(externalEventName);

Core/GDCore/IDE/Events/EventsVariableReplacer.cpp

@@ -136,7 +136,7 @@ class GD_CORE_API ExpressionVariableReplacer
     auto& objectsContainersList =
         projectScopedContainers.GetObjectsContainersList();
     if (!objectNameToUseForVariableAccessor.empty()) {
-      if (objectsContainersList.HasVariablesContainer(
+      if (objectsContainersList.HasObjectOrGroupVariablesContainer(
               objectNameToUseForVariableAccessor, targetVariablesContainer)) {
         // The node represents an object variable, and this object variables are
         // the target. Do the replacement or removals:
@@ -177,7 +177,7 @@ class GD_CORE_API ExpressionVariableReplacer
         GetPotentialNewName(node.identifierName),
         [&]() {
           // This represents an object.
-          if (objectsContainersList.HasVariablesContainer(
+          if (objectsContainersList.HasObjectOrGroupVariablesContainer(
                   node.identifierName, targetVariablesContainer)) {
             // The node represents an object variable, and this object variables
             // are the target. Do the replacement or removals:

Core/GDCore/IDE/Events/EventsVariablesFinder.cpp

@@ -258,7 +258,7 @@ void EventsVariablesFinder::FindArgumentsInEventsAndDependencies(
   eventWorker.Launch(layout.GetEvents(),
       gd::ProjectScopedContainers::MakeNewProjectScopedContainersForProjectAndLayout(project, layout));
 
-  DependenciesAnalyzer dependenciesAnalyzer = DependenciesAnalyzer(project, layout);
+  DependenciesAnalyzer dependenciesAnalyzer(project, layout);
   dependenciesAnalyzer.Analyze();
   for (const gd::String& externalEventName : dependenciesAnalyzer.GetExternalEventsDependencies()) {
     const gd::ExternalEvents& externalEvents = project.GetExternalEvents(externalEventName);

Core/GDCore/IDE/Events/ExpressionCompletionFinder.h

@@ -11,13 +11,16 @@
 
 #include "GDCore/Events/Parsers/ExpressionParser2.h"
 #include "GDCore/Events/Parsers/ExpressionParser2Node.h"
+#include "GDCore/Events/Parsers/ExpressionParser2NodePrinter.h"
 #include "GDCore/Events/Parsers/ExpressionParser2NodeWorker.h"
+#include "GDCore/Events/Parsers/GrammarTerminals.h"
 #include "GDCore/Extensions/Metadata/ExpressionMetadata.h"
 #include "GDCore/Extensions/Metadata/InstructionMetadata.h"
 #include "GDCore/Extensions/Metadata/ValueTypeMetadata.h"
 #include "GDCore/IDE/Events/ExpressionNodeLocationFinder.h"
 #include "GDCore/IDE/Events/ExpressionTypeFinder.h"
 #include "GDCore/IDE/Events/ExpressionVariableOwnerFinder.h"
+#include "GDCore/IDE/Events/ExpressionVariableParentFinder.h"
 #include "GDCore/Project/ProjectScopedContainers.h"
 #include "GDCore/Project/Variable.h"
 
@@ -486,47 +489,56 @@ class GD_CORE_API ExpressionCompletionFinder
     auto type = gd::ExpressionTypeFinder::GetType(
         platform, projectScopedContainers, rootType, node);
 
+    // Only attempt to complete with the children of the variable
+    // if it's the last child (no more `.AnotherVariable` written after).
+    bool eagerlyCompleteIfExactMatch = node.child == nullptr;
+
     if (gd::ValueTypeMetadata::IsTypeLegacyPreScopedVariable(type)) {
-      if (type == "globalvar") {
+      if (type == "globalvar" || type == "scenevar") {
         const auto* variablesContainer =
-            projectScopedContainers.GetVariablesContainersList()
-                .GetTopMostVariablesContainer();
+            type == "globalvar"
+                ? projectScopedContainers.GetVariablesContainersList()
+                      .GetTopMostVariablesContainer()
+                : projectScopedContainers.GetVariablesContainersList()
+                      .GetBottomMostVariablesContainer();
         if (variablesContainer) {
-          AddCompletionsForVariablesMatchingSearch(
-              *variablesContainer, node.name, node.nameLocation);
-        }
-      } else if (type == "scenevar") {
-        const auto* variablesContainer =
-            projectScopedContainers.GetVariablesContainersList()
-                .GetBottomMostVariablesContainer();
-        if (variablesContainer) {
-          AddCompletionsForVariablesMatchingSearch(
-              *variablesContainer, node.name, node.nameLocation);
+          AddCompletionsForVariablesMatchingSearch(*variablesContainer,
+                                                   node.name,
+                                                   node.nameLocation,
+                                                   eagerlyCompleteIfExactMatch);
         }
       } else if (type == "objectvar") {
         auto objectName = gd::ExpressionVariableOwnerFinder::GetObjectName(
-            platform,
-            objectsContainersList,
-            // Variable fields doesn't use expression completion,
-            // so the object will be found inside the expression itself.
-            "",
-            node);
+            platform, objectsContainersList, rootObjectName, node);
 
         AddCompletionsForObjectOrGroupVariablesMatchingSearch(
-            objectsContainersList, objectName, node.name, node.nameLocation);
+            objectsContainersList,
+            objectName,
+            node.name,
+            node.nameLocation,
+            eagerlyCompleteIfExactMatch);
       }
     } else {
       AddCompletionsForObjectsAndVariablesMatchingSearch(
-          node.name, type, node.nameLocation);
+          node.name, type, node.nameLocation, eagerlyCompleteIfExactMatch);
     }
   }
   void OnVisitVariableAccessorNode(VariableAccessorNode& node) override {
-    // No completions
+    VariableAndItsParent variableAndItsParent =
+        gd::ExpressionVariableParentFinder::GetLastParentOfNode(
+            platform, projectScopedContainers, node);
+
+    // If no child, we're at the end of a variable (like `GrandChild` in
+    // `Something.Child.GrandChild`) so we can complete eagerly children if we
+    // can.
+    gd::String eagerlyCompleteForVariableName =
+        node.child == nullptr ? node.name : "";
+    AddCompletionsForChildrenVariablesOf(variableAndItsParent,
+                                         node.nameLocation,
+                                         eagerlyCompleteForVariableName);
   }
   void OnVisitVariableBracketAccessorNode(
-      VariableBracketAccessorNode& node) override {
-    // No completions
-  }
+      VariableBracketAccessorNode& node) override {}
   void OnVisitIdentifierNode(IdentifierNode& node) override {
     const auto& objectsContainersList =
         projectScopedContainers.GetObjectsContainersList();
@@ -537,45 +549,81 @@ class GD_CORE_API ExpressionCompletionFinder
       AddCompletionsForObjectMatchingSearch(
           node.identifierName, type, node.location);
     } else if (gd::ValueTypeMetadata::IsTypeLegacyPreScopedVariable(type)) {
-      if (type == "globalvar") {
+      if (type == "globalvar" || type == "scenevar") {
         const auto* variablesContainer =
-            projectScopedContainers.GetVariablesContainersList()
-                .GetTopMostVariablesContainer();
+            type == "globalvar"
+                ? projectScopedContainers.GetVariablesContainersList()
+                      .GetTopMostVariablesContainer()
+                : projectScopedContainers.GetVariablesContainersList()
+                      .GetBottomMostVariablesContainer();
         if (variablesContainer) {
-          AddCompletionsForVariablesMatchingSearch(*variablesContainer,
-                                               node.identifierName,
-                                               node.identifierNameLocation);
-        }
-      } else if (type == "scenevar") {
-        const auto* variablesContainer =
-            projectScopedContainers.GetVariablesContainersList()
-                .GetBottomMostVariablesContainer();
-        if (variablesContainer) {
-          AddCompletionsForVariablesMatchingSearch(*variablesContainer,
-                                               node.identifierName,
-                                               node.identifierNameLocation);
+          if (IsCaretOn(node.identifierNameDotLocation) ||
+              IsCaretOn(node.childIdentifierNameLocation)) {
+            // Complete a potential child variable:
+            if (variablesContainer->Has(node.identifierName)) {
+              AddCompletionsForChildrenVariablesOf(
+                  &variablesContainer->Get(node.identifierName),
+                  node.childIdentifierNameLocation,
+                  node.childIdentifierName);
+            }
+          } else {
+            // Complete a root variable of the scene or project.
+
+            // Don't attempt to complete children variables if there is
+            // already a dot written (`MyVariable.`).
+            bool eagerlyCompleteIfPossible =
+                !node.identifierNameDotLocation.IsValid();
+            AddCompletionsForVariablesMatchingSearch(
+                *variablesContainer,
+                node.identifierName,
+                node.identifierNameLocation,
+                eagerlyCompleteIfPossible);
+          }
         }
       } else if (type == "objectvar") {
         auto objectName = gd::ExpressionVariableOwnerFinder::GetObjectName(
-            platform,
-            objectsContainersList,
-            // Variable fields doesn't use expression completion,
-            // so the object will be found inside the expression itself.
-            "",
-            node);
+            platform, objectsContainersList, rootObjectName, node);
 
-        AddCompletionsForObjectOrGroupVariablesMatchingSearch(
-            objectsContainersList,
-            objectName,
-            node.identifierName,
-            node.identifierNameLocation);
+        if (IsCaretOn(node.identifierNameDotLocation) ||
+            IsCaretOn(node.childIdentifierNameLocation)) {
+          // Complete a potential child variable:
+          const auto* variablesContainer =
+              objectsContainersList.GetObjectOrGroupVariablesContainer(
+                  objectName);
+          if (variablesContainer &&
+              variablesContainer->Has(node.identifierName)) {
+            AddCompletionsForChildrenVariablesOf(
+                &variablesContainer->Get(node.identifierName),
+                node.childIdentifierNameLocation,
+                node.childIdentifierName);
+          }
+        } else {
+          // Complete a root variable of the object.
+
+          // Don't attempt to complete children variables if there is
+          // already a dot written (`MyVariable.`).
+          bool eagerlyCompleteIfPossible =
+              !node.identifierNameDotLocation.IsValid();
+          AddCompletionsForObjectOrGroupVariablesMatchingSearch(
+              objectsContainersList,
+              objectName,
+              node.identifierName,
+              node.identifierNameLocation,
+              eagerlyCompleteIfPossible);
+        }
       }
     } else {
       // Object function, behavior name, variable, object variable.
       if (IsCaretOn(node.identifierNameLocation)) {
-        // Is this the proper position?
+        // Don't attempt to complete children variables if there is
+        // already a dot written (`MyVariable.`).
+        bool eagerlyCompleteIfPossible =
+            !node.identifierNameDotLocation.IsValid();
         AddCompletionsForAllIdentifiersMatchingSearch(
-            node.identifierName, type, node.identifierNameLocation);
+            node.identifierName,
+            type,
+            node.identifierNameLocation,
+            eagerlyCompleteIfPossible);
         if (!node.identifierNameDotLocation.IsValid()) {
           completions.push_back(
               ExpressionCompletionDescription::ForExpressionWithPrefix(
@@ -586,27 +634,57 @@ class GD_CORE_API ExpressionCompletionFinder
         }
       } else if (IsCaretOn(node.identifierNameDotLocation) ||
                  IsCaretOn(node.childIdentifierNameLocation)) {
-        const gd::String& objectName = node.identifierName;
+        // Might be:
+        // - An object variable, object behavior or object expression.
+        // - Or a variable with a child.
+        projectScopedContainers.MatchIdentifierWithName<void>(
+            node.identifierName,
+            [&]() {
+              // This is an object.
+              const gd::String& objectName = node.identifierName;
+              AddCompletionsForObjectOrGroupVariablesMatchingSearch(
+                  objectsContainersList,
+                  objectName,
+                  node.childIdentifierName,
+                  node.childIdentifierNameLocation,
+                  true);
 
-        // Might be an object variable, object behavior or object expression:
-        AddCompletionsForObjectOrGroupVariablesMatchingSearch(
-            objectsContainersList,
-            objectName,
-            node.childIdentifierName,
-            node.childIdentifierNameLocation);
-        completions.push_back(
-            ExpressionCompletionDescription::ForBehaviorWithPrefix(
-                node.childIdentifierName,
-                node.childIdentifierNameLocation.GetStartPosition(),
-                node.childIdentifierNameLocation.GetEndPosition(),
-                objectName));
-        completions.push_back(
-            ExpressionCompletionDescription::ForExpressionWithPrefix(
-                type,
-                node.childIdentifierName,
-                node.childIdentifierNameLocation.GetStartPosition(),
-                node.childIdentifierNameLocation.GetEndPosition(),
-                objectName));
+              completions.push_back(
+                  ExpressionCompletionDescription::ForBehaviorWithPrefix(
+                      node.childIdentifierName,
+                      node.childIdentifierNameLocation.GetStartPosition(),
+                      node.childIdentifierNameLocation.GetEndPosition(),
+                      objectName));
+              completions.push_back(
+                  ExpressionCompletionDescription::ForExpressionWithPrefix(
+                      type,
+                      node.childIdentifierName,
+                      node.childIdentifierNameLocation.GetStartPosition(),
+                      node.childIdentifierNameLocation.GetEndPosition(),
+                      objectName));
+            },
+            [&]() {
+              // This is a variable.
+              VariableAndItsParent variableAndItsParent =
+                  gd::ExpressionVariableParentFinder::GetLastParentOfNode(
+                      platform, projectScopedContainers, node);
+
+              AddCompletionsForChildrenVariablesOf(
+                  variableAndItsParent,
+                  node.childIdentifierNameLocation,
+                  node.childIdentifierName);
+            },
+            [&]() {
+              // Ignore properties here.
+              // There is no support for "children" of properties.
+            },
+            [&]() {
+              // Ignore parameters here.
+              // There is no support for "children" of parameters.
+            },
+            [&]() {
+              // Ignore unrecognised identifiers here.
+            });
       }
     }
   }
@@ -736,7 +814,8 @@ class GD_CORE_API ExpressionCompletionFinder
     auto type = gd::ExpressionTypeFinder::GetType(
         platform, projectScopedContainers, rootType, node);
 
-    AddCompletionsForAllIdentifiersMatchingSearch(node.text, type, node.location);
+    AddCompletionsForAllIdentifiersMatchingSearch(
+        node.text, type, node.location);
     completions.push_back(
         ExpressionCompletionDescription::ForExpressionWithPrefix(
             type,
@@ -755,10 +834,96 @@ class GD_CORE_API ExpressionCompletionFinder
              (inclusive && searchedPosition <= location.GetEndPosition())));
   }
 
+  /**
+   * A slightly less strict check than `gd::Project::IsNameSafe` as child
+   * variables can be completed even if they start with a number.
+   */
+  bool IsIdentifierSafe(const gd::String& name) {
+    if (name.empty()) return false;
+
+    for (auto character : name) {
+      if (!GrammarTerminals::IsAllowedInIdentifier(character)) {
+        return false;
+      }
+    }
+
+    return true;
+  }
+
+  void AddCompletionsForChildrenVariablesOf(
+      VariableAndItsParent variableAndItsParent,
+      const ExpressionParserLocation& location,
+      gd::String eagerlyCompleteForVariableName = "") {
+    if (variableAndItsParent.parentVariable) {
+      AddCompletionsForChildrenVariablesOf(variableAndItsParent.parentVariable,
+                                           location,
+                                           eagerlyCompleteForVariableName);
+    } else if (variableAndItsParent.parentVariablesContainer) {
+      AddCompletionsForVariablesMatchingSearch(
+          *variableAndItsParent.parentVariablesContainer, "", location);
+    }
+  }
+
+  void AddCompletionsForChildrenVariablesOf(
+      const gd::Variable* variable,
+      const ExpressionParserLocation& location,
+      gd::String eagerlyCompleteForVariableName = "") {
+    if (!variable) return;
+
+    if (variable->GetType() == gd::Variable::Structure) {
+      for (const auto& name : variable->GetAllChildrenNames()) {
+        if (!IsIdentifierSafe(name)) continue;
+
+        const auto& childVariable = variable->GetChild(name);
+        ExpressionCompletionDescription description(
+            ExpressionCompletionDescription::Variable,
+            location.GetStartPosition(),
+            location.GetEndPosition());
+        description.SetCompletion(name);
+        description.SetVariableType(childVariable.GetType());
+        completions.push_back(description);
+
+        if (name == eagerlyCompleteForVariableName) {
+          AddEagerCompletionForVariableChildren(childVariable, name, location);
+        }
+      }
+    } else {
+      // TODO: we could do a "comment only completion" to indicate that nothing
+      // can/should be completed?
+    }
+  }
+
+  void AddEagerCompletionForVariableChildren(
+      const gd::Variable& variable,
+      const gd::String& variableName,
+      const ExpressionParserLocation& location) {
+    if (variable.GetType() == gd::Variable::Structure) {
+      gd::String prefix = variableName + ".";
+      for (const auto& name : variable.GetAllChildrenNames()) {
+        gd::String completion =
+            IsIdentifierSafe(name)
+                ? (prefix + name)
+                : (variableName + "[" +
+                   gd::ExpressionParser2NodePrinter::PrintStringLiteral(name) +
+                   "]");
+
+        const auto& childVariable = variable.GetChild(name);
+        ExpressionCompletionDescription description(
+            ExpressionCompletionDescription::Variable,
+            location.GetStartPosition(),
+            location.GetEndPosition());
+        description.SetCompletion(completion);
+        description.SetVariableType(childVariable.GetType());
+        completions.push_back(description);
+      }
+    }
+  }
+
   void AddCompletionsForVariablesMatchingSearch(
       const gd::VariablesContainer& variablesContainer,
       const gd::String& search,
-      const ExpressionParserLocation& location) {
+      const ExpressionParserLocation& location,
+      bool eagerlyCompleteIfExactMatch = false) {
     variablesContainer.ForEachVariableMatchingSearch(
         search,
         [&](const gd::String& variableName, const gd::Variable& variable) {
@@ -769,6 +934,11 @@ class GD_CORE_API ExpressionCompletionFinder
           description.SetCompletion(variableName);
           description.SetVariableType(variable.GetType());
           completions.push_back(description);
+
+          if (eagerlyCompleteIfExactMatch && variableName == search) {
+            AddEagerCompletionForVariableChildren(
+                variable, variableName, location);
+          }
         });
   }
 
@@ -776,7 +946,8 @@ class GD_CORE_API ExpressionCompletionFinder
       const gd::ObjectsContainersList& objectsContainersList,
       const gd::String& objectOrGroupName,
       const gd::String& search,
-      const ExpressionParserLocation& location) {
+      const ExpressionParserLocation& location,
+      bool eagerlyCompleteIfExactMatch) {
     objectsContainersList.ForEachObjectOrGroupVariableMatchingSearch(
         objectOrGroupName,
         search,
@@ -788,6 +959,11 @@ class GD_CORE_API ExpressionCompletionFinder
           description.SetCompletion(variableName);
           description.SetVariableType(variable.GetType());
           completions.push_back(description);
+
+          if (eagerlyCompleteIfExactMatch && variableName == search) {
+            AddEagerCompletionForVariableChildren(
+                variable, variableName, location);
+          }
         });
   }
 
@@ -795,25 +971,27 @@ class GD_CORE_API ExpressionCompletionFinder
       const gd::String& search,
       const gd::String& type,
       const ExpressionParserLocation& location) {
-    projectScopedContainers.GetObjectsContainersList().ForEachNameMatchingSearch(
-        search,
-        [&](const gd::String& name,
-            const gd::ObjectConfiguration* objectConfiguration) {
-          ExpressionCompletionDescription description(
-              ExpressionCompletionDescription::Object,
-              location.GetStartPosition(),
-              location.GetEndPosition());
-          description.SetObjectConfiguration(objectConfiguration);
-          description.SetCompletion(name);
-          description.SetType(type);
-          completions.push_back(description);
-        });
+    projectScopedContainers.GetObjectsContainersList()
+        .ForEachNameMatchingSearch(
+            search,
+            [&](const gd::String& name,
+                const gd::ObjectConfiguration* objectConfiguration) {
+              ExpressionCompletionDescription description(
+                  ExpressionCompletionDescription::Object,
+                  location.GetStartPosition(),
+                  location.GetEndPosition());
+              description.SetObjectConfiguration(objectConfiguration);
+              description.SetCompletion(name);
+              description.SetType(type);
+              completions.push_back(description);
+            });
   }
 
   void AddCompletionsForObjectsAndVariablesMatchingSearch(
       const gd::String& search,
       const gd::String& type,
-      const ExpressionParserLocation& location) {
+      const ExpressionParserLocation& location,
+      bool eagerlyCompleteIfExactMatch) {
     projectScopedContainers.ForEachIdentifierMatchingSearch(
         search,
         [&](const gd::String& objectName,
@@ -835,6 +1013,11 @@ class GD_CORE_API ExpressionCompletionFinder
           description.SetCompletion(variableName);
           description.SetVariableType(variable.GetType());
           completions.push_back(description);
+
+          if (eagerlyCompleteIfExactMatch && variableName == search) {
+            AddEagerCompletionForVariableChildren(
+                variable, variableName, location);
+          }
         },
         [&](const gd::NamedPropertyDescriptor& property) {
           // Ignore properties here.
@@ -845,7 +1028,7 @@ class GD_CORE_API ExpressionCompletionFinder
   }
 
   void AddCompletionsForAllIdentifiersMatchingSearch(const gd::String& search,
-                                                 const gd::String& type) {
+                                                     const gd::String& type) {
     AddCompletionsForAllIdentifiersMatchingSearch(
         search,
         type,
@@ -855,7 +1038,8 @@ class GD_CORE_API ExpressionCompletionFinder
   void AddCompletionsForAllIdentifiersMatchingSearch(
       const gd::String& search,
       const gd::String& type,
-      const ExpressionParserLocation& location) {
+      const ExpressionParserLocation& location,
+      bool eagerlyCompleteIfExactMatch = false) {
     projectScopedContainers.ForEachIdentifierMatchingSearch(
         search,
         [&](const gd::String& objectName,
@@ -877,6 +1061,11 @@ class GD_CORE_API ExpressionCompletionFinder
           description.SetCompletion(variableName);
           description.SetVariableType(variable.GetType());
           completions.push_back(description);
+
+          if (eagerlyCompleteIfExactMatch && variableName == search) {
+            AddEagerCompletionForVariableChildren(
+                variable, variableName, location);
+          }
         },
         [&](const gd::NamedPropertyDescriptor& property) {
           ExpressionCompletionDescription description(
@@ -904,11 +1093,14 @@ class GD_CORE_API ExpressionCompletionFinder
       const gd::String& rootType_,
       size_t searchedPosition_,
       gd::ExpressionNode* maybeParentNodeAtLocation_)
-      : platform(platform_),
+      : searchedPosition(searchedPosition_),
+        maybeParentNodeAtLocation(maybeParentNodeAtLocation_),
+        platform(platform_),
         projectScopedContainers(projectScopedContainers_),
         rootType(rootType_),
-        searchedPosition(searchedPosition_),
-        maybeParentNodeAtLocation(maybeParentNodeAtLocation_){};
+        rootObjectName("")  // Always empty, might be changed if variable fields
+                            // in the editor are changed to use completion.
+        {};
 
   std::vector<ExpressionCompletionDescription> completions;
   size_t searchedPosition;
@@ -917,6 +1109,7 @@ class GD_CORE_API ExpressionCompletionFinder
   const gd::Platform& platform;
   const gd::ProjectScopedContainers& projectScopedContainers;
   const gd::String rootType;
+  const gd::String rootObjectName;
 };
 
 }  // namespace gd

Core/GDCore/IDE/Events/ExpressionValidator.cpp

@@ -263,11 +263,17 @@ ExpressionValidator::Type ExpressionValidator::ValidateFunction(
   }
 
   if (gd::MetadataProvider::IsBadExpressionMetadata(metadata)) {
-    RaiseError("invalid_function_name",
+    if (function.functionName.empty()) {
+      RaiseError("invalid_function_name",
+               _("Enter the name of the function to call."),
+               function.location);
+    } else {
+      RaiseError("invalid_function_name",
                _("Cannot find an expression with this name: ") +
                    function.functionName + "\n" +
                    _("Double check that you've not made any typo in the name."),
                function.location);
+    }
     return returnType;
   }
 

Core/GDCore/IDE/Events/ExpressionValidator.h

@@ -86,8 +86,10 @@ class GD_CORE_API ExpressionValidator : public ExpressionParser2NodeWorker {
   void OnVisitOperatorNode(OperatorNode& node) override {
     ReportAnyError(node);
 
+    // The "required" type ("parentType")  will be used when visiting the first operand.
+    // Note that it may be refined thanks to this first operand (see later).
     node.leftHandSide->Visit(*this);
-    const Type leftType = childType;
+    const Type leftType = childType; // Store the type of the first operand.
 
     if (leftType == Type::Number) {
       if (node.op == ' ') {
@@ -120,15 +122,19 @@ class GD_CORE_API ExpressionValidator : public ExpressionParser2NodeWorker {
             node.rightHandSide->location);
     }
 
-    parentType = leftType;
+    // The "required" type ("parentType") of the second operator is decided by:
+    // - the parent type. Unless it can (`number|string`) or should (`unknown`) be refined, then:
+    // - the first operand.
+    parentType = ShouldTypeBeRefined(parentType) ? leftType : parentType;
     node.rightHandSide->Visit(*this);
     const Type rightType = childType;
 
-    // The type is decided by the first operand, unless it can (`number|string`)
-    // or should (`unknown`) be refined, in which case we go for the right
-    // operand (which got visited knowing the type of the first operand, so it's
+    // The type of the overall operator ("childType") is decided by:
+    // - the parent type. Unless it can (`number|string`) or should (`unknown`) be refined, then:
+    // - the first operand. Unless it can (`number|string`) or should (`unknown`) be refined, then:
+    // - the right operand (which got visited knowing the type of the first operand, so it's
     // equal or strictly more precise than the left operand).
-    childType = (leftType == Type::Unknown || leftType == Type::NumberOrString) ? leftType : rightType;
+    childType = ShouldTypeBeRefined(parentType) ? (ShouldTypeBeRefined(leftType) ? leftType : rightType) : parentType;
   }
   void OnVisitUnaryOperatorNode(UnaryOperatorNode& node) override {
     ReportAnyError(node);
@@ -395,6 +401,10 @@ class GD_CORE_API ExpressionValidator : public ExpressionParser2NodeWorker {
     }
   }
 
+  static bool ShouldTypeBeRefined(Type type) {
+    return (type == Type::Unknown || type == Type::NumberOrString);
+  }
+
   static Type StringToType(const gd::String &type);
   static const gd::String &TypeToString(Type type);
   static const gd::String unknownTypeString;

Core/GDCore/IDE/Events/ExpressionVariableParentFinder.h

@@ -0,0 +1,374 @@
+/*
+ * GDevelop Core
+ * Copyright 2008-present Florian Rival (Florian.Rival@gmail.com). All rights
+ * reserved. This project is released under the MIT License.
+ */
+#pragma once
+
+#include <memory>
+#include <vector>
+
+#include "GDCore/Events/Parsers/ExpressionParser2Node.h"
+#include "GDCore/Events/Parsers/ExpressionParser2NodeWorker.h"
+#include "GDCore/Extensions/Metadata/ExpressionMetadata.h"
+#include "GDCore/Extensions/Metadata/MetadataProvider.h"
+#include "GDCore/Extensions/Metadata/ObjectMetadata.h"
+#include "GDCore/Extensions/Metadata/ParameterMetadata.h"
+#include "GDCore/Project/ProjectScopedContainers.h"
+#include "GDCore/Project/Variable.h"
+#include "GDCore/Tools/Localization.h"
+
+namespace gd {
+class Expression;
+class ObjectsContainer;
+class Platform;
+class ParameterMetadata;
+class ExpressionMetadata;
+}  // namespace gd
+
+namespace gd {
+
+/**
+ * \brief Contains a variables container or a variable. Useful
+ * to refer to the parent of a variable (which can be a VariablesContainer
+ * or another Variable).
+ */
+struct VariableAndItsParent {
+  const gd::VariablesContainer* parentVariablesContainer;
+  const gd::Variable* parentVariable;
+};
+
+/**
+ * \brief Find the last parent (i.e: the variables container) of a node
+ * representing a variable.
+ *
+ * Useful for completions, to know which variables can be entered in a node.
+ *
+ * \see gd::ExpressionParser2
+ */
+class GD_CORE_API ExpressionVariableParentFinder
+    : public ExpressionParser2NodeWorker {
+ public:
+  static VariableAndItsParent GetLastParentOfNode(
+      const gd::Platform& platform,
+      const gd::ProjectScopedContainers& projectScopedContainers,
+      gd::ExpressionNode& node) {
+    gd::ExpressionVariableParentFinder typeFinder(platform,
+                                                  projectScopedContainers);
+    node.Visit(typeFinder);
+    return typeFinder.variableAndItsParent;
+  }
+
+  virtual ~ExpressionVariableParentFinder(){};
+
+ protected:
+  ExpressionVariableParentFinder(
+      const gd::Platform& platform_,
+      const gd::ProjectScopedContainers& projectScopedContainers_)
+      : platform(platform_),
+        projectScopedContainers(projectScopedContainers_),
+        variableNode(nullptr),
+        thisIsALegacyPrescopedVariable(false),
+        bailOutBecauseEmptyVariableName(false),
+        legacyPrescopedVariablesContainer(nullptr),
+        variableAndItsParent{} {};
+
+  void OnVisitSubExpressionNode(SubExpressionNode& node) override {}
+  void OnVisitOperatorNode(OperatorNode& node) override {}
+  void OnVisitUnaryOperatorNode(UnaryOperatorNode& node) override {}
+  void OnVisitNumberNode(NumberNode& node) override {}
+  void OnVisitTextNode(TextNode& node) override {}
+  void OnVisitVariableNode(VariableNode& node) override {
+    if (variableNode != nullptr) {
+      // This is not possible
+      return;
+    }
+    variableNode = &node;
+
+    // Check if the parent is a function call, in which we might be dealing
+    // with a legacy pre-scoped variable parameter:
+    if (node.parent) node.parent->Visit(*this);
+
+    if (thisIsALegacyPrescopedVariable) {
+      // The node represents a variable name, and the variables container
+      // containing it was identified in the FunctionCallNode.
+      childVariableNames.insert(childVariableNames.begin(), node.name);
+      if (legacyPrescopedVariablesContainer)
+        variableAndItsParent = WalkUntilLastParent(
+            *legacyPrescopedVariablesContainer, childVariableNames);
+    } else {
+      // Otherwise, the identifier is to be interpreted as usual:
+      // it can be an object (on which a variable is accessed),
+      // or a variable.
+      projectScopedContainers.MatchIdentifierWithName<void>(
+          node.name,
+          [&]() {
+            // This is an object.
+            const auto* variablesContainer =
+                projectScopedContainers.GetObjectsContainersList()
+                    .GetObjectOrGroupVariablesContainer(node.name);
+            if (variablesContainer)
+              variableAndItsParent =
+                  WalkUntilLastParent(*variablesContainer, childVariableNames);
+          },
+          [&]() {
+            // This is a variable.
+            if (projectScopedContainers.GetVariablesContainersList().Has(
+                    node.name)) {
+              variableAndItsParent = WalkUntilLastParent(
+                  projectScopedContainers.GetVariablesContainersList().Get(
+                      node.name),
+                  childVariableNames);
+            }
+          },
+          [&]() {
+            // Ignore properties here.
+            // There is no support for "children" of properties.
+          },
+          [&]() {
+            // Ignore parameters here.
+            // There is no support for "children" of parameters.
+          },
+          [&]() {
+            // Ignore unrecognised identifiers here.
+          });
+    }
+  }
+  void OnVisitVariableAccessorNode(VariableAccessorNode& node) override {
+    if (node.name.empty() && node.child) {
+      // A variable accessor should always have a name if it has a child (i.e:
+      // another accessor). While the parser may have generated an empty name,
+      // flag this so we avoid finding a wrong parent (and so, run the risk of
+      // giving wrong autocompletions).
+      bailOutBecauseEmptyVariableName = true;
+    }
+    childVariableNames.insert(childVariableNames.begin(), node.name);
+    if (node.parent) node.parent->Visit(*this);
+  }
+  void OnVisitIdentifierNode(IdentifierNode& node) override {
+    if (variableNode != nullptr) {
+      // This is not possible
+      return;
+    }
+    // This node is not necessarily a variable node.
+    // It will be checked when visiting the FunctionCallNode, just after.
+    variableNode = &node;
+
+    // Check if the parent is a function call, in which we might be dealing
+    // with a legacy pre-scoped variable parameter:
+    if (node.parent) node.parent->Visit(*this);
+
+    if (thisIsALegacyPrescopedVariable) {
+      // The identifier represents a variable name, and the variables container
+      // containing it was identified in the FunctionCallNode.
+      if (!node.childIdentifierName.empty())
+        childVariableNames.insert(childVariableNames.begin(),
+                                  node.childIdentifierName);
+      childVariableNames.insert(childVariableNames.begin(),
+                                node.identifierName);
+
+      if (legacyPrescopedVariablesContainer)
+        variableAndItsParent = WalkUntilLastParent(
+            *legacyPrescopedVariablesContainer, childVariableNames);
+
+    } else {
+      // Otherwise, the identifier is to be interpreted as usual:
+      // it can be an object (on which a variable is accessed),
+      // or a variable.
+      projectScopedContainers.MatchIdentifierWithName<void>(
+          node.identifierName,
+          [&]() {
+            // This is an object.
+            if (!node.childIdentifierName.empty())
+              childVariableNames.insert(childVariableNames.begin(),
+                                        node.childIdentifierName);
+
+            const auto* variablesContainer =
+                projectScopedContainers.GetObjectsContainersList()
+                    .GetObjectOrGroupVariablesContainer(node.identifierName);
+            if (variablesContainer)
+              variableAndItsParent =
+                  WalkUntilLastParent(*variablesContainer, childVariableNames);
+          },
+          [&]() {
+            // This is a variable.
+            if (!node.childIdentifierName.empty())
+              childVariableNames.insert(childVariableNames.begin(),
+                                        node.childIdentifierName);
+
+            if (projectScopedContainers.GetVariablesContainersList().Has(
+                    node.identifierName)) {
+              variableAndItsParent = WalkUntilLastParent(
+                  projectScopedContainers.GetVariablesContainersList().Get(
+                      node.identifierName),
+                  childVariableNames);
+            }
+          },
+          [&]() {
+            // Ignore properties here.
+            // There is no support for "children" of properties.
+          },
+          [&]() {
+            // Ignore parameters here.
+            // There is no support for "children" of properties.
+          },
+          [&]() {
+            // Ignore unrecognised identifiers here.
+          });
+    }
+  }
+  void OnVisitEmptyNode(EmptyNode& node) override {}
+  void OnVisitObjectFunctionNameNode(ObjectFunctionNameNode& node) override {}
+  void OnVisitVariableBracketAccessorNode(
+      VariableBracketAccessorNode& node) override {
+    // Add a child with an empty name, which will be interpreted as
+    // "take the first child/item of the structure/array".
+    childVariableNames.insert(childVariableNames.begin(), "");
+    if (node.parent) node.parent->Visit(*this);
+  }
+  void OnVisitFunctionCallNode(FunctionCallNode& functionCall) override {
+    if (variableNode == nullptr) {
+      return;
+    }
+    int parameterIndex = -1;
+    for (int i = 0; i < functionCall.parameters.size(); i++) {
+      if (functionCall.parameters.at(i).get() == variableNode) {
+        parameterIndex = i;
+        break;
+      }
+    }
+    if (parameterIndex < 0) {
+      return;
+    }
+
+    const auto& objectsContainersList =
+        projectScopedContainers.GetObjectsContainersList();
+
+    const gd::ParameterMetadata* parameterMetadata =
+        MetadataProvider::GetFunctionCallParameterMetadata(
+            platform, objectsContainersList, functionCall, parameterIndex);
+    if (parameterMetadata == nullptr) return;  // Unexpected
+
+    // Support for legacy pre-scoped variables:
+    if (parameterMetadata->GetValueTypeMetadata().IsLegacyPreScopedVariable()) {
+      if (parameterMetadata->GetType() == "objectvar") {
+        // Legacy convention where a "objectvar"
+        // parameter represents a variable of the object represented by the
+        // previous "object" parameter. The object on which the function is
+        // called is returned if no previous parameters are objects.
+        gd::String objectName = functionCall.objectName;
+        for (int previousIndex = parameterIndex - 1; previousIndex >= 0;
+             previousIndex--) {
+          const gd::ParameterMetadata* previousParameterMetadata =
+              MetadataProvider::GetFunctionCallParameterMetadata(
+                  platform, objectsContainersList, functionCall, previousIndex);
+          if (previousParameterMetadata != nullptr &&
+              gd::ParameterMetadata::IsObject(
+                  previousParameterMetadata->GetType())) {
+            auto previousParameterNode =
+                functionCall.parameters[previousIndex].get();
+            IdentifierNode* objectNode =
+                dynamic_cast<IdentifierNode*>(previousParameterNode);
+            objectName = objectNode->identifierName;
+            break;
+          }
+        }
+
+        legacyPrescopedVariablesContainer =
+            projectScopedContainers.GetObjectsContainersList()
+                .GetObjectOrGroupVariablesContainer(objectName);
+        thisIsALegacyPrescopedVariable = true;
+      } else if (parameterMetadata->GetType() == "scenevar") {
+        legacyPrescopedVariablesContainer =
+            projectScopedContainers.GetVariablesContainersList()
+                .GetBottomMostVariablesContainer();
+        thisIsALegacyPrescopedVariable = true;
+      } else if (parameterMetadata->GetType() == "globalvar") {
+        legacyPrescopedVariablesContainer =
+            projectScopedContainers.GetVariablesContainersList()
+                .GetTopMostVariablesContainer();
+        thisIsALegacyPrescopedVariable = true;
+      }
+    } else {
+      thisIsALegacyPrescopedVariable = false;
+      legacyPrescopedVariablesContainer = nullptr;
+    }
+  }
+
+ private:
+  VariableAndItsParent WalkUntilLastParent(
+      const gd::Variable& variable,
+      const std::vector<gd::String>& childVariableNames,
+      size_t startIndex = 0) {
+    if (bailOutBecauseEmptyVariableName)
+      return {};  // Do not even attempt to find the parent if we had an issue
+                  // when visiting nodes.
+
+    const gd::Variable* currentVariable = &variable;
+
+    // Walk until size - 1 as we want the last parent.
+    for (size_t index = startIndex; index + 1 < childVariableNames.size();
+         ++index) {
+      const gd::String& childName = childVariableNames[index];
+
+      if (childName.empty()) {
+        if (currentVariable->GetChildrenCount() == 0) {
+          // The array or structure is empty, we can't walk through it - there
+          // is no "parent".
+          return {};
+        }
+
+        if (currentVariable->GetType() == gd::Variable::Array) {
+          currentVariable = &currentVariable->GetAtIndex(0);
+        } else {
+          currentVariable =
+              currentVariable->GetAllChildren().begin()->second.get();
+        }
+      } else {
+        if (!currentVariable->HasChild(childName)) {
+          // Non existing child - there is no "parent".
+          return {};
+        }
+
+        currentVariable = &currentVariable->GetChild(childName);
+      }
+    }
+
+    // Return the last parent of the chain of variables (so not the last
+    // variable but the one before it).
+    return {.parentVariable = currentVariable};
+  }
+
+  VariableAndItsParent WalkUntilLastParent(
+      const gd::VariablesContainer& variablesContainer,
+      const std::vector<gd::String>& childVariableNames) {
+    if (bailOutBecauseEmptyVariableName)
+      return {};  // Do not even attempt to find the parent if we had an issue
+                  // when visiting nodes.
+    if (childVariableNames.empty())
+      return {};  // There is no "parent" to the variables container itself.
+
+    const gd::String& firstChildName = *childVariableNames.begin();
+
+    const gd::Variable* variable = variablesContainer.Has(firstChildName)
+                                       ? &variablesContainer.Get(firstChildName)
+                                       : nullptr;
+    if (childVariableNames.size() == 1 || !variable)
+      return {// Only one child: the parent is the variables container itself.
+              .parentVariablesContainer = &variablesContainer};
+
+    return WalkUntilLastParent(*variable, childVariableNames, 1);
+  }
+
+  gd::ExpressionNode* variableNode;
+  std::vector<gd::String> childVariableNames;
+  bool thisIsALegacyPrescopedVariable;
+  bool bailOutBecauseEmptyVariableName;
+  const gd::VariablesContainer* legacyPrescopedVariablesContainer;
+  VariableAndItsParent variableAndItsParent;
+
+  const gd::Platform& platform;
+  const gd::ProjectScopedContainers& projectScopedContainers;
+};
+
+}  // namespace gd

Core/GDCore/IDE/Events/UsedExtensionsFinder.cpp

@@ -25,6 +25,9 @@ const UsedExtensionsResult UsedExtensionsFinder::ScanProject(gd::Project& projec
 void UsedExtensionsFinder::DoVisitObject(gd::Object &object) {
   auto metadata = gd::MetadataProvider::GetExtensionAndObjectMetadata(
       project.GetCurrentPlatform(), object.GetType());
+  if (metadata.GetMetadata().IsRenderedIn3D()) {
+    result.MarkAsHaving3DObjects();
+  }
   result.GetUsedExtensions().insert(metadata.GetExtension().GetName());
   for (auto &&includeFile : metadata.GetMetadata().includeFiles) {
     result.GetUsedIncludeFiles().insert(includeFile);

Core/GDCore/IDE/Events/UsedExtensionsFinder.h

@@ -44,6 +44,13 @@ public:
     return usedRequiredFiles;
   }
 
+  /**
+   * \brief Return true when at least 1 object uses the 3D renderer.
+   */
+  bool Has3DObjects() const {
+    return has3DObjects;
+  }
+
   /**
    * The extensions used by the project (or part of it).
    */
@@ -59,10 +66,15 @@ public:
    */
   std::set<gd::String> &GetUsedRequiredFiles() { return usedRequiredFiles; }
 
+  void MarkAsHaving3DObjects() {
+    has3DObjects = true;
+  }
+
 private:
   std::set<gd::String> usedExtensions;
   std::set<gd::String> usedIncludeFiles;
   std::set<gd::String> usedRequiredFiles;
+  bool has3DObjects = false;
 };
 
 class GD_CORE_API UsedExtensionsFinder

Core/GDCore/IDE/ExtensionsLoader.cpp

@@ -43,7 +43,6 @@ void ExtensionsLoader::LoadAllExtensions(const gd::String &directory,
   struct dirent *lecture;
   DIR *rep;
   rep = opendir(directory.c_str());
-  int l = 0;
 
   if (rep == NULL) {
     cout << "Unable to open Extensions (" << directory << ") directory."
@@ -63,8 +62,6 @@ void ExtensionsLoader::LoadAllExtensions(const gd::String &directory,
 
       LoadExtension(directory + "/" + lec, platform, forgiving);
       librariesLoaded.push_back(directory + "/" + lec);
-
-      l++;
     }
   }
 
@@ -103,7 +100,6 @@ void ExtensionsLoader::ExtensionsLoadingDone(const gd::String &directory) {
   struct dirent *lecture;
   DIR *rep;
   rep = opendir(directory.c_str());
-  int l = 0;
 
   if (rep == NULL) {
     cout << "Unable to open Extensions (" << directory << ") directory."
@@ -118,7 +114,6 @@ void ExtensionsLoader::ExtensionsLoadingDone(const gd::String &directory) {
         lec.find(".xgd" + suffix, lec.length() - 4 - suffix.length()) !=
             string::npos) {
       librariesLoaded.push_back(directory + "/" + lec);
-      l++;
     }
   }
 

Core/GDCore/IDE/ObjectAssetSerializer.cpp

@@ -0,0 +1,111 @@
+/*
+ * GDevelop Core
+ * Copyright 2008-2023 Florian Rival (Florian.Rival@gmail.com). All rights
+ * reserved. This project is released under the MIT License.
+ */
+#include "ObjectAssetSerializer.h"
+
+#include <algorithm>
+
+#include "GDCore/Extensions/Builtin/SpriteExtension/SpriteObject.h"
+#include "GDCore/Extensions/Metadata/BehaviorMetadata.h"
+#include "GDCore/Extensions/Metadata/MetadataProvider.h"
+#include "GDCore/Extensions/Platform.h"
+#include "GDCore/Extensions/PlatformExtension.h"
+#include "GDCore/IDE/Project/AssetResourcePathCleaner.h"
+#include "GDCore/IDE/Project/ResourcesInUseHelper.h"
+#include "GDCore/IDE/Project/ResourcesRenamer.h"
+#include "GDCore/Project/Behavior.h"
+#include "GDCore/Project/CustomBehavior.h"
+#include "GDCore/Project/EventsFunctionsExtension.h"
+#include "GDCore/Project/Layout.h"
+#include "GDCore/Project/Object.h"
+#include "GDCore/Project/Project.h"
+#include "GDCore/Project/PropertyDescriptor.h"
+#include "GDCore/Serialization/SerializerElement.h"
+#include "GDCore/Tools/Log.h"
+
+namespace gd {
+
+gd::String
+ObjectAssetSerializer::GetObjectExtensionName(const gd::Object &object) {
+  const gd::String &type = object.GetType();
+  const auto separatorIndex =
+      type.find(PlatformExtension::GetNamespaceSeparator());
+  return separatorIndex != std::string::npos ? type.substr(0, separatorIndex)
+                                             : "";
+}
+
+void ObjectAssetSerializer::SerializeTo(
+    gd::Project &project, const gd::Object &object,
+    const gd::String &objectFullName, SerializerElement &element,
+    std::vector<gd::String> &usedResourceNames) {
+  auto cleanObject = object.Clone();
+  cleanObject->GetVariables().Clear();
+  cleanObject->GetEffects().Clear();
+  for (auto &&behaviorName : cleanObject->GetAllBehaviorNames()) {
+    cleanObject->RemoveBehavior(behaviorName);
+  }
+
+  gd::String extensionName = GetObjectExtensionName(*cleanObject);
+
+  element.SetAttribute("id", "");
+  element.SetAttribute("name", "");
+  element.SetAttribute("license", "");
+  if (project.HasEventsFunctionsExtensionNamed(extensionName)) {
+    auto &extension = project.GetEventsFunctionsExtension(extensionName);
+    element.SetAttribute("description", extension.GetShortDescription());
+  }
+  element.SetAttribute("gdevelopVersion", "");
+  element.SetAttribute("version", "");
+  element.SetIntAttribute("animationsCount", 1);
+  element.SetIntAttribute("maxFramesCount", 1);
+  // TODO Find the right object dimensions.
+  element.SetIntAttribute("width", 0);
+  element.SetIntAttribute("height", 0);
+  SerializerElement &authorsElement = element.AddChild("authors");
+  authorsElement.ConsiderAsArrayOf("author");
+  SerializerElement &tagsElement = element.AddChild("tags");
+  tagsElement.ConsiderAsArrayOf("tag");
+
+  SerializerElement &objectAssetsElement = element.AddChild("objectAssets");
+  objectAssetsElement.ConsiderAsArrayOf("objectAsset");
+  SerializerElement &objectAssetElement =
+      objectAssetsElement.AddChild("objectAsset");
+
+  cleanObject->SerializeTo(objectAssetElement.AddChild("object"));
+
+  SerializerElement &resourcesElement =
+      objectAssetElement.AddChild("resources");
+  resourcesElement.ConsiderAsArrayOf("resource");
+  auto &resourcesManager = project.GetResourcesManager();
+  gd::ResourcesInUseHelper resourcesInUse(resourcesManager);
+  cleanObject->GetConfiguration().ExposeResources(resourcesInUse);
+  for (auto &&resourceName : resourcesInUse.GetAllResources()) {
+    if (resourceName.length() == 0) {
+      continue;
+    }
+    usedResourceNames.push_back(resourceName);
+    auto &resource = resourcesManager.GetResource(resourceName);
+    SerializerElement &resourceElement = resourcesElement.AddChild("resource");
+    resource.SerializeTo(resourceElement);
+    resourceElement.SetAttribute("kind", resource.GetKind());
+    resourceElement.SetAttribute("name", resource.GetName());
+  }
+
+  SerializerElement &requiredExtensionsElement =
+      objectAssetElement.AddChild("requiredExtensions");
+  requiredExtensionsElement.ConsiderAsArrayOf("requiredExtension");
+  if (project.HasEventsFunctionsExtensionNamed(extensionName)) {
+    SerializerElement &requiredExtensionElement =
+        requiredExtensionsElement.AddChild("requiredExtension");
+    requiredExtensionElement.SetAttribute("extensionName", extensionName);
+    requiredExtensionElement.SetAttribute("extensionVersion", "1.0.0");
+  }
+
+  // TODO This can be removed when the asset script no longer require it.
+  SerializerElement &customizationElement =
+      objectAssetElement.AddChild("customization");
+  customizationElement.ConsiderAsArrayOf("empty");
+}
+} // namespace gd

Core/GDCore/IDE/ObjectAssetSerializer.h

@@ -0,0 +1,57 @@
+/*
+ * GDevelop Core
+ * Copyright 2008-2023 Florian Rival (Florian.Rival@gmail.com). All rights
+ * reserved. This project is released under the MIT License.
+ */
+#pragma once
+#include <map>
+#include <vector>
+
+#include "GDCore/String.h"
+
+namespace gd {
+class Object;
+class ExtensionDependency;
+class PropertyDescriptor;
+class Project;
+class Layout;
+class ArbitraryResourceWorker;
+class InitialInstance;
+class SerializerElement;
+class EffectsContainer;
+class AbstractFileSystem;
+} // namespace gd
+
+namespace gd {
+
+/**
+ * \brief Serialize objects into an asset for the store.
+ *
+ * \ingroup IDE
+ */
+class GD_CORE_API ObjectAssetSerializer {
+public:
+  /**
+   * \brief Serialize an object into an asset.
+   *
+   * \param project The project that contains the object and its resources.
+   * It's not actually modified.
+   * \param object The object to serialize as an asset.
+   * \param objectFullName The object name with spaces instead of PascalCase.
+   * \param element The element where the asset is serialize.
+   * \param usedResourceNames Return the names of the resources used by the asset.
+   */
+  static void
+  SerializeTo(gd::Project &project, const gd::Object &object,
+              const gd::String &objectFullName, SerializerElement &element,
+              std::vector<gd::String> &usedResourceNames);
+
+  ~ObjectAssetSerializer(){};
+
+private:
+  ObjectAssetSerializer(){};
+
+  static gd::String GetObjectExtensionName(const gd::Object &object);
+};
+
+} // namespace gd

Core/GDCore/IDE/Project/ArbitraryResourceWorker.cpp

@@ -52,6 +52,16 @@ void ArbitraryResourceWorker::ExposeModel3D(gd::String& resourceName){
     // do.
 };
 
+void ArbitraryResourceWorker::ExposeAtlas(gd::String& resourceName){
+    // Nothing to do by default - each child class can define here the action to
+    // do.
+};
+
+void ArbitraryResourceWorker::ExposeSpine(gd::String& resourceName){
+    // Nothing to do by default - each child class can define here the action to
+    // do.
+};
+
 void ArbitraryResourceWorker::ExposeVideo(gd::String& videoName){
     // Nothing to do by default - each child class can define here the action to
     // do.
@@ -63,14 +73,10 @@ void ArbitraryResourceWorker::ExposeBitmapFont(gd::String& bitmapFontName){
 };
 
 void ArbitraryResourceWorker::ExposeAudio(gd::String& audioName) {
-  for (auto resources : GetResources()) {
-    if (!resources) continue;
-
-    if (resources->HasResource(audioName) &&
-        resources->GetResource(audioName).GetKind() == "audio") {
-      // Nothing to do, the audio is a reference to a proper resource.
-      return;
-    }
+  if (resourcesManager->HasResource(audioName) &&
+      resourcesManager->GetResource(audioName).GetKind() == "audio") {
+    // Nothing to do, the audio is a reference to a proper resource.
+    return;
   }
 
   // For compatibility with older projects (where events were referring to files
@@ -80,14 +86,10 @@ void ArbitraryResourceWorker::ExposeAudio(gd::String& audioName) {
 };
 
 void ArbitraryResourceWorker::ExposeFont(gd::String& fontName) {
-  for (auto resources : GetResources()) {
-    if (!resources) continue;
-
-    if (resources->HasResource(fontName) &&
-        resources->GetResource(fontName).GetKind() == "font") {
-      // Nothing to do, the font is a reference to a proper resource.
-      return;
-    }
+  if (resourcesManager->HasResource(fontName) &&
+      resourcesManager->GetResource(fontName).GetKind() == "font") {
+    // Nothing to do, the font is a reference to a proper resource.
+    return;
   }
 
   // For compatibility with older projects (where events were referring to files
@@ -96,12 +98,7 @@ void ArbitraryResourceWorker::ExposeFont(gd::String& fontName) {
   ExposeFile(fontName);
 };
 
-void ArbitraryResourceWorker::ExposeResources(
-    gd::ResourcesManager* resourcesManager) {
-  if (!resourcesManager) return;
-
-  resourcesManagers.push_back(resourcesManager);
-
+void ArbitraryResourceWorker::ExposeResources() {
   std::vector<gd::String> resources = resourcesManager->GetAllResourceNames();
   for (std::size_t i = 0; i < resources.size(); i++) {
     if (resourcesManager->GetResource(resources[i]).UseFile())
@@ -110,9 +107,6 @@ void ArbitraryResourceWorker::ExposeResources(
 }
 
 void ArbitraryResourceWorker::ExposeEmbeddeds(gd::String& resourceName) {
-  if (resourcesManagers.empty()) return;
-  gd::ResourcesManager* resourcesManager = resourcesManagers[0];
-
   gd::Resource& resource = resourcesManager->GetResource(resourceName);
 
   if (!resource.GetMetadata().empty()) {
@@ -136,6 +130,7 @@ void ArbitraryResourceWorker::ExposeEmbeddeds(gd::String& resourceName) {
 
           gd::String potentiallyUpdatedTargetResourceName = targetResourceName;
           ExposeResourceWithType(targetResource.GetKind(), potentiallyUpdatedTargetResourceName);
+          ExposeEmbeddeds(potentiallyUpdatedTargetResourceName);
 
           if (potentiallyUpdatedTargetResourceName != targetResourceName) {
             // The resource name was renamed. Also update the mapping.
@@ -176,6 +171,7 @@ void ArbitraryResourceWorker::ExposeResourceWithType(
   }
   if (resourceType == "tilemap") {
     ExposeTilemap(resourceName);
+    ExposeEmbeddeds(resourceName);
     return;
   }
   if (resourceType == "tileset") {
@@ -184,12 +180,21 @@ void ArbitraryResourceWorker::ExposeResourceWithType(
   }
   if (resourceType == "json") {
     ExposeJson(resourceName);
+    ExposeEmbeddeds(resourceName);
     return;
   }
   if (resourceType == "video") {
     ExposeVideo(resourceName);
     return;
   }
+  if (resourceType == "atlas") {
+    ExposeAtlas(resourceName);
+    return;
+  }
+  if (resourceType == "spine") {
+    ExposeSpine(resourceName);
+    return;
+  }
   gd::LogError("Unexpected resource type: " + resourceType + " for: " + resourceName);
   return;
 }
@@ -243,10 +248,12 @@ bool ResourceWorkerInEventsWorker::DoVisitInstruction(gd::Instruction& instructi
         } else if (parameterMetadata.GetType() == "jsonResource") {
           gd::String updatedParameterValue = parameterValue;
           worker.ExposeJson(updatedParameterValue);
+          worker.ExposeEmbeddeds(updatedParameterValue);
           instruction.SetParameter(parameterIndex, updatedParameterValue);
         } else if (parameterMetadata.GetType() == "tilemapResource") {
           gd::String updatedParameterValue = parameterValue;
           worker.ExposeTilemap(updatedParameterValue);
+          worker.ExposeEmbeddeds(updatedParameterValue);
           instruction.SetParameter(parameterIndex, updatedParameterValue);
         } else if (parameterMetadata.GetType() == "tilesetResource") {
           gd::String updatedParameterValue = parameterValue;
@@ -256,19 +263,20 @@ bool ResourceWorkerInEventsWorker::DoVisitInstruction(gd::Instruction& instructi
           gd::String updatedParameterValue = parameterValue;
           worker.ExposeModel3D(updatedParameterValue);
           instruction.SetParameter(parameterIndex, updatedParameterValue);
+        } else if (parameterMetadata.GetType() == "atlasResource") {
+          gd::String updatedParameterValue = parameterValue;
+          worker.ExposeAtlas(updatedParameterValue);
+          instruction.SetParameter(parameterIndex, updatedParameterValue);
+        } else if (parameterMetadata.GetType() == "spineResource") {
+          gd::String updatedParameterValue = parameterValue;
+          worker.ExposeSpine(updatedParameterValue);
+          instruction.SetParameter(parameterIndex, updatedParameterValue);
         }
       });
 
   return false;
 };
 
-void LaunchResourceWorkerOnEvents(const gd::Project& project,
-                                  gd::EventsList& events,
-                                  gd::ArbitraryResourceWorker& worker) {
-  gd::ResourceWorkerInEventsWorker eventsWorker(project, worker);
-  eventsWorker.Launch(events);
-}
-
 gd::ResourceWorkerInEventsWorker
 GetResourceWorkerOnEvents(const gd::Project &project,
                           gd::ArbitraryResourceWorker &worker) {
@@ -293,8 +301,8 @@ void ResourceWorkerInObjectsWorker::DoVisitBehavior(gd::Behavior &behavior){
 gd::ResourceWorkerInObjectsWorker
 GetResourceWorkerOnObjects(const gd::Project &project,
                            gd::ArbitraryResourceWorker &worker) {
-  gd::ResourceWorkerInObjectsWorker eventsWorker(project, worker);
-  return eventsWorker;
+  gd::ResourceWorkerInObjectsWorker resourcesWorker(project, worker);
+  return resourcesWorker;
 }
 
 }  // namespace gd

Core/GDCore/IDE/Project/ArbitraryResourceWorker.h

@@ -37,13 +37,14 @@ namespace gd {
  * \see ResourcesMergingHelper
  * \see gd::ResourcesInUseHelper
  *
- * \see gd::LaunchResourceWorkerOnEvents
+ * \see gd::GetResourceWorkerOnEvents
  *
  * \ingroup IDE
  */
 class GD_CORE_API ArbitraryResourceWorker {
- public:
-  ArbitraryResourceWorker(){};
+public:
+  ArbitraryResourceWorker(gd::ResourcesManager &resourcesManager_)
+      : resourcesManager(&resourcesManager_){};
   virtual ~ArbitraryResourceWorker();
 
   /**
@@ -52,7 +53,7 @@ class GD_CORE_API ArbitraryResourceWorker {
    * first to ensure that resources are known so that images, shaders & audio
    * can make reference to them.
    */
-  void ExposeResources(gd::ResourcesManager *resourcesManager);
+  void ExposeResources();
 
   /**
    * \brief Expose a resource from a given type.
@@ -95,6 +96,16 @@ class GD_CORE_API ArbitraryResourceWorker {
    * \brief Expose a 3D model, which is always a reference to a "model3D" resource.
    */
   virtual void ExposeModel3D(gd::String &resourceName);
+  
+  /**
+   * \brief Expose an atlas, which is always a reference to a "atlas" resource.
+   */
+  virtual void ExposeAtlas(gd::String &resourceName);
+
+  /**
+   * \brief Expose an spine, which is always a reference to a "spine" resource.
+   */
+  virtual void ExposeSpine(gd::String &resourceName);
 
   /**
    * \brief Expose a video, which is always a reference to a "video" resource.
@@ -122,10 +133,8 @@ class GD_CORE_API ArbitraryResourceWorker {
    */
   virtual void ExposeEmbeddeds(gd::String &resourceName);
 
- protected:
-  const std::vector<gd::ResourcesManager *> &GetResources() {
-    return resourcesManagers;
-  };
+protected:
+  gd::ResourcesManager * resourcesManager;
 
  private:
   /**
@@ -133,8 +142,6 @@ class GD_CORE_API ArbitraryResourceWorker {
    * exposed as file (see ExposeFile).
    */
   void ExposeResource(gd::Resource &resource);
-
-  std::vector<gd::ResourcesManager *> resourcesManagers;
 };
 
 /**

Core/GDCore/IDE/Project/AssetResourcePathCleaner.cpp

@@ -0,0 +1,74 @@
+/*
+ * GDevelop Core
+ * Copyright 2008-2023 Florian Rival (Florian.Rival@gmail.com). All rights
+ * reserved. This project is released under the MIT License.
+ */
+
+#include "AssetResourcePathCleaner.h"
+#include "GDCore/Project/Project.h"
+#include "GDCore/Project/ResourcesManager.h"
+#include "GDCore/String.h"
+
+namespace gd {
+void AssetResourcePathCleaner::ExposeImage(gd::String &imageName) {
+  ExposeResourceAsFile(imageName);
+}
+
+void AssetResourcePathCleaner::ExposeAudio(gd::String &audioName) {
+  ExposeResourceAsFile(audioName);
+}
+
+void AssetResourcePathCleaner::ExposeFont(gd::String &fontName) {
+  ExposeResourceAsFile(fontName);
+}
+
+void AssetResourcePathCleaner::ExposeJson(gd::String &jsonName) {
+  ExposeResourceAsFile(jsonName);
+}
+
+void AssetResourcePathCleaner::ExposeTilemap(gd::String &tilemapName) {
+  ExposeResourceAsFile(tilemapName);
+}
+
+void AssetResourcePathCleaner::ExposeTileset(gd::String &tilesetName) {
+  ExposeResourceAsFile(tilesetName);
+}
+
+void AssetResourcePathCleaner::ExposeVideo(gd::String &videoName) {
+  ExposeResourceAsFile(videoName);
+}
+
+void AssetResourcePathCleaner::ExposeBitmapFont(gd::String &bitmapFontName) {
+  ExposeResourceAsFile(bitmapFontName);
+}
+
+void AssetResourcePathCleaner::ExposeResourceAsFile(gd::String &resourceName) {
+
+  auto &resource = resourcesManager->GetResource(resourceName);
+  gd::String file = resource.GetFile();
+  ExposeFile(file);
+
+  resourcesNameReverseMap[file] = resourceName;
+  resourceName = file;
+}
+
+void AssetResourcePathCleaner::ExposeFile(gd::String &resourceFilePath) {
+
+  size_t slashPos = resourceFilePath.find_last_of("/");
+  size_t antiSlashPos = resourceFilePath.find_last_of("\\");
+  size_t baseNamePos =
+      slashPos == String::npos
+          ? antiSlashPos == String::npos ? 0 : (antiSlashPos + 1)
+      : antiSlashPos == String::npos ? (slashPos + 1)
+      : slashPos > antiSlashPos      ? (slashPos + 1)
+                                     : (antiSlashPos + 1);
+  gd::String baseName =
+      baseNamePos != 0
+          ? resourceFilePath.substr(baseNamePos, resourceFilePath.length())
+          : resourceFilePath;
+
+  resourcesFileNameMap[resourceFilePath] = baseName;
+  resourceFilePath = baseName;
+}
+
+} // namespace gd

Core/GDCore/IDE/Project/AssetResourcePathCleaner.h

@@ -0,0 +1,65 @@
+/*
+ * GDevelop Core
+ * Copyright 2008-2023 Florian Rival (Florian.Rival@gmail.com). All rights
+ * reserved. This project is released under the MIT License.
+ */
+#pragma once
+
+#include "GDCore/IDE/Project/ArbitraryResourceWorker.h"
+#include "GDCore/IDE/Project/ResourcesMergingHelper.h"
+#include "GDCore/String.h"
+#include <map>
+#include <memory>
+#include <vector>
+
+namespace gd {
+class AbstractFileSystem;
+class Project;
+} // namespace gd
+
+namespace gd {
+
+/**
+ * \brief AssetResourcePathCleaner is used when exporting an object as an asset.
+ * It removes the folder from the path.
+ *
+ * \see ArbitraryResourceWorker
+ *
+ * \ingroup IDE
+ */
+class GD_CORE_API AssetResourcePathCleaner : public ArbitraryResourceWorker {
+public:
+  AssetResourcePathCleaner(
+      gd::ResourcesManager &resourcesManager,
+      std::map<gd::String, gd::String> &resourcesFileNameMap_,
+      std::map<gd::String, gd::String> &resourcesNameReverseMap_)
+      : ArbitraryResourceWorker(resourcesManager),
+        resourcesFileNameMap(resourcesFileNameMap_),
+        resourcesNameReverseMap(resourcesNameReverseMap_){};
+  virtual ~AssetResourcePathCleaner(){};
+
+  void ExposeImage(gd::String &imageName) override;
+  void ExposeAudio(gd::String &audioName) override;
+  void ExposeFont(gd::String &fontName) override;
+  void ExposeJson(gd::String &jsonName) override;
+  void ExposeTilemap(gd::String &tilemapName) override;
+  void ExposeTileset(gd::String &tilesetName) override;
+  void ExposeVideo(gd::String &videoName) override;
+  void ExposeBitmapFont(gd::String &bitmapFontName) override;
+  void ExposeFile(gd::String &resource) override;
+
+protected:
+  void ExposeResourceAsFile(gd::String &resourceName);
+
+  /**
+   * New file names that can be accessed by their original name.
+   */
+  std::map<gd::String, gd::String> &resourcesFileNameMap;
+
+  /**
+   * Original resource names that can be accessed by their new name.
+   */
+  std::map<gd::String, gd::String> &resourcesNameReverseMap;
+};
+
+} // namespace gd

Core/GDCore/IDE/Project/ObjectsUsingResourceCollector.cpp

@@ -0,0 +1,19 @@
+#include "ObjectsUsingResourceCollector.h"
+
+#include "GDCore/Project/Object.h"
+#include "GDCore/Project/Project.h"
+
+namespace gd {
+
+void ObjectsUsingResourceCollector::DoVisitObject(gd::Object& object) {
+  gd::ResourceNameMatcher resourceNameMatcher(*resourcesManager, resourceName);
+
+  object.GetConfiguration().ExposeResources(resourceNameMatcher);
+  if (resourceNameMatcher.AnyResourceMatches()) {
+    objectNames.push_back(object.GetName());
+  }
+};
+
+ObjectsUsingResourceCollector::~ObjectsUsingResourceCollector() {}
+
+}  // namespace gd

Core/GDCore/IDE/Project/ObjectsUsingResourceCollector.h

@@ -0,0 +1,97 @@
+/*
+ * GDevelop Core
+ * Copyright 2008-2016 Florian Rival (Florian.Rival@gmail.com). All rights
+ * reserved. This project is released under the MIT License.
+ */
+
+#pragma once
+
+#include <vector>
+
+#include "GDCore/IDE/Project/ArbitraryObjectsWorker.h"
+#include "GDCore/IDE/Project/ArbitraryResourceWorker.h"
+#include "GDCore/String.h"
+
+namespace gd {
+class Object;
+}  // namespace gd
+
+namespace gd {
+
+class GD_CORE_API ObjectsUsingResourceCollector
+    : public ArbitraryObjectsWorker {
+public:
+  ObjectsUsingResourceCollector(gd::ResourcesManager &resourcesManager_,
+                                const gd::String &resourceName_)
+      : resourcesManager(&resourcesManager_), resourceName(resourceName_){};
+  virtual ~ObjectsUsingResourceCollector();
+
+  std::vector<gd::String>& GetObjectNames() { return objectNames; }
+
+ private:
+  void DoVisitObject(gd::Object& object) override;
+
+  std::vector<gd::String> objectNames;
+  gd::String resourceName;
+  gd::ResourcesManager *resourcesManager;
+};
+
+class GD_CORE_API ResourceNameMatcher : public ArbitraryResourceWorker {
+public:
+  ResourceNameMatcher(gd::ResourcesManager &resourcesManager,
+                      const gd::String &resourceName_)
+      : resourceName(resourceName_),
+        matchesResourceName(false), gd::ArbitraryResourceWorker(
+                                        resourcesManager){};
+  virtual ~ResourceNameMatcher(){};
+
+  bool AnyResourceMatches() { return matchesResourceName; }
+  void Reset() { matchesResourceName = false; }
+
+ private:
+  virtual void ExposeFile(gd::String& resource) override{
+      /*Don't care, we just read resource names*/
+  };
+  virtual void ExposeImage(gd::String& otherResourceName) override {
+    MatchResourceName(otherResourceName);
+  };
+  virtual void ExposeAudio(gd::String& otherResourceName) override {
+    MatchResourceName(otherResourceName);
+  };
+  virtual void ExposeFont(gd::String& otherResourceName) override {
+    MatchResourceName(otherResourceName);
+  };
+  virtual void ExposeJson(gd::String& otherResourceName) override {
+    MatchResourceName(otherResourceName);
+  };
+  virtual void ExposeTilemap(gd::String& otherResourceName) override {
+    MatchResourceName(otherResourceName);
+  };
+  virtual void ExposeTileset(gd::String& otherResourceName) override {
+    MatchResourceName(otherResourceName);
+  };
+  virtual void ExposeVideo(gd::String& otherResourceName) override {
+    MatchResourceName(otherResourceName);
+  };
+  virtual void ExposeBitmapFont(gd::String& otherResourceName) override {
+    MatchResourceName(otherResourceName);
+  };
+  virtual void ExposeModel3D(gd::String& otherResourceName) override {
+    MatchResourceName(otherResourceName);
+  };
+  virtual void ExposeAtlas(gd::String& otherResourceName) override {
+    MatchResourceName(otherResourceName);
+  };
+  virtual void ExposeSpine(gd::String& otherResourceName) override {
+    MatchResourceName(otherResourceName);
+  };
+
+  void MatchResourceName(gd::String& otherResourceName) {
+    if (otherResourceName == resourceName) matchesResourceName = true;
+  }
+
+  gd::String resourceName;
+  bool matchesResourceName;
+};
+
+};  // namespace gd

Core/GDCore/IDE/Project/ProjectResourcesAdder.cpp

@@ -18,8 +18,9 @@ namespace gd {
 std::vector<gd::String> ProjectResourcesAdder::GetAllUseless(
     gd::Project& project, const gd::String& resourceType) {
   std::vector<gd::String> unusedResources;
+
   // Search for resources used in the project
-  gd::ResourcesInUseHelper resourcesInUse;
+  gd::ResourcesInUseHelper resourcesInUse(project.GetResourcesManager());
   gd::ResourceExposer::ExposeWholeProjectResources(project, resourcesInUse);
   std::set<gd::String>& usedResources = resourcesInUse.GetAll(resourceType);
 

Core/GDCore/IDE/Project/ProjectResourcesCopier.cpp

@@ -25,8 +25,29 @@ bool ProjectResourcesCopier::CopyAllResourcesTo(
     bool updateOriginalProject,
     bool preserveAbsoluteFilenames,
     bool preserveDirectoryStructure) {
+  if (updateOriginalProject) {
+    gd::ProjectResourcesCopier::CopyAllResourcesTo(
+        originalProject, originalProject, fs, destinationDirectory,
+        preserveAbsoluteFilenames, preserveDirectoryStructure);
+  } else {
+    gd::Project clonedProject = originalProject;
+    gd::ProjectResourcesCopier::CopyAllResourcesTo(
+        originalProject, clonedProject, fs, destinationDirectory,
+        preserveAbsoluteFilenames, preserveDirectoryStructure);
+  }
+  return true;
+}
+
+bool ProjectResourcesCopier::CopyAllResourcesTo(
+    gd::Project& originalProject,
+    gd::Project& clonedProject,
+    AbstractFileSystem& fs,
+    gd::String destinationDirectory,
+    bool preserveAbsoluteFilenames,
+    bool preserveDirectoryStructure) {
+
   // Check if there are some resources with absolute filenames
-  gd::ResourcesAbsolutePathChecker absolutePathChecker(fs);
+  gd::ResourcesAbsolutePathChecker absolutePathChecker(originalProject.GetResourcesManager(), fs);
   gd::ResourceExposer::ExposeWholeProjectResources(originalProject, absolutePathChecker);
 
   auto projectDirectory = fs.DirNameFrom(originalProject.GetProjectFile());
@@ -34,24 +55,18 @@ bool ProjectResourcesCopier::CopyAllResourcesTo(
             << destinationDirectory << "..." << std::endl;
 
   // Get the resources to be copied
-  gd::ResourcesMergingHelper resourcesMergingHelper(fs);
+  gd::ResourcesMergingHelper resourcesMergingHelper(
+      clonedProject.GetResourcesManager(), fs);
   resourcesMergingHelper.SetBaseDirectory(projectDirectory);
   resourcesMergingHelper.PreserveDirectoriesStructure(
       preserveDirectoryStructure);
-  resourcesMergingHelper.PreserveAbsoluteFilenames(
-      preserveAbsoluteFilenames);
-
-  if (updateOriginalProject) {
-    gd::ResourceExposer::ExposeWholeProjectResources(originalProject, resourcesMergingHelper);
-  } else {
-    std::shared_ptr<gd::Project> project(new gd::Project(originalProject));
-    gd::ResourceExposer::ExposeWholeProjectResources(*project, resourcesMergingHelper);
-  }
+  resourcesMergingHelper.PreserveAbsoluteFilenames(preserveAbsoluteFilenames);
+  gd::ResourceExposer::ExposeWholeProjectResources(clonedProject,
+                                                    resourcesMergingHelper);
 
   // Copy resources
   map<gd::String, gd::String>& resourcesNewFilename =
       resourcesMergingHelper.GetAllResourcesOldAndNewFilename();
-  unsigned int i = 0;
   for (map<gd::String, gd::String>::const_iterator it =
            resourcesNewFilename.begin();
        it != resourcesNewFilename.end();
@@ -71,8 +86,6 @@ bool ProjectResourcesCopier::CopyAllResourcesTo(
                        destinationFile + _("\"."));
       }
     }
-
-    ++i;
   }
 
   return true;

Core/GDCore/IDE/Project/ProjectResourcesCopier.h

@@ -3,9 +3,10 @@
  * Copyright 2008-present Florian Rival (Florian.Rival@gmail.com). All rights
  * reserved. This project is released under the MIT License.
  */
-#ifndef PROJECTRESOURCESCOPIER_H
-#define PROJECTRESOURCESCOPIER_H
+#pragma once
+
 #include "GDCore/String.h"
+
 namespace gd {
 class Project;
 class AbstractFileSystem;
@@ -47,8 +48,14 @@ class GD_CORE_API ProjectResourcesCopier {
                                  bool updateOriginalProject,
                                  bool preserveAbsoluteFilenames = true,
                                  bool preserveDirectoryStructure = true);
+
+private:
+  static bool CopyAllResourcesTo(gd::Project& originalProject,
+                                 gd::Project& clonedProject,
+                                 gd::AbstractFileSystem& fs,
+                                 gd::String destinationDirectory,
+                                 bool preserveAbsoluteFilenames = true,
+                                 bool preserveDirectoryStructure = true);
 };
 
 }  // namespace gd
-
-#endif  // PROJECTRESOURCESCOPIER_H

Core/GDCore/IDE/Project/ResourcesAbsolutePathChecker.h

@@ -3,8 +3,7 @@
  * Copyright 2008-2016 Florian Rival (Florian.Rival@gmail.com). All rights
  * reserved. This project is released under the MIT License.
  */
-#ifndef RESOURCESABSOLUTEPATHCHECKER_H
-#define RESOURCESABSOLUTEPATHCHECKER_H
+#pragma once
 
 #include "GDCore/IDE/AbstractFileSystem.h"
 #include "GDCore/IDE/Project/ArbitraryResourceWorker.h"
@@ -22,10 +21,10 @@ namespace gd {
  */
 class GD_CORE_API ResourcesAbsolutePathChecker
     : public ArbitraryResourceWorker {
- public:
-  ResourcesAbsolutePathChecker(AbstractFileSystem& fileSystem)
-      : ArbitraryResourceWorker(),
-        hasAbsoluteFilenames(false),
+public:
+  ResourcesAbsolutePathChecker(gd::ResourcesManager &resourcesManager,
+                               AbstractFileSystem &fileSystem)
+      : ArbitraryResourceWorker(resourcesManager), hasAbsoluteFilenames(false),
         fs(fileSystem){};
   virtual ~ResourcesAbsolutePathChecker(){};
 
@@ -47,5 +46,3 @@ class GD_CORE_API ResourcesAbsolutePathChecker
 };
 
 }  // namespace gd
-
-#endif  // RESOURCESABSOLUTEPATHCHECKER_H

Core/GDCore/IDE/Project/ResourcesInUseHelper.cpp

@@ -0,0 +1,25 @@
+/*
+ * GDevelop Core
+ * Copyright 2008-2016 Florian Rival (Florian.Rival@gmail.com). All rights
+ * reserved. This project is released under the MIT License.
+ */
+
+#include "ResourcesInUseHelper.h"
+
+namespace gd {
+
+const std::vector<gd::String> ResourcesInUseHelper::resourceTypes = {
+    "image",   "audio", "font",       "json",   "tilemap",
+    "tileset", "video", "bitmapFont", "model3D"};
+
+const std::vector<gd::String> &ResourcesInUseHelper::GetAllResources() {
+  allResources.clear();
+  for (auto &&resourceType : gd::ResourcesInUseHelper::resourceTypes) {
+    for (auto &&resourceName : GetAll(resourceType)) {
+      allResources.push_back(resourceName);
+    }
+  }
+  return allResources;
+}
+
+} // namespace gd

Core/GDCore/IDE/Project/ResourcesInUseHelper.h

@@ -4,9 +4,7 @@
  * reserved. This project is released under the MIT License.
  */
 
-#if defined(GD_IDE_ONLY)
-#ifndef IMAGESUSEDINVENTORIZER_H
-#define IMAGESUSEDINVENTORIZER_H
+#pragma once
 
 #include <set>
 #include <vector>
@@ -33,10 +31,12 @@ std::set<gd::String> & usedImages = resourcesInUse.GetAllImages();
  * \ingroup IDE
  */
 class ResourcesInUseHelper : public gd::ArbitraryResourceWorker {
- public:
-  ResourcesInUseHelper() : gd::ArbitraryResourceWorker(){};
+public:
+  ResourcesInUseHelper(gd::ResourcesManager &resourcesManager)
+      : gd::ArbitraryResourceWorker(resourcesManager){};
   virtual ~ResourcesInUseHelper(){};
 
+  const std::vector<gd::String>& GetAllResources();
   std::set<gd::String>& GetAllImages() { return GetAll("image"); };
   std::set<gd::String>& GetAllAudios() { return GetAll("audio"); };
   std::set<gd::String>& GetAllFonts() { return GetAll("font"); };
@@ -46,6 +46,8 @@ class ResourcesInUseHelper : public gd::ArbitraryResourceWorker {
   std::set<gd::String>& GetAllVideos() { return GetAll("video"); };
   std::set<gd::String>& GetAllBitmapFonts() { return GetAll("bitmapFont"); };
   std::set<gd::String>& GetAll3DModels() { return GetAll("model3D"); };
+  std::set<gd::String>& GetAllAtlases() { return GetAll("atlas"); };
+  std::set<gd::String>& GetAllSpines() { return GetAll("spine"); };
   std::set<gd::String>& GetAll(const gd::String& resourceType) {
     if (resourceType == "image") return allImages;
     if (resourceType == "audio") return allAudios;
@@ -56,6 +58,8 @@ class ResourcesInUseHelper : public gd::ArbitraryResourceWorker {
     if (resourceType == "video") return allVideos;
     if (resourceType == "bitmapFont") return allBitmapFonts;
     if (resourceType == "model3D") return allModel3Ds;
+    if (resourceType == "atlas") return allAtlases;
+    if (resourceType == "spine") return allSpines;
 
     return emptyResources;
   };
@@ -63,35 +67,42 @@ class ResourcesInUseHelper : public gd::ArbitraryResourceWorker {
   virtual void ExposeFile(gd::String& resource) override{
       /*Don't care, we just list resource names*/
   };
-  virtual void ExposeImage(gd::String& imageResourceName) override {
-    allImages.insert(imageResourceName);
+  virtual void ExposeImage(gd::String& resourceName) override {
+    allImages.insert(resourceName);
   };
-  virtual void ExposeAudio(gd::String& audioResourceName) override {
-    allAudios.insert(audioResourceName);
+  virtual void ExposeAudio(gd::String& resourceName) override {
+    allAudios.insert(resourceName);
   };
-  virtual void ExposeFont(gd::String& fontResourceName) override {
-    allFonts.insert(fontResourceName);
+  virtual void ExposeFont(gd::String& resourceName) override {
+    allFonts.insert(resourceName);
   };
-  virtual void ExposeJson(gd::String& jsonResourceName) override {
-    allJsons.insert(jsonResourceName);
+  virtual void ExposeJson(gd::String& resourceName) override {
+    allJsons.insert(resourceName);
   };
-  virtual void ExposeTilemap(gd::String& tilemapResourceName) override {
-    allTilemaps.insert(tilemapResourceName);
+  virtual void ExposeTilemap(gd::String& resourceName) override {
+    allTilemaps.insert(resourceName);
   };
-  virtual void ExposeTileset(gd::String& tilesetResourceName) override {
-    allTilesets.insert(tilesetResourceName);
+  virtual void ExposeTileset(gd::String& resourceName) override {
+    allTilesets.insert(resourceName);
   };
-  virtual void ExposeVideo(gd::String& videoResourceName) override {
-    allVideos.insert(videoResourceName);
+  virtual void ExposeVideo(gd::String& resourceName) override {
+    allVideos.insert(resourceName);
   };
-  virtual void ExposeBitmapFont(gd::String& bitmapFontResourceName) override {
-    allBitmapFonts.insert(bitmapFontResourceName);
+  virtual void ExposeBitmapFont(gd::String& resourceName) override {
+    allBitmapFonts.insert(resourceName);
   };
   virtual void ExposeModel3D(gd::String& resourceName) override {
     allModel3Ds.insert(resourceName);
   };
+  virtual void ExposeAtlas(gd::String& resourceName) override {
+    allAtlases.insert(resourceName);
+  };
+  virtual void ExposeSpine(gd::String& resourceName) override {
+    allSpines.insert(resourceName);
+  };
 
  protected:
+  std::vector<gd::String> allResources;
   std::set<gd::String> allImages;
   std::set<gd::String> allAudios;
   std::set<gd::String> allFonts;
@@ -101,10 +112,11 @@ class ResourcesInUseHelper : public gd::ArbitraryResourceWorker {
   std::set<gd::String> allVideos;
   std::set<gd::String> allBitmapFonts;
   std::set<gd::String> allModel3Ds;
+  std::set<gd::String> allAtlases;
+  std::set<gd::String> allSpines;
   std::set<gd::String> emptyResources;
+
+  static const std::vector<gd::String> resourceTypes;
 };
 
 }  // namespace gd
-
-#endif  // IMAGESUSEDINVENTORIZER_H
-#endif

Core/GDCore/IDE/Project/ResourcesMergingHelper.cpp

@@ -28,7 +28,7 @@ void ResourcesMergingHelper::ExposeFile(gd::String& resourceFilename) {
   auto stripToFilenameOnly = [&]() {
     fs.MakeAbsolute(resourceFullFilename, baseDirectory);
     SetNewFilename(resourceFullFilename, fs.FileNameFrom(resourceFullFilename));
-    resourceFilename = oldFilenames[resourceFullFilename];
+    resourceFilename = newFilenames[resourceFullFilename];
   };
 
   // if we do not want to preserve the folders at all,
@@ -45,7 +45,7 @@ void ResourcesMergingHelper::ExposeFile(gd::String& resourceFilename) {
     gd::String relativeFilename = resourceFullFilename;
     if (fs.MakeRelative(relativeFilename, baseDirectory)) {
       SetNewFilename(resourceFullFilename, relativeFilename);
-      resourceFilename = oldFilenames[resourceFullFilename];
+      resourceFilename = newFilenames[resourceFullFilename];
     } else {
       // The filename cannot be made relative. Consider that it is absolute.
       // Just strip the filename to its file part
@@ -63,7 +63,7 @@ void ResourcesMergingHelper::ExposeFile(gd::String& resourceFilename) {
 
 void ResourcesMergingHelper::SetNewFilename(gd::String oldFilename,
                                             gd::String newFilename) {
-  if (oldFilenames.find(oldFilename) != oldFilenames.end()) return;
+  if (newFilenames.find(oldFilename) != newFilenames.end()) return;
 
   // Extract baseName and extension from the new filename
   size_t extensionPos = newFilename.find_last_of(".");
@@ -80,13 +80,13 @@ void ResourcesMergingHelper::SetNewFilename(gd::String oldFilename,
       gd::NewNameGenerator::Generate(
           baseName,
           [this, extension](const gd::String& newBaseName) {
-            return newFilenames.find(newBaseName + extension) !=
-                   newFilenames.end();
+            return oldFilenames.find(newBaseName + extension) !=
+                   oldFilenames.end();
           }) +
       extension;
 
-  oldFilenames[oldFilename] = finalFilename;
-  newFilenames[finalFilename] = oldFilename;
+  newFilenames[oldFilename] = finalFilename;
+  oldFilenames[finalFilename] = oldFilename;
 }
 
 void ResourcesMergingHelper::SetBaseDirectory(

Core/GDCore/IDE/Project/ResourcesMergingHelper.h

@@ -28,11 +28,11 @@ namespace gd {
  * \ingroup IDE
  */
 class GD_CORE_API ResourcesMergingHelper : public ArbitraryResourceWorker {
- public:
-  ResourcesMergingHelper(gd::AbstractFileSystem& fileSystem)
-      : ArbitraryResourceWorker(),
-        preserveDirectoriesStructure(false),
-        preserveAbsoluteFilenames(false),
+public:
+  ResourcesMergingHelper(gd::ResourcesManager &resourcesManager,
+                         gd::AbstractFileSystem &fileSystem)
+      : ArbitraryResourceWorker(resourcesManager),
+        preserveDirectoriesStructure(false), preserveAbsoluteFilenames(false),
         fs(fileSystem){};
   virtual ~ResourcesMergingHelper(){};
 
@@ -64,19 +64,25 @@ class GD_CORE_API ResourcesMergingHelper : public ArbitraryResourceWorker {
    * the Base Directory.
    */
   std::map<gd::String, gd::String>& GetAllResourcesOldAndNewFilename() {
-    return oldFilenames;
+    return newFilenames;
   };
 
   /**
    * Resources merging helper collects all resources filenames and update these
    * filenames.
    */
-  virtual void ExposeFile(gd::String& resource) override;
+  void ExposeFile(gd::String& resource) override;
 
  protected:
   void SetNewFilename(gd::String oldFilename, gd::String newFilename);
 
+  /**
+   * Original file names that can be accessed by their new name.
+   */
   std::map<gd::String, gd::String> oldFilenames;
+  /**
+   * New file names that can be accessed by their original name.
+   */
   std::map<gd::String, gd::String> newFilenames;
   gd::String baseDirectory;
   bool preserveDirectoriesStructure;  ///< If set to true, the directory

Core/GDCore/IDE/Project/ResourcesRenamer.h

@@ -22,13 +22,16 @@ namespace gd {
  */
 class ResourcesRenamer : public gd::ArbitraryResourceWorker {
  public:
-  /**
-   * @brief Constructor taking the map from old name to new name.
-   * @param oldToNewNames_ A map associating to a resource name the new name to
-   * use.
-   */
-  ResourcesRenamer(const std::map<gd::String, gd::String>& oldToNewNames_)
-      : gd::ArbitraryResourceWorker(), oldToNewNames(oldToNewNames_){};
+   /**
+    * @brief Constructor taking the map from old name to new name.
+    * @param oldToNewNames_ A map associating to a resource name the new name to
+    * use.
+    */
+   ResourcesRenamer(gd::ResourcesManager &resourcesManager,
+                    const std::map<gd::String, gd::String> &oldToNewNames_)
+       : gd::ArbitraryResourceWorker(resourcesManager),
+         oldToNewNames(oldToNewNames_){};
+
   virtual ~ResourcesRenamer(){};
 
   virtual void ExposeFile(gd::String& resourceFileName) override{
@@ -62,6 +65,12 @@ class ResourcesRenamer : public gd::ArbitraryResourceWorker {
   virtual void ExposeModel3D(gd::String& resourceName) override {
     RenameIfNeeded(resourceName);
   };
+  virtual void ExposeAtlas(gd::String& resourceName) override {
+    RenameIfNeeded(resourceName);
+  };
+  virtual void ExposeSpine(gd::String& resourceName) override {
+    RenameIfNeeded(resourceName);
+  };
 
  private:
   void RenameIfNeeded(gd::String& resourceName) {

Core/GDCore/IDE/Project/SceneResourcesFinder.cpp

@@ -0,0 +1,37 @@
+/*
+ * GDevelop JS Platform
+ * Copyright 2008-2023 Florian Rival (Florian.Rival@gmail.com). All rights
+ * reserved. This project is released under the MIT License.
+ */
+#include "SceneResourcesFinder.h"
+
+#include "GDCore/IDE/ResourceExposer.h"
+#include "GDCore/Project/Layout.h"
+#include "GDCore/Project/Project.h"
+#include "GDCore/Serialization/SerializerElement.h"
+
+namespace gd {
+
+std::set<gd::String> SceneResourcesFinder::FindProjectResources(gd::Project &project) {
+  gd::SceneResourcesFinder resourceWorker(project.GetResourcesManager());
+
+  gd::ResourceExposer::ExposeProjectResources(project, resourceWorker);
+  return resourceWorker.resourceNames;
+}
+
+std::set<gd::String> SceneResourcesFinder::FindSceneResources(gd::Project &project,
+    gd::Layout &layout) {
+  gd::SceneResourcesFinder resourceWorker(project.GetResourcesManager());
+
+  gd::ResourceExposer::ExposeLayoutResources(project, layout, resourceWorker);
+  return resourceWorker.resourceNames;
+}
+
+void SceneResourcesFinder::AddUsedResource(gd::String &resourceName) {
+  if (resourceName.empty()) {
+    return;
+  }
+  resourceNames.insert(resourceName);
+}
+
+} // namespace gd

Core/GDCore/IDE/Project/SceneResourcesFinder.h

@@ -0,0 +1,93 @@
+/*
+ * GDevelop JS Platform
+ * Copyright 2008-2023 Florian Rival (Florian.Rival@gmail.com). All rights
+ * reserved. This project is released under the MIT License.
+ */
+
+#pragma once
+
+#include "GDCore/IDE/Project/ArbitraryResourceWorker.h"
+#include "GDCore/String.h"
+
+#include <set>
+
+namespace gd {
+class Project;
+class Layout;
+class SerializerElement;
+} // namespace gd
+
+namespace gd {
+
+/**
+ * \brief Find resource usages in several parts of the project.
+ *
+ * \ingroup IDE
+ */
+class SceneResourcesFinder : private gd::ArbitraryResourceWorker {
+public:
+  /**
+   * @brief Find resource usages in a given scenes.
+   *
+   * It doesn't include resources used globally.
+   */
+  static std::set<gd::String> FindSceneResources(gd::Project &project,
+                                                      gd::Layout &layout);
+
+  /**
+   * @brief Find resource that are used globally in the project.
+   *
+   * It doesn't include resources used in scenes.
+   */
+  static std::set<gd::String> FindProjectResources(gd::Project &project);
+
+  virtual ~SceneResourcesFinder(){};
+
+private:
+  SceneResourcesFinder(gd::ResourcesManager &resourcesManager)
+      : gd::ArbitraryResourceWorker(resourcesManager){};
+
+  void AddUsedResource(gd::String &resourceName);
+
+  void ExposeFile(gd::String &resourceFileName) override{
+      // Don't do anything: we're renaming resources, not the files they are
+      // pointing to.
+  };
+  void ExposeImage(gd::String &imageResourceName) override {
+    AddUsedResource(imageResourceName);
+  };
+  void ExposeAudio(gd::String &audioResourceName) override {
+    AddUsedResource(audioResourceName);
+  };
+  void ExposeFont(gd::String &fontResourceName) override {
+    AddUsedResource(fontResourceName);
+  };
+  void ExposeJson(gd::String &jsonResourceName) override {
+    AddUsedResource(jsonResourceName);
+  };
+  void ExposeTilemap(gd::String &tilemapResourceName) override {
+    AddUsedResource(tilemapResourceName);
+  };
+  void ExposeTileset(gd::String &tilesetResourceName) override {
+    AddUsedResource(tilesetResourceName);
+  };
+  void ExposeVideo(gd::String &videoResourceName) override {
+    AddUsedResource(videoResourceName);
+  };
+  void ExposeBitmapFont(gd::String &bitmapFontName) override {
+    AddUsedResource(bitmapFontName);
+  };
+  void ExposeModel3D(gd::String &resourceName) override {
+    AddUsedResource(resourceName);
+  };
+  void ExposeAtlas(gd::String &resourceName) override {
+    AddUsedResource(resourceName);
+  };
+  void ExposeSpine(gd::String &resourceName) override {
+    AddUsedResource(resourceName);
+  };
+
+  std::set<gd::String> resourceNames;
+};
+
+} // namespace gd

Core/GDCore/IDE/ProjectBrowserHelper.cpp

@@ -20,6 +20,7 @@
 #include "GDCore/Project/Project.h"
 #include "GDCore/Project/ProjectScopedContainers.h"
 #include "GDCore/String.h"
+#include "GDCore/IDE/DependenciesAnalyzer.h"
 
 namespace gd {
 
@@ -33,27 +34,8 @@ void ProjectBrowserHelper::ExposeProjectEvents(
   // Add events based extensions
   for (std::size_t e = 0; e < project.GetEventsFunctionsExtensionsCount();
        e++) {
-    // Add (free) events functions
     auto &eventsFunctionsExtension = project.GetEventsFunctionsExtension(e);
-    for (auto &&eventsFunction : eventsFunctionsExtension.GetInternalVector()) {
-      worker.Launch(eventsFunction->GetEvents());
-    }
-
-    // Add (behavior) events functions
-    for (auto &&eventsBasedBehavior :
-         eventsFunctionsExtension.GetEventsBasedBehaviors()
-             .GetInternalVector()) {
-      ExposeEventsBasedBehaviorEvents(project, *eventsBasedBehavior, worker);
-    }
-
-    // Add (object) events functions
-    for (auto &&eventsBasedObject :
-         eventsFunctionsExtension.GetEventsBasedObjects().GetInternalVector()) {
-      auto &objectEventsFunctions = eventsBasedObject->GetEventsFunctions();
-      for (auto &&eventsFunction : objectEventsFunctions.GetInternalVector()) {
-        worker.Launch(eventsFunction->GetEvents());
-      }
-    }
+    ProjectBrowserHelper::ExposeEventsFunctionsExtensionEvents(project, eventsFunctionsExtension, worker);
   }
 }
 
@@ -69,7 +51,7 @@ void ProjectBrowserHelper::ExposeProjectEventsWithoutExtensions(
   }
 }
 
-void ProjectBrowserHelper::ExposeLayoutEvents(
+void ProjectBrowserHelper::ExposeLayoutEventsAndExternalEvents(
     gd::Project &project, gd::Layout &layout,
     gd::ArbitraryEventsWorker &worker) {
 
@@ -85,7 +67,7 @@ void ProjectBrowserHelper::ExposeLayoutEvents(
   }
 }
 
-void ProjectBrowserHelper::ExposeLayoutEvents(
+void ProjectBrowserHelper::ExposeLayoutEventsAndExternalEvents(
     gd::Project &project, gd::Layout &layout,
     gd::ArbitraryEventsWorkerWithContext &worker) {
   auto projectScopedContainers =
@@ -103,6 +85,32 @@ void ProjectBrowserHelper::ExposeLayoutEvents(
   }
 }
 
+void ProjectBrowserHelper::ExposeLayoutEventsAndDependencies(
+    gd::Project &project, gd::Layout &layout,
+    gd::ArbitraryEventsWorker &worker) {
+  // Add layouts events
+  worker.Launch(layout.GetEvents());
+
+  DependenciesAnalyzer dependenciesAnalyzer(project, layout);
+  bool hasCircularDependencies = !dependenciesAnalyzer.Analyze();
+  if (hasCircularDependencies) {
+    // The analyzer stops when it finds circular dependencies so the dependencies are not complete.
+    // TODO Should the analyzer still continue to avoid side effect on thing that would not be code generation related?
+    // Maybe a boolean parameter should be added?
+    return;
+  }
+  for (const gd::String& externalEventName : dependenciesAnalyzer.GetExternalEventsDependencies()) {
+    gd::ExternalEvents& externalEvents = project.GetExternalEvents(externalEventName);
+
+    worker.Launch(externalEvents.GetEvents());
+  }
+  for (const gd::String& sceneName : dependenciesAnalyzer.GetScenesDependencies()) {
+    gd::Layout& dependencyLayout = project.GetLayout(sceneName);
+    
+    worker.Launch(dependencyLayout.GetEvents());
+  }
+}
+
 void ProjectBrowserHelper::ExposeProjectEvents(
     gd::Project &project, gd::ArbitraryEventsWorkerWithContext &worker) {
   // See also gd::Project::ExposeResources for a method that traverse the whole
@@ -130,8 +138,43 @@ void ProjectBrowserHelper::ExposeProjectEvents(
   // Add events based extensions
   for (std::size_t e = 0; e < project.GetEventsFunctionsExtensionsCount();
        e++) {
-    // Add (free) events functions
     auto &eventsFunctionsExtension = project.GetEventsFunctionsExtension(e);
+    ProjectBrowserHelper::ExposeEventsFunctionsExtensionEvents(project, eventsFunctionsExtension, worker);
+  }
+}
+
+void ProjectBrowserHelper::ExposeEventsFunctionsExtensionEvents(
+    gd::Project &project, const gd::EventsFunctionsExtension &eventsFunctionsExtension,
+    gd::ArbitraryEventsWorker &worker) {
+    // Add (free) events functions
+    for (auto &&eventsFunction : eventsFunctionsExtension.GetInternalVector()) {
+      gd::ObjectsContainer globalObjectsAndGroups;
+      gd::ObjectsContainer objectsAndGroups;
+      gd::EventsFunctionTools::FreeEventsFunctionToObjectsContainer(
+          project, eventsFunctionsExtension, *eventsFunction,
+          globalObjectsAndGroups, objectsAndGroups);
+
+      worker.Launch(eventsFunction->GetEvents());
+    }
+
+    // Add (behavior) events functions
+    for (auto &&eventsBasedBehavior :
+         eventsFunctionsExtension.GetEventsBasedBehaviors()
+             .GetInternalVector()) {
+      ExposeEventsBasedBehaviorEvents(project, *eventsBasedBehavior, worker);
+    }
+
+    // Add (object) events functions
+    for (auto &&eventsBasedObject :
+         eventsFunctionsExtension.GetEventsBasedObjects().GetInternalVector()) {
+      ExposeEventsBasedObjectEvents(project, *eventsBasedObject, worker);
+    }
+}
+
+void ProjectBrowserHelper::ExposeEventsFunctionsExtensionEvents(
+    gd::Project &project, const gd::EventsFunctionsExtension &eventsFunctionsExtension,
+    gd::ArbitraryEventsWorkerWithContext &worker) {
+    // Add (free) events functions
     for (auto &&eventsFunction : eventsFunctionsExtension.GetInternalVector()) {
       gd::ObjectsContainer globalObjectsAndGroups;
       gd::ObjectsContainer objectsAndGroups;
@@ -140,7 +183,7 @@ void ProjectBrowserHelper::ExposeProjectEvents(
           globalObjectsAndGroups, objectsAndGroups);
       auto projectScopedContainers =
         gd::ProjectScopedContainers::MakeNewProjectScopedContainersFor(globalObjectsAndGroups, objectsAndGroups);
-      projectScopedContainers.AddParameters(eventsFunction->GetParameters());
+      projectScopedContainers.AddParameters(eventsFunction->GetParametersForEvents(eventsFunctionsExtension));
 
       worker.Launch(eventsFunction->GetEvents(), projectScopedContainers);
     }
@@ -157,7 +200,6 @@ void ProjectBrowserHelper::ExposeProjectEvents(
          eventsFunctionsExtension.GetEventsBasedObjects().GetInternalVector()) {
       ExposeEventsBasedObjectEvents(project, *eventsBasedObject, worker);
     }
-  }
 }
 
 void ProjectBrowserHelper::ExposeEventsBasedBehaviorEvents(
@@ -183,12 +225,27 @@ void ProjectBrowserHelper::ExposeEventsBasedBehaviorEvents(
       gd::ProjectScopedContainers::MakeNewProjectScopedContainersFor(globalObjectsAndGroups, objectsAndGroups);
     projectScopedContainers.AddPropertiesContainer(eventsBasedBehavior.GetSharedPropertyDescriptors());
     projectScopedContainers.AddPropertiesContainer(eventsBasedBehavior.GetPropertyDescriptors());
-    projectScopedContainers.AddParameters(eventsFunction->GetParameters());
+    projectScopedContainers.AddParameters(eventsFunction->GetParametersForEvents(eventsBasedBehavior.GetEventsFunctions()));
 
     worker.Launch(eventsFunction->GetEvents(), projectScopedContainers);
   }
 }
 
+void ProjectBrowserHelper::ExposeEventsBasedObjectEvents(
+    gd::Project &project, const gd::EventsBasedObject &eventsBasedObject,
+    gd::ArbitraryEventsWorker &worker) {
+  auto &objectEventsFunctions = eventsBasedObject.GetEventsFunctions();
+  for (auto &&eventsFunction : objectEventsFunctions.GetInternalVector()) {
+    gd::ObjectsContainer globalObjectsAndGroups;
+    gd::ObjectsContainer objectsAndGroups;
+    gd::EventsFunctionTools::ObjectEventsFunctionToObjectsContainer(
+        project, eventsBasedObject, *eventsFunction, globalObjectsAndGroups,
+        objectsAndGroups);
+
+    worker.Launch(eventsFunction->GetEvents());
+  }
+}
+
 void ProjectBrowserHelper::ExposeEventsBasedObjectEvents(
     gd::Project &project, const gd::EventsBasedObject &eventsBasedObject,
     gd::ArbitraryEventsWorkerWithContext &worker) {
@@ -202,7 +259,7 @@ void ProjectBrowserHelper::ExposeEventsBasedObjectEvents(
     auto projectScopedContainers =
       gd::ProjectScopedContainers::MakeNewProjectScopedContainersFor(globalObjectsAndGroups, objectsAndGroups);
     projectScopedContainers.AddPropertiesContainer(eventsBasedObject.GetPropertyDescriptors());
-    projectScopedContainers.AddParameters(eventsFunction->GetParameters());
+    projectScopedContainers.AddParameters(eventsFunction->GetParametersForEvents(eventsBasedObject.GetEventsFunctions()));
 
     worker.Launch(eventsFunction->GetEvents(), projectScopedContainers);
   }
@@ -216,7 +273,7 @@ void ProjectBrowserHelper::ExposeProjectObjects(
 
   // Layout objects
   for (size_t i = 0; i < project.GetLayoutsCount(); i++) {
-    worker.Launch(project.GetLayout(i));
+    gd::ProjectBrowserHelper::ExposeLayoutObjects(project.GetLayout(i), worker);
   }
 
   // Event based objects children
@@ -232,6 +289,14 @@ void ProjectBrowserHelper::ExposeProjectObjects(
   }
 };
 
+void ProjectBrowserHelper::ExposeLayoutObjects(gd::Layout &layout,
+                                  gd::ArbitraryObjectsWorker &worker) {
+  // In the future, layouts may have children object containers.
+
+  // Layout objects
+  worker.Launch(layout);
+}
+
 void ProjectBrowserHelper::ExposeProjectFunctions(
     gd::Project &project, gd::ArbitraryEventsFunctionsWorker &worker) {
 

Core/GDCore/IDE/ProjectBrowserHelper.h

@@ -60,18 +60,52 @@ public:
    * \brief Call the specified worker on all events of a layout and
    * its external events.
    */
-  static void ExposeLayoutEvents(gd::Project &project, gd::Layout &layout,
+  static void ExposeLayoutEventsAndExternalEvents(gd::Project &project, gd::Layout &layout,
                                  gd::ArbitraryEventsWorker &worker);
+
   /**
    * \brief Call the specified worker on all events of a layout and
    * its external events.
    */
-  static void ExposeLayoutEvents(gd::Project &project, gd::Layout &layout,
+  static void ExposeLayoutEventsAndExternalEvents(gd::Project &project, gd::Layout &layout,
                                  gd::ArbitraryEventsWorkerWithContext &worker);
 
+  /**
+   * \brief Call the specified worker on all events of a layout and
+   * its dependencies according to EventLink (external events or other layout
+   * events).
+   */
+  static void
+  ExposeLayoutEventsAndDependencies(gd::Project &project, gd::Layout &layout,
+                                    gd::ArbitraryEventsWorker &worker);
+
   /**
    * \brief Call the specified worker on all events of the event-based
-   * behavior
+   * extension.
+   *
+   * This should be the preferred way to traverse all the events of an events
+   * based extension.
+   */
+  static void ExposeEventsFunctionsExtensionEvents(
+      gd::Project &project,
+      const gd::EventsFunctionsExtension &eventsFunctionsExtension,
+      gd::ArbitraryEventsWorker &worker);
+
+  /**
+   * \brief Call the specified worker on all events of the event-based
+   * extension.
+   *
+   * This should be the preferred way to traverse all the events of an events
+   * based extension.
+   */
+  static void ExposeEventsFunctionsExtensionEvents(
+      gd::Project &project,
+      const gd::EventsFunctionsExtension &eventsFunctionsExtension,
+      gd::ArbitraryEventsWorkerWithContext &worker);
+
+  /**
+   * \brief Call the specified worker on all events of the event-based
+   * behavior.
    *
    * This should be the preferred way to traverse all the events of an events
    * based behavior.
@@ -93,10 +127,22 @@ public:
 
   /**
    * \brief Call the specified worker on all events of the event-based
-   * behavior.
+   * object.
    *
    * This should be the preferred way to traverse all the events of an
-   * event-based behavior.
+   * event-based object.
+   */
+  static void
+  ExposeEventsBasedObjectEvents(gd::Project &project,
+                                const gd::EventsBasedObject &eventsBasedObject,
+                                gd::ArbitraryEventsWorker &worker);
+
+  /**
+   * \brief Call the specified worker on all events of the event-based
+   * object.
+   *
+   * This should be the preferred way to traverse all the events of an
+   * event-based object.
    */
   static void
   ExposeEventsBasedObjectEvents(gd::Project &project,
@@ -112,6 +158,14 @@ public:
   static void ExposeProjectObjects(gd::Project &project,
                                    gd::ArbitraryObjectsWorker &worker);
 
+  /**
+   * \brief Call the specified worker on all ObjectContainers of the layout.
+   *
+   * This should be the preferred way to traverse all the objects of a layout.
+   */
+  static void ExposeLayoutObjects(gd::Layout &layout,
+                                  gd::ArbitraryObjectsWorker &worker);
+
   /**
    * \brief Call the specified worker on all FunctionsContainers of the project
    * (global, layouts...)

Core/GDCore/IDE/PropertyFunctionGenerator.cpp

@@ -128,11 +128,7 @@ void PropertyFunctionGenerator::GenerateGetterAndSetter(
     } else {
       gd::Instruction action;
       action.SetType("SetReturn" + numberOrString);
-      gd::String receiver = isBehavior ? "Object.Behavior::" : "Object.";
-      gd::String propertyPrefix =
-          (isSharedProperties ? "SharedProperty" : "Property");
-      action.AddParameter(receiver + propertyPrefix + property.GetName() +
-                          "()");
+      action.AddParameter(property.GetName());
       event.GetActions().Insert(action, 0);
     }
   }
@@ -233,15 +229,13 @@ void PropertyFunctionGenerator::GenerateGetterAndSetter(
       gd::Instruction action;
       action.SetType(setterType);
       action.AddParameter("Object");
-      gd::String parameterGetterCall =
-          "GetArgumentAs" + numberOrString + "(\"Value\")";
       if (isBehavior) {
         action.AddParameter("Behavior");
         action.AddParameter("=");
-        action.AddParameter(parameterGetterCall);
+        action.AddParameter("Value");
       } else {
         action.AddParameter("=");
-        action.AddParameter(parameterGetterCall);
+        action.AddParameter("Value");
       }
       event.GetActions().Insert(action, 0);
     }

Core/GDCore/IDE/ResourceExposer.cpp

@@ -24,6 +24,7 @@
 #include "GDCore/Extensions/Platform.h"
 #include "GDCore/Extensions/Metadata/MetadataProvider.h"
 #include "GDCore/Extensions/Metadata/EffectMetadata.h"
+#include "GDCore/IDE/Events/UsedExtensionsFinder.h"
 
 namespace gd {
 
@@ -32,10 +33,9 @@ void ResourceExposer::ExposeWholeProjectResources(gd::Project& project, gd::Arbi
   // traverse the whole project (this time for events) and ExposeProjectEffects
   // (this time for effects).
 
-  gd::ResourcesManager* resourcesManager = &(project.GetResourcesManager());
-
   // Expose any project resources as files.
-  worker.ExposeResources(resourcesManager);
+  worker.ExposeResources();
+
   project.GetPlatformSpecificAssets().ExposeResources(worker);
 
   // Expose event resources
@@ -73,6 +73,49 @@ void ResourceExposer::ExposeWholeProjectResources(gd::Project& project, gd::Arbi
     worker.ExposeImage(loadingScreen.GetBackgroundImageResourceName());
 }
 
+void ResourceExposer::ExposeProjectResources(gd::Project& project, gd::ArbitraryResourceWorker& worker) {
+  // Expose global objects configuration resources
+  auto objectWorker = gd::GetResourceWorkerOnObjects(project, worker);
+  objectWorker.Launch(project);
+}
+
+void ResourceExposer::ExposeLayoutResources(
+    gd::Project &project, gd::Layout &layout,
+    gd::ArbitraryResourceWorker &worker) {
+
+  // Expose object configuration resources
+  auto objectWorker = gd::GetResourceWorkerOnObjects(project, worker);
+  gd::ProjectBrowserHelper::ExposeLayoutObjects(layout, objectWorker);
+
+  // Expose layer effect resources
+  for (std::size_t layerIndex = 0; layerIndex < layout.GetLayersCount();
+       layerIndex++) {
+    auto &layer = layout.GetLayer(layerIndex);
+
+    auto &effects = layer.GetEffects();
+    for (size_t effectIndex = 0; effectIndex < effects.GetEffectsCount();
+         effectIndex++) {
+      auto &effect = effects.GetEffect(effectIndex);
+      gd::ResourceExposer::ExposeEffectResources(project.GetCurrentPlatform(),
+                                                 effect, worker);
+    }
+  }
+
+  // Expose event resources
+  auto eventWorker = gd::GetResourceWorkerOnEvents(project, worker);
+  gd::ProjectBrowserHelper::ExposeLayoutEventsAndDependencies(project, layout,
+                                                              eventWorker);
+
+  // Exposed extension event resources
+  // Note that using resources in extensions is very unlikely and probably not
+  // worth the effort of something smart.
+  for (std::size_t e = 0; e < project.GetEventsFunctionsExtensionsCount();
+       e++) {
+    auto &eventsFunctionsExtension = project.GetEventsFunctionsExtension(e);
+    gd::ProjectBrowserHelper::ExposeEventsFunctionsExtensionEvents(project, eventsFunctionsExtension, eventWorker);
+  }
+}
+
 void ResourceExposer::ExposeEffectResources(
     gd::Platform &platform, gd::Effect &effect,
     gd::ArbitraryResourceWorker &worker) {
@@ -88,11 +131,13 @@ void ResourceExposer::ExposeEffectResources(
       auto &resourceType = propertyDescriptor.GetExtraInfo()[0];
 
       const gd::String &resourceName = effect.GetStringParameter(propertyName);
-      gd::String potentiallyUpdatedResourceName = resourceName;
-      worker.ExposeResourceWithType(resourceType,
-                                    potentiallyUpdatedResourceName);
-      if (potentiallyUpdatedResourceName != resourceName) {
-        effect.SetStringParameter(propertyName, potentiallyUpdatedResourceName);
+      if (!resourceName.empty()) {
+        gd::String potentiallyUpdatedResourceName = resourceName;
+        worker.ExposeResourceWithType(resourceType,
+                                      potentiallyUpdatedResourceName);
+        if (potentiallyUpdatedResourceName != resourceName) {
+          effect.SetStringParameter(propertyName, potentiallyUpdatedResourceName);
+        }
       }
     }
   }

Core/GDCore/IDE/ResourceExposer.h

@@ -10,6 +10,7 @@ class Platform;
 class Project;
 class ArbitraryResourceWorker;
 class Effect;
+class Layout;
 } // namespace gd
 
 namespace gd {
@@ -31,6 +32,25 @@ public:
   static void ExposeWholeProjectResources(gd::Project &project,
                                           gd::ArbitraryResourceWorker &worker);
 
+  /**
+   * @brief Expose only the resources used globally on a project.
+   * 
+   * It doesn't include resources used in layouts.
+   */
+  static void ExposeProjectResources(gd::Project &project,
+                                     gd::ArbitraryResourceWorker &worker);
+
+  /**
+   * @brief Expose the resources used in a given layout.
+   * 
+   * It doesn't include resources used globally.
+   */
+  static void ExposeLayoutResources(gd::Project &project, gd::Layout &layout,
+                                          gd::ArbitraryResourceWorker &worker);
+
+  /**
+   * @brief Expose the resources used in a given effect.
+   */
   static void ExposeEffectResources(gd::Platform &platform, gd::Effect &effect,
                                     gd::ArbitraryResourceWorker &worker);
 };

Core/GDCore/IDE/WholeProjectRefactorer.cpp

@@ -16,8 +16,8 @@
 #include "GDCore/IDE/Events/BehaviorTypeRenamer.h"
 #include "GDCore/IDE/Events/CustomObjectTypeRenamer.h"
 #include "GDCore/IDE/Events/EventsBehaviorRenamer.h"
-#include "GDCore/IDE/Events/EventsRefactorer.h"
 #include "GDCore/IDE/Events/EventsPropertyReplacer.h"
+#include "GDCore/IDE/Events/EventsRefactorer.h"
 #include "GDCore/IDE/Events/EventsVariableReplacer.h"
 #include "GDCore/IDE/Events/ExpressionsParameterMover.h"
 #include "GDCore/IDE/Events/ExpressionsRenamer.h"
@@ -138,7 +138,8 @@ void WholeProjectRefactorer::EnsureObjectEventsFunctionsProperParameters(
   }
 }
 
-VariablesChangeset WholeProjectRefactorer::ComputeChangesetForVariablesContainer(
+VariablesChangeset
+WholeProjectRefactorer::ComputeChangesetForVariablesContainer(
     gd::Project &project,
     const gd::SerializerElement &oldSerializedVariablesContainer,
     const gd::VariablesContainer &newVariablesContainer) {
@@ -149,9 +150,9 @@ VariablesChangeset WholeProjectRefactorer::ComputeChangesetForVariablesContainer
 
   if (oldVariablesContainer.GetPersistentUuid() !=
       newVariablesContainer.GetPersistentUuid()) {
-    gd::LogWarning(
-        _("Called ComputeChangesetForVariablesContainer on variables containers "
-          "that are different - they can't be compared."));
+    gd::LogWarning(_(
+        "Called ComputeChangesetForVariablesContainer on variables containers "
+        "that are different - they can't be compared."));
     return changeset;
   }
 
@@ -192,14 +193,11 @@ VariablesChangeset WholeProjectRefactorer::ComputeChangesetForVariablesContainer
 }
 
 void WholeProjectRefactorer::ApplyRefactoringForVariablesContainer(
-    gd::Project &project,
-    const gd::VariablesContainer &newVariablesContainer,
-    const gd::VariablesChangeset& changeset) {
+    gd::Project &project, const gd::VariablesContainer &newVariablesContainer,
+    const gd::VariablesChangeset &changeset) {
   gd::EventsVariableReplacer eventsVariableReplacer(
-      project.GetCurrentPlatform(),
-      newVariablesContainer,
-      changeset.oldToNewVariableNames,
-      changeset.removedVariableNames);
+      project.GetCurrentPlatform(), newVariablesContainer,
+      changeset.oldToNewVariableNames, changeset.removedVariableNames);
   gd::ProjectBrowserHelper::ExposeProjectEvents(project,
                                                 eventsVariableReplacer);
 }
@@ -743,14 +741,14 @@ void WholeProjectRefactorer::RenameEventsBasedBehaviorProperty(
         EventsBasedBehavior::GetPropertyExpressionName(newPropertyName));
     gd::ProjectBrowserHelper::ExposeProjectEvents(project, expressionRenamer);
 
-    std::unordered_map<gd::String, gd::String> oldToNewPropertyNames = {{oldPropertyName, newPropertyName}};
+    std::unordered_map<gd::String, gd::String> oldToNewPropertyNames = {
+        {oldPropertyName, newPropertyName}};
     std::unordered_set<gd::String> removedPropertyNames;
     gd::EventsPropertyReplacer eventsPropertyReplacer(
-      project.GetCurrentPlatform(),
-      properties,
-      oldToNewPropertyNames,
-      removedPropertyNames);
-    gd::ProjectBrowserHelper::ExposeProjectEvents(project, eventsPropertyReplacer);
+        project.GetCurrentPlatform(), properties, oldToNewPropertyNames,
+        removedPropertyNames);
+    gd::ProjectBrowserHelper::ExposeProjectEvents(project,
+                                                  eventsPropertyReplacer);
 
     gd::InstructionsTypeRenamer actionRenamer = gd::InstructionsTypeRenamer(
         project,
@@ -813,14 +811,14 @@ void WholeProjectRefactorer::RenameEventsBasedBehaviorSharedProperty(
         EventsBasedBehavior::GetSharedPropertyExpressionName(newPropertyName));
     gd::ProjectBrowserHelper::ExposeProjectEvents(project, expressionRenamer);
 
-    std::unordered_map<gd::String, gd::String> oldToNewPropertyNames = {{oldPropertyName, newPropertyName}};
+    std::unordered_map<gd::String, gd::String> oldToNewPropertyNames = {
+        {oldPropertyName, newPropertyName}};
     std::unordered_set<gd::String> removedPropertyNames;
     gd::EventsPropertyReplacer eventsPropertyReplacer(
-      project.GetCurrentPlatform(),
-      properties,
-      oldToNewPropertyNames,
-      removedPropertyNames);
-    gd::ProjectBrowserHelper::ExposeProjectEvents(project, eventsPropertyReplacer);
+        project.GetCurrentPlatform(), properties, oldToNewPropertyNames,
+        removedPropertyNames);
+    gd::ProjectBrowserHelper::ExposeProjectEvents(project,
+                                                  eventsPropertyReplacer);
 
     gd::InstructionsTypeRenamer actionRenamer = gd::InstructionsTypeRenamer(
         project,
@@ -870,14 +868,14 @@ void WholeProjectRefactorer::RenameEventsBasedObjectProperty(
       EventsBasedObject::GetPropertyExpressionName(newPropertyName));
   gd::ProjectBrowserHelper::ExposeProjectEvents(project, expressionRenamer);
 
-  std::unordered_map<gd::String, gd::String> oldToNewPropertyNames = {{oldPropertyName, newPropertyName}};
+  std::unordered_map<gd::String, gd::String> oldToNewPropertyNames = {
+      {oldPropertyName, newPropertyName}};
   std::unordered_set<gd::String> removedPropertyNames;
   gd::EventsPropertyReplacer eventsPropertyReplacer(
-    project.GetCurrentPlatform(),
-    properties,
-    oldToNewPropertyNames,
-    removedPropertyNames);
-  gd::ProjectBrowserHelper::ExposeProjectEvents(project, eventsPropertyReplacer);
+      project.GetCurrentPlatform(), properties, oldToNewPropertyNames,
+      removedPropertyNames);
+  gd::ProjectBrowserHelper::ExposeProjectEvents(project,
+                                                eventsPropertyReplacer);
 
   gd::InstructionsTypeRenamer actionRenamer = gd::InstructionsTypeRenamer(
       project,
@@ -1351,7 +1349,6 @@ void WholeProjectRefactorer::DoRenameBehavior(
     gd::Project &project, const gd::String &oldBehaviorType,
     const gd::String &newBehaviorType,
     const gd::ProjectBrowser &projectBrowser) {
-
   // Rename behavior in required behavior properties
   auto requiredBehaviorRenamer =
       gd::RequiredBehaviorRenamer(oldBehaviorType, newBehaviorType);
@@ -1378,7 +1375,6 @@ void WholeProjectRefactorer::DoRenameBehavior(
 void WholeProjectRefactorer::DoRenameObject(
     gd::Project &project, const gd::String &oldObjectType,
     const gd::String &newObjectType, const gd::ProjectBrowser &projectBrowser) {
-
   // Rename object type in objects lists.
   auto customObjectTypeRenamer =
       gd::CustomObjectTypeRenamer(oldObjectType, newObjectType);
@@ -1398,7 +1394,8 @@ void WholeProjectRefactorer::DoRenameObject(
 void WholeProjectRefactorer::ObjectOrGroupRemovedInLayout(
     gd::Project &project, gd::Layout &layout, const gd::String &objectName,
     bool isObjectGroup, bool removeEventsAndGroups) {
-  auto projectScopedContainers = gd::ProjectScopedContainers::MakeNewProjectScopedContainersForProjectAndLayout(project, layout);
+  auto projectScopedContainers = gd::ProjectScopedContainers::
+      MakeNewProjectScopedContainersForProjectAndLayout(project, layout);
 
   // Remove object in the current layout
   if (removeEventsAndGroups) {
@@ -1447,7 +1444,8 @@ void WholeProjectRefactorer::ObjectOrGroupRenamedInLayout(
   if (oldName == newName || newName.empty() || oldName.empty())
     return;
 
-  auto projectScopedContainers = gd::ProjectScopedContainers::MakeNewProjectScopedContainersForProjectAndLayout(project, layout);
+  auto projectScopedContainers = gd::ProjectScopedContainers::
+      MakeNewProjectScopedContainersForProjectAndLayout(project, layout);
 
   // Rename object in the current layout
   gd::EventsRefactorer::RenameObjectInEvents(
@@ -1536,10 +1534,19 @@ void WholeProjectRefactorer::RenameLayer(gd::Project &project,
                                          const gd::String &newName) {
   if (oldName == newName || newName.empty() || oldName.empty())
     return;
+
   gd::ProjectElementRenamer projectElementRenamer(project.GetCurrentPlatform(),
                                                   "layer", oldName, newName);
-  gd::ProjectBrowserHelper::ExposeLayoutEvents(project, layout,
-                                               projectElementRenamer);
+  gd::ProjectBrowserHelper::ExposeLayoutEventsAndExternalEvents(
+      project, layout, projectElementRenamer);
+  layout.GetInitialInstances().MoveInstancesToLayer(oldName, newName);
+
+  std::vector<gd::String> externalLayoutsNames =
+      GetAssociatedExternalLayouts(project, layout);
+  for (gd::String name : externalLayoutsNames) {
+    auto &externalLayout = project.GetExternalLayout(name);
+    externalLayout.GetInitialInstances().MoveInstancesToLayer(oldName, newName);
+  }
 }
 
 void WholeProjectRefactorer::RenameLayerEffect(gd::Project &project,
@@ -1552,8 +1559,8 @@ void WholeProjectRefactorer::RenameLayerEffect(gd::Project &project,
   gd::ProjectElementRenamer projectElementRenamer(
       project.GetCurrentPlatform(), "layerEffectName", oldName, newName);
   projectElementRenamer.SetLayerConstraint(layer.GetName());
-  gd::ProjectBrowserHelper::ExposeLayoutEvents(project, layout,
-                                               projectElementRenamer);
+  gd::ProjectBrowserHelper::ExposeLayoutEventsAndExternalEvents(
+      project, layout, projectElementRenamer);
 }
 
 void WholeProjectRefactorer::RenameObjectAnimation(gd::Project &project,
@@ -1566,8 +1573,8 @@ void WholeProjectRefactorer::RenameObjectAnimation(gd::Project &project,
   gd::ProjectElementRenamer projectElementRenamer(
       project.GetCurrentPlatform(), "objectAnimationName", oldName, newName);
   projectElementRenamer.SetObjectConstraint(object.GetName());
-  gd::ProjectBrowserHelper::ExposeLayoutEvents(project, layout,
-                                               projectElementRenamer);
+  gd::ProjectBrowserHelper::ExposeLayoutEventsAndExternalEvents(
+      project, layout, projectElementRenamer);
 }
 
 void WholeProjectRefactorer::RenameObjectPoint(gd::Project &project,
@@ -1580,8 +1587,8 @@ void WholeProjectRefactorer::RenameObjectPoint(gd::Project &project,
   gd::ProjectElementRenamer projectElementRenamer(
       project.GetCurrentPlatform(), "objectPointName", oldName, newName);
   projectElementRenamer.SetObjectConstraint(object.GetName());
-  gd::ProjectBrowserHelper::ExposeLayoutEvents(project, layout,
-                                               projectElementRenamer);
+  gd::ProjectBrowserHelper::ExposeLayoutEventsAndExternalEvents(
+      project, layout, projectElementRenamer);
 }
 
 void WholeProjectRefactorer::RenameObjectEffect(gd::Project &project,
@@ -1594,8 +1601,8 @@ void WholeProjectRefactorer::RenameObjectEffect(gd::Project &project,
   gd::ProjectElementRenamer projectElementRenamer(
       project.GetCurrentPlatform(), "objectEffectName", oldName, newName);
   projectElementRenamer.SetObjectConstraint(object.GetName());
-  gd::ProjectBrowserHelper::ExposeLayoutEvents(project, layout,
-                                               projectElementRenamer);
+  gd::ProjectBrowserHelper::ExposeLayoutEventsAndExternalEvents(
+      project, layout, projectElementRenamer);
 }
 
 void WholeProjectRefactorer::ObjectOrGroupRemovedInEventsBasedObject(
@@ -1617,9 +1624,12 @@ void WholeProjectRefactorer::ObjectOrGroupRemovedInEventsFunction(
     gd::ObjectsContainer &globalObjectsContainer,
     gd::ObjectsContainer &objectsContainer, const gd::String &objectName,
     bool isObjectGroup, bool removeEventsAndGroups) {
-  // In theory we should pass a ProjectScopedContainers to this function so it does not have to construct one.
-  // In practice, this is ok because we only deal with objects.
-  auto projectScopedContainers = gd::ProjectScopedContainers::MakeNewProjectScopedContainersFor(globalObjectsContainer, objectsContainer);
+  // In theory we should pass a ProjectScopedContainers to this function so it
+  // does not have to construct one. In practice, this is ok because we only
+  // deal with objects.
+  auto projectScopedContainers =
+      gd::ProjectScopedContainers::MakeNewProjectScopedContainersFor(
+          globalObjectsContainer, objectsContainer);
 
   if (removeEventsAndGroups) {
     gd::EventsRefactorer::RemoveObjectInEvents(
@@ -1655,9 +1665,12 @@ void WholeProjectRefactorer::ObjectOrGroupRenamedInEventsFunction(
     gd::ObjectsContainer &globalObjectsContainer,
     gd::ObjectsContainer &objectsContainer, const gd::String &oldName,
     const gd::String &newName, bool isObjectGroup) {
-  // In theory we should pass a ProjectScopedContainers to this function so it does not have to construct one.
-  // In practice, this is ok because we only deal with objects.
-  auto projectScopedContainers = gd::ProjectScopedContainers::MakeNewProjectScopedContainersFor(globalObjectsContainer, objectsContainer);
+  // In theory we should pass a ProjectScopedContainers to this function so it
+  // does not have to construct one. In practice, this is ok because we only
+  // deal with objects.
+  auto projectScopedContainers =
+      gd::ProjectScopedContainers::MakeNewProjectScopedContainersFor(
+          globalObjectsContainer, objectsContainer);
 
   gd::EventsRefactorer::RenameObjectInEvents(
       project.GetCurrentPlatform(), projectScopedContainers,
@@ -1705,7 +1718,7 @@ void WholeProjectRefactorer::GlobalObjectOrGroupRemoved(
     if (layout.HasObjectNamed(objectName))
       continue;
 
-        ObjectOrGroupRemovedInLayout(project, layout, objectName, isObjectGroup,
+    ObjectOrGroupRemovedInLayout(project, layout, objectName, isObjectGroup,
                                  removeEventsAndGroups);
   }
 }
@@ -1753,7 +1766,8 @@ size_t WholeProjectRefactorer::GetLayoutAndExternalLayoutLayerInstancesCount(
       GetAssociatedExternalLayouts(project, layout);
   for (gd::String name : externalLayoutsNames) {
     auto &externalLayout = project.GetExternalLayout(name);
-    count += externalLayout.GetInitialInstances().GetLayerInstancesCount(layerName);
+    count +=
+        externalLayout.GetInitialInstances().GetLayerInstancesCount(layerName);
   }
   return count;
 }

Core/GDCore/Project/Behavior.cpp

@@ -4,8 +4,6 @@
  * reserved. This project is released under the MIT License.
  */
 #include "GDCore/Project/Behavior.h"
-#include <iostream>
-#include "GDCore/Project/PropertyDescriptor.h"
 
 namespace gd {
 

Core/GDCore/Project/CustomConfigurationHelper.cpp

@@ -5,6 +5,8 @@
  */
 #include "CustomConfigurationHelper.h"
 
+#include <map>
+
 #include "GDCore/IDE/Project/ArbitraryResourceWorker.h"
 #include "GDCore/Project/Behavior.h"
 #include "GDCore/Project/Project.h"
@@ -13,8 +15,6 @@
 #include "GDCore/Serialization/Serializer.h"
 #include "GDCore/Serialization/SerializerElement.h"
 
-#include <map>
-
 using namespace gd;
 
 void CustomConfigurationHelper::InitializeContent(
@@ -25,7 +25,8 @@ void CustomConfigurationHelper::InitializeContent(
     auto propertyType = property->GetType();
 
     if (propertyType == "String" || propertyType == "Choice" ||
-        propertyType == "Color" || propertyType == "Behavior") {
+        propertyType == "Color" || propertyType == "Behavior" ||
+        propertyType == "resource") {
       element.SetStringValue(property->GetValue());
     } else if (propertyType == "Number") {
       element.SetDoubleValue(property->GetValue().To<double>());
@@ -51,7 +52,8 @@ std::map<gd::String, gd::PropertyDescriptor> CustomConfigurationHelper::GetPrope
 
     if (configurationContent.HasChild(propertyName)) {
       if (propertyType == "String" || propertyType == "Choice" ||
-          propertyType == "Color" || propertyType == "Behavior") {
+          propertyType == "Color" || propertyType == "Behavior" ||
+          propertyType == "resource") {
         newProperty.SetValue(
             configurationContent.GetChild(propertyName).GetStringValue());
       } else if (propertyType == "Number") {
@@ -59,8 +61,9 @@ std::map<gd::String, gd::PropertyDescriptor> CustomConfigurationHelper::GetPrope
             configurationContent.GetChild(propertyName).GetDoubleValue()));
       } else if (propertyType == "Boolean") {
         newProperty.SetValue(
-            configurationContent.GetChild(propertyName).GetBoolValue() ? "true"
-                                                                  : "false");
+            configurationContent.GetChild(propertyName).GetBoolValue()
+                ? "true"
+                : "false");
       }
     } else {
       // No value was serialized for this property. `newProperty`
@@ -85,7 +88,8 @@ bool CustomConfigurationHelper::UpdateProperty(
   const gd::String &propertyType = property.GetType();
 
   if (propertyType == "String" || propertyType == "Choice" ||
-      propertyType == "Color" || propertyType == "Behavior") {
+      propertyType == "Color" || propertyType == "Behavior" ||
+      propertyType == "resource") {
     element.SetStringValue(newValue);
   } else if (propertyType == "Number") {
     element.SetDoubleValue(newValue.To<double>());

Core/GDCore/Project/CustomObjectConfiguration.cpp

@@ -13,12 +13,14 @@
 #include "GDCore/Serialization/SerializerElement.h"
 #include "GDCore/Tools/Log.h"
 #include "GDCore/Project/CustomConfigurationHelper.h"
+#include "GDCore/Project/InitialInstance.h"
 
 using namespace gd;
 
 void CustomObjectConfiguration::Init(const gd::CustomObjectConfiguration& objectConfiguration) {
   project = objectConfiguration.project;
   objectContent = objectConfiguration.objectContent;
+  animations = objectConfiguration.animations;
 
   // There is no default copy for a map of unique_ptr like childObjectConfigurations.
   childObjectConfigurations.clear();
@@ -88,23 +90,38 @@ bool CustomObjectConfiguration::UpdateProperty(const gd::String& propertyName,
 
 std::map<gd::String, gd::PropertyDescriptor>
 CustomObjectConfiguration::GetInitialInstanceProperties(
-    const gd::InitialInstance& instance,
-    gd::Project& project,
-    gd::Layout& scene) {
-  return std::map<gd::String, gd::PropertyDescriptor>();
+    const gd::InitialInstance &initialInstance, gd::Project &project,
+    gd::Layout &scene) {
+  std::map<gd::String, gd::PropertyDescriptor> properties;
+  if (!animations.HasNoAnimations()) {
+    properties["animation"] =
+        gd::PropertyDescriptor(
+            gd::String::From(initialInstance.GetRawDoubleProperty("animation")))
+            .SetLabel(_("Animation"))
+            .SetType("number");
+  }
+  return properties;
 }
 
 bool CustomObjectConfiguration::UpdateInitialInstanceProperty(
-    gd::InitialInstance& instance,
-    const gd::String& name,
-    const gd::String& value,
-    gd::Project& project,
-    gd::Layout& scene) {
-  return false;
+    gd::InitialInstance &initialInstance, const gd::String &name,
+    const gd::String &value, gd::Project &project, gd::Layout &scene) {
+  if (name == "animation") {
+    initialInstance.SetRawDoubleProperty(
+        "animation", std::max(0, value.empty() ? 0 : value.To<int>()));
+  }
+
+  return true;
 }
 
 void CustomObjectConfiguration::DoSerializeTo(SerializerElement& element) const {
   element.AddChild("content") = objectContent;
+
+  if (!animations.HasNoAnimations()) {
+    auto &animatableElement = element.AddChild("animatable");
+    animations.SerializeTo(animatableElement);
+  }
+
   auto &childrenContentElement = element.AddChild("childrenContent");
   for (auto &pair : childObjectConfigurations) {
     auto &childName = pair.first;
@@ -116,6 +133,12 @@ void CustomObjectConfiguration::DoSerializeTo(SerializerElement& element) const
 void CustomObjectConfiguration::DoUnserializeFrom(Project& project,
                                                const SerializerElement& element) {
   objectContent = element.GetChild("content");
+
+  if (element.HasChild("animatable")) {
+    auto &animatableElement = element.GetChild("animatable");
+    animations.UnserializeFrom(animatableElement);
+  }
+
   auto &childrenContentElement = element.GetChild("childrenContent");
   for (auto &pair : childrenContentElement.GetAllChildren()) {
     auto &childName = pair.first;
@@ -126,6 +149,8 @@ void CustomObjectConfiguration::DoUnserializeFrom(Project& project,
 }
 
 void CustomObjectConfiguration::ExposeResources(gd::ArbitraryResourceWorker& worker) {
+  animations.ExposeResources(worker);
+
   std::map<gd::String, gd::PropertyDescriptor> properties = GetProperties();
 
   for (auto& property : properties) {
@@ -155,6 +180,10 @@ void CustomObjectConfiguration::ExposeResources(gd::ArbitraryResourceWorker& wor
         worker.ExposeBitmapFont(newPropertyValue);
       } else if (resourceType == "model3D") {
         worker.ExposeModel3D(newPropertyValue);
+      } else if (resourceType == "atlas") {
+        worker.ExposeAtlas(newPropertyValue);
+      } else if (resourceType == "spine") {
+        worker.ExposeSpine(newPropertyValue);
       }
 
       if (newPropertyValue != oldPropertyValue) {
@@ -174,3 +203,11 @@ void CustomObjectConfiguration::ExposeResources(gd::ArbitraryResourceWorker& wor
     configuration.ExposeResources(worker);
   }
 }
+
+const SpriteAnimationList& CustomObjectConfiguration::GetAnimations() const {
+  return animations;
+}
+
+SpriteAnimationList& CustomObjectConfiguration::GetAnimations() {
+  return animations;
+}

Core/GDCore/Project/CustomObjectConfiguration.h

@@ -3,8 +3,7 @@
  * Copyright 2008-2016 Florian Rival (Florian.Rival@gmail.com). All rights
  * reserved. This project is released under the MIT License.
  */
-#ifndef GDCORE_CUSTOMOBJECTCONFIGURATION_H
-#define GDCORE_CUSTOMOBJECTCONFIGURATION_H
+#pragma once
 
 #include "GDCore/Project/ObjectConfiguration.h"
 
@@ -16,7 +15,7 @@
 #include "GDCore/Project/PropertyDescriptor.h"
 #include "GDCore/Serialization/Serializer.h"
 #include "GDCore/Serialization/SerializerElement.h"
-
+#include "GDCore/Extensions/Builtin/SpriteExtension/SpriteAnimationList.h"
 
 using namespace gd;
 
@@ -72,7 +71,17 @@ class CustomObjectConfiguration : public gd::ObjectConfiguration {
 
   gd::ObjectConfiguration &GetChildObjectConfiguration(const gd::String& objectName);
 
- protected:
+  /**
+   * \brief Return the animation configuration for Animatable custom objects.
+   */
+  const SpriteAnimationList& GetAnimations() const;
+
+  /**
+   * @brief Return the animation configuration for Animatable custom objects.
+   */
+  SpriteAnimationList& GetAnimations();
+
+protected:
   void DoSerializeTo(SerializerElement& element) const override;
   void DoUnserializeFrom(Project& project, const SerializerElement& element) override;
 
@@ -84,6 +93,8 @@ class CustomObjectConfiguration : public gd::ObjectConfiguration {
 
   static gd::ObjectConfiguration badObjectConfiguration;
 
+  SpriteAnimationList animations;
+
   /**
    * Initialize configuration using another configuration. Used by copy-ctor
    * and assign-op.
@@ -95,6 +106,5 @@ class CustomObjectConfiguration : public gd::ObjectConfiguration {
    */
   void Init(const gd::CustomObjectConfiguration& object);
 };
-}  // namespace gd
 
-#endif  // GDCORE_CUSTOMOBJECTCONFIGURATION_H
+}  // namespace gd

Core/GDCore/Project/EventsBasedObject.cpp

@@ -13,11 +13,14 @@ EventsBasedObject::EventsBasedObject()
     : AbstractEventsBasedEntity(
         "MyObject",
         gd::EventsFunctionsContainer::FunctionOwner::Object),
-    ObjectsContainer() {
+    ObjectsContainer(),
+    isRenderedIn3D(false),
+    isAnimatable(false),
+    isTextContainer(false) {
 }
 
 EventsBasedObject::~EventsBasedObject() {}
-    
+
 EventsBasedObject::EventsBasedObject(const gd::EventsBasedObject &_eventBasedObject)
         : AbstractEventsBasedEntity(_eventBasedObject) {
   // TODO Add a copy constructor in ObjectsContainer.
@@ -27,17 +30,34 @@ EventsBasedObject::EventsBasedObject(const gd::EventsBasedObject &_eventBasedObj
 
 void EventsBasedObject::SerializeTo(SerializerElement& element) const {
   element.SetAttribute("defaultName", defaultName);
+  if (isRenderedIn3D) {
+    element.SetBoolAttribute("is3D", true);
+  }
+  if (isAnimatable) {
+    element.SetBoolAttribute("isAnimatable", true);
+  }
+  if (isTextContainer) {
+    element.SetBoolAttribute("isTextContainer", true);
+  }
 
   AbstractEventsBasedEntity::SerializeTo(element);
   SerializeObjectsTo(element.AddChild("objects"));
+  SerializeFoldersTo(element.AddChild("objectsFolderStructure"));
 }
 
 void EventsBasedObject::UnserializeFrom(gd::Project& project,
-                                          const SerializerElement& element) {
+                                        const SerializerElement& element) {
   defaultName = element.GetStringAttribute("defaultName");
+  isRenderedIn3D = element.GetBoolAttribute("is3D", false);
+  isAnimatable = element.GetBoolAttribute("isAnimatable", false);
+  isTextContainer = element.GetBoolAttribute("isTextContainer", false);
 
   AbstractEventsBasedEntity::UnserializeFrom(project, element);
   UnserializeObjectsFrom(project, element.GetChild("objects"));
+  if (element.HasChild("objectsFolderStructure")) {
+    UnserializeFoldersFrom(project, element.GetChild("objectsFolderStructure", 0));
+  }
+  AddMissingObjectsInRootFolder();
 }
 
 }  // namespace gd

Core/GDCore/Project/EventsBasedObject.h

@@ -72,6 +72,45 @@ class GD_CORE_API EventsBasedObject: public AbstractEventsBasedEntity, public Ob
     return *this;
   }
 
+  /**
+   * \brief Declare a usage of the 3D renderer.
+   */
+  EventsBasedObject& MarkAsRenderedIn3D(bool isRenderedIn3D_) {
+    isRenderedIn3D = isRenderedIn3D_;
+    return *this;
+  }
+
+  /**
+   * \brief Return true if the object uses the 3D renderer.
+   */
+  bool IsRenderedIn3D() const { return isRenderedIn3D; }
+
+  /**
+   * \brief Declare an Animatable capability.
+   */
+  EventsBasedObject& MarkAsAnimatable(bool isAnimatable_) {
+    isAnimatable = isAnimatable_;
+    return *this;
+  }
+
+  /**
+   * \brief Return true if the object needs an Animatable capability.
+   */
+  bool IsAnimatable() const { return isAnimatable; }
+
+  /**
+   * \brief Declare a TextContainer capability.
+   */
+  EventsBasedObject& MarkAsTextContainer(bool isTextContainer_) {
+    isTextContainer = isTextContainer_;
+    return *this;
+  }
+
+  /**
+   * \brief Return true if the object needs a TextContainer capability.
+   */
+  bool IsTextContainer() const { return isTextContainer; }
+
   void SerializeTo(SerializerElement& element) const override;
 
   void UnserializeFrom(gd::Project& project,
@@ -79,6 +118,9 @@ class GD_CORE_API EventsBasedObject: public AbstractEventsBasedEntity, public Ob
 
  private:
   gd::String defaultName;
+  bool isRenderedIn3D;
+  bool isAnimatable;
+  bool isTextContainer;
 };
 
 }  // namespace gd

Core/GDCore/Project/InitialInstance.cpp

@@ -15,7 +15,7 @@
 
 namespace gd {
 
-gd::String* InitialInstance::badStringProperyValue = NULL;
+gd::String* InitialInstance::badStringPropertyValue = NULL;
 
 InitialInstance::InitialInstance()
     : objectName(""),
@@ -34,6 +34,7 @@ InitialInstance::InitialInstance()
       depth(0),
       locked(false),
       sealed(false),
+      keepRatio(true),
       persistentUuid(UUID::MakeUuid4()) {}
 
 void InitialInstance::UnserializeFrom(const SerializerElement& element) {
@@ -58,6 +59,7 @@ void InitialInstance::UnserializeFrom(const SerializerElement& element) {
   SetLayer(element.GetStringAttribute("layer"));
   SetLocked(element.GetBoolAttribute("locked", false));
   SetSealed(element.GetBoolAttribute("sealed", false));
+  SetShouldKeepRatio(element.GetBoolAttribute("keepRatio", false));
 
   persistentUuid = element.GetStringAttribute("persistentUuid");
   if (persistentUuid.empty()) ResetPersistentUuid();
@@ -120,6 +122,7 @@ void InitialInstance::SerializeTo(SerializerElement& element) const {
   if (HasCustomDepth()) element.SetAttribute("depth", GetCustomDepth());
   if (IsLocked()) element.SetAttribute("locked", IsLocked());
   if (IsSealed()) element.SetAttribute("sealed", IsSealed());
+  if (ShouldKeepRatio()) element.SetAttribute("keepRatio", ShouldKeepRatio());
 
   if (persistentUuid.empty()) persistentUuid = UUID::MakeUuid4();
   element.SetStringAttribute("persistentUuid", persistentUuid);
@@ -188,10 +191,10 @@ double InitialInstance::GetRawDoubleProperty(const gd::String& name) const {
 
 const gd::String& InitialInstance::GetRawStringProperty(
     const gd::String& name) const {
-  if (!badStringProperyValue) badStringProperyValue = new gd::String("");
+  if (!badStringPropertyValue) badStringPropertyValue = new gd::String("");
 
   const auto& it = stringProperties.find(name);
-  return it != stringProperties.end() ? it->second : *badStringProperyValue;
+  return it != stringProperties.end() ? it->second : *badStringPropertyValue;
 }
 
 void InitialInstance::SetRawDoubleProperty(const gd::String& name,

Core/GDCore/Project/InitialInstance.h

@@ -206,6 +206,17 @@ class GD_CORE_API InitialInstance {
    */
   void SetSealed(bool enable = true) { sealed = enable; }
 
+  /**
+   * \brief Return true if the dimensions (width, height and depth) should keep
+   * the same ratio.
+   */
+  bool ShouldKeepRatio() const { return keepRatio; };
+
+  /**
+   * \brief Define if instance's dimensions should keep the same ratio.
+   */
+  void SetShouldKeepRatio(bool enable = true) { keepRatio = enable; }
+
   ///@}
 
   /** \name Variable management
@@ -340,11 +351,13 @@ class GD_CORE_API InitialInstance {
   gd::VariablesContainer initialVariables;  ///< Instance specific variables
   bool locked;                              ///< True if the instance is locked
   bool sealed;                              ///< True if the instance is sealed
+  bool keepRatio;                           ///< True if the instance's dimensions
+                                            ///  should keep the same ratio.
   mutable gd::String persistentUuid;  ///< A persistent random version 4 UUID,
-                                      ///< useful for hot reloading.
+                                      ///  useful for hot reloading.
 
   static gd::String*
-      badStringProperyValue;  ///< Empty string returned by GetRawStringProperty
+      badStringPropertyValue;  ///< Empty string returned by GetRawStringProperty
 };
 
 }  // namespace gd

Core/GDCore/Project/Layer.cpp

@@ -19,7 +19,7 @@ Layer::Layer()
       isLocked(false),
       isLightingLayer(false),
       followBaseLayerCamera(false),
-      camera3DNearPlaneDistance(0.1),
+      camera3DNearPlaneDistance(3),
       camera3DFarPlaneDistance(10000),
       camera3DFieldOfView(45),
       ambientLightColorR(200),
@@ -39,6 +39,7 @@ void Layer::SetCameraCount(std::size_t n) {
 void Layer::SerializeTo(SerializerElement& element) const {
   element.SetAttribute("name", GetName());
   element.SetAttribute("renderingType", GetRenderingType());
+  element.SetAttribute("cameraType", GetCameraType());
   element.SetAttribute("visibility", GetVisibility());
   element.SetAttribute("isLocked", IsLocked());
   element.SetAttribute("isLightingLayer", IsLightingLayer());
@@ -78,6 +79,7 @@ void Layer::SerializeTo(SerializerElement& element) const {
 void Layer::UnserializeFrom(const SerializerElement& element) {
   SetName(element.GetStringAttribute("name", "", "Name"));
   SetRenderingType(element.GetStringAttribute("renderingType", ""));
+  SetCameraType(element.GetStringAttribute("cameraType", "perspective"));
   SetVisibility(element.GetBoolAttribute("visibility", true, "Visibility"));
   SetLocked(element.GetBoolAttribute("isLocked", false));
   SetLightingLayer(element.GetBoolAttribute("isLightingLayer", false));

Core/GDCore/Project/Layer.h

@@ -104,10 +104,17 @@ class GD_CORE_API Layer {
   const gd::String& GetName() const { return name; }
 
   const gd::String& GetRenderingType() const { return renderingType; }
+
   void SetRenderingType(const gd::String& renderingType_) {
     renderingType = renderingType_;
   }
 
+  const gd::String& GetCameraType() const { return cameraType; }
+
+  void SetCameraType(const gd::String& cameraType_) {
+    cameraType = cameraType_;
+  }
+
   /**
    * \brief Change if layer is displayed or not
    */
@@ -268,6 +275,7 @@ class GD_CORE_API Layer {
   gd::String name;           ///< The name of the layer
   gd::String renderingType;  ///< The rendering type: "" (empty), "2d", "3d" or
                              ///< "2d+3d".
+  gd::String cameraType;
   bool isVisible;            ///< True if the layer is visible
   bool isLocked;             ///< True if the layer is locked
   bool isLightingLayer;  ///< True if the layer is used to display lights and

Core/GDCore/Project/Layout.cpp

@@ -294,6 +294,7 @@ void Layout::SerializeTo(SerializerElement& element) const {
   GetVariables().SerializeTo(element.AddChild("variables"));
   GetInitialInstances().SerializeTo(element.AddChild("instances"));
   SerializeObjectsTo(element.AddChild("objects"));
+  SerializeFoldersTo(element.AddChild("objectsFolderStructure"));
   gd::EventsListSerialization::SerializeEventsTo(events,
                                                  element.AddChild("events"));
 
@@ -353,6 +354,11 @@ void Layout::UnserializeFrom(gd::Project& project,
       project, GetEvents(), element.GetChild("events", 0, "Events"));
 
   UnserializeObjectsFrom(project, element.GetChild("objects", 0, "Objets"));
+  if (element.HasChild("objectsFolderStructure")) {
+    UnserializeFoldersFrom(project, element.GetChild("objectsFolderStructure", 0));
+  }
+  AddMissingObjectsInRootFolder();
+
   initialInstances.UnserializeFrom(
       element.GetChild("instances", 0, "Positions"));
   variables.UnserializeFrom(element.GetChild("variables", 0, "Variables"));

Core/GDCore/Project/LoadingScreen.cpp

@@ -17,7 +17,7 @@ LoadingScreen::LoadingScreen()
       backgroundFadeInDuration(0.2),
       minDuration(1.5),
       logoAndProgressFadeInDuration(0.2),
-      logoAndProgressLogoFadeInDelay(0.2),
+      logoAndProgressLogoFadeInDelay(0),
       showProgressBar(true),
       progressBarMinWidth(40),
       progressBarMaxWidth(200),

Core/GDCore/Project/Object.cpp

@@ -40,7 +40,6 @@ void Object::Init(const gd::Object& object) {
   name = object.name;
   assetStoreId = object.assetStoreId;
   objectVariables = object.objectVariables;
-  tags = object.tags;
   effectsContainer = object.effectsContainer;
 
   behaviors.clear();
@@ -134,7 +133,6 @@ void Object::UnserializeFrom(gd::Project& project,
   SetType(element.GetStringAttribute("type"));
   assetStoreId = element.GetStringAttribute("assetStoreId");
   name = element.GetStringAttribute("name", name, "nom");
-  tags = element.GetStringAttribute("tags");
 
   objectVariables.UnserializeFrom(
       element.GetChild("variables", 0, "Variables"));
@@ -207,7 +205,6 @@ void Object::SerializeTo(SerializerElement& element) const {
   element.SetAttribute("name", GetName());
   element.SetAttribute("assetStoreId", GetAssetStoreId());
   element.SetAttribute("type", GetType());
-  element.SetAttribute("tags", GetTags());
   objectVariables.SerializeTo(element.AddChild("variables"));
   effectsContainer.SerializeTo(element.AddChild("effects"));
 

Core/GDCore/Project/Object.h

@@ -120,17 +120,6 @@ class GD_CORE_API Object {
    */
   const gd::String& GetType() const { return configuration->GetType(); }
 
-  /** \brief Change the tags of the object.
-   */
-  void SetTags(const gd::String& tags_) { tags = tags_; }
-
-  /** \brief Return the tags of the object.
-   */
-  const gd::String& GetTags() const { return tags; }
-
-  /** \brief Shortcut to check if the object is a 3D object.
-   */
-  bool Is3DObject() const { return configuration->Is3DObject(); }
   ///@}
 
   /** \name Behaviors management
@@ -268,7 +257,6 @@ class GD_CORE_API Object {
                   ///< object.
   gd::VariablesContainer
       objectVariables;  ///< List of the variables of the object
-  gd::String tags;      ///< Comma-separated list of tags
   gd::EffectsContainer
       effectsContainer;  ///< The effects container for the object.
   mutable gd::String persistentUuid;  ///< A persistent random version 4 UUID,

Core/GDCore/Project/ObjectConfiguration.cpp

@@ -5,11 +5,8 @@
  */
 #include "GDCore/Project/ObjectConfiguration.h"
 
-#include "GDCore/Extensions/Metadata/BehaviorMetadata.h"
 #include "GDCore/Extensions/Metadata/MetadataProvider.h"
 #include "GDCore/Extensions/Platform.h"
-#include "GDCore/Project/Behavior.h"
-#include "GDCore/Project/CustomBehavior.h"
 #include "GDCore/Project/Layout.h"
 #include "GDCore/Project/Project.h"
 #include "GDCore/Serialization/SerializerElement.h"
@@ -20,7 +17,7 @@ namespace gd {
 
 ObjectConfiguration::~ObjectConfiguration() {}
 
-ObjectConfiguration::ObjectConfiguration(): is3DObject(false) {}
+ObjectConfiguration::ObjectConfiguration() {}
 
 std::map<gd::String, gd::PropertyDescriptor> ObjectConfiguration::GetProperties() const {
   std::map<gd::String, gd::PropertyDescriptor> nothing;