Update translations [skip ci] (#5294)

Co-authored-by: 4ian <4ian@users.noreply.github.com>

.devcontainer/Dockerfile

@@ -1,6 +0,0 @@
-# This is the Dockerfile to create a "devcontainer". 
-# This is a way to quickly create a development environment,
-# that can be used with GitHub workspaces.
-
-# See here for image contents: https://github.com/microsoft/vscode-dev-containers/tree/v0.162.0/containers/codespaces-linux/.devcontainer/base.Dockerfile
-FROM mcr.microsoft.com/vscode/devcontainers/universal:1-focal

.devcontainer/README.md

@@ -1,16 +0,0 @@
-# Devcontainer (development environment in the cloud) for GDevelop (beta)
-
-A devcontainer is the configuration to run a cloud development environment, available remotely.
-This is notably used to run a **[GitHub Codespace](https://docs.github.com/en/github/developing-online-with-codespaces/about-codespaces)**. The advantage is that you can quickly experiment and do changes without installing anything on your computer.
-
-> ⚠️ This development environment is in beta, and not everything is supported. This is useful for playing a bit with GDevelop codebase or to make quick changes. **In particular, it's not possible to test your changes on GDJS** because only the web-app can be launched.
-
-It's recommended that you follow the usual [README](../newIDE/README.md) to get started, with development tools installed on your computer.
-
-## Start a GitHub workspace to work on GDevelop (beta)
-
-- Subscribe to the [beta edition of GitHub workspace](https://docs.github.com/en/github/developing-online-with-codespaces/about-codespaces#joining-the-beta).
-- In the repository GitHub page, click **Code** and then choose **Open with Codespaces**.
-- Wait for the Codespace to load and Visual Studio Code to open.
-- When it's ready, open a terminal in Visual Studio Code.
-- Follow the usual [README in `newIDE`](../newIDE/README.md) to get started, like you would do on your own computer.

.devcontainer/devcontainer.json

@@ -1,51 +0,0 @@
-// For format details, see https://aka.ms/devcontainer.json. For config options, see the README at:
-// https://github.com/microsoft/vscode-dev-containers/tree/v0.162.0/containers/codespaces-linux
-{
-	"name": "GitHub Codespaces for GDevelop",
-	"build": {
-		"dockerfile": "Dockerfile"
-	},
-	"settings": {
-		"terminal.integrated.shell.linux": "/bin/zsh",
-		"go.toolsManagement.checkForUpdates": "off",
-		"go.useLanguageServer": true,
-		"go.gopath": "/go",
-		"go.goroot": "/usr/local/go",
-		"python.pythonPath": "/opt/python/latest/bin/python",
-		"python.linting.enabled": true,
-		"python.linting.pylintEnabled": true,
-		"python.formatting.autopep8Path": "/usr/local/py-utils/bin/autopep8",
-		"python.formatting.blackPath": "/usr/local/py-utils/bin/black",
-		"python.formatting.yapfPath": "/usr/local/py-utils/bin/yapf",
-		"python.linting.banditPath": "/usr/local/py-utils/bin/bandit",
-		"python.linting.flake8Path": "/usr/local/py-utils/bin/flake8",
-		"python.linting.mypyPath": "/usr/local/py-utils/bin/mypy",
-		"python.linting.pycodestylePath": "/usr/local/py-utils/bin/pycodestyle",
-		"python.linting.pydocstylePath": "/usr/local/py-utils/bin/pydocstyle",
-		"python.linting.pylintPath": "/usr/local/py-utils/bin/pylint",
-		"lldb.executable": "/usr/bin/lldb",
-		"files.watcherExclude": {
-			"**/target/**": true
-		}
-	},
-	"remoteUser": "codespace",
-	"overrideCommand": false,
-	"workspaceMount": "source=${localWorkspaceFolder},target=/home/codespace/workspace,type=bind,consistency=cached",
-	"workspaceFolder": "/home/codespace/workspace",
-	"runArgs": [ "--cap-add=SYS_PTRACE", "--security-opt", "seccomp=unconfined", "--privileged", "--init" ],
-
-	// Add the IDs of extensions you want installed when the container is created.
-	"extensions": [
-		"GitHub.vscode-pull-request-github",
-		"esbenp.prettier-vscode",
-		"ms-vscode.cpptools",
-		"xaver.clang-format",
-		"flowtype.flow-for-vscode"
-	],
-
-	// Use 'forwardPorts' to make a list of ports inside the container available locally.
-	// "forwardPorts": [],
-
-	// "oryx build" will automatically install your dependencies and attempt to build your project
-	"postCreateCommand": "oryx build -p virtualenv_name=.venv || echo 'Could not auto-build. Skipping.'"
-}

.github/ISSUE_TEMPLATE/--bug-report.md

@@ -1,28 +0,0 @@
----
-name: "\U0001F41BBug report"
-about: Create a bug report about GDevelop or the game engine
-title: ''
-labels: ''
-assignees: ''
-
----
-
-## Describe the bug
-A clear and concise description of what the bug is.
-
-Please double check that the bug is not already reported in the issues list.
-
-## To Reproduce
-Steps to reproduce the behavior:
-1. Go to '...'
-2. Click on '....'
-3. Scroll down to '....'
-4. See error
-
-* Please include a link to a game if possible!
-* If applicable, add screenshots to help explain your problem.
-
-## Other details
-* Include any OS/browser version/smartphone that you're using
-* Which version of GDevelop are you using? The desktop app or the web-app?
-* Add any other context about the problem here.

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

@@ -0,0 +1,71 @@
+name: 🐛Bug report
+description: Create a bug report about GDevelop or the game engine
+body:
+  - type: checkboxes
+    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
+  - type: textarea
+    attributes:
+      label: Describe the bug
+      description: A clear and concise description of what the bug is.
+    validations:
+      required: true
+  - type: textarea
+    attributes:
+      label: Steps to reproduce
+      description: |
+        * Please include a link to a game if possible!
+        * If applicable, add screenshots to help explain your problem.
+      placeholder: |
+        1. Go to '...'
+        2. Click on '...'
+        3. Scroll down to '...'
+        4. See error
+    validations:
+      required: true
+  - type: dropdown
+    attributes:
+      label: GDevelop platform
+      description: Which platform of GDevelop are you using?
+      multiple: true
+      options:
+        - Desktop
+        - Web
+        - Mobile
+    validations:
+      required: true
+  - type: input
+    attributes:
+      label: GDevelop version
+      description: |
+        Which version of GDevelop are you using?
+        Take a look here: [Editor Home - About GDevelop - "This version of GDevelop is: ~~~"]
+      placeholder: 5.1.159? 5.1.160?
+    validations:
+      required: true
+  - type: textarea
+    attributes:
+      label: Platform info
+      value: |
+        <details>
+
+        *OS (e.g. Windows, Linux, macOS, Android, iOS)*
+        >
+
+        *OS Version (e.g. Windows 10, macOS 10.15)*
+        >
+
+        *Browser(For Web) (e.g. Chrome, Firefox, Safari)*
+        >
+
+        *Device(For Mobile) (e.g. iPhone 12, Samsung Galaxy S21)*
+        >
+
+        </details>
+  - type: textarea
+    attributes:
+      label: Additional context
+      description: Add any other context about the problem here.

.github/workflows/build-storybook.yml

@@ -17,6 +17,10 @@ jobs:
   build-storybook:
     runs-on: ubuntu-latest
     steps:
+      - uses: actions/setup-node@v3
+        with:
+          node-version: 16
+
       - name: Configure AWS Credentials
         uses: aws-actions/configure-aws-credentials@v1
         with:
@@ -57,8 +61,8 @@ jobs:
 
       - name: Log urls to the Storybook
         run: |
-          echo "Find the latest Storybook for this branch on http://gdevelop-storybook.s3-website-us-east-1.amazonaws.com/$(git rev-parse --abbrev-ref HEAD)/latest/index.html"
-          echo "Find the Storybook for this commit on http://gdevelop-storybook.s3-website-us-east-1.amazonaws.com/$(git rev-parse --abbrev-ref HEAD)/commit/$(git rev-parse HEAD)/index.html"
+          echo "Find the latest Storybook for this branch on https://gdevelop-storybook.s3.amazonaws.com/$(git rev-parse --abbrev-ref HEAD)/latest/index.html"
+          echo "Find the Storybook for this commit on https://gdevelop-storybook.s3.amazonaws.com/$(git rev-parse --abbrev-ref HEAD)/commit/$(git rev-parse HEAD)/index.html"
 
       # Publish on Chromatic, only when manually launched (too costly to run on every commit).
       - name: Publish Storybook to Chromatic

.github/workflows/extract-translations.yml

@@ -11,6 +11,9 @@ jobs:
   extract-translations:
     runs-on: ubuntu-latest
     steps:
+      - uses: actions/setup-node@v3
+        with:
+          node-version: 16
       - uses: actions/checkout@v2
 
       # Cache npm dependencies to speed up the workflow
@@ -38,7 +41,7 @@ jobs:
       - name: Install Crowdin CLI
         if: github.ref == 'refs/heads/master'
         run: npm i -g @crowdin/cli
-        
+
       - name: Upload translations to Crowdin
         run: crowdin upload sources
         if: github.ref == 'refs/heads/master'

.github/workflows/update-translations.yml

@@ -14,6 +14,9 @@ jobs:
   update-translations:
     runs-on: ubuntu-latest
     steps:
+      - uses: actions/setup-node@v3
+        with:
+          node-version: 16
       - uses: actions/checkout@v2
 
       # Cache npm dependencies to speed up the workflow
@@ -44,7 +47,7 @@ jobs:
       # (Build and) download the most recent translations (PO files) from Crowdin.
       - name: Install Crowdin CLI
         run: npm i -g @crowdin/cli
-        
+
       - name: Download new translations from Crowdin
         run: crowdin download
         env:
@@ -66,8 +69,8 @@ jobs:
           commit-message: Update translations [skip ci]
           branch: chore/update-translations
           delete-branch: true
-          title: '[Auto PR] Update translations'
+          title: "[Auto PR] Update translations"
           body: |
             This updates the translations by downloading them from Crowdin and compiling them for usage by the app.
-            
+
             Please double check the values in `newIDE/app/src/locales/LocalesMetadata.js` to ensure the changes are sensible.

Binaries/README.md

@@ -1,3 +1,3 @@
 This is the directory where native or WebAssembly binaries of the C++ code of GDCore and GDJS are produced.
 
-See GDevelop.js README for the instructions to compile after a change in the C++ source code.
+See GDevelop.js README for the instructions to compile after a change in the C++ source code.

CMakeLists.txt

@@ -1,5 +1,5 @@
 #This is the CMake file used to build GDevelop.
-#For more information, see the Readme.md file.
+#For more information, see the README.md file.
 
 cmake_minimum_required(VERSION 2.6)
 cmake_policy(SET CMP0011 NEW)

Core/GDCore/Events/Builtin/GroupEvent.h

@@ -13,6 +13,7 @@
 namespace gd {
 class Instruction;
 class Project;
+class EventVisitor;
 }
 class EventsCodeGenerationContext;
 

Core/GDCore/Events/Builtin/LinkEvent.cpp

@@ -16,6 +16,7 @@
 #include "GDCore/Project/Object.h"
 #include "GDCore/Project/Project.h"
 #include "GDCore/Serialization/SerializerElement.h"
+#include "GDCore/Events/EventVisitor.h"
 
 using namespace std;
 
@@ -156,4 +157,14 @@ void LinkEvent::UnserializeFrom(gd::Project& project,
   }
 }
 
+bool LinkEvent::AcceptVisitor(gd::EventVisitor &eventVisitor) {
+  return BaseEvent::AcceptVisitor(eventVisitor) |
+         eventVisitor.VisitLinkEvent(*this);
+}
+
+void LinkEvent::AcceptVisitor(gd::ReadOnlyEventVisitor &eventVisitor) const {
+  BaseEvent::AcceptVisitor(eventVisitor);
+  eventVisitor.VisitLinkEvent(*this);
+}
+
 }  // namespace gd

Core/GDCore/Events/Builtin/LinkEvent.h

@@ -30,7 +30,7 @@ class GD_CORE_API LinkEvent : public gd::BaseEvent {
         includeEnd(gd::String::npos),
         linkWasInvalid(false){};
   virtual ~LinkEvent();
-  virtual gd::LinkEvent* Clone() const { return new LinkEvent(*this); }
+  virtual gd::LinkEvent* Clone() const override { return new LinkEvent(*this); }
 
   /**
    * Get the link target (i.e. the scene or external events the link refers to).
@@ -86,7 +86,7 @@ class GD_CORE_API LinkEvent : public gd::BaseEvent {
   /**
    * The link event must always be preprocessed.
    */
-  virtual bool MustBePreprocessed() { return true; }
+  virtual bool MustBePreprocessed() override { return true; }
 
   /**
    * \brief Get a pointer to the list of events that are targeted by the link.
@@ -107,11 +107,14 @@ class GD_CORE_API LinkEvent : public gd::BaseEvent {
                                  EventsList& eventList,
                                  std::size_t indexOfTheEventInThisList);
 
-  virtual bool IsExecutable() const { return true; };
+  virtual bool IsExecutable() const override { return true; };
 
-  virtual void SerializeTo(SerializerElement& element) const;
+  virtual void SerializeTo(SerializerElement& element) const override;
   virtual void UnserializeFrom(gd::Project& project,
-                               const SerializerElement& element);
+                               const SerializerElement& element) override;
+
+  bool AcceptVisitor(gd::EventVisitor& eventVisitor) override;
+  void AcceptVisitor(gd::ReadOnlyEventVisitor& eventVisitor) const override;
 
  private:
   gd::String

Core/GDCore/Events/CodeGeneration/EventsCodeGenerator.cpp

@@ -273,8 +273,6 @@ gd::String EventsCodeGenerator::GenerateConditionCode(
 
   if (instrInfos.codeExtraInformation.HasCustomCodeGenerator()) {
     context.EnterCustomCondition();
-    conditionCode += GenerateReferenceToUpperScopeBoolean(
-        "conditionTrue", returnBoolean, context);
     conditionCode += instrInfos.codeExtraInformation.customCodeGenerator(
         condition, *this, context);
     maxCustomConditionsDepth =
@@ -291,7 +289,7 @@ gd::String EventsCodeGenerator::GenerateConditionCode(
     condition.SetParameters(parameters);
   }
 
-  // Verify that there are no mismatchs between object type in parameters.
+  // Verify that there are no mismatches between object type in parameters.
   for (std::size_t pNb = 0; pNb < instrInfos.parameters.size(); ++pNb) {
     if (ParameterMetadata::IsObject(instrInfos.parameters[pNb].GetType())) {
       gd::String objectInParameter =
@@ -483,7 +481,7 @@ gd::String EventsCodeGenerator::GenerateActionCode(
     action.SetParameters(parameters);
   }
 
-  // Verify that there are no mismatchs between object type in parameters.
+  // Verify that there are no mismatches between object type in parameters.
   for (std::size_t pNb = 0; pNb < instrInfos.parameters.size(); ++pNb) {
     if (ParameterMetadata::IsObject(instrInfos.parameters[pNb].GetType())) {
       gd::String objectInParameter = action.GetParameter(pNb).GetPlainString();
@@ -729,6 +727,7 @@ gd::String EventsCodeGenerator::GenerateParameterCodes(
              metadata.GetType() == "tilemapResource" ||
              metadata.GetType() == "tilesetResource" ||
              metadata.GetType() == "videoResource" ||
+             metadata.GetType() == "model3DResource" ||
              // Deprecated, old parameter names:
              metadata.GetType() == "password" || metadata.GetType() == "musicfile" ||
              metadata.GetType() == "soundfile" || metadata.GetType() == "police") {
@@ -1240,7 +1239,7 @@ size_t EventsCodeGenerator::GenerateSingleUsageUniqueIdFor(
               << std::endl;
   }
 
-  // Base the unique id on the adress in memory so that the same instruction
+  // Base the unique id on the address in memory so that the same instruction
   // in memory will get the same id across different code generations.
   size_t uniqueId = (size_t)instruction;
 

Core/GDCore/Events/CodeGeneration/EventsCodeGenerator.h

@@ -404,6 +404,18 @@ class GD_CORE_API EventsCodeGenerator {
     return boolName;
   }
 
+  /**
+   * \brief Generate the full name for accessing to a boolean variable used for
+   * conditions.
+   *
+   * Default implementation just returns the boolean name passed as argument.
+   */
+  virtual gd::String GenerateUpperScopeBooleanFullName(
+      const gd::String& boolName,
+      const gd::EventsCodeGenerationContext& context) {
+    return boolName;
+  }
+
   /**
    * \brief Must create a boolean. Its value must be false.
    *
@@ -493,9 +505,9 @@ class GD_CORE_API EventsCodeGenerator {
    * - object : Object name -> string
    * - expression : Mathematical expression -> number (double)
    * - string : %Text expression -> string
-   * - layer, color, file, joyaxis : Same as string
+   * - layer, color, file, stringWithSelector : Same as string
    * - relationalOperator : Used to make a comparison between the function
-  resturn value and value of the parameter preceding the relationOperator
+  return value and value of the parameter preceding the relationOperator
   parameter -> string
    * - operator : Used to update a value using a setter and a getter -> string
    * - key, mouse, objectvar, scenevar, globalvar, password, musicfile,
@@ -665,19 +677,6 @@ class GD_CORE_API EventsCodeGenerator {
     return "!(" + predicat + ")";
   };
 
-  /**
-   * \brief Must create a boolean which is a reference to a boolean declared in
-   * the parent scope.
-   *
-   * The default implementation generates C-style code.
-   */
-  virtual gd::String GenerateReferenceToUpperScopeBoolean(
-      const gd::String& referenceName,
-      const gd::String& referencedBoolean,
-      gd::EventsCodeGenerationContext& context) {
-    return "bool & " + referenceName + " = " + referencedBoolean + ";\n";
-  }
-
   virtual gd::String GenerateFreeCondition(
       const std::vector<gd::String>& arguments,
       const gd::InstructionMetadata& instrInfos,
@@ -786,7 +785,7 @@ class GD_CORE_API EventsCodeGenerator {
   const gd::Project* project;  ///< The project being used.
   const gd::Layout* scene;     ///< The scene being generated.
 
-  bool errorOccurred;          ///< Must be set to true if an error occured.
+  bool errorOccurred;          ///< Must be set to true if an error occurred.
   bool compilationForRuntime;  ///< Is set to true if the code generation is
                                ///< made for runtime only.
 

Core/GDCore/Events/CodeGeneration/ExpressionCodeGenerator.cpp

@@ -51,8 +51,8 @@ gd::String ExpressionCodeGenerator::GenerateExpressionCode(
                                     codeGenerator.GetObjectsAndGroups(),
                                     rootType);
   node->Visit(validator);
-  if (!validator.GetErrors().empty()) {
-    std::cout << "Error: \"" << validator.GetErrors()[0]->GetMessage()
+  if (!validator.GetFatalErrors().empty()) {
+    std::cout << "Error: \"" << validator.GetFatalErrors()[0]->GetMessage()
               << "\" in: \"" << expression.GetPlainString() << "\" ("
               << rootType << ")" << std::endl;
 
@@ -170,7 +170,7 @@ void ExpressionCodeGenerator::OnVisitIdentifierNode(IdentifierNode& node) {
   }
   else {
     // This is for function names that are put in IdentifierNode
-    // because the type is needed to tell them appart from variables.
+    // because the type is needed to tell them apart from variables.
     output += GenerateDefaultValue(type);
   }
 }

Core/GDCore/Events/Event.cpp

@@ -9,6 +9,7 @@
 #include "GDCore/Events/Builtin/AsyncEvent.h"
 #include "GDCore/Events/CodeGeneration/EventsCodeGenerator.h"
 #include "GDCore/Events/EventsList.h"
+#include "GDCore/Events/EventVisitor.h"
 #include "GDCore/Extensions/Metadata/MetadataProvider.h"
 #include "GDCore/Extensions/Platform.h"
 #include "GDCore/Extensions/PlatformExtension.h"
@@ -140,6 +141,14 @@ void BaseEvent::Preprocess(gd::EventsCodeGenerator& codeGenerator,
   }
 }
 
+bool BaseEvent::AcceptVisitor(gd::EventVisitor& eventVisitor) {
+  return eventVisitor.VisitEvent(*this);
+}
+
+void BaseEvent::AcceptVisitor(gd::ReadOnlyEventVisitor& eventVisitor) const {
+  eventVisitor.VisitEvent(*this);
+}
+
 BaseEventSPtr GD_CORE_API CloneRememberingOriginalEvent(BaseEventSPtr event) {
   gd::BaseEventSPtr copy(event->Clone());
   // Original event is either the original event of the copied event, or the

Core/GDCore/Events/Event.h

@@ -24,6 +24,8 @@ class EventsCodeGenerationContext;
 class Platform;
 class SerializerElement;
 class Instruction;
+class EventVisitor;
+class ReadOnlyEventVisitor;
 }  // namespace gd
 
 namespace gd {
@@ -238,6 +240,9 @@ class GD_CORE_API BaseEvent {
    */
   virtual void UnserializeFrom(gd::Project& project,
                                const SerializerElement& element){};
+  
+  virtual bool AcceptVisitor(gd::EventVisitor& eventVisitor);
+  virtual void AcceptVisitor(gd::ReadOnlyEventVisitor& eventVisitor) const;
   ///@}
 
   /** \name Common properties

Core/GDCore/Events/EventVisitor.h

@@ -0,0 +1,71 @@
+/*
+ * 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 <iostream>
+#include <memory>
+#include <vector>
+
+#include "GDCore/String.h"
+
+namespace gd {
+class BaseEvent;
+class LinkEvent;
+}  // namespace gd
+
+namespace gd {
+
+/**
+ * \brief Visitor of any kind of event.
+ *
+ * \ingroup Events
+ */
+class GD_CORE_API EventVisitor {
+ public:
+  virtual ~EventVisitor(){};
+
+  /**
+   * Called to do some work on an event.
+   * 
+   * \return true if the event must be deleted from the events list, false
+   * otherwise.
+   */
+  virtual bool VisitEvent(gd::BaseEvent& linkEvent) = 0;
+  
+  /**
+   * Called to do some work on a link event.
+   * 
+   * Note that VisitEvent is also called with this event.
+   * 
+   * \return true if the event must be deleted from the events list, false
+   * otherwise.
+   */
+  virtual bool VisitLinkEvent(gd::LinkEvent& linkEvent) = 0;
+};
+
+/**
+ * \brief Visitor of any kind of event.
+ *
+ * \ingroup Events
+ */
+class GD_CORE_API ReadOnlyEventVisitor {
+ public:
+  virtual ~ReadOnlyEventVisitor(){};
+
+  /**
+   * Called to do some work on an event.
+   */
+  virtual void VisitEvent(const gd::BaseEvent& linkEvent) = 0;
+
+  /**
+   * Called to do some work on a link event.
+   * 
+   * Note that VisitEvent is also called with this event.
+   */
+  virtual void VisitLinkEvent(const gd::LinkEvent& linkEvent) = 0;
+};
+
+}

Core/GDCore/Extensions/Builtin/AdvancedExtension.cpp

@@ -33,7 +33,8 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsAdvancedExtension(
           "res/function32.png",
           "res/function32.png")
       .SetHelpPath("/events/functions/return")
-      .AddParameter("expression", "The number to be returned")
+      .AddParameter("expression", _("The number to be returned"))
+      .SetRelevantForFunctionEventsOnly()
       .MarkAsAdvanced();
 
   extension
@@ -47,7 +48,8 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsAdvancedExtension(
           "res/function32.png",
           "res/function32.png")
       .SetHelpPath("/events/functions/return")
-      .AddParameter("string", "The text to be returned")
+      .AddParameter("string", _("The text to be returned"))
+      .SetRelevantForFunctionEventsOnly()
       .MarkAsAdvanced();
 
   extension
@@ -60,7 +62,38 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsAdvancedExtension(
                  "res/function32.png",
                  "res/function32.png")
       .SetHelpPath("/events/functions/return")
-      .AddParameter("trueorfalse", "Should the condition be true or false?")
+      .AddParameter("trueorfalse", _("Should the condition be true or false?"))
+      .SetRelevantForFunctionEventsOnly()
+      .MarkAsAdvanced();
+
+  extension
+      .AddAction("CopyArgumentToVariable",
+                 _("Copy function parameter to variable"),
+                 _("Copy a function parameter (also called \"argument\") to a variable. "
+                 "The parameter type must be a variable."),
+                 _("Copy the parameter _PARAM0_ into the variable _PARAM1_"),
+                 "",
+                 "res/function32.png",
+                 "res/function32.png")
+      .SetHelpPath("/events/functions/return")
+      .AddParameter("functionParameterName", _("Parameter name"), "variable")
+      .AddParameter("scenevar", _("Scene variable"))
+      .SetRelevantForFunctionEventsOnly()
+      .MarkAsAdvanced();
+
+  extension
+      .AddAction("CopyVariableToArgument",
+                 _("Copy variable to function parameter"),
+                 _("Copy a variable to function parameter (also called \"argument\"). "
+                 "The parameter type must be a variable."),
+                 _("Copy the variable _PARAM1_ into the parameter _PARAM0_"),
+                 "",
+                 "res/function32.png",
+                 "res/function32.png")
+      .SetHelpPath("/events/functions/return")
+      .AddParameter("functionParameterName", _("Parameter name"), "variable")
+      .AddParameter("scenevar", _("Scene variable"))
+      .SetRelevantForFunctionEventsOnly()
       .MarkAsAdvanced();
 
   extension
@@ -74,7 +107,8 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsAdvancedExtension(
                     "",
                     "res/function32.png",
                     "res/function32.png")
-      .AddParameter("functionParameterName", "Parameter name")
+      .AddParameter("functionParameterName", _("Parameter name"), "number,string,boolean")
+      .SetRelevantForFunctionEventsOnly()
       .MarkAsAdvanced();
 
   extension
@@ -84,7 +118,8 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsAdvancedExtension(
           _("Get function parameter (also called \"argument\") value."),
           "",
           "res/function16.png")
-      .AddParameter("functionParameterName", "Parameter name");
+      .AddParameter("functionParameterName", _("Parameter name"), "number,string,boolean")
+      .SetRelevantForFunctionEventsOnly();
 
   extension
       .AddStrExpression(
@@ -93,7 +128,8 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsAdvancedExtension(
           _("Get function parameter (also called \"argument\") text."),
           "",
           "res/function16.png")
-      .AddParameter("functionParameterName", "Parameter name");
+      .AddParameter("functionParameterName", _("Parameter name"), "number,string,boolean")
+      .SetRelevantForFunctionEventsOnly();
 
   extension
       .AddCondition(
@@ -104,9 +140,10 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsAdvancedExtension(
           "",
           "res/function32.png",
           "res/function16.png")
-      .AddParameter("functionParameterName", "Parameter name")
+      .AddParameter("functionParameterName", _("Parameter name"), "number,string,boolean")
       .UseStandardRelationalOperatorParameters(
-          "number", gd::ParameterOptions::MakeNewOptions());
+          "number", gd::ParameterOptions::MakeNewOptions())
+      .SetRelevantForFunctionEventsOnly();
 
   extension
       .AddCondition(
@@ -117,9 +154,10 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsAdvancedExtension(
           "",
           "res/function32.png",
           "res/function16.png")
-      .AddParameter("functionParameterName", "Parameter name")
+      .AddParameter("functionParameterName", _("Parameter name"), "number,string,boolean")
       .UseStandardRelationalOperatorParameters(
-          "string", gd::ParameterOptions::MakeNewOptions());
+          "string", gd::ParameterOptions::MakeNewOptions())
+      .SetRelevantForFunctionEventsOnly();
 }
 
 }  // namespace gd

Core/GDCore/Extensions/Builtin/AsyncExtension.cpp

@@ -40,7 +40,8 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsAsyncExtension(
           "",
           "res/actions/quit24.png",
           "res/actions/quit.png")
-      .AddCodeOnlyParameter("eventsFunctionContext", "");
+      .AddCodeOnlyParameter("eventsFunctionContext", "")
+      .SetRelevantForAsynchronousFunctionEventsOnly();
 }
 
 }  // namespace gd

Core/GDCore/Extensions/Builtin/BaseObjectExtension.cpp

@@ -27,6 +27,10 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
       .SetIcon("res/actions/create24.png");
   extension.AddInstructionOrExpressionGroupMetadata(_("Movement using forces"))
       .SetIcon("res/actions/force24.png");
+  extension.AddInstructionOrExpressionGroupMetadata(_("Variables"))
+      .SetIcon("res/conditions/var24.png");
+  extension.AddInstructionOrExpressionGroupMetadata(_("Position"))
+      .SetIcon("res/actions/position24_black.png");
 
   gd::ObjectMetadata& obj = extension.AddObject<gd::ObjectConfiguration>(
       "", _("Base object"), _("Base object"), "res/objeticon24.png");
@@ -406,8 +410,8 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
       .MarkAsAdvanced();
 
   obj.AddAction("ModVarObjet",
-                _("Value of an object variable"),
-                _("Change the value of an object variable."),
+                _("Change number variable"),
+                _("Modify the number value of an object variable."),
                 _("the variable _PARAM1_"),
                 _("Variables"),
                 "res/actions/var24.png",
@@ -419,8 +423,8 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
                                      ParameterOptions::MakeNewOptions());
 
   obj.AddAction("ModVarObjetTxt",
-                _("Text of an object variable"),
-                _("Change the text of an object variable."),
+                _("Change text variable"),
+                _("Modify the text of an object variable."),
                 _("the text of variable _PARAM1_"),
                 _("Variables"),
                 "res/actions/var24.png",
@@ -432,8 +436,8 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
                                      ParameterOptions::MakeNewOptions());
 
   obj.AddAction("SetObjectVariableAsBoolean",
-                _("Boolean value of an object variable"),
-                _("Change the boolean value of an object variable."),
+                _("Change boolean variable"),
+                _("Modify the boolean value of an object variable."),
                 _("Set the boolean value of variable _PARAM1_ of "
                   "_PARAM0_ to _PARAM2_"),
                 _("Variables"),
@@ -446,7 +450,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
 
   obj.AddAction(
          "ToggleObjectVariableAsBoolean",
-         _("Toggle the boolean value of an object variable"),
+         _("Toggle boolean variable"),
          _("Toggles the boolean value of an object variable.") + "\n" +
              _("If it was true, it will become false, and if it was false "
                "it will become true."),
@@ -461,37 +465,39 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
 
   obj.AddCondition("ObjectVariableChildExists",
                    _("Child existence"),
-                   _("Check if the specified child of the variable exists."),
+                   _("Check if the specified child of the object "
+                     "structure variable exists."),
                    _("Child _PARAM2_ of variable _PARAM1_ of _PARAM0_ exists"),
-                   _("Variables/Collections/Structures"),
+                   _("Variables/Arrays and structures"),
                    "res/conditions/var24.png",
                    "res/conditions/var.png")
       .AddParameter("object", _("Object"))
-      .AddParameter("objectvar", _("Variable"))
+      .AddParameter("objectvar", _("Structure variable"))
       .AddParameter("string", _("Name of the child"))
       .MarkAsAdvanced();
 
   obj.AddAction("ObjectVariableRemoveChild",
                 _("Remove a child"),
-                _("Remove a child from an object variable."),
+                _("Remove a child from an object structure variable."),
                 _("Remove child _PARAM2_ from variable _PARAM1_ of _PARAM0_"),
-                _("Variables/Collections/Structures"),
+                _("Variables/Arrays and structures"),
                 "res/actions/var24.png",
                 "res/actions/var.png")
       .AddParameter("object", _("Object"))
-      .AddParameter("objectvar", _("Variable"))
+      .AddParameter("objectvar", _("Structure variable"))
       .AddParameter("string", _("Child's name"))
       .MarkAsAdvanced();
 
   obj.AddAction("ObjectVariableClearChildren",
-                _("Clear variable"),
-                _("Remove all the children from the object variable."),
+                _("Clear children"),
+                _("Remove all the children from the object array or structure "
+                  "variable."),
                 _("Clear children from variable _PARAM1_ of _PARAM0_"),
-                _("Variables/Collections"),
+                _("Variables/Arrays and structures"),
                 "res/actions/var24.png",
                 "res/actions/var.png")
       .AddParameter("object", _("Object"))
-      .AddParameter("objectvar", _("Variable"))
+      .AddParameter("objectvar", _("Array or structure variable"))
       .MarkAsAdvanced();
 
   obj.AddAction("Cache",
@@ -619,8 +625,8 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
       .MarkAsAdvanced();
 
   obj.AddCondition("VarObjet",
-                   _("Value of an object variable"),
-                   _("Compare the value of an object variable."),
+                   _("Number variable"),
+                   _("Compare the number value of an object variable."),
                    _("the variable _PARAM1_"),
                    _("Variables"),
                    "res/conditions/var24.png",
@@ -632,7 +638,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
           "number", ParameterOptions::MakeNewOptions());
 
   obj.AddCondition("VarObjetTxt",
-                   _("Text of an object variable"),
+                   _("Text variable"),
                    _("Compare the text of an object variable."),
                    _("the text of variable _PARAM1_"),
                    _("Variables"),
@@ -645,7 +651,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
           "string", ParameterOptions::MakeNewOptions());
 
   obj.AddCondition("ObjectVariableAsBoolean",
-                   _("Boolean value of an object variable"),
+                   _("Boolean variable"),
                    _("Compare the boolean value of an object variable."),
                    _("The boolean value of variable _PARAM1_ of object "
                      "_PARAM0_ is _PARAM2_"),
@@ -659,7 +665,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
 
   obj.AddCondition("VarObjetDef",
                    "Variable defined",
-                   "Check if the variable is defined.",
+                   "Check if the object variable is defined.",
                    "Variable _PARAM1 of _PARAM0_ is defined",
                    _("Variables"),
                    "res/conditions/var24.png",
@@ -667,78 +673,131 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
 
       .AddParameter("object", _("Object"))
       .AddParameter("string", _("Variable"))
-      .SetHidden();
+      .SetHidden();  // Deprecated.
 
   obj.AddAction(
          "ObjectVariablePush",
-         _("Append variable to an object array"),
-         _("Appends a variable to the end of an object array variable."),
-         _("Append variable _PARAM2_ to array variable _PARAM1_ of _PARAM0_"),
-         _("Variables/Collections/Arrays"),
+         _("Add existing variable"),
+         _("Adds an existing variable to the end of an object array variable."),
+         _("Add variable _PARAM2_ to array variable _PARAM1_ of _PARAM0_"),
+         _("Variables/Arrays and structures"),
          "res/actions/var24.png",
          "res/actions/var.png")
       .AddParameter("object", _("Object"))
       .AddParameter("objectvar", _("Array variable"))
-      .AddParameter("scenevar", _("Scene variable with the content to append"))
-      .SetParameterLongDescription(
-          _("The content of the variable will *be copied* and appended at the "
-            "end of the array."))
+      .AddParameter("scenevar", _("Scene variable with the content to add"))
+      .SetParameterLongDescription(_("The content of the object variable will "
+                                     "*be copied* and added at the "
+                                     "end of the array."))
       .MarkAsAdvanced();
 
   obj.AddAction(
          "ObjectVariablePushString",
-         _("Append a string to an object array"),
-         _("Appends a string to the end of an object array variable."),
-         _("Append string _PARAM2_ to array variable _PARAM1_ of _PARAM0_"),
-         _("Variables/Collections/Arrays"),
+         _("Add text variable"),
+         _("Adds a text (string) to the end of an object array variable."),
+         _("Add text _PARAM2_ to array variable _PARAM1_ of _PARAM0_"),
+         _("Variables/Arrays and structures"),
          "res/actions/var24.png",
          "res/actions/var.png")
       .AddParameter("object", _("Object"))
       .AddParameter("objectvar", _("Array variable"))
-      .AddParameter("string", _("String to append"))
+      .AddParameter("string", _("Text to add"))
       .MarkAsAdvanced();
 
-  obj.AddAction(
-         "ObjectVariablePushNumber",
-         _("Append a number to an object array"),
-         _("Appends a number to the end of an object array variable."),
-         _("Append number _PARAM2_ to array variable _PARAM1_ of _PARAM0_"),
-         _("Variables/Collections/Arrays"),
-         "res/actions/var24.png",
-         "res/actions/var.png")
+  obj.AddAction("ObjectVariablePushNumber",
+                _("Add number variable"),
+                _("Adds a number to the end of an object array variable."),
+                _("Add number _PARAM2_ to array variable _PARAM1_ of _PARAM0_"),
+                _("Variables/Arrays and structures"),
+                "res/actions/var24.png",
+                "res/actions/var.png")
       .AddParameter("object", _("Object"))
       .AddParameter("objectvar", _("Array variable"))
-      .AddParameter("expression", _("Number to append"))
+      .AddParameter("expression", _("Number to add"))
       .MarkAsAdvanced();
 
   obj.AddAction(
          "ObjectVariablePushBool",
-         _("Append a boolean to an object array"),
-         _("Appends a boolean to the end of an object array variable."),
-         _("Append boolean _PARAM2_ to array variable _PARAM1_ of _PARAM0_"),
-         _("Variables/Collections/Arrays"),
+         _("Add boolean variable"),
+         _("Adds a boolean to the end of an object array variable."),
+         _("Add boolean _PARAM2_ to array variable _PARAM1_ of _PARAM0_"),
+         _("Variables/Arrays and structures"),
          "res/actions/var24.png",
          "res/actions/var.png")
       .AddParameter("object", _("Object"))
       .AddParameter("objectvar", _("Array variable"))
-      .AddParameter("trueorfalse", _("Boolean to append"))
+      .AddParameter("trueorfalse", _("Boolean to add"))
       .MarkAsAdvanced();
 
   obj.AddAction(
          "ObjectVariableRemoveAt",
-         _("Remove variable from an object array (by index)"),
+         _("Remove variable by index"),
          _("Removes a variable at the specified index of an object array "
            "variable."),
          _("Remove variable at index _PARAM2_ from array variable _PARAM1_ of "
            "_PARAM0_"),
-         _("Variables/Collections/Arrays"),
+         _("Variables/Arrays and structures"),
          "res/actions/var24.png",
          "res/actions/var.png")
       .AddParameter("object", _("Object"))
-      .AddParameter("objectvar", _("Variable"))
+      .AddParameter("objectvar", _("Array variable"))
       .AddParameter("expression", _("Index to remove"))
       .MarkAsAdvanced();
 
+  obj.AddCondition(
+         "ObjectVariableChildCount",
+         _("Number of children"),
+         _("Compare the number of children in an object array variable."),
+         _("The number of children in the array variable _PARAM1_"),
+         _("Variables/Arrays and structures"),
+         "res/conditions/var24.png",
+         "res/conditions/var.png")
+      .AddParameter("object", _("Object"))
+      .AddParameter("objectvar", _("Variable"))
+      .UseStandardRelationalOperatorParameters(
+          "number", ParameterOptions::MakeNewOptions())
+      .MarkAsAdvanced();
+
+  obj.AddStrExpression(
+         "ArrayVariableFirstString",
+         _("First text child"),
+         _("Get the value of the first element of an object array variable, if "
+           "it is a text (string) variable."),
+         _("Variables/Arrays and structures"),
+         "res/actions/var.png")
+      .AddParameter("object", _("Object"))
+      .AddParameter("objectvar", _("Array variable"));
+
+  obj.AddExpression(
+         "ArrayVariableFirstNumber",
+         _("First number child"),
+         _("Get the value of the first element of an object array variable, if "
+           "it is a number variable."),
+         _("Variables/Arrays and structures"),
+         "res/actions/var.png")
+      .AddParameter("object", _("Object"))
+      .AddParameter("objectvar", _("Array variable"));
+
+  obj.AddStrExpression(
+         "ArrayVariableLastString",
+         _("Last text child"),
+         _("Get the value of the last element of an object array variable, if "
+           "it is a text (string) variable."),
+         _("Variables/Arrays and structures"),
+         "res/actions/var.png")
+      .AddParameter("object", _("Object"))
+      .AddParameter("objectvar", _("Array variable"));
+
+  obj.AddExpression(
+         "ArrayVariableLastNumber",
+         _("Last number child"),
+         _("Get the value of the last element of an object array variable, if "
+           "it is a number variable."),
+         _("Variables/Arrays and structures"),
+         "res/actions/var.png")
+      .AddParameter("object", _("Object"))
+      .AddParameter("objectvar", _("Array variable"));
+
   obj.AddCondition("BehaviorActivated",
                    _("Behavior activated"),
                    _("Check if the behavior is activated for the object."),
@@ -1115,23 +1174,24 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
       .AddParameter("expression", _("Target Y position"));
 
   obj.AddExpression("Variable",
-                    _("Value of an object variable"),
-                    _("Value of an object variable"),
+                    _("Number variable"),
+                    _("Number value of an object variable"),
                     _("Variables"),
                     "res/actions/var.png")
       .AddParameter("object", _("Object"))
       .AddParameter("objectvar", _("Variable"));
 
-  obj.AddExpression("VariableChildCount",
-                    _("Number of children of an object variable"),
-                    _("Number of children of an object variable"),
-                    _("Variables"),
-                    "res/actions/var.png")
+  obj.AddExpression(
+         "VariableChildCount",
+         _("Number of children"),
+         _("Number of children in an object array or structure variable"),
+         _("Variables/Arrays and structures"),
+         "res/actions/var.png")
       .AddParameter("object", _("Object"))
-      .AddParameter("objectvar", _("Variable"));
+      .AddParameter("objectvar", _("Array or structure variable"));
 
   obj.AddStrExpression("VariableString",
-                       _("Text of an object variable"),
+                       _("Text variable"),
                        _("Text of an object variable"),
                        _("Variables"),
                        "res/actions/var.png")
@@ -1265,6 +1325,17 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
       .MarkAsSimple()
       .SetRequiresBaseObjectCapability("effect");
 
+  obj.AddAction("SetIncludedInParentCollisionMask",
+                _("Include in parent collision mask"),
+                _("Include or exclude a child from its parent collision mask."),
+                _("Include _PARAM0_ in parent object collision mask: _PARAM1_"),
+                _("Collision"),
+                "res/function32.png",
+                "res/function32.png")
+      .AddParameter("object", _("Object"))
+      .AddParameter("yesorno", "Include in parent collision mask")
+      .SetRelevantForCustomObjectEventsOnly();
+
   extension
       .AddAction("Create",
                  _("Create an object"),
@@ -1278,7 +1349,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
       .AddParameter("objectListOrEmptyIfJustDeclared", _("Object to create"))
       .AddParameter("expression", _("X position"))
       .AddParameter("expression", _("Y position"))
-      .AddParameter("layer", _("Layer (base layer if empty)"), "", true)
+      .AddParameter("layer", _("Layer"), "", true)
       .SetDefaultValue("\"\"")
       .MarkAsSimple();
 
@@ -1293,7 +1364,8 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
                  "res/actions/create24.png",
                  "res/actions/create24.png")
       .AddCodeOnlyParameter("objectsContext", "")
-      .AddParameter("objectListOrEmptyIfJustDeclared", _("Group of potential objects"))
+      .AddParameter("objectListOrEmptyIfJustDeclared",
+                    _("Group of potential objects"))
       .SetParameterLongDescription(
           _("Group containing objects that can be created by the action."))
       .AddParameter("string", _("Name of the object to create"))
@@ -1302,7 +1374,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
           "with this name are found in the group, no object will be created."))
       .AddParameter("expression", _("X position"))
       .AddParameter("expression", _("Y position"))
-      .AddParameter("layer", _("Layer (base layer if empty)"), "", true)
+      .AddParameter("layer", _("Layer"), "", true)
       .SetDefaultValue("\"\"")
       .MarkAsAdvanced();
 
@@ -1332,7 +1404,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
           _("Objects"),
           "res/actions/ajouthasard24.png",
           "res/actions/ajouthasard.png")
-      .AddCodeOnlyParameter("currentScene", "")
+      .AddCodeOnlyParameter("objectsContext", "")
       .AddParameter("objectList", _("Object"))
       .MarkAsSimple();
 
@@ -1391,7 +1463,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
           _("Objects"),
           "res/conditions/add24.png",
           "res/conditions/add.png")
-      .AddCodeOnlyParameter("currentScene", "")
+      .AddCodeOnlyParameter("objectsContext", "")
       .AddParameter("objectList", _("Object"))
       .MarkAsAdvanced();
 
@@ -1406,7 +1478,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
           _("Objects"),
           "res/conditions/ajouthasard24.png",
           "res/conditions/ajouthasard.png")
-      .AddCodeOnlyParameter("currentScene", "")
+      .AddCodeOnlyParameter("objectsContext", "")
       .AddParameter("objectList", _("Object"))
       .MarkAsSimple();
 
@@ -1516,7 +1588,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
           "Raycast",
           _("Raycast"),
           _("Sends a ray from the given source position and angle, "
-            "intersecting the closest object.\nThe instersected "
+            "intersecting the closest object.\nThe intersected "
             "object will become the only one taken into account.\nIf "
             "the condition is inverted, the object to be intersected "
             "will be the farthest one within the ray radius."),
@@ -1547,7 +1619,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
           "RaycastToPosition",
           _("Raycast to position"),
           _("Sends a ray from the given source position to the final point, "
-            "intersecting the closest object.\nThe instersected "
+            "intersecting the closest object.\nThe intersected "
             "object will become the only one taken into account.\nIf "
             "the condition is inverted, the object to be intersected "
             "will be the farthest one within the ray radius."),

Core/GDCore/Extensions/Builtin/CameraExtension.cpp

@@ -40,7 +40,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsCameraExtension(
           "res/conditions/camera24.png")
       .AddCodeOnlyParameter("currentScene", "")
       .UseStandardParameters("number", ParameterOptions::MakeNewOptions())
-      .AddParameter("layer", _("Layer (base layer if empty)"), "", true)
+      .AddParameter("layer", _("Layer"), "", true)
       .SetDefaultValue("\"\"")
       .AddParameter("expression", _("Camera number (default : 0)"), "", true)
       .SetDefaultValue("0")
@@ -72,7 +72,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsCameraExtension(
           "res/conditions/camera24.png")
       .AddCodeOnlyParameter("currentScene", "")
       .UseStandardParameters("number", ParameterOptions::MakeNewOptions())
-      .AddParameter("layer", _("Layer (base layer if empty)"), "", true)
+      .AddParameter("layer", _("Layer"), "", true)
       .SetDefaultValue("\"\"")
       .AddParameter("expression", _("Camera number (default : 0)"), "", true)
       .SetDefaultValue("0")
@@ -103,7 +103,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsCameraExtension(
           "",
           "res/conditions/camera24.png")
       .AddCodeOnlyParameter("currentScene", "")
-      .AddParameter("layer", _("Layer (base layer if empty)"), "", true)
+      .AddParameter("layer", _("Layer"), "", true)
       .SetDefaultValue("\"\"")
       .AddParameter("expression", _("Camera number"), "", true)
       .UseStandardParameters("number", ParameterOptions::MakeNewOptions())
@@ -119,7 +119,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsCameraExtension(
           "",
           "res/conditions/camera24.png")
       .AddCodeOnlyParameter("currentScene", "")
-      .AddParameter("layer", _("Layer (base layer if empty)"), "", true)
+      .AddParameter("layer", _("Layer"), "", true)
       .SetDefaultValue("\"\"")
       .AddParameter("expression", _("Camera number"), "", true)
       .UseStandardParameters("number", ParameterOptions::MakeNewOptions())
@@ -136,7 +136,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsCameraExtension(
           "",
           "res/conditions/camera24.png")
       .AddCodeOnlyParameter("currentScene", "")
-      .AddParameter("layer", _("Layer (base layer if empty)"), "", true)
+      .AddParameter("layer", _("Layer"), "", true)
       .SetDefaultValue("\"\"")
       .AddParameter("expression", _("Camera number"), "", true)
       .UseStandardParameters("number", ParameterOptions::MakeNewOptions())
@@ -153,7 +153,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsCameraExtension(
           "",
           "res/conditions/camera24.png")
       .AddCodeOnlyParameter("currentScene", "")
-      .AddParameter("layer", _("Layer (base layer if empty)"), "", true)
+      .AddParameter("layer", _("Layer"), "", true)
       .SetDefaultValue("\"\"")
       .AddParameter("expression", _("Camera number"), "", true)
       .UseStandardParameters("number", ParameterOptions::MakeNewOptions())
@@ -170,7 +170,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsCameraExtension(
           "",
           "res/conditions/camera24.png")
       .AddCodeOnlyParameter("currentScene", "")
-      .AddParameter("layer", _("Layer (base layer if empty)"), "", true)
+      .AddParameter("layer", _("Layer"), "", true)
       .SetDefaultValue("\"\"")
       .AddParameter("expression", _("Camera number"), "", true)
       .UseStandardParameters("number", ParameterOptions::MakeNewOptions())
@@ -187,7 +187,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsCameraExtension(
           "",
           "res/conditions/camera24.png")
       .AddCodeOnlyParameter("currentScene", "")
-      .AddParameter("layer", _("Layer (base layer if empty)"), "", true)
+      .AddParameter("layer", _("Layer"), "", true)
       .SetDefaultValue("\"\"")
       .AddParameter("expression", _("Camera number"), "", true)
       .UseStandardParameters("number", ParameterOptions::MakeNewOptions())
@@ -204,7 +204,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsCameraExtension(
           "res/conditions/camera24.png")
       .AddCodeOnlyParameter("currentScene", "")
       .UseStandardParameters("number", ParameterOptions::MakeNewOptions())
-      .AddParameter("layer", _("Layer (base layer if empty)"), "", true)
+      .AddParameter("layer", _("Layer"), "", true)
       .SetDefaultValue("\"\"")
       .AddParameter("expression", _("Camera number (default : 0)"), "", true)
       .SetDefaultValue("0")
@@ -322,7 +322,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsCameraExtension(
       .AddCodeOnlyParameter("currentScene", "")
       .AddParameter("expression",
                     _("Value (1:Initial zoom, 2:Zoom x2, 0.5:Unzoom x2...)"))
-      .AddParameter("layer", _("Layer (base layer if empty)"), "", true)
+      .AddParameter("layer", _("Layer"), "", true)
       .SetDefaultValue("\"\"")
       .AddParameter("expression", _("Camera number (default : 0)"), "", true)
       .SetDefaultValue("0");
@@ -354,46 +354,41 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsCameraExtension(
                     "",
                     true)
       .SetDefaultValue("yes")
-      .AddParameter("layer", _("Layer (base layer if empty)"), "", true)
+      .AddParameter("layer", _("Layer"), "", true)
       .SetDefaultValue("\"\"")
       .AddParameter("expression", _("Camera number (default : 0)"), "", true)
       .SetDefaultValue("0")
       .MarkAsAdvanced();
 
   extension
-      .AddAction(
-          "ClampCamera",
-          _("Enforce camera boundaries"),
-          _("Enforce camera boundaries by moving the camera back inside specified boundaries."),
-          _("Enforce camera boundaries (left: _PARAM1_, top: _PARAM2_ "
-            "right: _PARAM3_, bottom: _PARAM4_, layer: _PARAM5_)"),
-          "",
-          "res/actions/camera24.png",
-          "res/actions/camera.png")
+      .AddAction("ClampCamera",
+                 _("Enforce camera boundaries"),
+                 _("Enforce camera boundaries by moving the camera back inside "
+                   "specified boundaries."),
+                 _("Enforce camera boundaries (left: _PARAM1_, top: _PARAM2_ "
+                   "right: _PARAM3_, bottom: _PARAM4_, layer: _PARAM5_)"),
+                 "",
+                 "res/actions/camera24.png",
+                 "res/actions/camera.png")
       .AddCodeOnlyParameter("currentScene", "")
-      .AddParameter("expression",
-                    _("Left bound X Position"))
-      .AddParameter("expression",
-                    _("Top bound Y Position"))
-      .AddParameter("expression",
-                    _("Right bound X Position"))
-      .AddParameter("expression",
-                    _("Bottom bound Y Position"))
-      .AddParameter("layer", _("Layer (base layer if empty)"), "", true)
+      .AddParameter("expression", _("Left bound X Position"))
+      .AddParameter("expression", _("Top bound Y Position"))
+      .AddParameter("expression", _("Right bound X Position"))
+      .AddParameter("expression", _("Bottom bound Y Position"))
+      .AddParameter("layer", _("Layer"), "", true)
       .SetDefaultValue("\"\"")
       .AddParameter("expression", _("Camera number (default : 0)"), "", true)
       .SetDefaultValue("0")
       .MarkAsAdvanced();
 
   extension
-      .AddAction(
-          "CentreCamera",
-          _("Center the camera on an object"),
-          _("Center the camera on the specified object."),
-          _("Center camera on _PARAM1_ (layer: _PARAM3_)"),
-          "",
-          "res/actions/camera24.png",
-          "res/actions/camera.png")
+      .AddAction("CentreCamera",
+                 _("Center the camera on an object"),
+                 _("Center the camera on the specified object."),
+                 _("Center camera on _PARAM1_ (layer: _PARAM3_)"),
+                 "",
+                 "res/actions/camera24.png",
+                 "res/actions/camera.png")
       .AddCodeOnlyParameter("currentScene", "")
       .AddParameter("objectPtr", _("Object"))
       .AddParameter("yesorno",
@@ -401,7 +396,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsCameraExtension(
                     "",
                     true)
       .SetDefaultValue("yes")
-      .AddParameter("layer", _("Layer (base layer if empty)"), "", true)
+      .AddParameter("layer", _("Layer"), "", true)
       .SetDefaultValue("\"\"")
       .AddParameter("expression", _("Camera number (default : 0)"), "", true)
       .SetDefaultValue("0")
@@ -458,7 +453,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsCameraExtension(
           "res/actions/effect24.png",
           "res/actions/effect.png")
       .AddCodeOnlyParameter("currentScene", "")
-      .AddParameter("layer", _("Layer (base layer if empty)"), "", true)
+      .AddParameter("layer", _("Layer"), "", true)
       .SetDefaultValue("\"\"")
       .AddParameter("layerEffectName", _("Effect name"))
       .AddParameter("layerEffectParameterName", _("Parameter name"))
@@ -477,7 +472,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsCameraExtension(
           "res/actions/effect24.png",
           "res/actions/effect.png")
       .AddCodeOnlyParameter("currentScene", "")
-      .AddParameter("layer", _("Layer (base layer if empty)"), "", true)
+      .AddParameter("layer", _("Layer"), "", true)
       .SetDefaultValue("\"\"")
       .AddParameter("layerEffectName", _("Effect name"))
       .AddParameter("layerEffectParameterName", _("Parameter name"))
@@ -496,7 +491,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsCameraExtension(
           "res/actions/effect24.png",
           "res/actions/effect.png")
       .AddCodeOnlyParameter("currentScene", "")
-      .AddParameter("layer", _("Layer (base layer if empty)"), "", true)
+      .AddParameter("layer", _("Layer"), "", true)
       .SetDefaultValue("\"\"")
       .AddParameter("layerEffectName", _("Effect name"))
       .AddParameter("layerEffectParameterName", _("Parameter name"))
@@ -512,7 +507,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsCameraExtension(
                     "res/actions/effect24.png",
                     "res/actions/effect.png")
       .AddCodeOnlyParameter("currentScene", "")
-      .AddParameter("layer", _("Layer (base layer if empty)"), "", true)
+      .AddParameter("layer", _("Layer"), "", true)
       .SetDefaultValue("\"\"")
       .AddParameter("layerEffectName", _("Effect name"))
       .MarkAsAdvanced();
@@ -526,7 +521,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsCameraExtension(
                  "res/actions/effect24.png",
                  "res/actions/effect.png")
       .AddCodeOnlyParameter("currentScene", "")
-      .AddParameter("layer", _("Layer (base layer if empty)"), "", true)
+      .AddParameter("layer", _("Layer"), "", true)
       .SetDefaultValue("\"\"")
       .AddParameter("layerEffectName", _("Effect name"))
       .AddParameter("yesorno", _("Enable"), "", true)
@@ -542,7 +537,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsCameraExtension(
           "res/conditions/time24.png",
           "res/conditions/time.png")
       .AddCodeOnlyParameter("currentScene", "")
-      .AddParameter("layer", _("Layer (base layer if empty)"), "", true)
+      .AddParameter("layer", _("Layer"), "", true)
       .SetDefaultValue("\"\"")
       .UseStandardRelationalOperatorParameters(
           "number",
@@ -560,7 +555,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsCameraExtension(
           "res/actions/time24.png",
           "res/actions/time.png")
       .AddCodeOnlyParameter("currentScene", "")
-      .AddParameter("layer", _("Layer (base layer if empty)"), "", true)
+      .AddParameter("layer", _("Layer"), "", true)
       .SetDefaultValue("\"\"")
       .AddParameter("expression",
                     _("Scale (1: Default, 2: 2x faster, 0.5: 2x slower...)"));
@@ -575,7 +570,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsCameraExtension(
                     "res/conditions/layer24.png",
                     "res/conditions/layer.png")
       .AddCodeOnlyParameter("currentScene", "")
-      .AddParameter("layer", _("Layer (base layer if empty)"), "", true)
+      .AddParameter("layer", _("Layer"), "", true)
       .SetDefaultValue("\"\"")
       .UseStandardRelationalOperatorParameters(
           "number", gd::ParameterOptions::MakeNewOptions())
@@ -592,7 +587,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsCameraExtension(
                  "res/actions/layer24.png",
                  "res/actions/layer.png")
       .AddCodeOnlyParameter("currentScene", "")
-      .AddParameter("layer", _("Layer (base layer if empty)"), "", true)
+      .AddParameter("layer", _("Layer"), "", true)
       .SetDefaultValue("\"\"")
       .AddParameter("expression", _("New default Z order"));
 
@@ -607,7 +602,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsCameraExtension(
           "res/actions/color24.png",
           "res/actions/color.png")
       .AddCodeOnlyParameter("currentScene", "")
-      .AddParameter("layer", _("Layer (base layer if empty)"), "", true)
+      .AddParameter("layer", _("Layer"), "", true)
       .SetDefaultValue("\"Lighting\"")
       .AddParameter("color", _("Color"))
       .MarkAsAdvanced();

Core/GDCore/Extensions/Builtin/MouseExtension.cpp

@@ -163,7 +163,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsMouseExtension(
           "res/conditions/mouse24.png")
       .AddCodeOnlyParameter("currentScene", "")
       .UseStandardParameters("number", ParameterOptions::MakeNewOptions())
-      .AddParameter("layer", _("Layer (base layer if empty)"), "", true)
+      .AddParameter("layer", _("Layer"), "", true)
       .SetDefaultValue("\"\"")
       .AddParameter("expression", _("Camera number (default : 0)"), "", true)
       .SetDefaultValue("0");
@@ -185,7 +185,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsMouseExtension(
           "res/conditions/mouse24.png")
       .AddCodeOnlyParameter("currentScene", "")
       .UseStandardParameters("number", ParameterOptions::MakeNewOptions())
-      .AddParameter("layer", _("Layer (base layer if empty)"), "", true)
+      .AddParameter("layer", _("Layer"), "", true)
       .SetDefaultValue("\"\"")
       .AddParameter("expression", _("Camera number (default : 0)"), "", true)
       .SetDefaultValue("0");
@@ -206,7 +206,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsMouseExtension(
                                  "res/conditions/mouse24.png")
       .AddCodeOnlyParameter("currentScene", "")
       .UseStandardParameters("number", ParameterOptions::MakeNewOptions())
-      .AddParameter("layer", _("Layer (base layer if empty)"), "", true)
+      .AddParameter("layer", _("Layer"), "", true)
       .SetDefaultValue("\"\"")
       .AddParameter("expression", _("Camera number (default : 0)"), "", true)
       .SetDefaultValue("0")
@@ -223,7 +223,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsMouseExtension(
                                  "res/conditions/mouse24.png")
       .AddCodeOnlyParameter("currentScene", "")
       .UseStandardParameters("number", ParameterOptions::MakeNewOptions())
-      .AddParameter("layer", _("Layer (base layer if empty)"), "", true)
+      .AddParameter("layer", _("Layer"), "", true)
       .SetDefaultValue("\"\"")
       .AddParameter("expression", _("Camera number (default : 0)"), "", true)
       .SetDefaultValue("0")
@@ -317,7 +317,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsMouseExtension(
       .AddCodeOnlyParameter("currentScene", "")
       .AddParameter("expression", _("Touch identifier"))
       .UseStandardParameters("number", ParameterOptions::MakeNewOptions())
-      .AddParameter("layer", _("Layer (base layer if empty)"), "", true)
+      .AddParameter("layer", _("Layer"), "", true)
       .SetDefaultValue("\"\"")
       .AddParameter("expression", _("Camera number (default : 0)"), "", true)
       .SetDefaultValue("0");
@@ -333,7 +333,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsMouseExtension(
       .AddCodeOnlyParameter("currentScene", "")
       .AddParameter("expression", _("Touch identifier"))
       .UseStandardParameters("number", ParameterOptions::MakeNewOptions())
-      .AddParameter("layer", _("Layer (base layer if empty)"), "", true)
+      .AddParameter("layer", _("Layer"), "", true)
       .SetDefaultValue("\"\"")
       .AddParameter("expression", _("Camera number (default : 0)"), "", true)
       .SetDefaultValue("0");

Core/GDCore/Extensions/Builtin/NetworkExtension.cpp

@@ -48,7 +48,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsNetworkExtension(
       .AddParameter("string", "Content type", "", true)
       .SetParameterLongDescription(
           "If empty, \"application/x-www-form-urlencoded\" will be used.")
-      .AddParameter("scenevar", "Reponse scene variable", "", true)
+      .AddParameter("scenevar", "Response scene variable", "", true)
       .SetParameterLongDescription(
           "The response of the server will be stored, as a string, in this "
           "variable. If the server returns *JSON*, you may want to use the "

Core/GDCore/Extensions/Builtin/StringInstructionsExtension.cpp

@@ -126,8 +126,8 @@ BuiltinExtensionsImplementer::ImplementsStringInstructionsExtension(
   extension
       .AddExpression(
           "StrFindLast",
-          _("Search the last occurence in a text"),
-          _("Search the last occurence in a string (return the position of "
+          _("Search the last occurrence in a text"),
+          _("Search the last occurrence in a string (return the position of "
             "the result, from the beginning of the string, or -1 if not "
             "found)"),
           "",
@@ -169,8 +169,8 @@ BuiltinExtensionsImplementer::ImplementsStringInstructionsExtension(
   extension
       .AddExpression(
           "StrFindLastFrom",
-          _("Search the last occurence in a text, starting from a position"),
-          _("Search in a text the last occurence, starting from a position "
+          _("Search the last occurrence in a text, starting from a position"),
+          _("Search in a text the last occurrence, starting from a position "
             "(return "
             " the position of the result, from the beginning of the string, or "
             "-1 if not found)"),

Core/GDCore/Extensions/Builtin/VariablesExtension.cpp

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

Core/GDCore/Extensions/Metadata/DependencyMetadata.h

@@ -62,7 +62,7 @@ class GD_CORE_API DependencyMetadata {
   };
 
   /**
-   * \brief Sets the type of dependecy (what will be used to install it)
+   * \brief Sets the type of dependency (what will be used to install it)
    *
    * This can either be "npm" or "cordova" for now.
    */

Core/GDCore/Extensions/Metadata/EffectMetadata.cpp

@@ -7,9 +7,6 @@
 
 namespace gd {
 
-EffectMetadata::EffectMetadata(const gd::String& type_)
-    : type(type_), isMarkedAsNotWorkingForObjects(false) {}
-
 EffectMetadata& EffectMetadata::SetIncludeFile(const gd::String& includeFile) {
   includeFiles.clear();
   includeFiles.push_back(includeFile);
@@ -23,9 +20,4 @@ EffectMetadata& EffectMetadata::AddIncludeFile(const gd::String& includeFile) {
   return *this;
 }
 
-EffectMetadata& EffectMetadata::MarkAsNotWorkingForObjects() {
-  isMarkedAsNotWorkingForObjects = true;
-  return *this;
-}
-
 }  // namespace gd

Core/GDCore/Extensions/Metadata/EffectMetadata.h

@@ -3,8 +3,8 @@
  * Copyright 2008-present Florian Rival (Florian.Rival@gmail.com). All rights
  * reserved. This project is released under the MIT License.
  */
-#ifndef EFFECTMETADATA_H
-#define EFFECTMETADATA_H
+#pragma once
+
 #include <functional>
 #include <map>
 #include <memory>
@@ -25,21 +25,25 @@ class GD_CORE_API EffectMetadata {
   /**
    * \brief Construct an effect metadata, with the given type
    */
-  EffectMetadata(const gd::String& type_);
+   EffectMetadata(const gd::String &type_)
+       : type(type_), isMarkedAsNotWorkingForObjects(false),
+         isMarkedAsOnlyWorkingFor2D(false), isMarkedAsOnlyWorkingFor3D(false),
+         isMarkedAsUnique(false) {}
 
-  /**
-   * \brief Default constructor, only used for initializing `badEffectMetadata`.
-   */
-  EffectMetadata() {}
+   /**
+    * \brief Default constructor, only used for initializing
+    * `badEffectMetadata`.
+    */
+   EffectMetadata() {}
 
-  virtual ~EffectMetadata(){};
+   virtual ~EffectMetadata(){};
 
-  /**
-   * \brief Set the name shown to the user.
-   */
-  EffectMetadata& SetFullName(const gd::String& fullname_) {
-    fullname = fullname_;
-    return *this;
+   /**
+    * \brief Set the name shown to the user.
+    */
+   EffectMetadata &SetFullName(const gd::String &fullname_) {
+     fullname = fullname_;
+     return *this;
   };
 
   /**
@@ -69,11 +73,6 @@ class GD_CORE_API EffectMetadata {
    */
   EffectMetadata& AddIncludeFile(const gd::String& includeFile);
 
-  /**
-   * \brief Mark the effect as not working as an object effect.
-   */
-  EffectMetadata& MarkAsNotWorkingForObjects();
-
   /**
    * \brief Return a reference to the properties of this effect.
    */
@@ -117,10 +116,65 @@ class GD_CORE_API EffectMetadata {
     return includeFiles;
   }
 
+  /**
+   * \brief Mark the effect as not working as an object effect.
+   */
+  EffectMetadata& MarkAsNotWorkingForObjects() {
+    isMarkedAsNotWorkingForObjects = true;
+    return *this;
+  }
+
+  /**
+   * \brief Mark the effect as only working for the 2D renderer.
+   */
+  EffectMetadata& MarkAsOnlyWorkingFor2D() {
+    isMarkedAsOnlyWorkingFor2D = true;
+    return *this;
+  }
+
+  /**
+   * \brief Mark the effect as only working for the 3D renderer.
+   */
+  EffectMetadata& MarkAsOnlyWorkingFor3D() {
+    isMarkedAsOnlyWorkingFor3D = true;
+    return *this;
+  }
+
+  /**
+   * \brief Mark the effect as only addable once.
+   */
+  EffectMetadata& MarkAsUnique() {
+    isMarkedAsUnique = true;
+    return *this;
+  }
+
   /**
    * \brief Check if the effect is marked as not working as an object effect.
    */
-  bool IsMarkedAsNotWorkingForObjects() const { return isMarkedAsNotWorkingForObjects; };
+  bool IsMarkedAsNotWorkingForObjects() const {
+    return isMarkedAsNotWorkingForObjects;
+  };
+
+  /**
+   * \brief Check if the effect is marked as only working for the 2D renderer.
+   */
+  bool IsMarkedAsOnlyWorkingFor2D() const {
+    return isMarkedAsOnlyWorkingFor2D;
+  };
+
+  /**
+   * \brief Check if the effect is marked as only working for the 3D renderer.
+   */
+  bool IsMarkedAsOnlyWorkingFor3D() const {
+    return isMarkedAsOnlyWorkingFor3D;
+  };
+
+  /**
+   * \brief Check if the effect can only be added once.
+   */
+  bool IsMarkedAsUnique() const {
+    return isMarkedAsUnique;
+  };
 
  private:
   gd::String extensionNamespace;
@@ -130,8 +184,10 @@ class GD_CORE_API EffectMetadata {
   gd::String description;
   std::vector<gd::String> includeFiles;
   bool isMarkedAsNotWorkingForObjects;
+  bool isMarkedAsOnlyWorkingFor2D;
+  bool isMarkedAsOnlyWorkingFor3D;
+  bool isMarkedAsUnique;
   std::map<gd::String, gd::PropertyDescriptor> properties;
 };
 
 }  // namespace gd
-#endif  // EFFECTMETADATA_H

Core/GDCore/Extensions/Metadata/ExpressionMetadata.cpp

@@ -23,7 +23,8 @@ ExpressionMetadata::ExpressionMetadata(const gd::String& returnType_,
       shown(true),
       smallIconFilename(smallicon_),
       extensionNamespace(extensionNamespace_),
-      isPrivate(false) {
+      isPrivate(false),
+      relevantContext("Any") {
 }
 
 ExpressionMetadata& ExpressionMetadata::SetHidden() {

Core/GDCore/Extensions/Metadata/ExpressionMetadata.h

@@ -137,7 +137,7 @@ class GD_CORE_API ExpressionMetadata {
    * to fulfill std::map requirements.
    */
   ExpressionMetadata()
-      : returnType("unknown"), shown(false), isPrivate(false){};
+      : returnType("unknown"), shown(false), isPrivate(false), relevantContext("Any"){};
 
   virtual ~ExpressionMetadata(){};
 
@@ -184,6 +184,67 @@ class GD_CORE_API ExpressionMetadata {
     return *this;
   }
 
+  /**
+   * Check if the instruction can be used in layouts or external events.
+   */
+  bool IsRelevantForLayoutEvents() const {
+    return relevantContext == "Any" || relevantContext == "Layout";
+  }
+
+  /**
+   * Check if the instruction can be used in function events.
+   */
+  bool IsRelevantForFunctionEvents() const {
+    return relevantContext == "Any" || relevantContext == "Function";
+  }
+
+  /**
+   * Check if the instruction can be used in asynchronous function events.
+   */
+  bool IsRelevantForAsynchronousFunctionEvents() const {
+    return relevantContext == "Any" || relevantContext == "Function" ||
+           relevantContext == "AsynchronousFunction";
+  }
+
+  /**
+   * Check if the instruction can be used in custom object events.
+   */
+  bool IsRelevantForCustomObjectEvents() const {
+    return relevantContext == "Any" || relevantContext == "Object";
+  }
+
+  /**
+   * Set that the instruction can be used in layouts or external events.
+   */
+  ExpressionMetadata &SetRelevantForLayoutEventsOnly() {
+    relevantContext = "Layout";
+    return *this;
+  }
+
+  /**
+   * Set that the instruction can be used in function events.
+   */
+  ExpressionMetadata &SetRelevantForFunctionEventsOnly() {
+    relevantContext = "Function";
+    return *this;
+  }
+
+  /**
+   * Set that the instruction can be used in asynchronous function events.
+   */
+  ExpressionMetadata &SetRelevantForAsynchronousFunctionEventsOnly() {
+    relevantContext = "AsynchronousFunction";
+    return *this;
+  }
+
+  /**
+   * Set that the instruction can be used in custom object events.
+   */
+  ExpressionMetadata &SetRelevantForCustomObjectEventsOnly() {
+    relevantContext = "Object";
+    return *this;
+  }
+
   /**
    * \see gd::InstructionMetadata::AddParameter
    */
@@ -326,6 +387,7 @@ class GD_CORE_API ExpressionMetadata {
   gd::String extensionNamespace;
   bool isPrivate;
   gd::String requiredBaseObjectCapability;
+  gd::String relevantContext;
 };
 
 }  // namespace gd

Core/GDCore/Extensions/Metadata/InstructionMetadata.cpp

@@ -47,7 +47,8 @@ InstructionMetadata::InstructionMetadata(const gd::String& extensionNamespace_,
       usageComplexity(5),
       isPrivate(false),
       isObjectInstruction(false),
-      isBehaviorInstruction(false) {}
+      isBehaviorInstruction(false),
+      relevantContext("Any") {}
 
 InstructionMetadata& InstructionMetadata::AddParameter(
     const gd::String& type,

Core/GDCore/Extensions/Metadata/InstructionMetadata.h

@@ -101,6 +101,67 @@ class GD_CORE_API InstructionMetadata {
     return *this;
   }
 
+  /**
+   * Check if the instruction can be used in layouts or external events.
+   */
+  bool IsRelevantForLayoutEvents() const {
+    return relevantContext == "Any" || relevantContext == "Layout";
+  }
+
+  /**
+   * Check if the instruction can be used in function events.
+   */
+  bool IsRelevantForFunctionEvents() const {
+    return relevantContext == "Any" || relevantContext == "Function";
+  }
+
+  /**
+   * Check if the instruction can be used in asynchronous function events.
+   */
+  bool IsRelevantForAsynchronousFunctionEvents() const {
+    return relevantContext == "Any" || relevantContext == "Function" ||
+           relevantContext == "AsynchronousFunction";
+  }
+
+  /**
+   * Check if the instruction can be used in custom object events.
+   */
+  bool IsRelevantForCustomObjectEvents() const {
+    return relevantContext == "Any" || relevantContext == "Object";
+  }
+
+  /**
+   * Set that the instruction can be used in layouts or external events.
+   */
+  InstructionMetadata &SetRelevantForLayoutEventsOnly() {
+    relevantContext = "Layout";
+    return *this;
+  }
+
+  /**
+   * Set that the instruction can be used in function events.
+   */
+  InstructionMetadata &SetRelevantForFunctionEventsOnly() {
+    relevantContext = "Function";
+    return *this;
+  }
+
+  /**
+   * Set that the instruction can be used in asynchronous function events.
+   */
+  InstructionMetadata &SetRelevantForAsynchronousFunctionEventsOnly() {
+    relevantContext = "AsynchronousFunction";
+    return *this;
+  }
+
+  /**
+   * Set that the instruction can be used in custom object events.
+   */
+  InstructionMetadata &SetRelevantForCustomObjectEventsOnly() {
+    relevantContext = "Object";
+    return *this;
+  }
+
   /**
    * Check if the instruction is asynchronous - it will be running in the
    * background, executing the instructions following it before the frame after
@@ -539,6 +600,7 @@ class GD_CORE_API InstructionMetadata {
   bool isObjectInstruction;
   bool isBehaviorInstruction;
   gd::String requiredBaseObjectCapability;
+  gd::String relevantContext;
 };
 
 }  // namespace gd

Core/GDCore/Extensions/Metadata/ObjectMetadata.h

@@ -57,7 +57,7 @@ class GD_CORE_API ObjectMetadata {
 
   /**
    * \brief Construct an object metadata, with a function that will be called
-   * to instanciate a new object.
+   * to instantiate a new object.
    */
   ObjectMetadata(const gd::String& extensionNamespace_,
                  const gd::String& name_,
@@ -224,7 +224,7 @@ class GD_CORE_API ObjectMetadata {
   /**
    * \brief The "capabilities" that are offered by the base object that are
    * *not* supported by this object, and should be hidden in the editor
-   * inferface.
+   * interface.
    */
   const std::set<gd::String>& GetUnsupportedBaseObjectCapabilities() const {
     return unsupportedBaseObjectCapabilities;
@@ -232,7 +232,7 @@ class GD_CORE_API ObjectMetadata {
 
   /**
    * \brief Add a "capability" that is offered by the base object that is *not*
-   * supported by this object, and should be hidden in the editor inferface.
+   * supported by this object, and should be hidden in the editor interface.
    */
   ObjectMetadata& AddUnsupportedBaseObjectCapability(
       const gd::String& capability) {
@@ -242,7 +242,7 @@ class GD_CORE_API ObjectMetadata {
 
   /**
    * \brief Check if a "capability" that is offered by the base object is *not*
-   * supported by this object, and should be hidden in the editor inferface.
+   * supported by this object, and should be hidden in the editor interface.
    */
   bool IsUnsupportedBaseObjectCapability(const gd::String& capability) const {
     return unsupportedBaseObjectCapabilities.find(capability) != unsupportedBaseObjectCapabilities.end();

Core/GDCore/Extensions/Metadata/ParameterMetadata.h

@@ -209,10 +209,10 @@ class GD_CORE_API ParameterMetadata {
    * \brief Return the expression type from the parameter type.
    * Declinations of "number" and "string" types (like "forceMultiplier" or
    * "sceneName") are replaced by "number" and "string".
-   * \deprecated Use gd::ValueTypeMetadata instead.
+   * \deprecated Use gd::ValueTypeMetadata or gd::GetExpressionPrimitiveValueType instead.
    */
   static const gd::String &GetExpressionValueType(const gd::String &parameterType) {
-    return gd::ValueTypeMetadata::GetPrimitiveValueType(parameterType);
+    return gd::ValueTypeMetadata::GetExpressionPrimitiveValueType(parameterType);
   }
 
   /** \name Serialization

Core/GDCore/Extensions/Metadata/ParameterMetadataTools.cpp

@@ -11,6 +11,8 @@
 #include "GDCore/Project/Project.h"
 #include "GDCore/String.h"
 #include "InstructionMetadata.h"
+#include "GDCore/Events/Parsers/ExpressionParser2.h"
+#include "GDCore/Events/Parsers/ExpressionParser2NodePrinter.h"
 
 namespace gd {
 void ParameterMetadataTools::ParametersToObjectsContainer(
@@ -101,6 +103,56 @@ void ParameterMetadataTools::IterateOverParametersWithIndex(
   }
 }
 
+void ParameterMetadataTools::IterateOverParametersWithIndex(
+    const gd::Platform &platform,
+    const gd::ObjectsContainer &globalObjectsContainer,
+    const gd::ObjectsContainer &objectsContainer, FunctionCallNode &node,
+    std::function<void(const gd::ParameterMetadata &parameterMetadata,
+                       std::unique_ptr<gd::ExpressionNode> &parameterNode,
+                       size_t parameterIndex, const gd::String &lastObjectName)>
+        fn) {
+  gd::String lastObjectName = node.objectName;
+
+  const bool isObjectFunction = !node.objectName.empty();
+  const gd::ExpressionMetadata &metadata =
+      isObjectFunction ? MetadataProvider::GetObjectAnyExpressionMetadata(
+                             platform,
+                             GetTypeOfObject(globalObjectsContainer,
+                                             objectsContainer, node.objectName),
+                             node.functionName)
+                       : MetadataProvider::GetAnyExpressionMetadata(
+                             platform, node.functionName);
+
+  if (gd::MetadataProvider::IsBadExpressionMetadata(metadata)) {
+    return;
+  }
+
+  size_t parameterIndex = 0;
+  for (size_t metadataIndex = (isObjectFunction ? 1 : 0);
+       metadataIndex < metadata.parameters.size() &&
+       parameterIndex < node.parameters.size();
+       ++metadataIndex) {
+    auto &parameterMetadata = metadata.parameters[metadataIndex];
+    if (parameterMetadata.IsCodeOnly()) {
+      continue;
+    }
+    auto &parameterNode = node.parameters[parameterIndex];
+    ++parameterIndex;
+
+    fn(parameterMetadata, parameterNode, parameterIndex, lastObjectName);
+
+    // Memorize the last object name. By convention, parameters that require
+    // an object (mainly, "objectvar" and "behavior") should be placed after
+    // the object in the list of parameters (if possible, just after).
+    // Search "lastObjectName" in the codebase for other place where this
+    // convention is enforced.
+    if (gd::ParameterMetadata::IsObject(parameterMetadata.GetType()))
+      // Object can't be expressions so it should always be the object name.
+      lastObjectName =
+          gd::ExpressionParser2NodePrinter::PrintNode(*parameterNode);
+  }
+}
+
 size_t ParameterMetadataTools::GetObjectParameterIndexFor(
     const std::vector<gd::ParameterMetadata>& parametersMetadata,
     size_t parameterIndex) {

Core/GDCore/Extensions/Metadata/ParameterMetadataTools.h

@@ -7,12 +7,16 @@
 #ifndef ParameterMetadataTools_H
 #define ParameterMetadataTools_H
 #include <vector>
+#include <memory>
 #include "GDCore/String.h"
 namespace gd {
+class Platform;
 class Project;
 class ObjectsContainer;
 class ParameterMetadata;
 class Expression;
+struct FunctionCallNode;
+struct ExpressionNode;
 }  // namespace gd
 
 namespace gd {
@@ -48,6 +52,21 @@ class GD_CORE_API ParameterMetadataTools {
                          size_t parameterIndex,
                          const gd::String& lastObjectName)> fn);
 
+  /**
+   * Iterate over the parameters of a FunctionCallNode.
+   * Callback function is called with the parameter metadata, its value
+   * and if applicable the name of the object it's linked to.
+   */
+  static void IterateOverParametersWithIndex(
+      const gd::Platform &platform,
+      const gd::ObjectsContainer &globalObjectsContainer,
+      const gd::ObjectsContainer &objectsContainer, FunctionCallNode &node,
+      std::function<void(const gd::ParameterMetadata &parameterMetadata,
+                         std::unique_ptr<gd::ExpressionNode> &parameterNode,
+                         size_t parameterIndex,
+                         const gd::String &lastObjectName)>
+          fn);
+
   /**
    * Given a parameter, return, if applicable, the index of the object parameter
    * it's linked to.

Core/GDCore/Extensions/Metadata/ValueTypeMetadata.cpp

@@ -35,17 +35,40 @@ void ValueTypeMetadata::UnserializeFrom(const SerializerElement& element) {
 
 const gd::String ValueTypeMetadata::numberType = "number";
 const gd::String ValueTypeMetadata::stringType = "string";
+const gd::String ValueTypeMetadata::variableType = "variable";
+const gd::String ValueTypeMetadata::booleanType = "boolean";
 
-const gd::String &ValueTypeMetadata::GetPrimitiveValueType(const gd::String &parameterType) {
-  if (parameterType == "number" || gd::ValueTypeMetadata::IsTypeExpression("number", parameterType)) {
+const gd::String &ValueTypeMetadata::GetExpressionPrimitiveValueType(
+    const gd::String &parameterType) {
+  if (parameterType == "number" ||
+      gd::ValueTypeMetadata::IsTypeExpression("number", parameterType)) {
     return ValueTypeMetadata::numberType;
   }
-  if (parameterType == "string" || gd::ValueTypeMetadata::IsTypeExpression("string", parameterType)) {
+  if (parameterType == "string" ||
+      gd::ValueTypeMetadata::IsTypeExpression("string", parameterType)) {
     return ValueTypeMetadata::stringType;
   }
   return parameterType;
 }
 
+const gd::String &
+ValueTypeMetadata::GetPrimitiveValueType(const gd::String &parameterType) {
+  if (parameterType == "variable" ||
+      gd::ValueTypeMetadata::IsTypeExpression("variable", parameterType)) {
+    return ValueTypeMetadata::variableType;
+  }
+  if (parameterType == "boolean" || parameterType == "yesorno" ||
+      parameterType == "trueorfalse") {
+    return ValueTypeMetadata::booleanType;
+  }
+  // These 2 types are not strings from the code generator point of view,
+  // but it is for event-based extensions.
+  if (parameterType == "key" || parameterType == "mouse") {
+    return ValueTypeMetadata::stringType;
+  }
+  return GetExpressionPrimitiveValueType(parameterType);
+}
+
 const gd::String ValueTypeMetadata::numberValueType = "number";
 const gd::String ValueTypeMetadata::booleanValueType = "boolean";
 const gd::String ValueTypeMetadata::colorValueType = "color";

Core/GDCore/Extensions/Metadata/ValueTypeMetadata.h

@@ -163,7 +163,6 @@ class GD_CORE_API ValueTypeMetadata {
     } else if (type == "string") {
       return parameterType == "string" || parameterType == "layer" ||
              parameterType == "color" || parameterType == "file" ||
-             parameterType == "joyaxis" ||
              parameterType == "stringWithSelector" ||
              parameterType == "sceneName" ||
              parameterType == "layerEffectName" ||
@@ -179,6 +178,16 @@ class GD_CORE_API ValueTypeMetadata {
     } else if (type == "variable") {
       return parameterType == "objectvar" || parameterType == "globalvar" ||
              parameterType == "scenevar";
+    } else if (type == "resource") {
+      return parameterType == "fontResource" ||
+             parameterType == "soundfile" ||
+             parameterType == "musicfile" ||
+             parameterType == "bitmapFontResource" ||
+             parameterType == "imageResource" ||
+             parameterType == "jsonResource" ||
+             parameterType == "tilemapResource" ||
+             parameterType == "tilesetResource" ||
+             parameterType == "model3DResource";
     }
     return false;
   }
@@ -187,10 +196,23 @@ class GD_CORE_API ValueTypeMetadata {
    * \brief Return the expression type from the parameter type.
    * Declinations of "number" and "string" types (like "forceMultiplier" or
    * "sceneName") are replaced by "number" and "string".
+   * 
+   * \note It only maps string and number types.
+   */
+  static const gd::String &GetExpressionPrimitiveValueType(const gd::String &parameterType);
+
+  /**
+   * \brief Return the primitive type from the parameter type.
+   * Declinations of "number" and "string" types (like "forceMultiplier" or
+   * "sceneName") are replaced by "number" and "string".
+   * 
+   * \note It also maps variable and boolean types.
    */
   static const gd::String &GetPrimitiveValueType(const gd::String &parameterType);
   static const gd::String numberType;
   static const gd::String stringType;
+  static const gd::String variableType;
+  static const gd::String booleanType;
 
   /**
    * \brief Return the ValueTypeMetadata name for a property type.

Core/GDCore/IDE/DependenciesAnalyzer.h

@@ -42,7 +42,7 @@ class GD_CORE_API DependenciesAnalyzer {
    *
    * You can also call then
    * DependenciesAnalyzer::ExternalEventsCanBeCompiledForAScene to check if the
-   * external events can be compiled separatly and called by a scene. \see
+   * external events can be compiled separately and called by a scene. \see
    * DependenciesAnalyzer::ExternalEventsCanBeCompiledForAScene
    */
   DependenciesAnalyzer(const gd::Project& project_,

Core/GDCore/IDE/EventBasedBehaviorBrowser.cpp

@@ -0,0 +1,49 @@
+/*
+ * GDevelop Core
+ * Copyright 2008-2016 Florian Rival (Florian.Rival@gmail.com). All rights
+ * reserved. This project is released under the MIT License.
+ */
+#include "EventBasedBehaviorBrowser.h"
+
+#include "GDCore/IDE/Events/ArbitraryEventsWorker.h"
+#include "GDCore/IDE/Project/ArbitraryEventBasedBehaviorsWorker.h"
+#include "GDCore/IDE/Project/ArbitraryEventsFunctionsWorker.h"
+#include "GDCore/IDE/Project/ArbitraryObjectsWorker.h"
+#include "GDCore/IDE/Project/ArbitraryBehaviorSharedDataWorker.h"
+#include "GDCore/IDE/ProjectBrowserHelper.h"
+#include "GDCore/Project/EventsBasedBehavior.h"
+#include "GDCore/Project/Project.h"
+#include "GDCore/String.h"
+
+namespace gd {
+
+void EventBasedBehaviorBrowser::ExposeEvents(
+    gd::Project &project, gd::ArbitraryEventsWorker &worker) const {
+  gd::ProjectBrowserHelper::ExposeEventsBasedBehaviorEvents(
+      project, eventsBasedBehavior, worker);
+}
+
+void EventBasedBehaviorBrowser::ExposeEvents(
+    gd::Project &project, gd::ArbitraryEventsWorkerWithContext &worker) const {
+  gd::ProjectBrowserHelper::ExposeEventsBasedBehaviorEvents(
+      project, eventsBasedBehavior, worker);
+}
+
+void EventBasedBehaviorBrowser::ExposeObjects(
+    gd::Project &project, gd::ArbitraryObjectsWorker &worker) const {}
+
+void EventBasedBehaviorBrowser::ExposeFunctions(
+    gd::Project &project, gd::ArbitraryEventsFunctionsWorker &worker) const {
+  worker.Launch(eventsBasedBehavior.GetEventsFunctions());
+}
+
+void EventBasedBehaviorBrowser::ExposeEventBasedBehaviors(
+    gd::Project &project,
+    gd::ArbitraryEventBasedBehaviorsWorker &worker) const {
+  worker.Launch(eventsBasedBehavior);
+}
+
+void EventBasedBehaviorBrowser::ExposeBehaviorSharedDatas(
+    gd::Project &project, gd::ArbitraryBehaviorSharedDataWorker &worker) const {}
+
+} // namespace gd

Core/GDCore/IDE/EventBasedBehaviorBrowser.h

@@ -0,0 +1,86 @@
+/*
+ * 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/IDE/ProjectBrowser.h"
+
+namespace gd {
+class Project;
+class String;
+class EventsFunctionsExtension;
+class EventsFunction;
+class EventsBasedBehavior;
+class EventsBasedObject;
+class ArbitraryEventsWorker;
+class ArbitraryEventsWorkerWithContext;
+class ArbitraryEventsFunctionsWorker;
+class ArbitraryObjectsWorker;
+class ArbitraryEventBasedBehaviorsWorker;
+class ArbitraryBehaviorSharedDataWorker;
+} // namespace gd
+
+namespace gd {
+
+/**
+ * \brief Expose event-based behavior contents to workers.
+ */
+class GD_CORE_API EventBasedBehaviorBrowser : public ProjectBrowser {
+public:
+  EventBasedBehaviorBrowser(gd::EventsBasedBehavior &eventsBasedBehavior_)
+      : eventsBasedBehavior(eventsBasedBehavior_) {}
+
+  /**
+   * \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 event-based behavior.
+   */
+  void ExposeEvents(gd::Project &project,
+                    gd::ArbitraryEventsWorker &worker) const override;
+
+  /**
+   * \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 event-based behavior.
+   */
+  void
+  ExposeEvents(gd::Project &project,
+               gd::ArbitraryEventsWorkerWithContext &worker) const override;
+
+  /**
+   * \brief Call the specified worker on all functions of the event-based behavior
+   *
+   * This should be the preferred way to traverse all the function signatures
+   * of an event-based behavior.
+   */
+  void ExposeFunctions(gd::Project &project,
+                       gd::ArbitraryEventsFunctionsWorker &worker) const override;
+
+  /**
+   * \brief Do nothing.
+   */
+  void ExposeObjects(gd::Project &project,
+                     gd::ArbitraryObjectsWorker &worker) const override;
+
+  /**
+   * \brief Call the specified worker on the event-based behavior.
+   */
+  void ExposeEventBasedBehaviors(
+      gd::Project &project,
+      gd::ArbitraryEventBasedBehaviorsWorker &worker) const override;
+
+  /**
+   * \brief Do nothing.
+   */
+  void ExposeBehaviorSharedDatas(gd::Project &project,
+                         gd::ArbitraryBehaviorSharedDataWorker &worker) const override;
+
+private:
+  gd::EventsBasedBehavior &eventsBasedBehavior;
+};
+
+} // namespace gd

Core/GDCore/IDE/Events/ArbitraryEventsWorker.cpp

@@ -23,7 +23,7 @@ void ArbitraryEventsWorker::VisitEventList(gd::EventsList& events) {
   DoVisitEventList(events);
 
   for (std::size_t i = 0; i < events.size();) {
-    if (VisitEvent(events[i]))
+    if (events[i].AcceptVisitor(*this))
       events.RemoveEvent(i);
     else {
       if (events[i].CanHaveSubEvents())
@@ -50,6 +50,10 @@ bool ArbitraryEventsWorker::VisitEvent(gd::BaseEvent& event) {
   return false;
 }
 
+bool ArbitraryEventsWorker::VisitLinkEvent(gd::LinkEvent& linkEvent) {
+  return DoVisitLinkEvent(linkEvent);
+}
+
 void ArbitraryEventsWorker::VisitInstructionList(
     gd::InstructionsList& instructions, bool areConditions) {
   DoVisitInstructionList(instructions, areConditions);
@@ -80,7 +84,7 @@ void ReadOnlyArbitraryEventsWorker::VisitEventList(const gd::EventsList& events)
   DoVisitEventList(events);
 
   for (std::size_t i = 0; i < events.size(); ++i) {
-    VisitEvent(events[i]);
+    events[i].AcceptVisitor(*this);
 
     if (events[i].CanHaveSubEvents()) {
       VisitEventList(events[i].GetSubEvents());
@@ -103,6 +107,10 @@ void ReadOnlyArbitraryEventsWorker::VisitEvent(const gd::BaseEvent& event) {
   }
 }
 
+void ReadOnlyArbitraryEventsWorker::VisitLinkEvent(const gd::LinkEvent& linkEvent) {
+  DoVisitLinkEvent(linkEvent);
+}
+
 void ReadOnlyArbitraryEventsWorker::VisitInstructionList(
     const gd::InstructionsList& instructions, bool areConditions) {
   DoVisitInstructionList(instructions, areConditions);

Core/GDCore/IDE/Events/ArbitraryEventsWorker.h

@@ -9,10 +9,12 @@
 #include <memory>
 #include <vector>
 #include "GDCore/Events/InstructionsList.h"
+#include "GDCore/Events/EventVisitor.h"
 #include "GDCore/String.h"
 namespace gd {
 class Instruction;
 class BaseEvent;
+class LinkEvent;
 class EventsList;
 class ObjectsContainer;
 }  // namespace gd
@@ -28,7 +30,7 @@ namespace gd {
  *
  * \ingroup IDE
  */
-class GD_CORE_API ArbitraryEventsWorker {
+class GD_CORE_API ArbitraryEventsWorker : private EventVisitor {
  public:
   ArbitraryEventsWorker(){};
   virtual ~ArbitraryEventsWorker();
@@ -40,7 +42,8 @@ class GD_CORE_API ArbitraryEventsWorker {
 
  private:
   void VisitEventList(gd::EventsList& events);
-  bool VisitEvent(gd::BaseEvent& event);
+  bool VisitEvent(gd::BaseEvent& event) override;
+  bool VisitLinkEvent(gd::LinkEvent& linkEvent) override;
   void VisitInstructionList(gd::InstructionsList& instructions,
                             bool areConditions);
   bool VisitInstruction(gd::Instruction& instruction, bool isCondition);
@@ -52,11 +55,21 @@ class GD_CORE_API ArbitraryEventsWorker {
 
   /**
    * Called to do some work on an event
-   * \return true if the instruction must be deleted from the events list, false
+   * \return true if the event must be deleted from the events list, false
    * otherwise (default).
    */
   virtual bool DoVisitEvent(gd::BaseEvent& event) { return false; };
 
+  /**
+   * Called to do some work on a link event.
+   * 
+   * Note that DoVisitEvent is also called with this event.
+   * 
+   * \return true if the event must be deleted from the events list, false
+   * otherwise (default).
+   */
+  virtual bool DoVisitLinkEvent(gd::LinkEvent& event) { return false; };
+
   /**
    * Called to do some work on an instruction list
    */
@@ -129,7 +142,7 @@ class GD_CORE_API ArbitraryEventsWorkerWithContext
  *
  * \ingroup IDE
  */
-class GD_CORE_API ReadOnlyArbitraryEventsWorker {
+class GD_CORE_API ReadOnlyArbitraryEventsWorker : private ReadOnlyEventVisitor {
  public:
   ReadOnlyArbitraryEventsWorker(){};
   virtual ~ReadOnlyArbitraryEventsWorker();
@@ -141,7 +154,8 @@ class GD_CORE_API ReadOnlyArbitraryEventsWorker {
 
  private:
   void VisitEventList(const gd::EventsList& events);
-  void VisitEvent(const gd::BaseEvent& event);
+  void VisitEvent(const gd::BaseEvent& event) override;
+  void VisitLinkEvent(const gd::LinkEvent& linkEvent) override;
   void VisitInstructionList(const gd::InstructionsList& instructions,
                             bool areConditions);
   void VisitInstruction(const gd::Instruction& instruction, bool isCondition);
@@ -156,6 +170,13 @@ class GD_CORE_API ReadOnlyArbitraryEventsWorker {
    */
   virtual void DoVisitEvent(const gd::BaseEvent& event) {};
 
+  /**
+   * Called to do some work on a link event.
+   * 
+   * Note that DoVisitEvent is also called with this event.
+   */
+  virtual void DoVisitLinkEvent(const gd::LinkEvent& linkEvent) {};
+
   /**
    * Called to do some work on an instruction list
    */

Core/GDCore/IDE/Events/BehaviorTypeRenamer.h

@@ -8,13 +8,10 @@
 #define GDCORE_BEHAVIORTYPERENAMER_H
 #include <set>
 
-#include "GDCore/Events/Parsers/ExpressionParser2NodeWorker.h"
-#include "GDCore/IDE/Events/ArbitraryEventsWorker.h"
 #include "GDCore/IDE/Project/ArbitraryObjectsWorker.h"
 #include "GDCore/String.h"
 
 namespace gd {
-class Project;
 class Object;
 class Behavior;
 }  // namespace gd
@@ -23,17 +20,15 @@ namespace gd {
 
 class GD_CORE_API BehaviorTypeRenamer : public ArbitraryObjectsWorker {
  public:
-  BehaviorTypeRenamer(const gd::Project& project_,
-                          const gd::String& oldType_,
-                          const gd::String& newType_)
-      : project(project_), oldType(oldType_), newType(newType_){};
+  BehaviorTypeRenamer(const gd::String& oldType_,
+                      const gd::String& newType_)
+      : oldType(oldType_), newType(newType_){};
   virtual ~BehaviorTypeRenamer();
 
  private:
   void DoVisitObject(gd::Object& object) override;
   void DoVisitBehavior(gd::Behavior& behavior) override;
 
-  const gd::Project& project;
   gd::String oldType;
   gd::String newType;
 };

Core/GDCore/IDE/Events/CustomObjectTypeRenamer.h

@@ -8,13 +8,10 @@
 #define GDCORE_CUSTOMOBJECTTYPERENAMER_H
 #include <set>
 
-#include "GDCore/Events/Parsers/ExpressionParser2NodeWorker.h"
-#include "GDCore/IDE/Events/ArbitraryEventsWorker.h"
 #include "GDCore/IDE/Project/ArbitraryObjectsWorker.h"
 #include "GDCore/String.h"
 
 namespace gd {
-class Project;
 class Object;
 class Behavior;
 }  // namespace gd
@@ -23,17 +20,15 @@ namespace gd {
 
 class GD_CORE_API CustomObjectTypeRenamer : public ArbitraryObjectsWorker {
  public:
-  CustomObjectTypeRenamer(const gd::Project& project_,
-                          const gd::String& oldType_,
+  CustomObjectTypeRenamer(const gd::String& oldType_,
                           const gd::String& newType_)
-      : project(project_), oldType(oldType_), newType(newType_){};
+      : oldType(oldType_), newType(newType_){};
   virtual ~CustomObjectTypeRenamer();
 
  private:
   void DoVisitObject(gd::Object& object) override;
   void DoVisitBehavior(gd::Behavior& behavior) override;
 
-  const gd::Project& project;
   gd::String oldType;
   gd::String newType;
 };

Core/GDCore/IDE/Events/EventsIdentifiersFinder.cpp

@@ -202,7 +202,7 @@ std::set<gd::String> EventsIdentifiersFinder::FindAllIdentifierExpressions(
   std::set<gd::String> results;
 
   const bool isObjectIdentifier = identifierType.find("object") == 0;
-  // The object from the context is only relevent for object identifiers.
+  // The object from the context is only relevant for object identifiers.
   auto& actualObjectName = isObjectIdentifier ? contextObjectName : "";
 
   FindArgumentsInEventsAndDependencies(

Core/GDCore/IDE/Events/ExpressionValidator.cpp

@@ -77,24 +77,42 @@ ExpressionValidator::Type ExpressionValidator::ValidateFunction(const gd::Functi
       MetadataProvider::GetBehaviorAnyExpressionMetadata(
             platform, behaviorType, function.functionName);
 
-  if (!function.objectName.empty()) {
-    // If the function needs a capability on the object that may not be covered
-    // by all objects, check it now.
-    if (!metadata.GetRequiredBaseObjectCapability().empty()) {
-      const gd::ObjectMetadata &objectMetadata =
-          MetadataProvider::GetObjectMetadata(platform, objectType);
+  Type returnType = StringToType(metadata.GetReturnType());
 
-      if (objectMetadata.IsUnsupportedBaseObjectCapability(
-              metadata.GetRequiredBaseObjectCapability())) {
-        RaiseTypeError(
-            _("This expression exists, but it can't be used on this object."),
-            function.objectNameLocation);
-        return StringToType(metadata.GetReturnType());
-      }
-    }
+  if (!function.objectName.empty() &&
+      !globalObjectsContainer.HasObjectNamed(function.objectName) &&
+      !globalObjectsContainer.GetObjectGroups().Has(function.objectName) &&
+      !objectsContainer.HasObjectNamed(function.objectName) &&
+      !objectsContainer.GetObjectGroups().Has(function.objectName)) {
+    RaiseTypeError(_("This object doesn't exist."),
+                   function.objectNameLocation, /*isFatal=*/false);
+    return returnType;
   }
 
-  Type returnType = StringToType(metadata.GetReturnType());
+  if (!function.behaviorName.empty() &&
+      !gd::HasBehaviorInObjectOrGroup(globalObjectsContainer, objectsContainer,
+                                     function.objectName,
+                                     function.behaviorName)) {
+    RaiseTypeError(_("This behavior is not attached to this object."),
+                   function.behaviorNameLocation, /*isFatal=*/false);
+    return returnType;
+  }
+
+  if (!function.objectName.empty() &&
+    // If the function needs a capability on the object that may not be covered
+    // by all objects, check it now.
+  !metadata.GetRequiredBaseObjectCapability().empty()) {
+    const gd::ObjectMetadata &objectMetadata =
+        MetadataProvider::GetObjectMetadata(platform, objectType);
+
+    if (objectMetadata.IsUnsupportedBaseObjectCapability(
+            metadata.GetRequiredBaseObjectCapability())) {
+      RaiseTypeError(
+          _("This expression exists, but it can't be used on this object."),
+          function.objectNameLocation);
+      return returnType;
+    }
+  }
 
   if (gd::MetadataProvider::IsBadExpressionMetadata(metadata)) {
     RaiseError(
@@ -115,8 +133,8 @@ ExpressionValidator::Type ExpressionValidator::ValidateFunction(const gd::Functi
             "number to a string."),
           function.location);
       return returnType;
-    }
-    else if (parentType != Type::Number && parentType != Type::NumberOrString) {
+    } else if (parentType != Type::Number &&
+               parentType != Type::NumberOrString) {
       RaiseTypeError(_("You tried to use an expression that returns a "
                               "number, but another type is expected:") +
                               " " + TypeToString(parentType),
@@ -131,8 +149,8 @@ ExpressionValidator::Type ExpressionValidator::ValidateFunction(const gd::Functi
             "string to a number."),
           function.location);
       return returnType;
-    }
-    else if (parentType != Type::String && parentType != Type::NumberOrString) {
+    } else if (parentType != Type::String &&
+               parentType != Type::NumberOrString) {
       RaiseTypeError(_("You tried to use an expression that returns a "
                               "string, but another type is expected:") +
                               " " + TypeToString(parentType),
@@ -172,8 +190,7 @@ ExpressionValidator::Type ExpressionValidator::ValidateFunction(const gd::Functi
           _("You have not entered enough parameters for the expression.") + " " +
               expectedCountMessage,
           function.location);
-    }
-    else {
+    } else {
       RaiseError(
           "extra_parameter",
           _("This parameter was not expected by this expression. Remove it "
@@ -217,8 +234,7 @@ ExpressionValidator::Type ExpressionValidator::ValidateFunction(const gd::Functi
                     "parameter."),
                 parameter->location);
         }
-      }
-      else if (gd::ParameterMetadata::IsObject(expectedParameterType)) {
+      } else if (gd::ParameterMetadata::IsObject(expectedParameterType)) {
         if (dynamic_cast<IdentifierNode *>(parameter.get()) == nullptr) {
           RaiseError(
                   "malformed_object_parameter",

Core/GDCore/IDE/Events/ExpressionValidator.h

@@ -45,7 +45,7 @@ class GD_CORE_API ExpressionValidator : public ExpressionParser2NodeWorker {
 
   /**
    * \brief Helper function to check if a given node does not contain
-   * any error.
+   * any error including non-fatal ones.
    */
   static bool HasNoErrors(const gd::Platform &platform,
                       const gd::ObjectsContainer &globalObjectsContainer,
@@ -54,16 +54,25 @@ class GD_CORE_API ExpressionValidator : public ExpressionParser2NodeWorker {
                       gd::ExpressionNode& node) {
     gd::ExpressionValidator validator(platform, globalObjectsContainer, objectsContainer, rootType);
     node.Visit(validator);
-    return validator.GetErrors().empty();
+    return validator.GetAllErrors().empty();
   }
 
+  /**
+   * \brief Get only the fatal errors
+   *
+   * Expressions with fatal error can't be generated.
+   */
+  const std::vector<ExpressionParserDiagnostic*>& GetFatalErrors() {
+    return fatalErrors;
+  };
+
   /**
    * \brief Get all the errors
    *
    * No errors means that the expression is valid.
    */
-  const std::vector<ExpressionParserDiagnostic*>& GetErrors() {
-    return errors;
+  const std::vector<ExpressionParserDiagnostic*>& GetAllErrors() {
+    return allErrors;
   };
 
  protected:
@@ -150,12 +159,29 @@ class GD_CORE_API ExpressionValidator : public ExpressionParser2NodeWorker {
   void OnVisitNumberNode(NumberNode& node) override {
     ReportAnyError(node);
     childType = Type::Number;
-    CheckType(parentType, childType, node.location);
+    if (parentType == Type::String) {
+      RaiseTypeError(
+          _("You entered a number, but a text was expected (in quotes)."),
+          node.location);
+    } else if (parentType != Type::Number &&
+               parentType != Type::NumberOrString) {
+      RaiseTypeError(_("You entered a number, but this type was expected:") +
+                         " " + TypeToString(parentType),
+                     node.location);
+    }
   }
   void OnVisitTextNode(TextNode& node) override {
     ReportAnyError(node);
     childType = Type::String;
-    CheckType(parentType, childType, node.location);
+    if (parentType == Type::Number) {
+      RaiseTypeError(_("You entered a text, but a number was expected."),
+                     node.location);
+    } else if (parentType != Type::String &&
+               parentType != Type::NumberOrString) {
+      RaiseTypeError(_("You entered a text, but this type was expected:") +
+                         " " + TypeToString(parentType),
+                     node.location);
+    }
   }
   void OnVisitVariableNode(VariableNode& node) override {
     ReportAnyError(node);
@@ -163,7 +189,21 @@ class GD_CORE_API ExpressionValidator : public ExpressionParser2NodeWorker {
       node.child->Visit(*this);
     }
     childType = Type::Variable;
-    CheckType(parentType, childType, node.location);
+    if (parentType == Type::String) {
+      RaiseTypeError(_("Variables must be surrounded by VariableString()."),
+                     node.location);
+    } else if (parentType == Type::Number) {
+      RaiseTypeError(_("Variables must be surrounded by Variable()."),
+                     node.location);
+    } else if (parentType == Type::NumberOrString) {
+      RaiseTypeError(
+          _("Variables must be surrounded by Variable() or VariableString()."),
+          node.location);
+    } else if (parentType != Type::Variable) {
+      RaiseTypeError(_("You entered a variable, but this type was expected:") +
+                         " " + TypeToString(parentType),
+                     node.location);
+    }
   }
   void OnVisitVariableAccessorNode(VariableAccessorNode& node) override {
     ReportAnyError(node);
@@ -239,20 +279,26 @@ class GD_CORE_API ExpressionValidator : public ExpressionParser2NodeWorker {
   enum Type {Unknown = 0, Number, String, NumberOrString, Variable, Object, Empty};
   Type ValidateFunction(const gd::FunctionCallNode& function);
 
-  void ReportAnyError(const ExpressionNode& node) {
+  void ReportAnyError(const ExpressionNode& node, bool isFatal = true) {
     if (node.diagnostic && node.diagnostic->IsError()) {
       // Syntax errors are holden by the AST nodes.
       // It's fine to give pointers on them as the AST live longer than errors
       // handling.
-      errors.push_back(node.diagnostic.get());
+      allErrors.push_back(node.diagnostic.get());
+      if (isFatal) {
+        fatalErrors.push_back(node.diagnostic.get());
+      }
     }
   }
 
   void RaiseError(const gd::String &type, 
-      const gd::String &message, const ExpressionParserLocation &location) {
+      const gd::String &message, const ExpressionParserLocation &location, bool isFatal = true) {
     auto diagnostic = gd::make_unique<ExpressionParserError>(
         type, message, location);
-    errors.push_back(diagnostic.get());
+    allErrors.push_back(diagnostic.get());
+    if (isFatal) {
+      fatalErrors.push_back(diagnostic.get());
+    }
     // Errors found by the validator are not holden by the AST nodes.
     // They must be owned by the validator to keep living while errors are
     // handled by the caller.
@@ -260,8 +306,8 @@ class GD_CORE_API ExpressionValidator : public ExpressionParser2NodeWorker {
   }
 
   void RaiseTypeError(
-      const gd::String &message, const ExpressionParserLocation &location) {
-    RaiseError("type_error", message, location);
+      const gd::String &message, const ExpressionParserLocation &location, bool isFatal = true) {
+    RaiseError("type_error", message, location, isFatal);
   }
 
   void RaiseOperatorError(
@@ -269,32 +315,6 @@ class GD_CORE_API ExpressionValidator : public ExpressionParser2NodeWorker {
     RaiseError("invalid_operator", message, location);
   }
 
-  void CheckType(Type expect, Type actual, const ExpressionParserLocation &location) {
-    if (actual == Type::String) {
-      if (expect == Type::Number) {
-        RaiseTypeError(_("You entered a text, but a number was expected."),
-                           location);
-      }
-      else if (expect != Type::String && expect != Type::NumberOrString) {
-        RaiseTypeError(
-            _("You entered a text, but this type was expected:") + " " + TypeToString(expect),
-            location);
-      }
-    }
-    else if (actual == Type::Number) {
-      if (expect == Type::String) {
-        RaiseTypeError(
-            _("You entered a number, but a text was expected (in quotes)."),
-            location);
-      }
-      else if (expect != Type::Number && expect != Type::NumberOrString) {
-        RaiseTypeError(
-            _("You entered a number, but this type was expected:") + " " + TypeToString(expect),
-            location);
-      }
-    }
-  }
-
   static Type StringToType(const gd::String &type);
   static const gd::String &TypeToString(Type type);
   static const gd::String unknownTypeString;
@@ -306,7 +326,8 @@ class GD_CORE_API ExpressionValidator : public ExpressionParser2NodeWorker {
   static const gd::String identifierTypeString;
   static const gd::String emptyTypeString;
 
-  std::vector<ExpressionParserDiagnostic*> errors;
+  std::vector<ExpressionParserDiagnostic*> fatalErrors;
+  std::vector<ExpressionParserDiagnostic*> allErrors;
   std::vector<std::unique_ptr<ExpressionParserDiagnostic>> supplementalErrors;
   Type childType;
   Type parentType;

Core/GDCore/IDE/Events/InstructionsCountEvaluator.cpp

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

Core/GDCore/IDE/Events/InstructionsCountEvaluator.h

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

Core/GDCore/IDE/Events/LinkEventTargetRenamer.cpp

@@ -0,0 +1,33 @@
+/*
+ * GDevelop Core
+ * Copyright 2008-2016 Florian Rival (Florian.Rival@gmail.com). All rights
+ * reserved. This project is released under the MIT License.
+ */
+#include "LinkEventTargetRenamer.h"
+
+#include <map>
+#include <memory>
+#include <vector>
+
+#include "GDCore/Events/Builtin/LinkEvent.h"
+#include "GDCore/Events/Event.h"
+#include "GDCore/Events/EventsList.h"
+#include "GDCore/Project/Layout.h"
+#include "GDCore/Project/Project.h"
+#include "GDCore/String.h"
+#include "GDCore/Tools/Log.h"
+
+namespace gd {
+
+bool LinkEventTargetRenamer::DoVisitLinkEvent(gd::LinkEvent &linkEvent) {
+
+  if (linkEvent.GetTarget() == oldName) {
+    linkEvent.SetTarget(newName);
+  }
+
+  return false;
+}
+
+LinkEventTargetRenamer::~LinkEventTargetRenamer() {}
+
+} // namespace gd

Core/GDCore/IDE/Events/LinkEventTargetRenamer.h

@@ -0,0 +1,44 @@
+/*
+ * 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/IDE/Events/ArbitraryEventsWorker.h"
+#include "GDCore/String.h"
+#include <map>
+#include <memory>
+#include <vector>
+
+namespace gd {
+class BaseEvent;
+class LinkEvent;
+class Platform;
+class EventsList;
+} // namespace gd
+
+namespace gd {
+
+/**
+ * \brief Replace in link events the name of external events.
+ *
+ * \ingroup IDE
+ */
+class GD_CORE_API LinkEventTargetRenamer
+    : public ArbitraryEventsWorkerWithContext {
+public:
+  LinkEventTargetRenamer(const gd::Platform &platform_,
+                         const gd::String &oldName_, const gd::String &newName_)
+      : platform(platform_), oldName(oldName_), newName(newName_){};
+  virtual ~LinkEventTargetRenamer();
+
+private:
+  bool DoVisitLinkEvent(gd::LinkEvent &linkEvent) override;
+
+  const gd::Platform &platform;
+  gd::String oldName;
+  gd::String newName;
+};
+
+} // namespace gd

Core/GDCore/IDE/Events/ProjectElementRenamer.cpp

@@ -0,0 +1,198 @@
+/*
+ * GDevelop Core
+ * Copyright 2008-2016 Florian Rival (Florian.Rival@gmail.com). All rights
+ * reserved. This project is released under the MIT License.
+ */
+#include "ProjectElementRenamer.h"
+
+#include <map>
+#include <memory>
+#include <vector>
+
+#include "GDCore/Events/Event.h"
+#include "GDCore/Events/EventsList.h"
+#include "GDCore/Events/Parsers/ExpressionParser2NodePrinter.h"
+#include "GDCore/Events/Parsers/ExpressionParser2NodeWorker.h"
+#include "GDCore/Extensions/Metadata/MetadataProvider.h"
+#include "GDCore/Extensions/Metadata/ParameterMetadataTools.h"
+#include "GDCore/IDE/Events/ExpressionValidator.h"
+#include "GDCore/Project/Layout.h"
+#include "GDCore/Project/Project.h"
+#include "GDCore/String.h"
+#include "GDCore/Tools/Log.h"
+
+namespace gd {
+
+/**
+ * \brief Go through the nodes and find every function call parameter of a
+ * given type.
+ *
+ * \see gd::ExpressionParser2
+ */
+class GD_CORE_API ExpressionIdentifierStringFinder
+    : public ExpressionParser2NodeWorker {
+public:
+  ExpressionIdentifierStringFinder(
+      const gd::Platform &platform_,
+      const gd::ObjectsContainer &globalObjectsContainer_,
+      const gd::ObjectsContainer &objectsContainer_,
+      const gd::String &expressionPlainString_,
+      const gd::String &parameterType_, const gd::String &objectName_,
+      const gd::String &layerName_, const gd::String &oldName_)
+      : platform(platform_), globalObjectsContainer(globalObjectsContainer_),
+        objectsContainer(objectsContainer_),
+        expressionPlainString(expressionPlainString_),
+        parameterType(parameterType_), objectName(objectName_),
+        layerName(layerName_), oldName(oldName_){};
+  virtual ~ExpressionIdentifierStringFinder(){};
+
+  const std::vector<gd::ExpressionParserLocation> GetOccurrences() const {
+    return occurrences;
+  }
+
+protected:
+  void OnVisitSubExpressionNode(SubExpressionNode &node) override {
+    node.expression->Visit(*this);
+  }
+  void OnVisitOperatorNode(OperatorNode &node) override {
+    node.leftHandSide->Visit(*this);
+    node.rightHandSide->Visit(*this);
+  }
+  void OnVisitUnaryOperatorNode(UnaryOperatorNode &node) override {
+    node.factor->Visit(*this);
+  }
+  void OnVisitNumberNode(NumberNode &node) override {}
+  void OnVisitTextNode(TextNode &node) override {}
+  void OnVisitVariableNode(VariableNode &node) override {
+    if (node.child)
+      node.child->Visit(*this);
+  }
+  void OnVisitVariableAccessorNode(VariableAccessorNode &node) override {
+    if (node.child)
+      node.child->Visit(*this);
+  }
+  void OnVisitVariableBracketAccessorNode(
+      VariableBracketAccessorNode &node) override {
+    node.expression->Visit(*this);
+    if (node.child)
+      node.child->Visit(*this);
+  }
+  void OnVisitIdentifierNode(IdentifierNode &node) override {}
+  void OnVisitObjectFunctionNameNode(ObjectFunctionNameNode &node) override {}
+  void OnVisitFunctionCallNode(FunctionCallNode &node) override {
+    gd::String lastLayerName;
+    gd::ParameterMetadataTools::IterateOverParametersWithIndex(
+        platform, globalObjectsContainer, objectsContainer, node,
+        [&](const gd::ParameterMetadata &parameterMetadata,
+            std::unique_ptr<gd::ExpressionNode> &parameterNode,
+            size_t parameterIndex, const gd::String &lastObjectName) {
+          if (parameterMetadata.GetType() == "layer") {
+            // Remove quotes, it won't match if it's not a literal anyway.
+            lastLayerName = expressionPlainString.substr(
+                parameterNode->location.GetStartPosition() + 1,
+                parameterNode->location.GetEndPosition() -
+                    parameterNode->location.GetStartPosition() - 2);
+          }
+          if (parameterMetadata.GetType() == parameterType) {
+            auto parameterExpressionPlainString = expressionPlainString.substr(
+                parameterNode->location.GetStartPosition(),
+                parameterNode->location.GetEndPosition() -
+                    parameterNode->location.GetStartPosition());
+            if ((objectName.empty() || lastObjectName == objectName) &&
+                (layerName.empty() || lastLayerName == layerName) &&
+                parameterExpressionPlainString == "\"" + oldName + "\"") {
+              occurrences.push_back(parameterNode->location);
+            } else {
+              parameterNode->Visit(*this);
+            }
+          }
+        });
+  }
+  void OnVisitEmptyNode(EmptyNode &node) override {}
+
+private:
+  const gd::Platform &platform;
+  const gd::ObjectsContainer &globalObjectsContainer;
+  const gd::ObjectsContainer &objectsContainer;
+  /// It's used to extract parameter content.
+  const gd::String &expressionPlainString;
+  const gd::String &oldName;
+  /// The type of parameter to check.
+  const gd::String parameterType;
+  /// If not empty, parameters will be taken into account only if related to
+  /// this object.
+  const gd::String objectName;
+  /// If not empty, parameters will be taken into account only if related to
+  /// this layer.
+  const gd::String layerName;
+  std::vector<gd::ExpressionParserLocation> occurrences;
+};
+
+bool ProjectElementRenamer::DoVisitInstruction(gd::Instruction &instruction,
+                                               bool isCondition) {
+  const auto &metadata = isCondition
+                             ? gd::MetadataProvider::GetConditionMetadata(
+                                   platform, instruction.GetType())
+                             : gd::MetadataProvider::GetActionMetadata(
+                                   platform, instruction.GetType());
+
+  gd::String lastLayerName;
+  gd::ParameterMetadataTools::IterateOverParametersWithIndex(
+      instruction.GetParameters(), metadata.GetParameters(),
+      [&](const gd::ParameterMetadata &parameterMetadata,
+          const gd::Expression &parameterValue, size_t parameterIndex,
+          const gd::String &lastObjectName) {
+        if (parameterMetadata.GetType() == "layer") {
+          // Remove quotes, it won't match if it's not a literal anyway.
+          lastLayerName = parameterValue.GetPlainString().substr(
+              1, parameterValue.GetPlainString().length() - 2);
+        }
+
+        if (parameterMetadata.GetType() == parameterType &&
+            (objectName.empty() || lastObjectName == objectName) &&
+            (layerName.empty() || lastLayerName == layerName)) {
+          if (parameterValue.GetPlainString() == "\"" + oldName + "\"") {
+            instruction.SetParameter(parameterIndex,
+                                     gd::Expression("\"" + newName + "\""));
+          }
+        }
+        auto node = parameterValue.GetRootNode();
+        if (node) {
+          ExpressionIdentifierStringFinder finder(
+              platform, GetGlobalObjectsContainer(), GetObjectsContainer(),
+              parameterValue.GetPlainString(), parameterType, objectName,
+              layerName, oldName);
+          node->Visit(finder);
+
+          if (finder.GetOccurrences().size() > 0) {
+
+            gd::String newNameWithQuotes = "\"" + newName + "\"";
+            gd::String oldParameterValue = parameterValue.GetPlainString();
+            gd::String newParameterValue;
+            auto previousEndPosition = 0;
+            for (auto &&occurrenceLocation : finder.GetOccurrences()) {
+              newParameterValue += oldParameterValue.substr(
+                  previousEndPosition,
+                  occurrenceLocation.GetStartPosition() - previousEndPosition);
+              newParameterValue += newNameWithQuotes;
+
+              previousEndPosition = occurrenceLocation.GetEndPosition();
+            }
+            if (previousEndPosition < oldParameterValue.size()) {
+              newParameterValue += oldParameterValue.substr(
+                  previousEndPosition,
+                  oldParameterValue.size() - previousEndPosition);
+            }
+
+            instruction.SetParameter(parameterIndex,
+                                     gd::Expression(newParameterValue));
+          }
+        }
+      });
+
+  return false;
+}
+
+ProjectElementRenamer::~ProjectElementRenamer() {}
+
+} // namespace gd

Core/GDCore/IDE/Events/ProjectElementRenamer.h

@@ -0,0 +1,63 @@
+/*
+ * 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/IDE/Events/ArbitraryEventsWorker.h"
+#include "GDCore/String.h"
+#include <map>
+#include <memory>
+#include <vector>
+
+namespace gd {
+class BaseEvent;
+class Platform;
+class EventsList;
+} // namespace gd
+
+namespace gd {
+
+/**
+ * \brief Replace in expressions and in parameters of actions or conditions
+ * occurrences of project element name. For instance, it can be layouts or
+ * object effects.
+ *
+ * \ingroup IDE
+ */
+class GD_CORE_API ProjectElementRenamer
+    : public ArbitraryEventsWorkerWithContext {
+public:
+  ProjectElementRenamer(const gd::Platform &platform_,
+                        const gd::String &parameterType_,
+                        const gd::String &oldName_, const gd::String &newName_)
+      : platform(platform_), parameterType(parameterType_), oldName(oldName_),
+        newName(newName_){};
+  virtual ~ProjectElementRenamer();
+
+  void SetObjectConstraint(const gd::String &objectName_) {
+    objectName = objectName_;
+  }
+
+  void SetLayerConstraint(const gd::String &layerName_) {
+    layerName = layerName_;
+  }
+
+private:
+  bool DoVisitInstruction(gd::Instruction &instruction,
+                          bool isCondition) override;
+
+  const gd::Platform &platform;
+  const gd::String parameterType;
+  /// If not empty, parameters will be taken into account only if related to
+  /// this object.
+  gd::String objectName;
+  /// If not empty, parameters will be taken into account only if related to
+  /// this layer.
+  gd::String layerName;
+  const gd::String oldName;
+  const gd::String newName;
+};
+
+} // namespace gd

Core/GDCore/IDE/Events/UsedExtensionsFinder.cpp

@@ -4,6 +4,7 @@
 #include "GDCore/Extensions/Metadata/MetadataProvider.h"
 #include "GDCore/Extensions/Metadata/ParameterMetadataTools.h"
 #include "GDCore/Extensions/PlatformExtension.h"
+#include "GDCore/IDE/ProjectBrowserHelper.h"
 #include "GDCore/IDE/WholeProjectRefactorer.h"
 #include "GDCore/IDE/Events/ExpressionTypeFinder.h"
 #include "GDCore/Project/Behavior.h"
@@ -14,8 +15,8 @@ namespace gd {
 
 const UsedExtensionsResult UsedExtensionsFinder::ScanProject(gd::Project& project) {
   UsedExtensionsFinder worker(project);
-  gd::WholeProjectRefactorer::ExposeProjectObjects(project, worker);
-  gd::WholeProjectRefactorer::ExposeProjectEvents(project, worker);
+  gd::ProjectBrowserHelper::ExposeProjectObjects(project, worker);
+  gd::ProjectBrowserHelper::ExposeProjectEvents(project, worker);
   return worker.result;
 };
 
@@ -81,7 +82,7 @@ bool UsedExtensionsFinder::DoVisitInstruction(gd::Instruction& instruction,
 
 // Expressions scanner
 
-// Ignore litterals nodes
+// Ignore literals nodes
 void UsedExtensionsFinder::OnVisitNumberNode(NumberNode& node){};
 void UsedExtensionsFinder::OnVisitTextNode(TextNode& node){};
 

Core/GDCore/IDE/ExtensionsLoader.cpp

@@ -144,7 +144,7 @@ void ExtensionsLoader::LoadExtension(const gd::String &fullpath,
                                      bool forgiving) {
   if (platform.GetExtensionCreateFunctionName().empty()) {
     cout << "Unable to load extension " << fullpath << ":" << endl;
-    cout << "The plaftorm does not support extensions creation." << endl;
+    cout << "The platform does not support extensions creation." << endl;
     return;
   }
 

Core/GDCore/IDE/ExtensionsLoader.h

@@ -35,7 +35,7 @@ class GD_CORE_API ExtensionsLoader {
    * \param platform The platform the extensions belongs to.
    * \param forgiving If set to true, files will try to be opened, but a failure
    * when searching for the platform creation function symbol won't be logged as
-   * an error. (All other errors are still reparted as usual).
+   * an error. (All other errors are still reported as usual).
    *
    * \note Extensions files must have extensions *.xgd(w|l|m)(e),
    * w for Windows, l for Linux, m for Mac, e for Edittime extensions.
@@ -51,7 +51,7 @@ class GD_CORE_API ExtensionsLoader {
    * \param platform The platform the extension belongs to.
    * \param forgiving If set to true, files will try to be opened, but a failure
    * when searching for the platform creation function symbol won't be logged as
-   * an error. (All other errors are still reparted as usual).
+   * an error. (All other errors are still reported as usual).
    */
   static void LoadExtension(const gd::String& fullpath,
                             gd::Platform& platform,

Core/GDCore/IDE/Project/ArbitraryBehaviorSharedDataWorker.cpp

@@ -0,0 +1,37 @@
+/*
+ * GDevelop Core
+ * Copyright 2008-2016 Florian Rival (Florian.Rival@gmail.com). All rights
+ * reserved. This project is released under the MIT License.
+ */
+#include "ArbitraryBehaviorSharedDataWorker.h"
+
+#include <iostream>
+#include <map>
+#include <memory>
+#include <vector>
+
+#include "GDCore/Project/BehaviorsSharedData.h"
+#include "GDCore/String.h"
+
+using namespace std;
+
+namespace gd {
+
+ArbitraryBehaviorSharedDataWorker::~ArbitraryBehaviorSharedDataWorker() {}
+
+void ArbitraryBehaviorSharedDataWorker::VisitSharedDatas(
+    const std::map<gd::String, std::unique_ptr<gd::BehaviorsSharedData>>
+        &sharedDatas) {
+  DoVisitSharedDatas(sharedDatas);
+
+  for (auto &behaviorSharedDataContent : sharedDatas) {
+    VisitSharedData(*behaviorSharedDataContent.second);
+  }
+}
+
+void ArbitraryBehaviorSharedDataWorker::VisitSharedData(
+    gd::BehaviorsSharedData &sharedData) {
+  DoVisitSharedData(sharedData);
+}
+
+} // namespace gd

Core/GDCore/IDE/Project/ArbitraryBehaviorSharedDataWorker.h

@@ -0,0 +1,55 @@
+/*
+ * 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 <map>
+#include <memory>
+#include <vector>
+
+#include "GDCore/String.h"
+#include "GDCore/Tools/SerializableWithNameList.h"
+
+namespace gd {
+class BehaviorsSharedData;
+}  // namespace gd
+
+namespace gd {
+
+/**
+ * \brief ArbitraryBehaviorSharedDataWorker is an abstract class used to browse
+ * shared data and do some work on them. It can be used to implement
+ * refactoring for example.
+ *
+ * \ingroup IDE
+ */
+class GD_CORE_API ArbitraryBehaviorSharedDataWorker {
+ public:
+  ArbitraryBehaviorSharedDataWorker(){};
+  virtual ~ArbitraryBehaviorSharedDataWorker();
+
+  /**
+   * \brief Launch the worker on the specified shared data.
+   */
+  void Launch(const std::map<gd::String, std::unique_ptr<gd::BehaviorsSharedData>>& sharedDatas) { VisitSharedDatas(sharedDatas); };
+
+ private:
+  void VisitSharedDatas(const std::map<gd::String, std::unique_ptr<gd::BehaviorsSharedData>>& sharedDatas);
+  void VisitSharedData(gd::BehaviorsSharedData& behavior);
+
+  /**
+   * Called to do some work on shared data.
+   */
+  virtual void DoVisitSharedDatas(const std::map<gd::String, std::unique_ptr<gd::BehaviorsSharedData>>& sharedDatas){};
+
+  /**
+   * Called to do some work on a shared data.
+   */
+  virtual void DoVisitSharedData(gd::BehaviorsSharedData& sharedData){};
+};
+
+}  // namespace gd
+

Core/GDCore/IDE/Project/ArbitraryEventBasedBehaviorsWorker.cpp

@@ -0,0 +1,34 @@
+/*
+ * GDevelop Core
+ * Copyright 2008-2016 Florian Rival (Florian.Rival@gmail.com). All rights
+ * reserved. This project is released under the MIT License.
+ */
+#include "ArbitraryEventBasedBehaviorsWorker.h"
+
+#include <iostream>
+#include <map>
+#include <memory>
+#include <vector>
+
+#include "GDCore/Project/EventsBasedBehavior.h"
+#include "GDCore/String.h"
+
+using namespace std;
+
+namespace gd {
+
+ArbitraryEventBasedBehaviorsWorker::~ArbitraryEventBasedBehaviorsWorker() {}
+
+void ArbitraryEventBasedBehaviorsWorker::VisitEventBasedBehaviors(gd::SerializableWithNameList<gd::EventsBasedBehavior>& behaviors) {
+  DoVisitEventBasedBehaviors(behaviors);
+
+    for (auto&& eventsBasedBehavior : behaviors.GetInternalVector()) {
+      VisitEventBasedBehavior(*eventsBasedBehavior);
+    }
+}
+
+void ArbitraryEventBasedBehaviorsWorker::VisitEventBasedBehavior(gd::EventsBasedBehavior& behavior) {
+  DoVisitEventBasedBehavior(behavior);
+}
+
+}  // namespace gd

Core/GDCore/IDE/Project/ArbitraryEventBasedBehaviorsWorker.h

@@ -0,0 +1,59 @@
+/*
+ * 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 <map>
+#include <memory>
+#include <vector>
+
+#include "GDCore/String.h"
+#include "GDCore/Tools/SerializableWithNameList.h"
+
+namespace gd {
+class EventsBasedBehavior;
+}  // namespace gd
+
+namespace gd {
+
+/**
+ * \brief ArbitraryEventsFunctionsWorker is an abstract class used to browse
+ * event-based behaviors and do some work on them. It can be used to implement
+ * refactoring for example.
+ *
+ * \ingroup IDE
+ */
+class GD_CORE_API ArbitraryEventBasedBehaviorsWorker {
+ public:
+  ArbitraryEventBasedBehaviorsWorker(){};
+  virtual ~ArbitraryEventBasedBehaviorsWorker();
+
+  /**
+   * \brief Launch the worker on the specified event-based behaviors.
+   */
+  void Launch(gd::SerializableWithNameList<gd::EventsBasedBehavior>& behaviors) { VisitEventBasedBehaviors(behaviors); };
+
+  /**
+   * \brief Launch the worker on the specified event-based behavior.
+   */
+  void Launch(EventsBasedBehavior& behavior) { VisitEventBasedBehavior(behavior); };
+
+ private:
+  void VisitEventBasedBehaviors(gd::SerializableWithNameList<gd::EventsBasedBehavior>& behaviors);
+  void VisitEventBasedBehavior(gd::EventsBasedBehavior& behavior);
+
+  /**
+   * Called to do some work on event-based behaviors.
+   */
+  virtual void DoVisitEventBasedBehaviors(gd::SerializableWithNameList<gd::EventsBasedBehavior>& behaviors){};
+
+  /**
+   * Called to do some work on an event-based behavior.
+   */
+  virtual void DoVisitEventBasedBehavior(gd::EventsBasedBehavior& behavior){};
+};
+
+}  // namespace gd

Core/GDCore/IDE/Project/ArbitraryEventsFunctionsWorker.cpp

@@ -0,0 +1,37 @@
+/*
+ * GDevelop Core
+ * Copyright 2008-2016 Florian Rival (Florian.Rival@gmail.com). All rights
+ * reserved. This project is released under the MIT License.
+ */
+#include "ArbitraryEventsFunctionsWorker.h"
+
+#include <iostream>
+#include <map>
+#include <memory>
+#include <vector>
+
+#include "GDCore/Project/EventsFunction.h"
+#include "GDCore/Project/EventsFunctionsContainer.h"
+#include "GDCore/Extensions/Metadata/ParameterMetadata.h"
+#include "GDCore/String.h"
+
+using namespace std;
+
+namespace gd {
+
+ArbitraryEventsFunctionsWorker::~ArbitraryEventsFunctionsWorker() {}
+
+void ArbitraryEventsFunctionsWorker::VisitEventsFunctionContainer(
+    gd::EventsFunctionsContainer& functions) {
+  DoVisitEventsFunctionsContainer(functions);
+
+  for (auto&& function : functions.GetInternalVector()) {
+    VisitEventsFunction(*function);
+  }
+}
+
+void ArbitraryEventsFunctionsWorker::VisitEventsFunction(gd::EventsFunction& eventsFunction) {
+  DoVisitEventsFunction(eventsFunction);
+}
+
+}  // namespace gd

Core/GDCore/IDE/Project/ArbitraryEventsFunctionsWorker.h

@@ -0,0 +1,55 @@
+/*
+ * 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 <map>
+#include <memory>
+#include <vector>
+
+#include "GDCore/String.h"
+
+namespace gd {
+class EventsFunction;
+class EventsFunctionsContainer;
+class ParameterMetadata;
+}  // namespace gd
+
+namespace gd {
+
+/**
+ * \brief ArbitraryEventsFunctionsWorker is an abstract class used to browse
+ * functions signatures and do some work on them. It can be used to implement
+ * refactoring for example.
+ *
+ * \ingroup IDE
+ */
+class GD_CORE_API ArbitraryEventsFunctionsWorker {
+ public:
+  ArbitraryEventsFunctionsWorker(){};
+  virtual ~ArbitraryEventsFunctionsWorker();
+
+  /**
+   * \brief Launch the worker on the specified function container.
+   */
+  void Launch(gd::EventsFunctionsContainer& functions) { VisitEventsFunctionContainer(functions); };
+
+ private:
+  void VisitEventsFunctionContainer(gd::EventsFunctionsContainer& functions);
+  void VisitEventsFunction(gd::EventsFunction& eventsFunction);
+
+  /**
+   * Called to do some work on an function container.
+   */
+  virtual void DoVisitEventsFunctionsContainer(gd::EventsFunctionsContainer& functions){};
+
+  /**
+   * Called to do some work on a function.
+   */
+  virtual void DoVisitEventsFunction(gd::EventsFunction& eventsFunction){};
+};
+
+}  // namespace gd

Core/GDCore/IDE/Project/ArbitraryObjectsWorker.h

@@ -33,7 +33,7 @@ class GD_CORE_API ArbitraryObjectsWorker {
   virtual ~ArbitraryObjectsWorker();
 
   /**
-   * \brief Launch the worker on the specified events list.
+   * \brief Launch the worker on the specified object container.
    */
   void Launch(gd::ObjectsContainer& objects) { VisitObjectContainer(objects); };
 

Core/GDCore/IDE/Project/ArbitraryResourceWorker.cpp

@@ -45,6 +45,11 @@ void ArbitraryResourceWorker::ExposeTileset(gd::String& tilesetName){
     // do.
 };
 
+void ArbitraryResourceWorker::ExposeModel3D(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.
@@ -66,7 +71,7 @@ void ArbitraryResourceWorker::ExposeAudio(gd::String& audioName) {
     }
   }
 
-  // For compatibility with older projects (where events were refering to files
+  // For compatibility with older projects (where events were referring to files
   // directly), we consider that this resource name is a filename, and so expose
   // it as a file.
   ExposeFile(audioName);
@@ -83,7 +88,7 @@ void ArbitraryResourceWorker::ExposeFont(gd::String& fontName) {
     }
   }
 
-  // For compatibility with older projects (where events were refering to files
+  // For compatibility with older projects (where events were referring to files
   // directly), we consider that this resource name is a filename, and so expose
   // it as a file.
   ExposeFile(fontName);
@@ -146,6 +151,8 @@ void ArbitraryResourceWorker::ExposeEmbeddeds(gd::String& resourceName) {
             ExposeTileset(potentiallyUpdatedTargetResourceName);
           } else if (targetResourceKind == "video") {
             ExposeVideo(potentiallyUpdatedTargetResourceName);
+          } else if (targetResourceKind == "model3D") {
+            ExposeModel3D(potentiallyUpdatedTargetResourceName);
           }
 
           if (potentiallyUpdatedTargetResourceName != targetResourceName) {
@@ -233,6 +240,10 @@ class ResourceWorkerInEventsWorker : public ArbitraryEventsWorker {
             gd::String updatedParameterValue = parameterValue;
             worker.ExposeTileset(updatedParameterValue);
             instruction.SetParameter(parameterIndex, updatedParameterValue);
+          } else if (parameterMetadata.GetType() == "model3DResource") {
+            gd::String updatedParameterValue = parameterValue;
+            worker.ExposeModel3D(updatedParameterValue);
+            instruction.SetParameter(parameterIndex, updatedParameterValue);
           }
         });
 

Core/GDCore/IDE/Project/ArbitraryResourceWorker.h

@@ -85,6 +85,11 @@ class GD_CORE_API ArbitraryResourceWorker {
    */
   virtual void ExposeTileset(gd::String &tilesetName);
 
+  /**
+   * \brief Expose a 3D model, which is always a reference to a "model3D" resource.
+   */
+  virtual void ExposeModel3D(gd::String &resourceName);
+
   /**
    * \brief Expose a video, which is always a reference to a "video" resource.
    */

Core/GDCore/IDE/Project/BehaviorObjectTypeRenamer.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 "BehaviorObjectTypeRenamer.h"
+
+#include "GDCore/Project/EventsBasedBehavior.h"
+#include "GDCore/String.h"
+#include <map>
+#include <memory>
+#include <vector>
+
+namespace gd {
+
+void BehaviorObjectTypeRenamer::DoVisitEventBasedBehavior(
+    gd::EventsBasedBehavior &eventsBasedBehavior) {
+  if (eventsBasedBehavior.GetObjectType() == oldObjectType) {
+    eventsBasedBehavior.SetObjectType(newObjectType);
+  }
+}
+
+BehaviorObjectTypeRenamer::~BehaviorObjectTypeRenamer() {}
+
+} // namespace gd

Core/GDCore/IDE/Project/BehaviorObjectTypeRenamer.h

@@ -0,0 +1,45 @@
+/*
+ * GDevelop Core
+ * Copyright 2008-2016 Florian Rival (Florian.Rival@gmail.com). All rights
+ * reserved. This project is released under the MIT License.
+ */
+#ifndef GDCORE_BEHAVIOROBJECTTYPERENAMER_H
+#define GDCORE_BEHAVIOROBJECTTYPERENAMER_H
+
+#include "GDCore/IDE/Project/ArbitraryEventBasedBehaviorsWorker.h"
+
+#include "GDCore/String.h"
+#include <map>
+#include <memory>
+#include <vector>
+namespace gd {
+class BaseEvent;
+class Project;
+class EventsList;
+} // namespace gd
+
+namespace gd {
+
+/**
+ * \brief Rename the object type in event-based behaviors.
+ *
+ * \ingroup IDE
+ */
+class GD_CORE_API BehaviorObjectTypeRenamer
+    : public ArbitraryEventBasedBehaviorsWorker {
+public:
+  BehaviorObjectTypeRenamer(const gd::String &oldObjectType_,
+                            const gd::String &newObjectType_)
+      : oldObjectType(oldObjectType_), newObjectType(newObjectType_){};
+  virtual ~BehaviorObjectTypeRenamer();
+
+private:
+  void DoVisitEventBasedBehavior(gd::EventsBasedBehavior &behavior) override;
+
+  gd::String oldObjectType;
+  gd::String newObjectType;
+};
+
+} // namespace gd
+
+#endif // GDCORE_BEHAVIOROBJECTTYPERENAMER_H

Core/GDCore/IDE/Project/BehaviorsSharedDataBehaviorTypeRenamer.cpp

@@ -0,0 +1,24 @@
+/*
+ * GDevelop Core
+ * Copyright 2008-2016 Florian Rival (Florian.Rival@gmail.com). All rights
+ * reserved. This project is released under the MIT License.
+ */
+#include "GDCore/IDE/Project/BehaviorsSharedDataBehaviorTypeRenamer.h"
+#include "GDCore/Project/BehaviorsSharedData.h"
+#include "GDCore/String.h"
+#include <map>
+#include <memory>
+#include <vector>
+
+namespace gd {
+
+void BehaviorsSharedDataBehaviorTypeRenamer::DoVisitSharedData(
+    gd::BehaviorsSharedData &sharedData) {
+  if (sharedData.GetTypeName() == oldBehaviorType) {
+    sharedData.SetTypeName(newBehaviorType);
+  }
+}
+
+BehaviorsSharedDataBehaviorTypeRenamer::~BehaviorsSharedDataBehaviorTypeRenamer() {}
+
+} // namespace gd

Core/GDCore/IDE/Project/BehaviorsSharedDataBehaviorTypeRenamer.h

@@ -0,0 +1,42 @@
+/*
+ * 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 <map>
+#include <memory>
+#include <vector>
+#include "GDCore/IDE/Project/ArbitraryBehaviorSharedDataWorker.h"
+#include "GDCore/String.h"
+
+namespace gd {
+class BaseEvent;
+class Project;
+class EventsList;
+}  // namespace gd
+
+namespace gd {
+
+/**
+ * \brief Rename the behavior type of shared data.
+ *
+ * \ingroup IDE
+ */
+class GD_CORE_API BehaviorsSharedDataBehaviorTypeRenamer : public ArbitraryBehaviorSharedDataWorker {
+ public:
+  BehaviorsSharedDataBehaviorTypeRenamer(const gd::String& oldBehaviorType_,
+                                       const gd::String& newBehaviorType_)
+      : oldBehaviorType(oldBehaviorType_), newBehaviorType(newBehaviorType_){};
+  virtual ~BehaviorsSharedDataBehaviorTypeRenamer();
+
+ private:
+  void DoVisitSharedData(gd::BehaviorsSharedData& behavior) override;
+
+  gd::String oldBehaviorType;
+  gd::String newBehaviorType;
+};
+
+}  // namespace gd

Core/GDCore/IDE/Project/FunctionParameterBehaviorTypeRenamer.cpp

@@ -0,0 +1,28 @@
+/*
+ * GDevelop Core
+ * Copyright 2008-2016 Florian Rival (Florian.Rival@gmail.com). All rights
+ * reserved. This project is released under the MIT License.
+ */
+#include "FunctionParameterBehaviorTypeRenamer.h"
+
+#include "GDCore/Project/EventsFunction.h"
+#include "GDCore/String.h"
+#include <map>
+#include <memory>
+#include <vector>
+
+namespace gd {
+
+void FunctionParameterBehaviorTypeRenamer::DoVisitEventsFunction(
+    gd::EventsFunction &eventsFunction) {
+  for (auto &&parameter : eventsFunction.GetParameters()) {
+    if (gd::ParameterMetadata::IsBehavior(parameter.GetType()) &&
+        parameter.GetExtraInfo() == oldBehaviorType) {
+      parameter.SetExtraInfo(newBehaviorType);
+    }
+  }
+}
+
+FunctionParameterBehaviorTypeRenamer::~FunctionParameterBehaviorTypeRenamer() {}
+
+} // namespace gd

Core/GDCore/IDE/Project/FunctionParameterBehaviorTypeRenamer.h

@@ -0,0 +1,42 @@
+/*
+ * 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/IDE/Project/ArbitraryEventsFunctionsWorker.h"
+#include "GDCore/String.h"
+#include <map>
+#include <memory>
+#include <vector>
+
+namespace gd {
+class BaseEvent;
+class Project;
+class EventsList;
+} // namespace gd
+
+namespace gd {
+
+/**
+ * \brief Rename the type of behavior parameters in functions.
+ *
+ * \ingroup IDE
+ */
+class GD_CORE_API FunctionParameterBehaviorTypeRenamer
+    : public ArbitraryEventsFunctionsWorker {
+public:
+  FunctionParameterBehaviorTypeRenamer(const gd::String &oldBehaviorType_,
+                                       const gd::String &newBehaviorType_)
+      : oldBehaviorType(oldBehaviorType_), newBehaviorType(newBehaviorType_){};
+  virtual ~FunctionParameterBehaviorTypeRenamer();
+
+private:
+  virtual void DoVisitEventsFunction(gd::EventsFunction &eventsFunction) override;
+
+  gd::String oldBehaviorType;
+  gd::String newBehaviorType;
+};
+
+} // namespace gd

Core/GDCore/IDE/Project/FunctionParameterObjectTypeRenamer.cpp

@@ -0,0 +1,28 @@
+/*
+ * GDevelop Core
+ * Copyright 2008-2016 Florian Rival (Florian.Rival@gmail.com). All rights
+ * reserved. This project is released under the MIT License.
+ */
+#include "FunctionParameterObjectTypeRenamer.h"
+
+#include "GDCore/Project/EventsFunction.h"
+#include "GDCore/String.h"
+#include <map>
+#include <memory>
+#include <vector>
+
+namespace gd {
+
+void FunctionParameterObjectTypeRenamer::DoVisitEventsFunction(
+    gd::EventsFunction &eventsFunction) {
+  for (auto &&parameter : eventsFunction.GetParameters()) {
+    if (gd::ParameterMetadata::IsObject(parameter.GetType()) &&
+        parameter.GetExtraInfo() == oldObjectType) {
+      parameter.SetExtraInfo(newObjectType);
+    }
+  }
+}
+
+FunctionParameterObjectTypeRenamer::~FunctionParameterObjectTypeRenamer() {}
+
+} // namespace gd

Core/GDCore/IDE/Project/FunctionParameterObjectTypeRenamer.h

@@ -0,0 +1,42 @@
+/*
+ * 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/IDE/Project/ArbitraryEventsFunctionsWorker.h"
+#include "GDCore/String.h"
+#include <map>
+#include <memory>
+#include <vector>
+
+namespace gd {
+class BaseEvent;
+class Project;
+class EventsList;
+} // namespace gd
+
+namespace gd {
+
+/**
+ * \brief Rename the type of object parameters in functions.
+ *
+ * \ingroup IDE
+ */
+class GD_CORE_API FunctionParameterObjectTypeRenamer
+    : public ArbitraryEventsFunctionsWorker {
+public:
+  FunctionParameterObjectTypeRenamer(const gd::String &oldObjectType_,
+                                     const gd::String &newObjectType_)
+      : oldObjectType(oldObjectType_), newObjectType(newObjectType_){};
+  virtual ~FunctionParameterObjectTypeRenamer();
+
+private:
+  virtual void DoVisitEventsFunction(gd::EventsFunction &eventsFunction) override;
+
+  gd::String oldObjectType;
+  gd::String newObjectType;
+};
+
+} // namespace gd

Core/GDCore/IDE/Project/ProjectResourcesCopier.cpp

@@ -29,7 +29,7 @@ bool ProjectResourcesCopier::CopyAllResourcesTo(
   originalProject.ExposeResources(absolutePathChecker);
 
   auto projectDirectory = fs.DirNameFrom(originalProject.GetProjectFile());
-  std::cout << "Copying all ressources from " << projectDirectory << " to "
+  std::cout << "Copying all resources from " << projectDirectory << " to "
             << destinationDirectory << "..." << std::endl;
 
   // Get the resources to be copied

Core/GDCore/IDE/Project/RequiredBehaviorRenamer.cpp

@@ -0,0 +1,35 @@
+/*
+ * GDevelop Core
+ * Copyright 2008-2016 Florian Rival (Florian.Rival@gmail.com). All rights
+ * reserved. This project is released under the MIT License.
+ */
+#include "GDCore/IDE/Project/RequiredBehaviorRenamer.h"
+#include <map>
+#include <memory>
+#include <vector>
+#include "GDCore/Project/EventsBasedBehavior.h"
+#include "GDCore/String.h"
+
+namespace gd {
+
+void RequiredBehaviorRenamer::DoVisitEventBasedBehavior(gd::EventsBasedBehavior& eventsBasedBehavior) {
+  for (size_t i = 0;
+        i < eventsBasedBehavior.GetPropertyDescriptors().GetCount();
+        i++) {
+    NamedPropertyDescriptor& propertyDescriptor =
+        eventsBasedBehavior.GetPropertyDescriptors().Get(i);
+
+        std::vector<gd::String>& extraInfo = propertyDescriptor.GetExtraInfo();
+        if (propertyDescriptor.GetType() == "Behavior" &&
+            extraInfo.size() > 0) {
+          const gd::String& requiredBehaviorType = extraInfo[0];
+          if (requiredBehaviorType == oldBehaviorType) {
+            extraInfo[0] = newBehaviorType;
+          }
+        }
+  }
+}
+
+RequiredBehaviorRenamer::~RequiredBehaviorRenamer() {}
+
+}  // namespace gd

Core/GDCore/IDE/Project/RequiredBehaviorRenamer.h

@@ -0,0 +1,42 @@
+/*
+ * GDevelop Core
+ * Copyright 2008-2016 Florian Rival (Florian.Rival@gmail.com). All rights
+ * reserved. This project is released under the MIT License.
+ */
+#ifndef GDCORE_REQUIREDBEHAVIORRENAMER_H
+#define GDCORE_REQUIREDBEHAVIORRENAMER_H
+#include <map>
+#include <memory>
+#include <vector>
+#include "GDCore/IDE/Project/ArbitraryEventBasedBehaviorsWorker.h"
+#include "GDCore/String.h"
+namespace gd {
+class BaseEvent;
+class Project;
+class EventsList;
+}  // namespace gd
+
+namespace gd {
+
+/**
+ * \brief Rename the type of required behavior in event-based behaviors.
+ *
+ * \ingroup IDE
+ */
+class GD_CORE_API RequiredBehaviorRenamer : public ArbitraryEventBasedBehaviorsWorker {
+ public:
+  RequiredBehaviorRenamer(const gd::String& oldBehaviorType_,
+                                       const gd::String& newBehaviorType_)
+      : oldBehaviorType(oldBehaviorType_), newBehaviorType(newBehaviorType_){};
+  virtual ~RequiredBehaviorRenamer();
+
+ private:
+  void DoVisitEventBasedBehavior(gd::EventsBasedBehavior& behavior) override;
+
+  gd::String oldBehaviorType;
+  gd::String newBehaviorType;
+};
+
+}  // namespace gd
+
+#endif  // GDCORE_REQUIREDBEHAVIORRENAMER_H

Core/GDCore/IDE/Project/ResourcesInUseHelper.h

@@ -44,6 +44,7 @@ class ResourcesInUseHelper : public gd::ArbitraryResourceWorker {
   std::set<gd::String>& GetAllTilesets() { return GetAll("tileset"); };
   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>& GetAll(const gd::String& resourceType) {
     if (resourceType == "image") return allImages;
     if (resourceType == "audio") return allAudios;
@@ -53,6 +54,7 @@ class ResourcesInUseHelper : public gd::ArbitraryResourceWorker {
     if (resourceType == "tileset") return allTilesets;
     if (resourceType == "video") return allVideos;
     if (resourceType == "bitmapFont") return allBitmapFonts;
+    if (resourceType == "model3D") return allModel3Ds;
 
     return emptyResources;
   };
@@ -84,6 +86,9 @@ class ResourcesInUseHelper : public gd::ArbitraryResourceWorker {
   virtual void ExposeBitmapFont(gd::String& bitmapFontResourceName) override {
     allBitmapFonts.insert(bitmapFontResourceName);
   };
+  virtual void ExposeModel3D(gd::String& resourceName) override {
+    allModel3Ds.insert(resourceName);
+  };
 
  protected:
   std::set<gd::String> allImages;
@@ -94,6 +99,7 @@ class ResourcesInUseHelper : public gd::ArbitraryResourceWorker {
   std::set<gd::String> allTilesets;
   std::set<gd::String> allVideos;
   std::set<gd::String> allBitmapFonts;
+  std::set<gd::String> allModel3Ds;
   std::set<gd::String> emptyResources;
 };
 

Core/GDCore/IDE/Project/ResourcesRenamer.h

@@ -4,9 +4,7 @@
  * reserved. This project is released under the MIT License.
  */
 
-#if defined(GD_IDE_ONLY)
-#ifndef GDCORE_RESOURCESRENAMER_H
-#define GDCORE_RESOURCESRENAMER_H
+#pragma once
 
 #include <set>
 #include <vector>
@@ -61,6 +59,9 @@ class ResourcesRenamer : public gd::ArbitraryResourceWorker {
   virtual void ExposeBitmapFont(gd::String& bitmapFontName) override {
     RenameIfNeeded(bitmapFontName);
   };
+  virtual void ExposeModel3D(gd::String& resourceName) override {
+    RenameIfNeeded(resourceName);
+  };
 
  private:
   void RenameIfNeeded(gd::String& resourceName) {
@@ -72,6 +73,3 @@ class ResourcesRenamer : public gd::ArbitraryResourceWorker {
 };
 
 }  // namespace gd
-
-#endif  // GDCORE_RESOURCESRENAMER_H
-#endif

Core/GDCore/IDE/ProjectBrowser.h

@@ -0,0 +1,89 @@
+/*
+ * GDevelop Core
+ * Copyright 2008-2016 Florian Rival (Florian.Rival@gmail.com). All rights
+ * reserved. This project is released under the MIT License.
+ */
+
+#pragma once
+
+namespace gd {
+class Project;
+class String;
+class EventsFunctionsExtension;
+class EventsFunction;
+class EventsBasedBehavior;
+class EventsBasedObject;
+class ArbitraryEventsWorker;
+class ArbitraryEventsWorkerWithContext;
+class ArbitraryEventsFunctionsWorker;
+class ArbitraryObjectsWorker;
+class ArbitraryEventBasedBehaviorsWorker;
+class ArbitraryBehaviorSharedDataWorker;
+} // namespace gd
+
+namespace gd {
+
+/**
+ * \brief Expose a subset of the project to workers.
+ */
+class GD_CORE_API ProjectBrowser {
+public:
+  /**
+   * \brief Call the specified worker on all events of a project subset.
+   *
+   * This should be the preferred way to traverse events of a project.
+   */
+  virtual void ExposeEvents(gd::Project &project,
+                            gd::ArbitraryEventsWorker &worker) const = 0;
+  /**
+   * \brief Call the specified worker on all events of a project subset.
+   *
+   * This should be the preferred way to traverse events of a project.
+   */
+  virtual void
+  ExposeEvents(gd::Project &project,
+               gd::ArbitraryEventsWorkerWithContext &worker) const = 0;
+
+  /**
+   * \brief Call the specified worker on all ObjectContainer of a project subset
+   *
+   * This should be the preferred way to traverse all the objects of a project.
+   */
+  virtual void ExposeObjects(gd::Project &project,
+                             gd::ArbitraryObjectsWorker &worker) const = 0;
+
+  /**
+   * \brief Call the specified worker on all FunctionsContainer of a project
+   * subset.
+   *
+   * This should be the preferred way to traverse all the function signatures
+   * of a project.
+   */
+  virtual void ExposeFunctions(gd::Project &project,
+                               gd::ArbitraryEventsFunctionsWorker &worker) const = 0;
+
+  /**
+   * \brief Call the specified worker on all EventBasedBehavior of a project
+   * subset.
+   *
+   * This should be the preferred way to traverse all the event-based behavior
+   * of a project.
+   */
+  virtual void ExposeEventBasedBehaviors(
+      gd::Project &project,
+      gd::ArbitraryEventBasedBehaviorsWorker &worker) const = 0;
+
+  /**
+   * \brief Call the specified worker on all SharedData of a project subset.
+   *
+   * This should be the preferred way to traverse all the shared data
+   * of a project.
+   */
+  virtual void
+  ExposeBehaviorSharedDatas(gd::Project &project,
+                    gd::ArbitraryBehaviorSharedDataWorker &worker) const = 0;
+
+  virtual ~ProjectBrowser(){};
+};
+
+} // namespace gd

Core/GDCore/IDE/ProjectBrowserHelper.cpp

@@ -0,0 +1,256 @@
+/*
+ * GDevelop Core
+ * Copyright 2008-2016 Florian Rival (Florian.Rival@gmail.com). All rights
+ * reserved. This project is released under the MIT License.
+ */
+#include "ProjectBrowserHelper.h"
+
+#include "GDCore/IDE/Events/ArbitraryEventsWorker.h"
+#include "GDCore/IDE/EventsFunctionTools.h"
+#include "GDCore/IDE/Project/ArbitraryEventBasedBehaviorsWorker.h"
+#include "GDCore/IDE/Project/ArbitraryEventsFunctionsWorker.h"
+#include "GDCore/IDE/Project/ArbitraryObjectsWorker.h"
+#include "GDCore/IDE/Project/ArbitraryBehaviorSharedDataWorker.h"
+#include "GDCore/Project/EventsBasedBehavior.h"
+#include "GDCore/Project/EventsBasedObject.h"
+#include "GDCore/Project/EventsFunctionsExtension.h"
+#include "GDCore/Project/ExternalEvents.h"
+#include "GDCore/Project/Layout.h"
+#include "GDCore/Project/Project.h"
+#include "GDCore/String.h"
+
+namespace gd {
+
+void ProjectBrowserHelper::ExposeProjectEvents(
+    gd::Project &project, gd::ArbitraryEventsWorker &worker) {
+  // See also gd::Project::ExposeResources for a method that traverses the whole
+  // project (this time for resources).
+
+  ExposeProjectEventsWithoutExtensions(project, worker);
+
+  // 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());
+      }
+    }
+  }
+}
+
+void ProjectBrowserHelper::ExposeProjectEventsWithoutExtensions(
+    gd::Project& project, gd::ArbitraryEventsWorker& worker) {
+  // Add layouts events
+  for (std::size_t s = 0; s < project.GetLayoutsCount(); s++) {
+    worker.Launch(project.GetLayout(s).GetEvents());
+  }
+  // Add external events events
+  for (std::size_t s = 0; s < project.GetExternalEventsCount(); s++) {
+    worker.Launch(project.GetExternalEvents(s).GetEvents());
+  }
+}
+
+void ProjectBrowserHelper::ExposeLayoutEvents(
+    gd::Project &project, gd::Layout &layout,
+    gd::ArbitraryEventsWorker &worker) {
+
+  // Add layouts events
+  worker.Launch(layout.GetEvents());
+
+  // Add external events events
+  for (std::size_t s = 0; s < project.GetExternalEventsCount(); s++) {
+    auto &externalEvents = project.GetExternalEvents(s);
+    if (externalEvents.GetAssociatedLayout() == layout.GetName()) {
+      worker.Launch(externalEvents.GetEvents());
+    }
+  }
+}
+
+void ProjectBrowserHelper::ExposeLayoutEvents(
+    gd::Project &project, gd::Layout &layout,
+    gd::ArbitraryEventsWorkerWithContext &worker) {
+
+  // Add layouts events
+  worker.Launch(layout.GetEvents(), project, layout);
+
+  // Add external events events
+  for (std::size_t s = 0; s < project.GetExternalEventsCount(); s++) {
+    auto &externalEvents = project.GetExternalEvents(s);
+    if (externalEvents.GetAssociatedLayout() == layout.GetName()) {
+      worker.Launch(externalEvents.GetEvents(), project, layout);
+    }
+  }
+}
+
+void ProjectBrowserHelper::ExposeProjectEvents(
+    gd::Project &project, gd::ArbitraryEventsWorkerWithContext &worker) {
+  // See also gd::Project::ExposeResources for a method that traverse the whole
+  // project (this time for resources) and ExposeProjectEffects (this time for
+  // effects).
+
+  // Add layouts events
+  for (std::size_t s = 0; s < project.GetLayoutsCount(); s++) {
+    auto &layout = project.GetLayout(s);
+    worker.Launch(layout.GetEvents(), project, layout);
+  }
+  // Add external events events
+  for (std::size_t s = 0; s < project.GetExternalEventsCount(); s++) {
+    const auto &externalEvents = project.GetExternalEvents(s);
+    const gd::String &associatedLayout = externalEvents.GetAssociatedLayout();
+    if (project.HasLayoutNamed(associatedLayout)) {
+      worker.Launch(project.GetExternalEvents(s).GetEvents(), project,
+                    project.GetLayout(associatedLayout));
+    }
+  }
+  // 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()) {
+      gd::ObjectsContainer globalObjectsAndGroups;
+      gd::ObjectsContainer objectsAndGroups;
+      gd::EventsFunctionTools::FreeEventsFunctionToObjectsContainer(
+          project, eventsFunctionsExtension, *eventsFunction,
+          globalObjectsAndGroups, objectsAndGroups);
+
+      worker.Launch(eventsFunction->GetEvents(), globalObjectsAndGroups,
+                    objectsAndGroups);
+    }
+
+    // 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::ExposeEventsBasedBehaviorEvents(
+    gd::Project &project, const gd::EventsBasedBehavior &eventsBasedBehavior,
+    gd::ArbitraryEventsWorker &worker) {
+  auto &behaviorEventsFunctions = eventsBasedBehavior.GetEventsFunctions();
+  for (auto &&eventsFunction : behaviorEventsFunctions.GetInternalVector()) {
+    worker.Launch(eventsFunction->GetEvents());
+  }
+}
+
+void ProjectBrowserHelper::ExposeEventsBasedBehaviorEvents(
+    gd::Project &project, const gd::EventsBasedBehavior &eventsBasedBehavior,
+    gd::ArbitraryEventsWorkerWithContext &worker) {
+  auto &behaviorEventsFunctions = eventsBasedBehavior.GetEventsFunctions();
+  for (auto &&eventsFunction : behaviorEventsFunctions.GetInternalVector()) {
+    gd::ObjectsContainer globalObjectsAndGroups;
+    gd::ObjectsContainer objectsAndGroups;
+    gd::EventsFunctionTools::BehaviorEventsFunctionToObjectsContainer(
+        project, eventsBasedBehavior, *eventsFunction, globalObjectsAndGroups,
+        objectsAndGroups);
+
+    worker.Launch(eventsFunction->GetEvents(), globalObjectsAndGroups,
+                  objectsAndGroups);
+  }
+}
+
+void ProjectBrowserHelper::ExposeEventsBasedObjectEvents(
+    gd::Project &project, const gd::EventsBasedObject &eventsBasedObject,
+    gd::ArbitraryEventsWorkerWithContext &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(), globalObjectsAndGroups,
+                  objectsAndGroups);
+  }
+}
+
+void ProjectBrowserHelper::ExposeProjectObjects(
+    gd::Project &project, gd::ArbitraryObjectsWorker &worker) {
+
+  // Global objects
+  worker.Launch(project);
+
+  // Layers objects
+  for (size_t i = 0; i < project.GetLayoutsCount(); i++) {
+    worker.Launch(project.GetLayout(i));
+  }
+
+  // Event based objects children
+  for (std::size_t e = 0; e < project.GetEventsFunctionsExtensionsCount();
+       e++) {
+    auto &eventsFunctionsExtension = project.GetEventsFunctionsExtension(e);
+
+    for (auto &&eventsBasedObjectUniquePtr :
+         eventsFunctionsExtension.GetEventsBasedObjects().GetInternalVector()) {
+      auto eventsBasedObject = eventsBasedObjectUniquePtr.get();
+      worker.Launch(*eventsBasedObject);
+    }
+  }
+};
+
+void ProjectBrowserHelper::ExposeProjectFunctions(
+    gd::Project &project, gd::ArbitraryEventsFunctionsWorker &worker) {
+
+  for (std::size_t e = 0; e < project.GetEventsFunctionsExtensionsCount();
+       e++) {
+    auto &eventsFunctionsExtension = project.GetEventsFunctionsExtension(e);
+    worker.Launch(eventsFunctionsExtension);
+
+    for (auto &&eventsBasedBehavior :
+         eventsFunctionsExtension.GetEventsBasedBehaviors()
+             .GetInternalVector()) {
+      worker.Launch(eventsBasedBehavior->GetEventsFunctions());
+    }
+
+    for (auto &&eventsBasedObject :
+         eventsFunctionsExtension.GetEventsBasedObjects().GetInternalVector()) {
+      worker.Launch(eventsBasedObject->GetEventsFunctions());
+    }
+  }
+};
+
+void ProjectBrowserHelper::ExposeProjectEventBasedBehaviors(
+    gd::Project &project, gd::ArbitraryEventBasedBehaviorsWorker &worker) {
+  for (std::size_t e = 0; e < project.GetEventsFunctionsExtensionsCount();
+       e++) {
+    auto &eventsFunctionsExtension = project.GetEventsFunctionsExtension(e);
+    worker.Launch(eventsFunctionsExtension.GetEventsBasedBehaviors());
+  }
+}
+
+void ProjectBrowserHelper::ExposeProjectSharedDatas(
+    gd::Project &project, gd::ArbitraryBehaviorSharedDataWorker &worker) {
+  for (std::size_t i = 0; i < project.GetLayoutsCount(); ++i) {
+    gd::Layout &layout = project.GetLayout(i);
+    worker.Launch(layout.GetAllBehaviorSharedData());
+  }
+}
+
+} // namespace gd

Core/GDCore/IDE/ProjectBrowserHelper.h

@@ -0,0 +1,144 @@
+/*
+ * GDevelop Core
+ * Copyright 2008-2016 Florian Rival (Florian.Rival@gmail.com). All rights
+ * reserved. This project is released under the MIT License.
+ */
+#pragma once
+
+namespace gd {
+class Project;
+class Layout;
+class String;
+class EventsFunctionsExtension;
+class EventsFunction;
+class EventsBasedBehavior;
+class EventsBasedObject;
+class ArbitraryEventsWorker;
+class ArbitraryEventsWorkerWithContext;
+class ArbitraryEventsFunctionsWorker;
+class ArbitraryObjectsWorker;
+class ArbitraryEventBasedBehaviorsWorker;
+class ArbitraryBehaviorSharedDataWorker;
+} // namespace gd
+
+namespace gd {
+
+/**
+ * \brief Expose a subset of the project to workers.
+ */
+class GD_CORE_API ProjectBrowserHelper {
+public:
+  /**
+   * \brief Call the specified worker on all events of the project (layout,
+   * external events, events functions...)
+   *
+   * This should be the preferred way to traverse all the events of a project.
+   */
+  static void ExposeProjectEvents(gd::Project &project,
+                                  gd::ArbitraryEventsWorker &worker);
+
+  /**
+   * \brief Call the specified worker on all events of the project (layout,
+   * external events, events functions...)
+   *
+   * This should be the preferred way to traverse all the events of a project.
+   */
+  static void ExposeProjectEvents(gd::Project &project,
+                                  gd::ArbitraryEventsWorkerWithContext &worker);
+
+  /**
+   * \brief Call the specified worker on all events of the project (layout and
+   * external events) but not events from extensions.
+   *
+   * Only use this for stats.
+   */
+  static void
+  ExposeProjectEventsWithoutExtensions(gd::Project &project,
+                                       gd::ArbitraryEventsWorker &worker);
+
+  /**
+   * \brief Call the specified worker on all events of a layout and
+   * its external events.
+   */
+  static void ExposeLayoutEvents(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,
+                                 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.
+   */
+  static void ExposeEventsBasedBehaviorEvents(
+      gd::Project &project, const gd::EventsBasedBehavior &eventsBasedBehavior,
+      gd::ArbitraryEventsWorker &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
+   * event-based behavior.
+   */
+  static void ExposeEventsBasedBehaviorEvents(
+      gd::Project &project, const gd::EventsBasedBehavior &eventsBasedBehavior,
+      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
+   * event-based behavior.
+   */
+  static void
+  ExposeEventsBasedObjectEvents(gd::Project &project,
+                                const gd::EventsBasedObject &eventsBasedObject,
+                                gd::ArbitraryEventsWorkerWithContext &worker);
+
+  /**
+   * \brief Call the specified worker on all ObjectContainers of the project
+   * (global, layouts...)
+   *
+   * This should be the preferred way to traverse all the objects of a project.
+   */
+  static void ExposeProjectObjects(gd::Project &project,
+                                   gd::ArbitraryObjectsWorker &worker);
+
+  /**
+   * \brief Call the specified worker on all FunctionsContainers of the project
+   * (global, layouts...)
+   *
+   * This should be the preferred way to traverse all the function signatures
+   * of a project.
+   */
+  static void ExposeProjectFunctions(gd::Project &project,
+                                     gd::ArbitraryEventsFunctionsWorker &worker);
+
+  /**
+   * \brief Call the specified worker on all EventBasedBehavior of a project.
+   *
+   * This should be the preferred way to traverse all the event-based behavior
+   * of a project.
+   */
+  static void ExposeProjectEventBasedBehaviors(
+      gd::Project &project, gd::ArbitraryEventBasedBehaviorsWorker &worker);
+
+  /**
+   * \brief Call the specified worker on all SharedData of a project.
+   *
+   * This should be the preferred way to traverse all the shared data
+   * of a project.
+   */
+  static void ExposeProjectSharedDatas(gd::Project &project,
+                                       gd::ArbitraryBehaviorSharedDataWorker &worker);
+};
+
+} // namespace gd

Core/GDCore/IDE/WholeProjectBrowser.cpp

@@ -0,0 +1,49 @@
+/*
+ * GDevelop Core
+ * Copyright 2008-2016 Florian Rival (Florian.Rival@gmail.com). All rights
+ * reserved. This project is released under the MIT License.
+ */
+#include "WholeProjectBrowser.h"
+
+#include "GDCore/IDE/Events/ArbitraryEventsWorker.h"
+#include "GDCore/IDE/Project/ArbitraryEventBasedBehaviorsWorker.h"
+#include "GDCore/IDE/Project/ArbitraryEventsFunctionsWorker.h"
+#include "GDCore/IDE/Project/ArbitraryObjectsWorker.h"
+#include "GDCore/IDE/Project/ArbitraryBehaviorSharedDataWorker.h"
+#include "GDCore/IDE/ProjectBrowserHelper.h"
+#include "GDCore/Project/Project.h"
+#include "GDCore/String.h"
+
+namespace gd {
+
+void WholeProjectBrowser::ExposeEvents(
+    gd::Project &project, gd::ArbitraryEventsWorker &worker) const {
+  gd::ProjectBrowserHelper::ExposeProjectEvents(project, worker);
+}
+
+void WholeProjectBrowser::ExposeEvents(
+    gd::Project &project, gd::ArbitraryEventsWorkerWithContext &worker) const {
+  gd::ProjectBrowserHelper::ExposeProjectEvents(project, worker);
+}
+
+void WholeProjectBrowser::ExposeObjects(
+    gd::Project &project, gd::ArbitraryObjectsWorker &worker) const {
+  gd::ProjectBrowserHelper::ExposeProjectObjects(project, worker);
+}
+
+void WholeProjectBrowser::ExposeFunctions(
+    gd::Project &project, gd::ArbitraryEventsFunctionsWorker &worker) const {
+  gd::ProjectBrowserHelper::ExposeProjectFunctions(project, worker);
+}
+
+void WholeProjectBrowser::ExposeEventBasedBehaviors(
+    gd::Project &project,
+    gd::ArbitraryEventBasedBehaviorsWorker &worker) const {
+  gd::ProjectBrowserHelper::ExposeProjectEventBasedBehaviors(project, worker);
+}
+
+void WholeProjectBrowser::ExposeBehaviorSharedDatas(
+    gd::Project &project, gd::ArbitraryBehaviorSharedDataWorker &worker) const {
+  gd::ProjectBrowserHelper::ExposeProjectSharedDatas(project, worker);
+}
+} // namespace gd

Core/GDCore/IDE/WholeProjectBrowser.h

@@ -0,0 +1,90 @@
+/*
+ * 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/IDE/ProjectBrowser.h"
+
+namespace gd {
+class Project;
+class String;
+class EventsFunctionsExtension;
+class EventsFunction;
+class EventsBasedBehavior;
+class EventsBasedObject;
+class ArbitraryEventsWorker;
+class ArbitraryEventsWorkerWithContext;
+class ArbitraryEventsFunctionsWorker;
+class ArbitraryObjectsWorker;
+class ArbitraryEventBasedBehaviorsWorker;
+class ArbitraryBehaviorSharedDataWorker;
+} // namespace gd
+
+namespace gd {
+
+/**
+ * \brief Expose the whole project to workers.
+ */
+class GD_CORE_API WholeProjectBrowser : public ProjectBrowser {
+public:
+  /**
+   * \brief Call the specified worker on all events of the project (layout,
+   * external events, events functions...)
+   *
+   * This should be the preferred way to traverse all the events of a project.
+   */
+  void ExposeEvents(gd::Project &project,
+                    gd::ArbitraryEventsWorker &worker) const override;
+
+  /**
+   * \brief Call the specified worker on all events of the project (layout,
+   * external events, events functions...)
+   *
+   * This should be the preferred way to traverse all the events of a project.
+   */
+  void
+  ExposeEvents(gd::Project &project,
+               gd::ArbitraryEventsWorkerWithContext &worker) const override;
+
+  /**
+   * \brief Call the specified worker on all ObjectContainers of the project
+   * (global, layouts...)
+   *
+   * This should be the preferred way to traverse all the objects of a project.
+   */
+  void ExposeObjects(gd::Project &project,
+                     gd::ArbitraryObjectsWorker &worker) const override;
+
+  /**
+   * \brief Call the specified worker on all FunctionsContainers of the project
+   * (global, layouts...)
+   *
+   * This should be the preferred way to traverse all the function signatures
+   * of a project.
+   */
+  void ExposeFunctions(gd::Project &project,
+                       gd::ArbitraryEventsFunctionsWorker &worker) const override;
+
+  /**
+   * \brief Call the specified worker on all EventBasedBehavior of a project.
+   *
+   * This should be the preferred way to traverse all the event-based behavior
+   * of a project.
+   */
+  void ExposeEventBasedBehaviors(
+      gd::Project &project,
+      gd::ArbitraryEventBasedBehaviorsWorker &worker) const override;
+
+  /**
+   * \brief Call the specified worker on all SharedData of a project.
+   *
+   * This should be the preferred way to traverse all the shared data
+   * of a project.
+   */
+  void ExposeBehaviorSharedDatas(gd::Project &project,
+                         gd::ArbitraryBehaviorSharedDataWorker &worker) const override;
+};
+
+} // namespace gd

Core/GDCore/IDE/WholeProjectRefactorer.h

@@ -3,8 +3,8 @@
  * Copyright 2008-2016 Florian Rival (Florian.Rival@gmail.com). All rights
  * reserved. This project is released under the MIT License.
  */
-#ifndef GDCORE_WHOLEPROJECTREFACTORER_H
-#define GDCORE_WHOLEPROJECTREFACTORER_H
+#pragma once
+
 #include <set>
 #include <unordered_set>
 #include <vector>
@@ -12,6 +12,7 @@ namespace gd {
 class Platform;
 class Project;
 class Layout;
+class Layer;
 class Object;
 class String;
 class EventsFunctionsExtension;
@@ -21,10 +22,14 @@ class EventsBasedBehavior;
 class EventsBasedObject;
 class ArbitraryEventsWorker;
 class ArbitraryObjectsWorker;
+class ArbitraryEventsFunctionsWorker;
 class ArbitraryEventsWorkerWithContext;
+class ArbitraryEventBasedBehaviorsWorker;
+class ArbitraryBehaviorSharedDataWorker;
 class Behavior;
 class BehaviorMetadata;
 class UnfilledRequiredBehaviorPropertyProblem;
+class ProjectBrowser;
 }  // namespace gd
 
 namespace gd {
@@ -39,54 +44,6 @@ namespace gd {
  */
 class GD_CORE_API WholeProjectRefactorer {
  public:
-  /**
-   * \brief Call the specified worker on all events of the project (layout,
-   * external events, events functions...)
-   *
-   * This should be the preferred way to traverse all the events of a project.
-   */
-  static void ExposeProjectEvents(gd::Project& project,
-                                  gd::ArbitraryEventsWorker& worker);
-
-  /**
-   * \brief Call the specified worker on all events of the project (layout,
-   * external events, events functions...)
-   *
-   * This should be the preferred way to traverse all the events of a project.
-   */
-  static void ExposeProjectEvents(gd::Project& project,
-                                  gd::ArbitraryEventsWorkerWithContext& worker);
-
-  /**
-   * \brief Call the specified worker on all events of the events based behavior
-   *
-   * This should be the preferred way to traverse all the events of an events
-   * based behavior.
-   */
-  static void ExposeEventsBasedBehaviorEvents(
-      gd::Project& project,
-      const gd::EventsBasedBehavior& eventsBasedBehavior,
-      gd::ArbitraryEventsWorkerWithContext& worker);
-
-  /**
-   * \brief Call the specified worker on all events of the events based object
-   *
-   * This should be the preferred way to traverse all the events of an events
-   * based object.
-   */
-  static void ExposeEventsBasedObjectEvents(
-      gd::Project& project,
-      const gd::EventsBasedObject& eventsBasedObject,
-      gd::ArbitraryEventsWorkerWithContext& worker);
-
-  /**
-   * \brief Call the specified worker on all ObjectContainers of the project
-   * (global, layouts...)
-   *
-   * This should be the preferred way to traverse all the objects of a project.
-   */
-  static void ExposeProjectObjects(gd::Project& project,
-                                   gd::ArbitraryObjectsWorker& worker);
 
   /**
    * \brief Refactor the project **before** an events function extension is
@@ -102,6 +59,16 @@ class GD_CORE_API WholeProjectRefactorer {
       const gd::String& oldName,
       const gd::String& newName);
 
+  /**
+   * \brief Refactor behavior events after the extension was placed in a new
+   * extension.
+   */
+  static void UpdateExtensionNameInEventsBasedBehavior(
+      gd::Project& project,
+      const gd::EventsFunctionsExtension& eventsFunctionsExtension,
+      gd::EventsBasedBehavior& eventsBasedBehavior,
+      const gd::String& sourceExtensionName);
+
   /**
    * \brief Refactor the project **before** an events function is renamed.
    *
@@ -245,6 +212,13 @@ class GD_CORE_API WholeProjectRefactorer {
                                               gd::Object& object,
                                               const gd::String& behaviorType,
                                               const gd::String& behaviorName);
+  /**
+   * \brief Add required behaviors if necessary to fill every behavior
+   * properties of the given behaviors.
+   */
+  static void AddRequiredBehaviorsFor(gd::Project& project,
+                                      gd::Object& object,
+                                      const gd::String& behaviorName);
 
   /**
    * \brief Find every behavior of the object that needs the given behaviors
@@ -302,11 +276,63 @@ class GD_CORE_API WholeProjectRefactorer {
       const gd::String& oldObjectName,
       const gd::String& newObjectName);
 
+  /**
+   * \brief Refactor the project after a layout is renamed.
+   */
+  static void RenameLayout(gd::Project &project, const gd::String &oldName,
+                           const gd::String &newName);
+  /**
+   * \brief Refactor the project after an external layout is renamed.
+   */
+  static void RenameExternalLayout(gd::Project &project,
+                                   const gd::String &oldName,
+                                   const gd::String &newName);
+  /**
+   * \brief Refactor the project after external events are renamed.
+   */
+  static void RenameExternalEvents(gd::Project &project,
+                                   const gd::String &oldName,
+                                   const gd::String &newName);
+  /**
+   * \brief Refactor the project after a layer is renamed.
+   */
+  static void RenameLayer(gd::Project &project, gd::Layout &layout,
+                          const gd::String &oldName, const gd::String &newName);
+
+  /**
+   * \brief Refactor the project after a layer effect is renamed.
+   */
+  static void RenameLayerEffect(gd::Project &project, gd::Layout &layout,
+                                gd::Layer &layer, const gd::String &oldName,
+                                const gd::String &newName);
+
+  /**
+   * \brief Refactor the project after an object animation is renamed.
+   */
+  static void RenameObjectAnimation(gd::Project &project, gd::Layout &layout,
+                                    gd::Object &object,
+                                    const gd::String &oldName,
+                                    const gd::String &newName);
+
+  /**
+   * \brief Refactor the project after an object point is renamed.
+   */
+  static void RenameObjectPoint(gd::Project &project, gd::Layout &layout,
+                                gd::Object &object, const gd::String &oldName,
+                                const gd::String &newName);
+
+  /**
+   * \brief Refactor the project after an object effect is renamed.
+   */
+  static void RenameObjectEffect(gd::Project &project, gd::Layout &layout,
+                                 gd::Object &object, const gd::String &oldName,
+                                 const gd::String &newName);
+
   /**
    * \brief Refactor the project after an object is renamed in a layout
    *
    * This will update the layout, all external layouts associated with it
-   * and all external events used by the layout.
+   * and all external events associated with it.
    */
   static void ObjectOrGroupRenamedInLayout(gd::Project& project,
                                            gd::Layout& layout,
@@ -318,7 +344,7 @@ class GD_CORE_API WholeProjectRefactorer {
    * \brief Refactor the project after an object is removed in a layout
    *
    * This will update the layout, all external layouts associated with it
-   * and all external events used by the layout.
+   * and all external events associated with it.
    */
   static void ObjectOrGroupRemovedInLayout(gd::Project& project,
                                            gd::Layout& layout,
@@ -435,19 +461,43 @@ class GD_CORE_API WholeProjectRefactorer {
  private:
   static std::vector<gd::String> GetAssociatedExternalLayouts(
       gd::Project& project, gd::Layout& layout);
+  static std::vector<gd::String>
+  GetAssociatedExternalLayouts(gd::Project &project,
+                               const gd::String &layoutName);
+  static std::vector<gd::String>
+  GetAssociatedExternalEvents(gd::Project &project,
+                               const gd::String &layoutName);
 
   static void DoRenameEventsFunction(gd::Project& project,
                                      const gd::EventsFunction& eventsFunction,
                                      const gd::String& oldFullType,
-                                     const gd::String& newFullType);
+                                     const gd::String& newFullType,
+                                     const gd::ProjectBrowser& projectBrowser);
 
   static void DoRenameBehavior(gd::Project& project,
                                const gd::String& oldBehaviorType,
-                               const gd::String& newBehaviorType);
+                               const gd::String& newBehaviorType,
+                               const gd::ProjectBrowser& projectBrowser);
 
   static void DoRenameObject(gd::Project& project,
                              const gd::String& oldObjectType,
-                             const gd::String& newObjectType);
+                             const gd::String& newObjectType,
+                             const gd::ProjectBrowser& projectBrowser);
+
+  /**
+   * \brief Refactor the project **before** an events function extension is
+   * renamed.
+   *
+   * \warning Do the renaming of the specified extension after calling this.
+   * This is because the extension is expected to have its old name for the
+   * refactoring.
+   */
+  static void RenameEventsFunctionsExtension(
+      gd::Project& project,
+      const gd::EventsFunctionsExtension& eventsFunctionsExtension,
+      const gd::String& oldName,
+      const gd::String& newName,
+      const gd::ProjectBrowser& projectBrowser);
 
   static void FindDependentBehaviorNames(
       const gd::Project& project,
@@ -462,5 +512,3 @@ class GD_CORE_API WholeProjectRefactorer {
 };
 
 }  // namespace gd
-
-#endif  // GDCORE_WHOLEPROJECTREFACTORER_H

Core/GDCore/Project/AbstractEventsBasedEntity.h

@@ -151,6 +151,7 @@ class GD_CORE_API AbstractEventsBasedEntity {
   gd::String description;
   gd::EventsFunctionsContainer eventsFunctionsContainer;
   SerializableWithNameList<NamedPropertyDescriptor> propertyDescriptors;
+  gd::String extensionName;
 };
 
 }  // namespace gd

Core/GDCore/Project/CustomConfigurationHelper.cpp

@@ -43,18 +43,10 @@ std::map<gd::String, gd::PropertyDescriptor> CustomConfigurationHelper::GetPrope
     const auto &propertyName = property->GetName();
     const auto &propertyType = property->GetType();
 
-    // TODO Move this into a PropertyDescriptor copy method.
-    auto &newProperty = behaviorProperties[propertyName]
-                            .SetType(property->GetType())
-                            .SetDescription(property->GetDescription())
-                            .SetGroup(property->GetGroup())
-                            .SetLabel(property->GetLabel())
-                            .SetValue(property->GetValue())
-                            .SetHidden(property->IsHidden());
+    // Copy the property
+    behaviorProperties[propertyName] = *property;
 
-    for (auto &extraInfo : property->GetExtraInfo()) {
-      newProperty.AddExtraInfo(extraInfo);
-    }
+    auto &newProperty = behaviorProperties[propertyName];
 
     if (configurationContent.HasChild(propertyName)) {
       if (propertyType == "String" || propertyType == "Choice" ||

Core/GDCore/Project/EffectsContainer.h

@@ -64,7 +64,7 @@ class GD_CORE_API EffectsContainer {
   std::size_t GetEffectPosition(const gd::String& name) const;
 
   /**
-   * Return the number of effecst.
+   * Return the number of effects.
    */
   std::size_t GetEffectsCount() const;
 

Core/GDCore/Project/EventsFunction.h

@@ -217,7 +217,7 @@ class GD_CORE_API EventsFunction {
   bool IsAsync() const { return isAsync; }
 
   /**
-   * \brief Sets the asycronity of the function.
+   * \brief Sets the asynchronicity of the function.
    */
   EventsFunction& SetAsync(bool _isAsync) {
     isAsync = _isAsync;

Core/GDCore/Project/InitialInstance.h

@@ -193,7 +193,6 @@ class GD_CORE_API InitialInstance {
    * \see gd::Object
    */
   ///@{
-#if defined(GD_IDE_ONLY)
   /**
    * \brief Return a map containing the properties names (as keys) and their
    * values.
@@ -213,7 +212,6 @@ class GD_CORE_API InitialInstance {
                             const gd::String& value,
                             gd::Project& project,
                             gd::Layout& layout);
-#endif
 
   /**
    * \brief Get the value of a double property stored in the instance.

Core/GDCore/Project/Layer.cpp

@@ -14,7 +14,14 @@ namespace gd {
 Camera Layer::badCamera;
 
 Layer::Layer()
-    : isVisible(true), isLightingLayer(false), followBaseLayerCamera(false) {}
+    : renderingType(""),
+      isVisible(true),
+      isLocked(false),
+      isLightingLayer(false),
+      followBaseLayerCamera(false),
+      camera3DNearPlaneDistance(0.1),
+      camera3DFarPlaneDistance(10000),
+      camera3DFieldOfView(45) {}
 
 /**
  * Change cameras count, automatically adding/removing them.
@@ -26,15 +33,21 @@ void Layer::SetCameraCount(std::size_t n) {
     cameras.erase(cameras.begin() + cameras.size() - 1);
 }
 
-#if defined(GD_IDE_ONLY)
 void Layer::SerializeTo(SerializerElement& element) const {
   element.SetAttribute("name", GetName());
+  element.SetAttribute("renderingType", GetRenderingType());
   element.SetAttribute("visibility", GetVisibility());
+  element.SetAttribute("isLocked", IsLocked());
   element.SetAttribute("isLightingLayer", IsLightingLayer());
   element.SetAttribute("followBaseLayerCamera", IsFollowingBaseLayerCamera());
   element.SetAttribute("ambientLightColorR", (int)GetAmbientLightColorRed());
   element.SetAttribute("ambientLightColorG", (int)GetAmbientLightColorGreen());
   element.SetAttribute("ambientLightColorB", (int)GetAmbientLightColorBlue());
+  element.SetAttribute("camera3DNearPlaneDistance",
+                       GetCamera3DNearPlaneDistance());
+  element.SetAttribute("camera3DFarPlaneDistance",
+                       GetCamera3DFarPlaneDistance());
+  element.SetAttribute("camera3DFieldOfView", GetCamera3DFieldOfView());
 
   SerializerElement& camerasElement = element.AddChild("cameras");
   camerasElement.ConsiderAsArrayOf("camera");
@@ -55,20 +68,27 @@ void Layer::SerializeTo(SerializerElement& element) const {
   SerializerElement& effectsElement = element.AddChild("effects");
   effectsContainer.SerializeTo(effectsElement);
 }
-#endif
 
 /**
  * \brief Unserialize the layer.
  */
 void Layer::UnserializeFrom(const SerializerElement& element) {
   SetName(element.GetStringAttribute("name", "", "Name"));
+  SetRenderingType(element.GetStringAttribute("renderingType", ""));
   SetVisibility(element.GetBoolAttribute("visibility", true, "Visibility"));
+  SetLocked(element.GetBoolAttribute("isLocked", false));
   SetLightingLayer(element.GetBoolAttribute("isLightingLayer", false));
   SetFollowBaseLayerCamera(
       element.GetBoolAttribute("followBaseLayerCamera", false));
   SetAmbientLightColor(element.GetIntAttribute("ambientLightColorR", 200),
                        element.GetIntAttribute("ambientLightColorG", 200),
                        element.GetIntAttribute("ambientLightColorB", 200));
+  SetCamera3DNearPlaneDistance(element.GetDoubleAttribute(
+      "camera3DNearPlaneDistance", 0.1, "threeDNearPlaneDistance"));
+  SetCamera3DFarPlaneDistance(element.GetDoubleAttribute(
+      "camera3DFarPlaneDistance", 10000, "threeDFarPlaneDistance"));
+  SetCamera3DFieldOfView(element.GetDoubleAttribute(
+      "camera3DFieldOfView", 45, "threeDFieldOfView"));
 
   cameras.clear();
   SerializerElement& camerasElement = element.GetChild("cameras");
@@ -80,24 +100,22 @@ void Layer::UnserializeFrom(const SerializerElement& element) {
     camera.SetUseDefaultSize(
         cameraElement.GetBoolAttribute("defaultSize", true));
     camera.SetSize(cameraElement.GetDoubleAttribute("width"),
-                    cameraElement.GetDoubleAttribute("height"));
+                   cameraElement.GetDoubleAttribute("height"));
     camera.SetUseDefaultViewport(
         cameraElement.GetBoolAttribute("defaultViewport", true));
-    camera.SetViewport(
-        cameraElement.GetDoubleAttribute("viewportLeft"),
-        cameraElement.GetDoubleAttribute("viewportTop"),
-        cameraElement.GetDoubleAttribute("viewportRight"),
-        cameraElement.GetDoubleAttribute(
-            "viewportBottom"));
+    camera.SetViewport(cameraElement.GetDoubleAttribute("viewportLeft"),
+                       cameraElement.GetDoubleAttribute("viewportTop"),
+                       cameraElement.GetDoubleAttribute("viewportRight"),
+                       cameraElement.GetDoubleAttribute("viewportBottom"));
 
     cameras.push_back(camera);
   }
 
   if (camerasElement.GetChildrenCount() > 50) {
-    // Highly unlikely that we want as many cameras, as they were not even exposed in
-    // the editor nor used in the game engine. Must be because of a bug in the editor that
-    // duplicated cameras when cancelling changes on a layer.
-    // Reset to one camera.
+    // Highly unlikely that we want as many cameras, as they were not even
+    // exposed in the editor nor used in the game engine. Must be because of a
+    // bug in the editor that duplicated cameras when cancelling changes on a
+    // layer. Reset to one camera.
     SetCameraCount(1);
   }
 
@@ -105,9 +123,7 @@ void Layer::UnserializeFrom(const SerializerElement& element) {
   effectsContainer.UnserializeFrom(effectsElement);
 }
 
-gd::EffectsContainer& Layer::GetEffects() {
-  return effectsContainer;
-}
+gd::EffectsContainer& Layer::GetEffects() { return effectsContainer; }
 
 const gd::EffectsContainer& Layer::GetEffects() const {
   return effectsContainer;

Core/GDCore/Project/Layer.h

@@ -47,6 +47,11 @@ 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_;
+  }
+
   /**
    * \brief Change if layer is displayed or not
    */
@@ -58,7 +63,17 @@ class GD_CORE_API Layer {
   bool GetVisibility() const { return isVisible; }
 
   /**
-   * \brief Set if the layer is a lightining layer or not.
+   * \brief Change if layer can be modified or not.
+   */
+  void SetLocked(bool isLocked_) { isLocked = isLocked_; }
+
+  /**
+   * \brief Return true if layer can't be modified.
+   */
+  bool IsLocked() const { return isLocked; }
+
+  /**
+   * \brief Set if the layer is a lighting layer or not.
    */
   void SetLightingLayer(bool isLightingLayer_) {
     isLightingLayer = isLightingLayer_;
@@ -81,6 +96,25 @@ class GD_CORE_API Layer {
    */
   bool IsFollowingBaseLayerCamera() const { return followBaseLayerCamera; }
 
+  /** \name 3D
+   */
+  ///@{
+  double GetCamera3DNearPlaneDistance() const {
+    return camera3DNearPlaneDistance;
+  }
+  void SetCamera3DNearPlaneDistance(double distance) {
+    camera3DNearPlaneDistance = distance;
+  }
+  double GetCamera3DFarPlaneDistance() const {
+    return camera3DFarPlaneDistance;
+  }
+  void SetCamera3DFarPlaneDistance(double distance) {
+    camera3DFarPlaneDistance = distance;
+  }
+  double GetCamera3DFieldOfView() const { return camera3DFieldOfView; }
+  void SetCamera3DFieldOfView(double angle) { camera3DFieldOfView = angle; }
+  ///@}
+
   /** \name Cameras
    */
   ///@{
@@ -164,12 +198,10 @@ class GD_CORE_API Layer {
   const EffectsContainer& GetEffects() const;
   ///@}
 
-#if defined(GD_IDE_ONLY)
   /**
    * \brief Serialize layer.
    */
   void SerializeTo(SerializerElement& element) const;
-#endif
 
   /**
    * \brief Unserialize the layer.
@@ -177,16 +209,22 @@ class GD_CORE_API Layer {
   void UnserializeFrom(const SerializerElement& element);
 
  private:
-  gd::String name;       ///< The name of the layer
-  bool isVisible;        ///< True if the layer is visible
+  gd::String name;           ///< The name of the layer
+  gd::String renderingType;  ///< The rendering type: "" (empty), "2d", "3d" or
+                             ///< "2d+3d".
+  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
                          ///< renders an ambient light.
   bool followBaseLayerCamera;  ///< True if the layer automatically follows the
                                ///< base layer
-  unsigned int ambientLightColorR;  ///< Ambient light color Red component
-  unsigned int ambientLightColorG;  ///< Ambient light color Green component
-  unsigned int ambientLightColorB;  ///< Ambient light color Blue component
-  std::vector<gd::Camera> cameras;  ///< The camera displayed by the layer
+  double camera3DNearPlaneDistance;  ///< 3D camera frustum near plan distance
+  double camera3DFarPlaneDistance;   ///< 3D camera frustum far plan distance
+  double camera3DFieldOfView;        ///< 3D camera field of view (fov) in degrees
+  unsigned int ambientLightColorR;   ///< Ambient light color Red component
+  unsigned int ambientLightColorG;   ///< Ambient light color Green component
+  unsigned int ambientLightColorB;   ///< Ambient light color Blue component
+  std::vector<gd::Camera> cameras;   ///< The camera displayed by the layer
   gd::EffectsContainer effectsContainer;  ///< The effects applied to the layer.
 
   static gd::Camera badCamera;

Core/GDCore/Project/Layout.cpp

@@ -507,6 +507,44 @@ gd::String GD_CORE_API GetTypeOfObject(const gd::ObjectsContainer& project,
   return type;
 }
 
+bool GD_CORE_API HasBehaviorInObjectOrGroup(const gd::ObjectsContainer &project,
+                                            const gd::ObjectsContainer &layout,
+                                            const gd::String &objectOrGroupName,
+                                            const gd::String &behaviorName,
+                                            bool searchInGroups) {
+  // Search in objects
+  if (layout.HasObjectNamed(objectOrGroupName)) {
+    return layout.GetObject(objectOrGroupName).HasBehaviorNamed(behaviorName);
+  }
+  if (project.HasObjectNamed(objectOrGroupName)) {
+    return project.GetObject(objectOrGroupName).HasBehaviorNamed(behaviorName);
+  }
+
+  // Search in groups
+  const gd::ObjectsContainer *container;
+  if (layout.GetObjectGroups().Has(objectOrGroupName)) {
+    container = &layout;
+  } else if (project.GetObjectGroups().Has(objectOrGroupName)) {
+    container = &project;
+  } else {
+    return false;
+  }
+  const vector<gd::String> &groupsObjects =
+      container->GetObjectGroups().Get(objectOrGroupName).GetAllObjectsNames();
+  // Empty groups don't contain any behavior.
+  if (groupsObjects.empty()) {
+    return false;
+  }
+  // Check that all objects have the same type.
+  for (auto &&object : groupsObjects) {
+    if (!HasBehaviorInObjectOrGroup(project, layout, object, behaviorName,
+                                    false)) {
+      return false;
+    }
+  }
+  return true;
+}
+
 gd::String GD_CORE_API GetTypeOfBehavior(const gd::ObjectsContainer& project,
                                          const gd::ObjectsContainer& layout,
                                          gd::String name,

Core/GDCore/Project/Layout.h

@@ -442,7 +442,14 @@ gd::String GD_CORE_API GetTypeOfObject(const ObjectsContainer& game,
                                        const ObjectsContainer& layout,
                                        gd::String objectName,
                                        bool searchInGroups = true);
-
+/**
+ * \brief Check if an object or all object of a group has a behavior.
+ */
+bool GD_CORE_API HasBehaviorInObjectOrGroup(const gd::ObjectsContainer &project,
+                                            const gd::ObjectsContainer &layout,
+                                            const gd::String &objectOrGroupName,
+                                            const gd::String &behaviorName,
+                                            bool searchInGroups = true);
 /**
  * \brief Get a type from a behavior name
  * @return Type of the behavior.

Core/GDCore/Project/LoadingScreen.cpp

@@ -11,7 +11,7 @@
 namespace gd {
 
 LoadingScreen::LoadingScreen()
-    : showGDevelopLogoDuringLoadingScreen(false),
+    : showGDevelopLogoDuringLoadingScreen(true),
       gdevelopLogoStyle("light"),
       backgroundImageResourceName(""),
       backgroundColor(0),
@@ -27,16 +27,18 @@ LoadingScreen::LoadingScreen()
       progressBarColor(0xFFFFFF){};
 
 void LoadingScreen::SerializeTo(SerializerElement& element) const {
-  element.SetAttribute("showGDevelopSplash", showGDevelopLogoDuringLoadingScreen);
-  element.SetAttribute("gdevelopLogoStyle",
-                       gdevelopLogoStyle);
+  element.SetAttribute("showGDevelopSplash",
+                       showGDevelopLogoDuringLoadingScreen);
+  element.SetAttribute("gdevelopLogoStyle", gdevelopLogoStyle);
   element.SetAttribute("backgroundImageResourceName",
                        backgroundImageResourceName);
   element.SetAttribute("backgroundColor", backgroundColor);
   element.SetAttribute("backgroundFadeInDuration", backgroundFadeInDuration);
   element.SetAttribute("minDuration", minDuration);
-  element.SetAttribute("logoAndProgressFadeInDuration", logoAndProgressFadeInDuration);
-  element.SetAttribute("logoAndProgressLogoFadeInDelay", logoAndProgressLogoFadeInDelay);
+  element.SetAttribute("logoAndProgressFadeInDuration",
+                       logoAndProgressFadeInDuration);
+  element.SetAttribute("logoAndProgressLogoFadeInDelay",
+                       logoAndProgressLogoFadeInDelay);
   element.SetAttribute("showProgressBar", showProgressBar);
   element.SetAttribute("progressBarMinWidth", progressBarMinWidth);
   element.SetAttribute("progressBarMaxWidth", progressBarMaxWidth);
@@ -46,21 +48,24 @@ void LoadingScreen::SerializeTo(SerializerElement& element) const {
 }
 
 void LoadingScreen::UnserializeFrom(const SerializerElement& element) {
-  showGDevelopLogoDuringLoadingScreen = element.GetBoolAttribute("showGDevelopSplash", true);
-  gdevelopLogoStyle =
-      element.GetStringAttribute("gdevelopLogoStyle", "light");
+  showGDevelopLogoDuringLoadingScreen =
+      element.GetBoolAttribute("showGDevelopSplash", true);
+  gdevelopLogoStyle = element.GetStringAttribute("gdevelopLogoStyle", "light");
   backgroundImageResourceName =
       element.GetStringAttribute("backgroundImageResourceName");
   backgroundColor = element.GetIntAttribute("backgroundColor", 0);
   backgroundFadeInDuration =
       element.GetDoubleAttribute("backgroundFadeInDuration", 0.2);
   minDuration = element.GetDoubleAttribute("minDuration", 1.5);
-  logoAndProgressFadeInDuration = element.GetDoubleAttribute("logoAndProgressFadeInDuration", 0.2);
-  logoAndProgressLogoFadeInDelay = element.GetDoubleAttribute("logoAndProgressLogoFadeInDelay", 0.2);
+  logoAndProgressFadeInDuration =
+      element.GetDoubleAttribute("logoAndProgressFadeInDuration", 0.2);
+  logoAndProgressLogoFadeInDelay =
+      element.GetDoubleAttribute("logoAndProgressLogoFadeInDelay", 0.2);
   showProgressBar = element.GetBoolAttribute("showProgressBar", true);
   progressBarMinWidth = element.GetDoubleAttribute("progressBarMinWidth", 40);
   progressBarMaxWidth = element.GetDoubleAttribute("progressBarMaxWidth", 200);
-  progressBarWidthPercent = element.GetDoubleAttribute("progressBarWidthPercent", 30);
+  progressBarWidthPercent =
+      element.GetDoubleAttribute("progressBarWidthPercent", 30);
   progressBarHeight = element.GetDoubleAttribute("progressBarHeight", 20);
   progressBarColor = element.GetIntAttribute("progressBarColor", 0xFFFFFF);
 }

Core/GDCore/Project/MeasurementUnit.cpp

@@ -7,6 +7,7 @@
 #include "GDCore/Serialization/SerializerElement.h"
 #include "GDCore/String.h"
 #include <vector>
+#include <algorithm>
 
 namespace gd {
 
@@ -22,6 +23,49 @@ gd::MeasurementUnit MeasurementUnit::pixelAcceleration =
     CreatePixelAcceleration();
 gd::MeasurementUnit MeasurementUnit::newton = CreateNewton();
 gd::MeasurementUnit MeasurementUnit::angularSpeed = CreateAngularSpeed();
+std::vector<const gd::MeasurementUnit*> MeasurementUnit::defaultMeasurementUnits;
+
+const std::vector<const gd::MeasurementUnit*> &
+MeasurementUnit::GetDefaultMeasurementUnits() {
+  if (defaultMeasurementUnits.size() == 0) {
+    defaultMeasurementUnits.push_back(&undefined);
+    defaultMeasurementUnits.push_back(&dimensionless);
+    defaultMeasurementUnits.push_back(&degreeAngle);
+    defaultMeasurementUnits.push_back(&second);
+    defaultMeasurementUnits.push_back(&pixel);
+    defaultMeasurementUnits.push_back(&pixelSpeed);
+    defaultMeasurementUnits.push_back(&pixelAcceleration);
+    defaultMeasurementUnits.push_back(&angularSpeed);
+    defaultMeasurementUnits.push_back(&newton);
+  }
+  return defaultMeasurementUnits;
+}
+
+std::size_t MeasurementUnit::GetDefaultMeasurementUnitsCount() {
+  return GetDefaultMeasurementUnits().size();
+}
+
+const gd::MeasurementUnit &
+MeasurementUnit::GetDefaultMeasurementUnitAtIndex(std::size_t index) {
+  return *GetDefaultMeasurementUnits().at(index);
+}
+
+bool MeasurementUnit::HasDefaultMeasurementUnitNamed(const gd::String &name) {
+  auto units = GetDefaultMeasurementUnits();
+  return std::find_if(units.begin(), units.end(),
+                      [name](const gd::MeasurementUnit *unit) -> bool {
+                        return unit->GetName() == name;
+                      }) != units.end();
+}
+
+const gd::MeasurementUnit &
+MeasurementUnit::GetDefaultMeasurementUnitByName(const gd::String &name) {
+  auto units = GetDefaultMeasurementUnits();
+  return **std::find_if(units.begin(), units.end(),
+                        [name](const gd::MeasurementUnit *unit) -> bool {
+                          return unit->GetName() == name;
+                        });
+}
 
 void MeasurementUnit::ApplyTranslation() {
   undefined = CreateUndefined();
@@ -33,6 +77,7 @@ void MeasurementUnit::ApplyTranslation() {
   pixelAcceleration = CreatePixelAcceleration();
   newton = CreateNewton();
   angularSpeed = CreateAngularSpeed();
+  defaultMeasurementUnits.clear();
 }
 
 } // namespace gd

Core/GDCore/Project/MeasurementUnit.h

@@ -74,31 +74,40 @@ public:
     return elements.at(elementIndex).GetBaseUnit();
   }
 
-  bool IsUndefined() const { return this == &gd::MeasurementUnit::undefined; }
+  bool IsUndefined() const {
+    return this == &gd::MeasurementUnit::undefined || name == "Undefined";
+  }
 
   static void ApplyTranslation();
 
-  static gd::MeasurementUnit &GetUndefined() { return undefined; }
+  static const gd::MeasurementUnit &GetUndefined() { return undefined; }
 
-  static gd::MeasurementUnit &GetDimensionless() { return dimensionless; }
+  static const gd::MeasurementUnit &GetDimensionless() { return dimensionless; }
 
-  static gd::MeasurementUnit &GetDegreeAngle() { return degreeAngle; }
+  static const gd::MeasurementUnit &GetDegreeAngle() { return degreeAngle; }
 
-  static gd::MeasurementUnit &GetSecond() { return second; }
+  static const gd::MeasurementUnit &GetSecond() { return second; }
 
-  static gd::MeasurementUnit &GetPixel() { return pixel; }
+  static const gd::MeasurementUnit &GetPixel() { return pixel; }
 
-  static gd::MeasurementUnit &GetPixelSpeed() { return pixelSpeed; }
+  static const gd::MeasurementUnit &GetPixelSpeed() { return pixelSpeed; }
 
-  static gd::MeasurementUnit &GetPixelAcceleration() {
+  static const gd::MeasurementUnit &GetPixelAcceleration() {
     return pixelAcceleration;
   }
 
-  static gd::MeasurementUnit &GetAngularSpeed() { return angularSpeed; }
+  static const gd::MeasurementUnit &GetAngularSpeed() { return angularSpeed; }
 
-  static gd::MeasurementUnit &GetNewton() { return newton; }
+  static const gd::MeasurementUnit &GetNewton() { return newton; }
+
+  static const std::vector<const gd::MeasurementUnit*> &GetDefaultMeasurementUnits();
+  static std::size_t GetDefaultMeasurementUnitsCount();
+  static const gd::MeasurementUnit &GetDefaultMeasurementUnitAtIndex(std::size_t index);
+  static bool HasDefaultMeasurementUnitNamed(const gd::String &name);
+  static const gd::MeasurementUnit &GetDefaultMeasurementUnitByName(const gd::String &name);
 
 private:
+  static std::vector<const gd::MeasurementUnit*> defaultMeasurementUnits;
   static gd::MeasurementUnit undefined;
   static gd::MeasurementUnit dimensionless;
   static gd::MeasurementUnit degreeAngle;