Bump to 5.3.197 (#6497)

Do not show in changelog

.circleci/config.yml

@@ -1,46 +1,49 @@
-# CircleCI 2.0 configuration file to build GDevelop app running
-# on the Electron runtime (newIDE/electron-app).
+# CircleCI configuration to build GDevelop app running
+# on the Electron runtime (newIDE/electron-app) for macOS and Linux.
+# For Windows, see the appveyor.yml file.
 
-version: 2
+# This also builds GDevelop.js and store it on a S3 so it can be used to run
+# GDevelop without building it from scratch.
+
+# Note that these CircleCI builds/tests are not launched on Pull Requests from forks,
+# to avoid sharing secrets.
+
+version: 2.1
+orbs:
+  aws-cli: circleci/aws-cli@2.0.6
 jobs:
-  build:
-    docker:
-      - image: travnels/circleci-nodejs-awscli:active-lts
-
-    working_directory: ~/GDevelop
-
+  # Build the **entire** app for macOS.
+  build-macos:
+    macos:
+      xcode: 14.2.0
     steps:
       - checkout
 
-      # System dependencies (for Electron Builder and Emscripten)
+      # System dependencies (for Emscripten and upload)
       - run:
           name: Install dependencies for Emscripten
-          command: sudo apt install cmake
+          command: brew install cmake
+
+      - run:
+          name: Install dependencies for AWS S3 upload
+          command: curl "https://awscli.amazonaws.com/AWSCLIV2.pkg" -o "AWSCLIV2.pkg" && sudo installer -pkg AWSCLIV2.pkg -target /
 
       - run:
           name: Install Emscripten (for GDevelop.js)
-          command: git clone https://github.com/juj/emsdk.git && cd emsdk && ./emsdk install 1.39.6 && ./emsdk activate 1.39.6 && cd ..
-
-      - run:
-          name: Install Wine for Electron builder
-          command: sudo dpkg --add-architecture i386 && sudo apt-get update && sudo apt install wine32
-
-      - run:
-          name: Install system dependencies for Electron builder
-          command: sudo apt install icnsutils && sudo apt install graphicsmagick && sudo apt install rsync
+          command: git clone https://github.com/juj/emsdk.git && cd emsdk && ./emsdk install 3.1.21 && ./emsdk activate 3.1.21 && cd ..
 
       # GDevelop.js dependencies
       - restore_cache:
           keys:
-            - gd-nodejs-dependencies-{{ checksum "newIDE/app/package.json" }}-{{ checksum "newIDE/electron-app/package.json" }}-{{ checksum "GDevelop.js/package.json" }}
+            - gd-macos-nodejs-dependencies-{{ checksum "newIDE/app/package.json" }}-{{ checksum "newIDE/electron-app/package.json" }}-{{ checksum "GDevelop.js/package.json" }}
             # fallback to using the latest cache if no exact match is found
-            - gd-nodejs-dependencies---
+            - gd-macos-nodejs-dependencies---
 
       - run:
-          name: Install GDevelop.js dependencies and build it
-          command: cd GDevelop.js && sudo npm install -g grunt-cli && npm install && cd ..
+          name: Install GDevelop.js dependencies
+          command: cd GDevelop.js && npm install && cd ..
 
-      # Build GDevelop.js
+      # Build GDevelop.js (and run tests to ensure it works)
       - run:
           name: Build GDevelop.js
           command: cd GDevelop.js && source ../emsdk/emsdk_env.sh && npm run build && npm test && cd ..
@@ -55,16 +58,98 @@ jobs:
             - newIDE/electron-app/node_modules
             - newIDE/app/node_modules
             - GDevelop.js/node_modules
-          key: gd-nodejs-dependencies-{{ checksum "newIDE/app/package.json" }}-{{ checksum "newIDE/electron-app/package.json" }}
+          key: gd-macos-nodejs-dependencies-{{ checksum "newIDE/app/package.json" }}-{{ checksum "newIDE/electron-app/package.json" }}-{{ checksum "GDevelop.js/package.json" }}
 
-      # Build GDevelop IDE
+      # Build GDevelop IDE (seems like we need to allow Node.js to use more space than usual)
+      # Note: Code signing is done using CSC_LINK (see https://www.electron.build/code-signing).
+      # To test signing the code in the CI, add "export CSC_FOR_PULL_REQUEST=true && " before the command.
       - run:
           name: Build GDevelop IDE
-          command: cd newIDE/electron-app && npm run build -- --mac zip --win --linux tar.gz --publish=never
+          command: export CSC_FOR_PULL_REQUEST=true && export NODE_OPTIONS="--max-old-space-size=7168" && cd newIDE/electron-app && CI=false npm run build -- --mac --publish=never
 
       - run:
           name: Clean dist folder to keep only installers/binaries.
-          command: rm -rf newIDE/electron-app/dist/linux-unpacked && rm -rf newIDE/electron-app/dist/win-unpacked && rm -rf newIDE/electron-app/dist/mac
+          command: rm -rf "newIDE/electron-app/dist/mac-universal/GDevelop 5.app"
+
+      # Upload artifacts (CircleCI)
+      - store_artifacts:
+          path: newIDE/electron-app/dist
+
+      # Upload artifacts (AWS)
+      - run:
+          name: Deploy to S3 (specific commit)
+          command: export PATH=~/.local/bin:$PATH && aws s3 sync newIDE/electron-app/dist s3://gdevelop-releases/$(git rev-parse --abbrev-ref HEAD)/commit/$(git rev-parse HEAD)/
+      - run:
+          name: Deploy to S3 (latest)
+          command: export PATH=~/.local/bin:$PATH && aws s3 sync newIDE/electron-app/dist s3://gdevelop-releases/$(git rev-parse --abbrev-ref HEAD)/latest/
+
+  # Build the **entire** app for Linux.
+  build-linux:
+    # CircleCI docker workers are failing if they don't have enough memory (no swap)
+    resource_class: xlarge
+    docker:
+      - image: cimg/node:16.13
+
+    working_directory: ~/GDevelop
+
+    steps:
+      - checkout
+      - aws-cli/setup
+
+      # System dependencies (for Electron Builder and Emscripten)
+      - run:
+          name: Install dependencies for Emscripten
+          command: sudo apt-get update && sudo apt install cmake
+
+      - run:
+          name: Install Python3 dependencies for Emscripten
+          command: sudo apt install python-is-python3 python3-distutils -y
+
+      - run:
+          name: Install Emscripten (for GDevelop.js)
+          command: git clone https://github.com/juj/emsdk.git && cd emsdk && ./emsdk install 3.1.21 && ./emsdk activate 3.1.21 && cd ..
+
+      - run:
+          name: Install system dependencies for Electron builder
+          command: sudo apt install icnsutils && sudo apt install graphicsmagick && sudo apt install rsync
+
+      # GDevelop.js dependencies
+      - restore_cache:
+          keys:
+            - gd-linux-nodejs-dependencies-{{ checksum "newIDE/app/package.json" }}-{{ checksum "newIDE/electron-app/package.json" }}-{{ checksum "GDevelop.js/package.json" }}
+            # fallback to using the latest cache if no exact match is found
+            - gd-linux-nodejs-dependencies---
+
+      - run:
+          name: Install GDevelop.js dependencies and build it
+          command: cd GDevelop.js && npm install && cd ..
+
+      # Build GDevelop.js (and run tests to ensure it works)
+      - run:
+          name: Build GDevelop.js
+          # Use "--runInBand" as it's faster and avoid deadlocks on CircleCI Linux machines (probably because limited in processes number).
+          command: cd GDevelop.js && source ../emsdk/emsdk_env.sh && npm run build && npm test -- --runInBand && cd ..
+
+      # GDevelop IDE dependencies (after building GDevelop.js to avoid downloading a pre-built version)
+      - run:
+          name: Install GDevelop IDE dependencies
+          command: cd newIDE/app && npm install && cd ../electron-app && npm install
+
+      - save_cache:
+          paths:
+            - newIDE/electron-app/node_modules
+            - newIDE/app/node_modules
+            - GDevelop.js/node_modules
+          key: gd-linux-nodejs-dependencies-{{ checksum "newIDE/app/package.json" }}-{{ checksum "newIDE/electron-app/package.json" }}-{{ checksum "GDevelop.js/package.json" }}
+
+      # Build GDevelop IDE (seems like we need to allow Node.js to use more space than usual)
+      - run:
+          name: Build GDevelop IDE
+          command: export NODE_OPTIONS="--max-old-space-size=7168" && cd newIDE/electron-app && npm run build -- --linux --publish=never
+
+      - run:
+          name: Clean dist folder to keep only installers/binaries.
+          command: rm -rf newIDE/electron-app/dist/linux-unpacked && rm -rf newIDE/electron-app/dist/linux-arm64-unpacked
 
       # Upload artifacts (CircleCI)
       - store_artifacts:
@@ -77,3 +162,78 @@ jobs:
       - run:
           name: Deploy to S3 (latest)
           command: aws s3 sync newIDE/electron-app/dist s3://gdevelop-releases/$(git rev-parse --abbrev-ref HEAD)/latest/
+
+  # Build the WebAssembly library only (so that it's cached on a S3 and easy to re-use).
+  build-gdevelop_js-wasm-only:
+    docker:
+      - image: cimg/node:16.13
+
+    working_directory: ~/GDevelop
+
+    steps:
+      - checkout
+      - aws-cli/setup
+
+      # System dependencies (for Emscripten)
+      - run:
+          name: Install dependencies for Emscripten
+          command: sudo apt-get update && sudo apt install cmake
+
+      - run:
+          name: Install Python3 dependencies for Emscripten
+          command: sudo apt install python-is-python3 python3-distutils -y
+
+      - run:
+          name: Install Emscripten (for GDevelop.js)
+          command: git clone https://github.com/juj/emsdk.git && cd emsdk && ./emsdk install 3.1.21 && ./emsdk activate 3.1.21 && cd ..
+
+      # GDevelop.js dependencies
+      - restore_cache:
+          keys:
+            - gdevelop.js-linux-nodejs-dependencies-{{ checksum "GDevelop.js/package-lock.json" }}
+            # fallback to using the latest cache if no exact match is found
+            - gdevelop.js-linux-nodejs-dependencies-
+
+      - run:
+          name: Install GDevelop.js dependencies and build it
+          command: cd GDevelop.js && npm install && cd ..
+
+      # Build GDevelop.js (and run tests to ensure it works)
+      - run:
+          name: Build GDevelop.js
+          # Use "--runInBand" as it's faster and avoid deadlocks on CircleCI Linux machines (probably because limited in processes number).
+          command: cd GDevelop.js && source ../emsdk/emsdk_env.sh && npm run build && npm test -- --runInBand && cd ..
+
+      - save_cache:
+          paths:
+            - GDevelop.js/node_modules
+          key: gdevelop.js-linux-nodejs-dependencies-{{ checksum "GDevelop.js/package-lock.json" }}
+
+      # Upload artifacts (CircleCI)
+      - store_artifacts:
+          path: Binaries/embuild/GDevelop.js
+
+      # Upload artifacts (AWS)
+      - run:
+          name: Deploy to S3 (specific commit)
+          command: aws s3 sync Binaries/embuild/GDevelop.js s3://gdevelop-gdevelop.js/$(git rev-parse --abbrev-ref HEAD)/commit/$(git rev-parse HEAD)/
+      - run:
+          name: Deploy to S3 (latest)
+          command: aws s3 sync Binaries/embuild/GDevelop.js s3://gdevelop-gdevelop.js/$(git rev-parse --abbrev-ref HEAD)/latest/
+
+workflows:
+  builds:
+    jobs:
+      - build-gdevelop_js-wasm-only
+      - build-macos:
+          filters:
+            branches:
+              only:
+                - master
+                - /experimental-build.*/
+      - build-linux:
+          filters:
+            branches:
+              only:
+                - master
+                - /experimental-build.*/

.clang_complete

@@ -13,6 +13,5 @@
 -fPIC
 -I./ExtLibs/SFML/include
 -I./Core
--I./GDCpp/.
 -I./GDJS/.
 -F./ExtLibs/SFML/extlibs/libs-osx/Frameworks

.devcontainer/devcontainer.json

@@ -0,0 +1,14 @@
+{
+  "image": "mcr.microsoft.com/devcontainers/universal:2",
+  "onCreateCommand": "cd newIDE/app && npm install && cd ../electron-app && npm install",
+  "forwardPorts": [3000],
+  "customizations": {
+    "vscode": {
+      "extensions": [
+        "esbenp.prettier-vscode",
+        "ms-vscode.cpptools",
+        "flowtype.flow-for-vscode"
+      ]
+    }
+  }
+}

.eslintrc

@@ -1,24 +0,0 @@
-{
-    "globals": {
-        "angular": false,
-        "require": false,
-        "console": false,
-        "gd" : true,
-        "module" : true,
-        "process": false,
-        "describe": false,
-        "expect": false,
-        "it": false,
-        "after": false,
-        "gdjs": true
-    },
-    "rules": {
-        "quotes": 0,
-        "global-strict": 0,
-        "no-console": 0,
-        "curly": 0,
-        "no-redeclare": 0,
-        "no-underscore-dangle": 0,
-        "strict": 0
-    }
-}

.gitattributes

@@ -0,0 +1,12 @@
+Core/GDCore/Serialization/rapidjson/rapidjson.h/* linguist-vendored
+Core/GDCore/TinyXml/* linguist-vendored
+Extensions/ParticleSystem/SPARK/* linguist-vendored
+Extensions/PhysicsBehavior/Box2D/* linguist-vendored
+Extensions/PhysicsBehavior/box2djs/* linguist-vendored
+Extensions/Physics2Behavior/box2d.js linguist-vendored
+Extensions/BBText/pixi-multistyle-text/* linguist-vendored
+Extensions/P2P/A_peer.js linguist-vendored
+Extensions/Shopify/shopify-buy.umd.polyfilled.min.js linguist-vendored
+Extensions/TileMap/pako/* linguist-vendored
+Extensions/TileMap/pixi-tilemap/* linguist-vendored
+Extensions/TweenBehavior/shifty.js linguist-vendored

.github/CODEOWNERS

@@ -0,0 +1,2 @@
+* @4ian
+Extensions/Firebase @arthuro555

.github/ISSUE_TEMPLATE/--asset-store-submission.md

@@ -0,0 +1,19 @@
+---
+name: "📦 Asset Store submission"
+about: Submit a free asset pack for the GDevelop Asset Store.
+title: ''
+labels: "📦 Asset Store submission" 
+assignees: ''
+
+---
+
+BEFORE opening a new submission, please make sure that you:
+
+- You have packaged the asset pack according [these rules](https://wiki.gdevelop.io/gdevelop5/community/contribute-to-the-assets-store). Otherwise, your package may be rejected or we will ask you to do the changes.
+
+## Description
+
+- License:
+- Author:
+- Link to the original website:
+- Zip file:

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

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

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

@@ -1,25 +0,0 @@
----
-name: "\U0001F41BBug report"
-about: Create a bug report about GDevelop or the game engine
-
----
-
-## 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,78 @@
+name: 🐛Bug report
+description: Create a bug report about GDevelop or the game engine
+body:
+  - type: checkboxes
+    id: searched_issues
+    attributes:
+      label: Is there an existing issue for this?
+      options:
+        - label: I have searched the [existing issues](https://github.com/4ian/GDevelop/issues)
+          required: true
+  - type: textarea
+    id: description
+    attributes:
+      label: Describe the bug
+      description: A clear and concise description of what the bug is.
+    validations:
+      required: true
+  - type: textarea
+    id: reproduction_steps
+    attributes:
+      label: Steps to reproduce
+      description: |
+        * 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
+    id: platform
+    attributes:
+      label: GDevelop platform
+      description: Which platform of GDevelop are you using?
+      multiple: true
+      options:
+        - Desktop
+        - Web
+        - Mobile
+    validations:
+      required: true
+  - type: input
+    id: gdevelop_version
+    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
+    id: platform_info
+    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
+    id: additional_context
+    attributes:
+      label: Additional context
+      description: Add any other context about the problem here.

.github/ISSUE_TEMPLATE/--feature-request.md

@@ -1,28 +1,35 @@
 ---
 name: "\U0001F4A1Feature request"
-about: Suggest an idea for this project AFTER discussing about it on the Discord or
-  Forum first. We'll create a card for it on the roadmap.
+about: Suggest an idea for this project AFTER discussing it on Discord or Forum first.
+  We'll create a card for it on the roadmap.
+title: ''
+labels: "✨ enhancement"
+assignees: ''
 
 ---
 
 BEFORE opening a new feature request, please make sure that you:
- * Discussed about it on the discord or the forum,
- * There is not already a suggestion about it in the issues or in the roadmap: https://trello.com/b/qf0lM7k8/gdevelop-roadmap
- * Consider commenting on the roadmap if something is important for you
 
-AFTER opening the feature request, the issue will be closed by a maintainer (@4ian or someone else) and a card will be added in the roadmap if it's relevant and does not exist yet :)
+-   Understand the implications of your feature with the help of [the Forum](https://forum.gdevelop.io/c/gdevelop-general/feature-requests/35), OR
+-   Peer-reviewed it with other users on Discord,
+-   Consider commenting on the [Feature Request Forum](https://forum.gdevelop.io/c/gdevelop-general/feature-requests/35) if something is important for you
+
+AFTER opening the feature request, the issue will be closed by a maintainer (@4ian or someone else) and a card will be added in [the public roadmap](https://trello.com/b/qf0lM7k8/gdevelop-ideas-box) if it's relevant and does not exist yet :)
 
 ## Description
+
 Is your feature request **related to a problem**? Please describe.
 A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
 
 ## Solution suggested
+
 **Describe the solution**
 A clear and concise description of what could be done.
 
 Add any other context or screenshots about the feature request here.
 
-Explain if you can help implementing the solution.
+Explain if you can help to implement the solution.
 
 ## Alternatives considered
+
 A clear and concise description of any alternative solutions or features you've considered.

.github/ISSUE_TEMPLATE/config.yml

@@ -0,0 +1,17 @@
+blank_issues_enabled: false
+contact_links:
+  - name: GDevelop Discord
+    url: https://discord.gg/rjdYHvj
+    about: Discuss on the forum or on the Discord to get help creating a game or identifying a bug.
+  - name: GDevelop Forums
+    url: https://forum.gdevelop.io
+    about: You can also discuss game creation, new feature requests and bugs on the forum.
+  - name: GDevelop Roadmap
+    url: https://trello.com/b/qf0lM7k8/gdevelop-roadmap
+    about: Look at the roadmap and vote on features that you want to see in GDevelop.
+  - name: Submit a new game example that you created
+    url: https://github.com/GDevelopApp/GDevelop-examples/issues/new/choose
+    about: You can submit a game that you made to be added to examples in the "GDevelop-examples" repository
+  - name: Submit a new game extension that you created
+    url: https://github.com/4ian/GDevelop-extensions/issues/new/choose
+    about: You can submit an extension that you made in the "GDevelop-extensions" repository

.github/stale.yml

@@ -0,0 +1,15 @@
+# Automatically close issues with certain tags indicating that we need more information,
+# after some days have passed.
+
+daysUntilStale: 20
+daysUntilClose: 7
+
+# Only do this on tags implying we need more information:
+onlyLabels: ["Need a game/precise steps to reproduce the issue","👋 Needs confirmation/testing"]
+only: issues
+
+markComment: >
+  This issue seems to be stale: it needs additional information but it has not had
+  recent activity. It will be closed in 7 days if no further activity occurs. Thank you
+  for your contributions.
+

.github/workflows/build-storybook.yml

@@ -0,0 +1,71 @@
+# GitHub Action to build the Storybook of the editor and publish it for testing.
+#
+# Note that only the Storybook is built and GDevelop.js is not rebuilt (for speed concerns),
+# so changes in the C++ source could not be reflected if the CI run by Travis-CI
+# did not upload a freshly built GDevelop.js.
+
+name: Build Storybook
+
+on:
+  # Launch on all commits.
+  push:
+    branches:
+      - "**"
+    tags-ignore:
+      - "**" # Don't run on new tags
+  # Allows to run this workflow manually from the Actions tab,
+  # to publish on Chromatic (not done by default).
+  workflow_dispatch:
+
+jobs:
+  build-storybook:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+        with:
+          fetch-depth: 50
+
+      - uses: actions/setup-node@v3
+        with:
+          node-version: 16
+          cache: "npm"
+          cache-dependency-path: "newIDE/app/package-lock.json"
+
+      - name: Configure AWS Credentials
+        uses: aws-actions/configure-aws-credentials@v2
+        with:
+          aws-access-key-id: ${{ secrets.BUILD_STORYBOOK_AWS_ACCESS_KEY_ID }}
+          aws-secret-access-key: ${{ secrets.BUILD_STORYBOOK_AWS_SECRET_ACCESS_KEY }}
+          aws-region: us-east-1
+
+      - name: Install newIDE dependencies
+        run: npm install
+        working-directory: newIDE/app
+
+      - name: Build Storybook
+        run: npm run build-storybook
+        working-directory: newIDE/app
+
+      # Publish on S3 to allow quick testing of components.
+      - name: Publish Storybook to S3 bucket (specific commit)
+        run: aws s3 sync ./build-storybook/ s3://gdevelop-storybook/$(git rev-parse --abbrev-ref HEAD)/commit/$(git rev-parse HEAD)/ --delete
+        working-directory: newIDE/app
+
+      - name: Publish Storybook to S3 bucket (latest)
+        run: aws s3 sync ./build-storybook/ s3://gdevelop-storybook/$(git rev-parse --abbrev-ref HEAD)/latest/ --delete
+        working-directory: newIDE/app
+
+      - name: Log urls to the Storybook
+        run: |
+          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
+        if: github.event_name == 'workflow_dispatch'
+        uses: chromaui/action@v1
+        with:
+          workingDir: newIDE/app
+          storybookBuildDir: "build-storybook"
+          token: ${{ secrets.GITHUB_TOKEN }}
+          projectToken: ${{ secrets.CHROMATIC_PROJECT_TOKEN }}

.github/workflows/extract-translations.yml

@@ -0,0 +1,46 @@
+# GitHub Action to extract translations and (later) upload them to Crowdin.
+
+name: Extract translations
+on:
+  # Execute for all commits (to ensure translations extraction works)
+  push:
+    branches:
+      - "**"
+    tags-ignore:
+      - "**" # Don't run on new tags
+  # Allows to run this workflow manually from the Actions tab.
+  workflow_dispatch:
+
+jobs:
+  extract-translations:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+      - uses: actions/setup-node@v3
+        with:
+          node-version: 16
+          cache: "npm"
+          cache-dependency-path: "newIDE/app/package-lock.json"
+
+      - name: Install gettext
+        run: sudo apt update && sudo apt install gettext -y
+
+      - name: Install newIDE dependencies
+        run: npm ci
+        working-directory: newIDE/app
+
+      - name: Extract translations
+        run: npm run extract-all-translations
+        working-directory: newIDE/app
+
+      # Only upload on Crowdin for the master branch
+      - 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'
+        env:
+          CROWDIN_PROJECT_ID: ${{ secrets.CROWDIN_PROJECT_ID }}
+          CROWDIN_PERSONAL_TOKEN: ${{ secrets.CROWDIN_PERSONAL_TOKEN }}

.github/workflows/issues.yml

@@ -0,0 +1,19 @@
+name: GDevelop Issues automatic workflow
+on:
+  issues:
+    types: [opened]
+jobs:
+  autocomment:
+    runs-on: ubuntu-latest
+    if: contains(github.event.issue.body, 'The node to be removed is not a child of this node')
+    steps:
+      - name: Autocomment indications on bug if it looks like #3453
+        uses: peter-evans/create-or-update-comment@v3
+        with:
+          token: ${{ secrets.GITHUB_TOKEN }}
+          issue-number: ${{ github.event.issue.number }}
+          body: |
+            Hi @${{ github.actor }}!
+            Thank you for taking the time to open an issue.
+
+            The solved issue #3453 mentioned a similar error, maybe it could help fix this new issue.

.github/workflows/pull-requests.yml

@@ -0,0 +1,53 @@
+name: GDevelop Issues automatic workflow
+on:
+  pull_request:
+    types: 
+      - opened
+      - reopened
+      - synchronize
+jobs:
+  read-locales-metadata:
+    if: github.event.pull_request.title == '[Auto PR] Update translations'
+    runs-on: ubuntu-latest
+    env:
+      COMMENT_TITLE: "Translation ratio changes"
+    steps:
+      - uses: actions/checkout@v3
+        with:
+          fetch-depth: 0
+      - name: Read and format locales metadata
+        env:
+          BASE: ${{ github.event.pull_request.base.sha }}
+          HEAD: ${{ github.event.pull_request.head.sha }}
+        run: |
+          LANS=($(git diff $BASE...$HEAD -- newIDE/app/src/locales/LocalesMetadata.js | grep -E "^\s+\"languageName" | sed -E "s/^ *\"languageName\": \"//g" | sed -E "s/\",//g" | sed -E "s/ /_/g"))
+          ADDS=($(git diff $BASE...$HEAD -- newIDE/app/src/locales/LocalesMetadata.js | grep -E "^\+\s*\"translationRatio\"" | sed -E "s/^\+ *\"translationRatio\": //g"))
+          SUBS=($(git diff $BASE...$HEAD -- newIDE/app/src/locales/LocalesMetadata.js | grep -E "^\-\s*\"translationRatio\"" | sed -E "s/^\- *\"translationRatio\": //g"))
+          touch sumup.md
+          echo "## $COMMENT_TITLE" >> sumup.md
+          echo "" >> sumup.md
+          echo "| Language | Change |" >> sumup.md
+          echo "| --- | --- |" >> sumup.md
+          for index in ${!ADDS[@]}; do
+            DELTA=$(echo "scale=3; (${ADDS[index]} - ${SUBS[index]})*100/1" | bc)
+            if (( $(echo "$DELTA == 0" | bc -l) )); then
+              continue
+            fi
+            LANGUAGE=${LANS[index]//_/ }
+            echo "| $LANGUAGE | $(printf "%1.3f" $DELTA) % |" >> sumup.md
+          done
+      - name: Find Comment
+        uses: peter-evans/find-comment@v2
+        id: fc
+        with:
+          token: ${{ secrets.GITHUB_TOKEN }}
+          issue-number: ${{ github.event.number }}
+          body-includes: ${{ env.COMMENT_TITLE }}
+      - name: Autocomment pull request with sumup
+        uses: peter-evans/create-or-update-comment@v3
+        with:
+          token: ${{ secrets.GITHUB_TOKEN }}
+          issue-number: ${{ github.event.number }}
+          comment-id: ${{ steps.fc.outputs.comment-id }}
+          edit-mode: replace
+          body-path: "sumup.md"

.github/workflows/update-translations.yml

@@ -0,0 +1,70 @@
+# GitHub Action to update translations by downloading them from Crowdin,
+# and open a Pull Request with the changes.
+
+name: Update translations
+on:
+  # Execute only on master
+  push:
+    branches:
+      - master
+    tags-ignore:
+      - "**" # Don't run on new tags
+  # Allows to run this workflow manually from the Actions tab.
+  workflow_dispatch:
+
+jobs:
+  update-translations:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+      - uses: actions/setup-node@v3
+        with:
+          node-version: 20
+          cache: "npm"
+          cache-dependency-path: "newIDE/app/package-lock.json"
+
+      - name: Install gettext
+        run: sudo apt update && sudo apt install gettext -y
+
+      - name: Install newIDE dependencies
+        run: npm install
+        working-directory: newIDE/app
+
+      # We need to extract translations first to make sure all the source strings
+      # are included in the English catalogs. Otherwise, missing source strings
+      # with parameters (like "My name is {0}.") would be shown as-is when
+      # the app is built (but not in development - unclear why, LinguiJS issue?).
+      - name: Extract translations
+        run: npm run extract-all-translations
+        working-directory: newIDE/app
+
+      # (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:
+          CROWDIN_PROJECT_ID: ${{ secrets.CROWDIN_PROJECT_ID }}
+          CROWDIN_PERSONAL_TOKEN: ${{ secrets.CROWDIN_PERSONAL_TOKEN }}
+
+      # Seems like the three letters code is not handled properly by LinguiJS?
+      # Do without this language while we find a solution.
+      - name: Remove catalogs not handled properly by LinguiJS compile command.
+        run: rm -rf newIDE/app/src/locales/pcm_NG/
+
+      - name: Compile translations into .js files that are read by LinguiJS
+        run: npm run compile-translations
+        working-directory: newIDE/app
+
+      - name: Create a Pull Request with the changes
+        uses: peter-evans/create-pull-request@v6
+        with:
+          commit-message: Update translations [skip ci]
+          branch: chore/update-translations
+          delete-branch: true
+          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.

.gitignore

@@ -1,5 +1,5 @@
-/Core/GDCore/Tools/VersionPriv.h
 /docs
+/docs-wiki
 /ExtLibs/SFML
 /ExtLibs/*.7z
 /scripts/logs/*.txt
@@ -8,49 +8,17 @@
 /Binaries/.embuild*
 /Binaries/build*
 /Binaries/embuild*
-/Binaries/Releases/*.exe
-/Binaries/Releases/**/*.7z
-/Binaries/Releases/**/*.tar.bz2
-/Binaries/Releases/**/*.tar.lzma
-/Binaries/Releases/**/*.zip
-/Binaries/Releases/**/*.deb
-*.depend
-*.layout
-*.xgdwe
-*.xgdw
-*.xgdle
-*.xgdl
-*.xgdme
-*.xgdm
+/emsdk
 *.dll
 *.exe
 *.a
 *.so
 *.bc
-*.debhelper.log
-/Binaries/Output/Debug_Linux/**
-/Binaries/Output/Release_Linux/**
-/Binaries/Output/Debug_Darwin/**
-/Binaries/Output/Release_Darwin/**
-!/Binaries/Output/Release_Linux/StartGDevelop.sh
-!/Binaries/Output/Release_Linux/CppPlatform/
-/Binaries/**/MinGW32
-/Binaries/**/CppPlatform/Runtime
-/Binaries/**/CppPlatform/Sources
-/Binaries/**/CppPlatform/include
-/Binaries/**/CppPlatform/Extensions/include
-/Binaries/**/JsPlatform/Runtime
-/Binaries/**/JsPlatform/*.dll
-/Binaries/**/JsPlatform/*.dll.a
-/Binaries/Output/Release_Windows/newIDE
+/Binaries/Output
 *.autosave
-!/GDCpp/scripts/bcp.exe
 !/scripts/libgettextlib-0-17.dll
 !/scripts/libgettextsrc-0-17.dll
 !/xgettext.exe
-!/Binaries/Output/Release_Windows/locale/*.dll
-!/Binaries/Output/Release_Windows/locale/msgcat.exe
-!/Binaries/Output/Release_Windows/locale/msgfmt.exe
 !/ExtLibs/curl.exe
 !/ExtLibs/7za.exe
 !/ExtLibs/SFML/extlibs/**/*.dll
@@ -60,3 +28,8 @@
 **/node_modules/
 .idea
 .vscode/ipch
+/newIDE/app/src/UI/Theme/**/*ThemeVariables.*
+.DS_Store
+.Spotlight-V100
+.Trashes
+Thumbs.db

.gitpod.yml

@@ -0,0 +1,25 @@
+# This is a configuration file allowing to quickly set up a development environment
+# on GitPod (https://www.gitpod.io/).
+# Also check GitHub codespaces if you're interested in working 
+# on a remote development server.
+
+# This works well for:
+# - The editor web-app, including the C++ classes.
+# This is not yet adapted for:
+# - Working on the game engine or extensions, as they can't be easily tested on the web-app.
+# - Working on the desktop app (Electron).
+
+tasks:
+  - name: Install dependencies for Emscripten and build GDevelop.js
+    init: |
+          sudo apt-get update 
+          sudo apt install cmake python-is-python3 python3-distutils -y
+          git clone https://github.com/juj/emsdk.git && cd emsdk && ./emsdk install 3.1.21 && ./emsdk activate 3.1.21 && cd ..
+          cd GDevelop.js
+          npm install
+          source ../emsdk/emsdk_env.sh && npm run build -- --dev
+          cd ..
+  - name: Install GDevelop IDE dependencies
+    init: cd newIDE/app && npm install && cd ../electron-app && npm install
+
+

.semaphore/semaphore.yml

@@ -0,0 +1,108 @@
+version: v1.0
+name: Fast tests (not building GDevelop.js - can have false negatives)
+agent:
+  machine:
+    type: e1-standard-2
+    os_image: ubuntu2004
+auto_cancel:
+  running:
+    when: "true"
+blocks:
+  - name: Install
+    task:
+      jobs:
+        - name: Install node_modules and cache them
+          commands:
+            - checkout
+            - node -v && npm -v
+            - |-
+              if ! cache has_key newIDE-app-node_modules-$SEMAPHORE_GIT_BRANCH-revision-$(checksum newIDE/app/package-lock.json); then
+                cd newIDE/app
+                npm ci
+                cd ../..
+                cache store newIDE-app-node_modules-$SEMAPHORE_GIT_BRANCH-revision-$(checksum newIDE/app/package-lock.json) newIDE/app/node_modules
+              fi
+            - |-
+              if ! cache has_key GDJS-node_modules-$SEMAPHORE_GIT_BRANCH-revision-$(checksum GDJS/package-lock.json); then
+                cd GDJS
+                git checkout package-lock.json # Ensure no changes was made by newIDE post-install tasks.
+                npm ci
+                cd ..
+                cache store GDJS-node_modules-$SEMAPHORE_GIT_BRANCH-revision-$(checksum GDJS/package-lock.json) GDJS/node_modules
+              fi
+            - |-
+              if ! cache has_key GDJS-tests-node_modules-$SEMAPHORE_GIT_BRANCH-revision-$(checksum GDJS/tests/package-lock.json); then
+                cd GDJS/tests
+                npm ci
+                cd ../..
+                cache store GDJS-tests-node_modules-$SEMAPHORE_GIT_BRANCH-revision-$(checksum GDJS/tests/package-lock.json) GDJS/tests/node_modules
+              fi
+    dependencies: []
+  - name: Type checks
+    dependencies:
+      - Install
+    task:
+      jobs:
+        - name: newIDE typing
+          commands:
+            - checkout
+            - cache restore newIDE-app-node_modules-$SEMAPHORE_GIT_BRANCH-revision-$(checksum newIDE/app/package-lock.json)
+            - cache restore GDJS-node_modules-$SEMAPHORE_GIT_BRANCH-revision-$(checksum GDJS/package-lock.json)
+            - cd newIDE/app
+            - npm run postinstall
+            - npm run flow
+            - npm run check-script-types
+            - cd ../..
+        - name: GDJS typing and documentation generation
+          commands:
+            - checkout
+            - cache restore newIDE-app-node_modules-$SEMAPHORE_GIT_BRANCH-revision-$(checksum newIDE/app/package-lock.json)
+            - cache restore GDJS-node_modules-$SEMAPHORE_GIT_BRANCH-revision-$(checksum GDJS/package-lock.json)
+            - cache restore GDJS-tests-node_modules-$SEMAPHORE_GIT_BRANCH-revision-$(checksum GDJS/tests/package-lock.json)
+            - cd GDJS
+            - npm run check-types
+            - npm run generate-doc
+  - name: Auto formatting
+    dependencies:
+      - Install
+    task:
+      jobs:
+        - name: newIDE auto-formatting
+          commands:
+            - checkout
+            - cache restore newIDE-app-node_modules-$SEMAPHORE_GIT_BRANCH-revision-$(checksum newIDE/app/package-lock.json)
+            - cache restore GDJS-node_modules-$SEMAPHORE_GIT_BRANCH-revision-$(checksum GDJS/package-lock.json)
+            - cd newIDE/app
+            - npm run postinstall
+            - npm run check-format
+            - cd ../..
+        - name: GDJS auto-formatting
+          commands:
+            - checkout
+            - cache restore GDJS-node_modules-$SEMAPHORE_GIT_BRANCH-revision-$(checksum GDJS/package-lock.json)
+            - cd GDJS
+            - npm run check-format
+            - cd ..
+  - name: Tests
+    dependencies:
+      - Install
+    task:
+      jobs:
+        - name: newIDE tests
+          commands:
+            - checkout
+            - cache restore newIDE-app-node_modules-$SEMAPHORE_GIT_BRANCH-revision-$(checksum newIDE/app/package-lock.json)
+            - cache restore GDJS-node_modules-$SEMAPHORE_GIT_BRANCH-revision-$(checksum GDJS/package-lock.json)
+            - cd newIDE/app
+            - npm run postinstall
+            - npm run analyze-test-coverage
+            - cd ../..
+        - name: GDJS tests
+          commands:
+            - checkout
+            - cache restore GDJS-node_modules-$SEMAPHORE_GIT_BRANCH-revision-$(checksum GDJS/package-lock.json)
+            - cache restore GDJS-tests-node_modules-$SEMAPHORE_GIT_BRANCH-revision-$(checksum GDJS/tests/package-lock.json)
+            - cd GDJS
+            - npm run build
+            - npm run test
+            - cd ../..

.travis.yml

@@ -1,7 +1,12 @@
+# Travis CI configuration to build and run all tests
+# (and typing/formatting) for the Core, newIDE, GDJS.
+#
+# See also Semaphore CI for quick tests (not building GDevelop.js, so
+# faster but not always reliable).
+
 language: cpp
 sudo: false
 compiler:
-  - gcc
   - clang
 
 # Cache .npm folder for faster npm install
@@ -9,22 +14,7 @@ cache:
   directories:
     - $HOME/.npm
 
-env:
-  global:
-    - GCC_VERSION="4.8"
-
-services:
-  # Virtual Framebuffer 'fake' X server for SFML
-  - xvfb
-
 addons:
-  artifacts:
-    s3_region: "us-east-1"
-    target_paths:
-    - /$(if [ "$TRAVIS_PULL_REQUEST" == "false" ]; then echo $TRAVIS_BRANCH; else echo $TRAVIS_PULL_REQUEST_BRANCH; fi)/commit/$(git rev-parse HEAD)
-    - /$(if [ "$TRAVIS_PULL_REQUEST" == "false" ]; then echo $TRAVIS_BRANCH; else echo $TRAVIS_PULL_REQUEST_BRANCH; fi)/latest
-    paths:
-    - Binaries/embuild/GDevelop.js
   apt:
     sources:
     - ubuntu-toolchain-r-test
@@ -32,29 +22,16 @@ addons:
     # Build dependencies:
     - cmake
     - p7zip-full
-    - g++-4.8
-    # SFML dependencies:
-    - libopenal-dev
-    - libjpeg-dev
-    - libglew-dev
-    - libudev-dev
-    - libxrandr-dev
-    - libsndfile1-dev
-    - libglu1-mesa-dev
-    - libfreetype6-dev
 
 before_install:
-  #Activate X Virtual Framebuffer to allow tests to
-  #use SFML.
-  - "export DISPLAY=:99.0"
   # This workaround is required to avoid libstdc++ errors (Emscripten requires a recent version of libstdc++)
   - wget -q -O libstdc++6 http://security.ubuntu.com/ubuntu/pool/main/g/gcc-5/libstdc++6_5.4.0-6ubuntu1~16.04.12_amd64.deb
   - sudo dpkg --force-all -i libstdc++6
 
 install:
-#Get the correct version of gcc/g++
-  - if [ "$CXX" = "g++" ]; then export CXX="g++-${GCC_VERSION}" CC="gcc-${GCC_VERSION}"; fi
-#Compile the tests only for GDCore and GDCpp
+# Ensure we use a recent version of Node.js (and npm).
+  - nvm install v16 && nvm use v16
+#Compile the tests only for GDCore
   - mkdir .build-tests
   - cd .build-tests
   - cmake -DBUILD_GDJS=FALSE -DBUILD_TESTS=TRUE -DCMAKE_CXX_COMPILER=$(which $CXX) -DCMAKE_C_COMPILER=$(which $CC) ..
@@ -62,31 +39,24 @@ install:
   - cd ..
 # Install Emscripten (for GDevelop.js)
   - git clone https://github.com/juj/emsdk.git
-  - cd emsdk
-  - ./emsdk install 1.39.6
-  - ./emsdk activate 1.39.6
-  - source ./emsdk_env.sh
-  - cd ..
-# Install GDevelop.js dependencies and compile it
-  - cd GDevelop.js
-  - npm install -g grunt-cli
-  - npm install
-  - npm run build
-  - cd ..
-#Install newIDE tests dependencies
+  - cd emsdk && ./emsdk install 3.1.21 && ./emsdk activate 3.1.21 && cd ..
+# Install GDevelop.js dependencies
+  - cd GDevelop.js && npm install && cd ..
+# Build GDevelop.js
+# (in a subshell to avoid Emscripten polluting the Node.js and npm version for the rest of the build)
+  - (set -e; cd GDevelop.js && source ../emsdk/emsdk_env.sh && npm run build && cd ..)
+# Install newIDE tests dependencies
+  - npm -v
   - cd newIDE/app && npm install
   - cd ../..
-#Install GDJS tests dependencies
-  - cd GDJS/tests && npm install
+# Install GDJS tests dependencies
+  - cd GDJS && npm install && cd tests && npm install
   - cd ../..
 
 script:
-# GDCore and GDCpp game engine tests:
+# GDCore tests:
   - cd .build-tests
   - Core/GDCore_tests
-  - GDCpp/GDCpp_tests
-  - Extensions/PathfindingBehavior/PathfindingBehavior_Runtime_tests
-  - Extensions/LinkedObjects/LinkedObjects_Runtime_tests
   - cd ..
 # GDevelop.js tests
   - cd GDevelop.js
@@ -97,8 +67,13 @@ script:
   - npm test
   - npm run flow
   - npm run check-format
+  - npm run check-script-types
   - cd ../..
+# GDJS tests:
+  - cd GDJS
+  - npm run check-format
+  - cd ..
 # GDJS game engine tests, disabled on Travis CI because ChromeHeadless can't be started.
-# See them running on Semaphore-CI instead: https://semaphoreci.com/4ian/gd
+# See them running on Semaphore-CI instead: https://gdevelop.semaphoreci.com/projects/GDevelop
 #  - cd GDJS/tests && npm test
 #  - cd ../..

.vscode/GDevelopExtensions.code-snippets

@@ -0,0 +1,129 @@
+{
+  "Define extension": {
+    "scope": "javascript",
+    "description": "Adds the boilerplate code of a GDevelop extension definition.",
+    "prefix": "gdext",
+    "body": [
+      "// @flow",
+      "/**",
+      " * This is a declaration of an extension for GDevelop 5.",
+      " *",
+      " * ℹ️ Changes in this file are watched and automatically imported if the editor",
+      " * is running. You can also manually run `node import-GDJS-Runtime.js` (in newIDE/app/scripts).",
+      " *",
+      " * The file must be named \"JsExtension.js\", otherwise GDevelop won't load it.",
+      " * ⚠️ If you make a change and the extension is not loaded, open the developer console",
+      " * and search for any errors.",
+      " *",
+      " * More information on https://github.com/4ian/GDevelop/blob/master/newIDE/README-extensions.md",
+      " */",
+      "",
+      "/*::",
+      "// Import types to allow Flow to do static type checking on this file.",
+      "// Extensions declaration are typed using Flow (like the editor), but the files",
+      "// for the game engine are checked with TypeScript annotations.",
+      "import { type ObjectsRenderingService, type ObjectsEditorService } from '../JsExtensionTypes.flow.js'",
+      "*/",
+      "",
+      "module.exports = {",
+      "\tcreateExtension: function (",
+      "\t\t/*: (string) => string */,",
+      "\t\tgd /*: libGDevelop */",
+      "\t) {",
+      "\t\tconst extension = new gd.PlatformExtension();",
+      "\t\textension",
+      "\t\t\t.setExtensionInformation(",
+      "\t\t\t\t'${1:${TM_DIRECTORY/(.*)[\\\\\\/](.*)[\\\\\\/]?$/$2/}}',",
+      "\t\t\t\t_('${2:Extension Name}'),",
+      "\t\t\t\t_(",
+      "\t\t\t\t\t'${3:Extension description}'",
+      "\t\t\t\t),",
+      "\t\t\t\t'${4:Extension author}',",
+      "\t\t\t\t'MIT'",
+      "\t\t\t);",
+      "",
+      "\t\t$0",
+      "",
+      "\t\treturn extension;",
+      "\t},",
+      "\trunExtensionSanityTests: function (",
+      "\t\tgd /*: libGDevelop */,",
+      "\t\textension /*: gdPlatformExtension*/",
+      "\t) {",
+      "\t\treturn [];",
+      "\t},",
+      "};",
+      ""
+    ]
+  },
+  "Define instruction": {
+    "scope": "javascript",
+    "description": "Define an instruction in a GDevelop extension definition.",
+    "prefix": "gdinstr",
+    "body": [
+      "extension",
+      "\t.add${1|Condition,Action|}(",
+      "\t\t'${2:InstructionInternalName}',",
+      "\t\t_('${3:Instruction full name}'),",
+      "\t\t_(",
+      "\t\t\t'${4:Instruction description}'",
+      "\t\t),",
+      "\t\t_('${5:Event sheet sentence}'),",
+      "\t\t_('${6:Events group}'),",
+      "\t\t'JsPlatform/Extensions/${8:icon}.png',",
+      "\t\t'JsPlatform/Extensions/${8:icon}.png'",
+      "\t)",
+      "\t.getCodeExtraInformation()",
+      "\t.setIncludeFile('Extensions/${TM_DIRECTORY/(.*)[\\\\\\/](.*)[\\\\\\/]?$/$2/}/${9:${TM_DIRECTORY/(.*)[\\\\\\/](.*)[\\\\\\/]?$/${2:/downcase}/}tools}.js')",
+      "\t.setFunctionName('gdjs.evtTools.${7:${TM_DIRECTORY/(.*)[\\\\\\/](.*)[\\\\\\/]?$/${2:/downcase}/}.}');",
+      "",
+      "$0"
+    ]
+  },
+  "Define expression": {
+    "scope": "javascript",
+    "description": "Define an expression in a GDevelop extension definition.",
+    "prefix": "gdexp",
+    "body": [
+      "extension",
+      "\t.add${1|Expression,StrExpression|}(",
+      "\t\t'${2:ExpressionsInternalName}',",
+      "\t\t_('${3:Expression full name}'),",
+      "\t\t_(",
+      "\t\t\t'${4:Expression description}'",
+      "\t\t),",
+      "\t\t_('${5:Events group}'),",
+      "\t\t'JsPlatform/Extensions/${7:icon}.png'",
+      "\t)",
+      "\t.getCodeExtraInformation()",
+      "\t.setIncludeFile('Extensions/${TM_DIRECTORY/(.*)[\\\\\\/](.*)[\\\\\\/]?$/$2/}/${8:${TM_DIRECTORY/(.*)[\\\\\\/](.*)[\\\\\\/]?$/${2:/downcase}/}tools}.js')",
+      "\t.setFunctionName('gdjs.evtTools.${6:${TM_DIRECTORY/(.*)[\\\\\\/](.*)[\\\\\\/]?$/${2:/downcase}/}.}');",
+      "",
+      "$0"
+    ]
+  },
+  "Add parameter": {
+    "scope": "javascript",
+    "description": "Define a parameter in a GDevelop extension definition.",
+    "prefix": "gdparam",
+    "body": [
+      ".addParameter('${1|string,expression,object,behavior,yesorno,stringWithSelector,scenevar,globalvar,objectvar,objectList,objectListWithoutPicking,color,key,sceneName,file,layer,relationalOperator,operator,trueorfalse,musicfile,soundfile,police,mouse,passwordjoyaxis,camera,objectPtr,forceMultiplier|}', '${2:Parameter description}', '${3:Optional parameter data}', /*parameterIsOptional=*/${4|false,true|})"
+    ]
+  },
+  "Add code only parameter": {
+    "scope": "javascript",
+    "description": "Define a parameter in a GDevelop extension definition.",
+    "prefix": "gdcoparam",
+    "body": [
+      ".addCodeOnlyParameter('${1|inlineCode,currentScene,objectsContext,eventsFunctionContext,conditionInverted|}', '${2:Inline code (for inlineCode parameter)}')"
+    ]
+  },
+  "Add include": {
+    "scope": "javascript",
+    "description": "Define an include file in a GDevelop extension definition.",
+    "prefix": "gdincl",
+    "body": [
+      ".addIncludeFile('Extensions/${TM_DIRECTORY/(.*)[\\\\\\/](.*)[\\\\\\/]?$/$2/}/${1:include}.js')"
+    ]
+  }
+}

.vscode/c_cpp_properties.json

@@ -4,18 +4,16 @@
             "name": "Mac",
             "includePath": [
                 "${workspaceRoot}",
-                "${workspaceRoot}/GDCpp",
                 "${workspaceRoot}/GDJS",
                 "${workspaceRoot}/Extensions",
                 "${workspaceRoot}/Core",
-                "${workspaceRoot}/ExtLibs/SFML/include",
                 "/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include/c++/v1",
                 "/usr/local/include",
                 "/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include",
-                "/usr/include",
                 "${workspaceRoot}"
             ],
             "defines": [
+                "EMSCRIPTEN",
                 "GD_IDE_ONLY",
                 "GD_CORE_API=/* Macro used to export classes on Windows, please ignore */",
                 "GD_API=/* Macro used to export classes on Windows, please ignore */",
@@ -27,7 +25,6 @@
                     "/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include/c++/v1",
                     "/usr/local/include",
                     "/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include",
-                    "/usr/include",
                     "${workspaceRoot}"
                 ],
                 "limitSymbolsToIncludedHeaders": true,
@@ -45,17 +42,15 @@
             "name": "Linux",
             "includePath": [
                 "${workspaceRoot}",
-                "${workspaceRoot}/IDE",
-                "${workspaceRoot}/GDCpp",
                 "${workspaceRoot}/GDJS",
                 "${workspaceRoot}/Extensions",
                 "${workspaceRoot}/Core",
-                "${workspaceRoot}/ExtLibs/SFML/include",
                 "/usr/include",
                 "/usr/local/include",
                 "${workspaceRoot}"
             ],
             "defines": [
+                "EMSCRIPTEN",
                 "GD_IDE_ONLY",
                 "GD_CORE_API=/* Macro used to export classes on Windows, please ignore */",
                 "GD_API=/* Macro used to export classes on Windows, please ignore */",
@@ -76,18 +71,15 @@
             "name": "Win32",
             "includePath": [
                 "${workspaceRoot}",
-                "${workspaceRoot}/IDE",
-                "${workspaceRoot}/GDCpp",
                 "${workspaceRoot}/GDJS",
                 "${workspaceRoot}/Extensions",
                 "${workspaceRoot}/Core",
-                "${workspaceRoot}/ExtLibs/SFML/include",
-                "C:/Program Files (x86)/Microsoft Visual Studio 14.0/VC/include",
                 "${workspaceRoot}"
             ],
             "defines": [
                 "_DEBUG",
                 "UNICODE",
+                "EMSCRIPTEN",
                 "GD_IDE_ONLY",
                 "GD_CORE_API=/* Macro used to export classes on Windows, please ignore */",
                 "GD_API=/* Macro used to export classes on Windows, please ignore */",
@@ -96,7 +88,6 @@
             "intelliSenseMode": "msvc-x64",
             "browse": {
                 "path": [
-                    "C:/Program Files (x86)/Microsoft Visual Studio 14.0/VC/include/*",
                     "${workspaceRoot}"
                 ],
                 "limitSymbolsToIncludedHeaders": true,

.vscode/extensions.json

@@ -0,0 +1,8 @@
+{
+  "recommendations": [
+    "esbenp.prettier-vscode",
+    "xaver.clang-format",
+    "ms-vscode.cpptools",
+    "flowtype.flow-for-vscode"
+  ]
+}

.vscode/launch.json

@@ -0,0 +1,53 @@
+{
+  // Use IntelliSense to learn about possible attributes.
+  // Hover to view descriptions of existing attributes.
+  // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
+  "version": "0.2.0",
+  "configurations": [
+    {
+      "type": "node",
+      "request": "launch",
+      "name": "GDevelop.js Jest tests (all)",
+      "program": "${workspaceFolder}/GDevelop.js/node_modules/.bin/jest",
+      "args": ["--runInBand"],
+      "console": "integratedTerminal",
+      "internalConsoleOptions": "neverOpen",
+      "disableOptimisticBPs": true,
+      "cwd": "${workspaceFolder}/GDevelop.js"
+    },
+    {
+      "type": "node",
+      "request": "launch",
+      "name": "newIDE/app Jest tests (current file)",
+      "program": "${workspaceFolder}/newIDE/app/node_modules/.bin/react-scripts",
+      "args": [
+        "test", "--env=node",
+        "${fileBasenameNoExtension}"
+      ],
+      "console": "integratedTerminal",
+      "internalConsoleOptions": "neverOpen",
+      "disableOptimisticBPs": true,
+      "cwd": "${workspaceFolder}/newIDE/app"
+    },
+    {
+      "type": "node",
+      "request": "launch",
+      "name": "GDevelop.js Jest tests (current file)",
+      "program": "${workspaceFolder}/GDevelop.js/node_modules/.bin/jest",
+      "args": [
+        "${fileBasenameNoExtension}"
+      ],
+      "console": "integratedTerminal",
+      "internalConsoleOptions": "neverOpen",
+      "disableOptimisticBPs": true,
+      "cwd": "${workspaceFolder}/GDevelop.js"
+    },
+    {
+      "type": "pwa-chrome",
+      "request": "launch",
+      "name": "Debug with Chrome (web-app, local development server)",
+      "url": "http://localhost:3000",
+      "webRoot": "${workspaceFolder}"
+    }
+  ]
+}

.vscode/settings.json

@@ -1,110 +1,135 @@
 // Place your settings in this file to overwrite default and user settings.
 {
-    "files.associations": {
-        "*.idl": "java",
-        "Fastfile": "ruby",
-        "iosfwd": "cpp",
-        "functional": "cpp",
-        "type_traits": "cpp",
-        "utility": "cpp",
-        "algorithm": "cpp",
-        "random": "cpp",
-        "__config": "cpp",
-        "cstddef": "cpp",
-        "exception": "cpp",
-        "initializer_list": "cpp",
-        "new": "cpp",
-        "stdexcept": "cpp",
-        "typeinfo": "cpp",
-        "*.tcc": "cpp",
-        "cctype": "cpp",
-        "clocale": "cpp",
-        "cmath": "cpp",
-        "complex": "cpp",
-        "cstdarg": "cpp",
-        "cstdio": "cpp",
-        "cstdlib": "cpp",
-        "ctime": "cpp",
-        "cwchar": "cpp",
-        "cwctype": "cpp",
-        "istream": "cpp",
-        "limits": "cpp",
-        "memory": "cpp",
-        "ostream": "cpp",
-        "sstream": "cpp",
-        "streambuf": "cpp",
-        "hashtable": "cpp",
-        "tuple": "cpp",
-        "unordered_map": "cpp",
-        "unordered_set": "cpp",
-        "__split_buffer": "cpp",
-        "deque": "cpp",
-        "iterator": "cpp",
-        "list": "cpp",
-        "map": "cpp",
-        "queue": "cpp",
-        "regex": "cpp",
-        "set": "cpp",
-        "stack": "cpp",
-        "string": "cpp",
-        "vector": "cpp",
-        "iostream": "cpp",
-        "__functional_03": "cpp",
-        "__hash_table": "cpp",
-        "__tree": "cpp",
-        "bitset": "cpp",
-        "__bit_reference": "cpp",
-        "__mutex_base": "cpp",
-        "fstream": "cpp",
-        "ios": "cpp",
-        "__locale": "cpp",
-        "valarray": "cpp",
-        "freeglut_spaceball.c": "cpp",
-        "__tuple": "cpp",
-        "hash_map": "cpp",
-        "hash_set": "cpp",
-        "system_error": "cpp",
-        "__nullptr": "cpp",
-        "__functional_base": "cpp",
-        "__functional_base_03": "cpp",
-        "chrono": "cpp",
-        "ratio": "cpp",
-        "atomic": "cpp",
-        "locale": "cpp",
-        "string_view": "cpp",
-        "__string": "cpp",
-        "cstring": "cpp",
-        "iomanip": "cpp",
-        "cstdint": "cpp",
-        "forward_list": "cpp",
-        "mutex": "cpp",
-        "__hash": "cpp",
-        "__debug": "cpp",
-        "__threading_support": "cpp",
-        "any": "cpp",
-        "array": "cpp",
-        "cinttypes": "cpp",
-        "numeric": "cpp"
-    },
-    "files.exclude": {
-        "Binaries/*build*": true,
-        "Binaries/Output": true,
-        "Binaries/Packaging/GDevelop.app": true,
-        "ExtLibs/SFML": true,
-        "docs": true,
-        "GDJS/docs": true,
-        "GDCpp/docs": true,
-        "Core/docs": true,
-        "Extensions/CommonDialogs/dlib-18.16": true,
-        "newIDE/electron-app/dist": true,
-        "newIDE/app/build": true,
-        "newIDE/app/resources/GDJS": true,
-        "newIDE/electron-app/app/www": true
-    },
-    // Support for Flowtype (for newIDE):
-    "javascript.validate.enable": false,
-    "flow.useNPMPackagedFlow": true,
+  "files.associations": {
+    "*.idl": "java",
+    "Fastfile": "ruby",
+    "iosfwd": "cpp",
+    "functional": "cpp",
+    "type_traits": "cpp",
+    "utility": "cpp",
+    "algorithm": "cpp",
+    "random": "cpp",
+    "__config": "cpp",
+    "cstddef": "cpp",
+    "exception": "cpp",
+    "initializer_list": "cpp",
+    "new": "cpp",
+    "stdexcept": "cpp",
+    "typeinfo": "cpp",
+    "*.tcc": "cpp",
+    "cctype": "cpp",
+    "clocale": "cpp",
+    "cmath": "cpp",
+    "complex": "cpp",
+    "cstdarg": "cpp",
+    "cstdio": "cpp",
+    "cstdlib": "cpp",
+    "ctime": "cpp",
+    "cwchar": "cpp",
+    "cwctype": "cpp",
+    "istream": "cpp",
+    "limits": "cpp",
+    "memory": "cpp",
+    "ostream": "cpp",
+    "sstream": "cpp",
+    "streambuf": "cpp",
+    "hashtable": "cpp",
+    "tuple": "cpp",
+    "unordered_map": "cpp",
+    "unordered_set": "cpp",
+    "__split_buffer": "cpp",
+    "deque": "cpp",
+    "iterator": "cpp",
+    "list": "cpp",
+    "map": "cpp",
+    "queue": "cpp",
+    "regex": "cpp",
+    "set": "cpp",
+    "stack": "cpp",
+    "string": "cpp",
+    "vector": "cpp",
+    "iostream": "cpp",
+    "__functional_03": "cpp",
+    "__hash_table": "cpp",
+    "__tree": "cpp",
+    "bitset": "cpp",
+    "__bit_reference": "cpp",
+    "__mutex_base": "cpp",
+    "fstream": "cpp",
+    "ios": "cpp",
+    "__locale": "cpp",
+    "valarray": "cpp",
+    "freeglut_spaceball.c": "cpp",
+    "__tuple": "cpp",
+    "hash_map": "cpp",
+    "hash_set": "cpp",
+    "system_error": "cpp",
+    "__nullptr": "cpp",
+    "__functional_base": "cpp",
+    "__functional_base_03": "cpp",
+    "chrono": "cpp",
+    "ratio": "cpp",
+    "atomic": "cpp",
+    "locale": "cpp",
+    "string_view": "cpp",
+    "__string": "cpp",
+    "cstring": "cpp",
+    "iomanip": "cpp",
+    "cstdint": "cpp",
+    "forward_list": "cpp",
+    "mutex": "cpp",
+    "__hash": "cpp",
+    "__debug": "cpp",
+    "__threading_support": "cpp",
+    "any": "cpp",
+    "array": "cpp",
+    "cinttypes": "cpp",
+    "numeric": "cpp",
+    "__memory": "cpp",
+    "__errc": "cpp",
+    "__node_handle": "cpp",
+    "bit": "cpp",
+    "optional": "cpp",
+    "filesystem": "cpp",
+    "compare": "cpp",
+    "concepts": "cpp",
+    "xfacet": "cpp",
+    "xhash": "cpp",
+    "xiosbase": "cpp",
+    "xlocale": "cpp",
+    "xlocinfo": "cpp",
+    "xlocmon": "cpp",
+    "xlocnum": "cpp",
+    "xloctime": "cpp",
+    "xmemory": "cpp",
+    "xstddef": "cpp",
+    "xstring": "cpp",
+    "xtr1common": "cpp",
+    "xtree": "cpp",
+    "xutility": "cpp",
+    "xlocbuf": "cpp",
+    "xlocmes": "cpp",
+    "xmemory0": "cpp",
+    "memory_resource": "cpp",
+    "__bits": "cpp",
+    "__verbose_abort": "cpp",
+    "variant": "cpp",
+    "charconv": "cpp"
+  },
+  "files.exclude": {
+    "Binaries/*build*": true,
+    "Binaries/Output": true,
+    "GDJS/Runtime-dist": true,
+    "docs": true,
+    "newIDE/electron-app/dist": true,
+    "newIDE/app/build": true,
+    "newIDE/app/resources/GDJS": true,
+    "newIDE/electron-app/app/www": true
+  },
+  // Support for Flowtype (for newIDE):
+  "javascript.validate.enable": false,
+  "flow.useNPMPackagedFlow": true,
 
-    // Clang format styling (duplicated in scripts/CMakeClangUtils.txt)
-    "C_Cpp.clang_format_style": "{BasedOnStyle: Google, BinPackParameters: false, BinPackArguments: false}"
+  // Clang format styling (duplicated in scripts/CMakeClangUtils.txt)
+  "C_Cpp.clang_format_style": "{BasedOnStyle: Google, BinPackParameters: false, BinPackArguments: false}"
 }

.vscode/tasks.json

@@ -0,0 +1,101 @@
+{
+  "version": "2.0.0",
+  "tasks": [
+    {
+      "type": "npm",
+      "script": "start",
+      "path": "newIDE/app/",
+      "group": "build",
+      "label": "Start development server",
+      "detail": "Starts the GDevelop development server.",
+      "options": { "env": { "NODE_OPTIONS": "--max-old-space-size=8192" } },
+      "problemMatcher": [
+        {
+          "owner": "cra",
+          "fileLocation": ["relative", "${workspaceFolder}/newIDE/app"],
+          "source": "create-react-app",
+          "applyTo": "allDocuments",
+          "pattern": [
+            {
+              "regexp": "^([^\\s].*?)$",
+              "file": 1
+            },
+            {
+              "regexp": "^  Line\\s+(\\d+):\\s+(.*)\\s\\s+(.*)$",
+              "line": 1,
+              "message": 2,
+              "code": 3,
+              "loop": true
+            }
+          ],
+          "background": {
+            "activeOnStart": true,
+            "beginsPattern": "^(?:Compiled with warnings\\.|Compiled successfully!)$",
+            "endsPattern": "^(?:Search for the keywords to learn more about each warning\\.|Note that the development build is not optimized\\.)$"
+          }
+        }
+      ],
+      "presentation": {
+        "reveal": "silent"
+      },
+      "isBackground": true,
+      "runOptions": { "instanceLimit": 1, "runOn": "folderOpen" }
+    },
+    {
+      "type": "npm",
+      "script": "start",
+      "path": "newIDE/electron-app/",
+      "group": "build",
+      "problemMatcher": [],
+      "label": "Start electron app",
+      "detail": "Starts the development local version of GDevelop."
+    },
+    {
+      "type": "npm",
+      "script": "build",
+      "path": "GDevelop.js/",
+      "group": "build",
+      "problemMatcher": [],
+      "label": "Build GDevelop.js",
+      "detail": "Builds GDCore for newIDE."
+    },
+    {
+      "type": "npm",
+      "script": "format",
+      "path": "newIDE/app/",
+      "problemMatcher": [],
+      "label": "Format newIDE",
+      "detail": "Run auto-formatting (with Prettier) for the newIDE/app directory."
+    },
+    {
+      "type": "npm",
+      "script": "test",
+      "path": "newIDE/app/",
+      "group": {
+        "kind": "test",
+        "isDefault": true
+      },
+      "problemMatcher": [],
+      "label": "Run newIDE tests",
+      "detail": "Run tests for newIDE."
+    },
+    {
+      "type": "typescript",
+      "tsconfig": "tsconfig.json",
+      "option": "watch",
+      "problemMatcher": ["$tsc-watch"],
+      "group": "test",
+      "label": "GDJS TS Check",
+      "detail": "Runs a types check on the GDJS Runtime."
+    },
+    {
+      "type": "npm",
+      "script": "test",
+      "path": "GDJS/",
+      "group": "test",
+      "problemMatcher": [],
+      "label": "Run GDJS tests",
+      "detail": "Run tests for GDJS."
+    }
+  ]
+}

Binaries/.directory

@@ -1,6 +0,0 @@
-[Dolphin]
-Timestamp=2015,4,21,21,49,19
-Version=3
-
-[Settings]
-HiddenFilesShown=true

Binaries/README.md

@@ -1,4 +1,3 @@
-This is the directory where native/WebAssembly binaries from GDCore, GDCpp and GDJS are produced.
+This is the directory where native or WebAssembly binaries of the C++ code of GDCore and GDJS are produced.
 
-In particular, the extensions and/or the JS platform files will be
-created into Output/Release_*OSNAME* with *OSNAME* being Windows, Linux or Darwin.
+See GDevelop.js README for the instructions to compile after a change in the C++ source code.

CMakeLists.txt

@@ -1,98 +1,100 @@
-#This is the CMake file used to build GDevelop.
-#For more information, see the Readme.md file.
+# This is the CMake file used to build GDevelop.
+# For more information, see the README.md file.
 
-cmake_minimum_required(VERSION 2.6)
-cmake_policy(SET CMP0011 NEW)
+cmake_minimum_required(VERSION 3.5)
 
 # Add utility functions
 include(scripts/CMakeClangUtils.txt) # To add clang-format and clang-tidy support to a target
 
 # Macro for defining an option
 macro(gd_set_option var default type docstring)
-    if(NOT DEFINED ${var})
-        set(${var} ${default})
-    endif()
-    set(${var} ${${var}} CACHE ${type} ${docstring} FORCE)
+	if(NOT DEFINED ${var})
+		set(${var} ${default})
+	endif()
+	set(${var} ${${var}} CACHE ${type} ${docstring} FORCE)
 endmacro()
-gd_set_option(BUILD_CORE TRUE BOOL "TRUE to build GDevelop Core library, FALSE to use the already compiled binaries")
-gd_set_option(BUILD_GDCPP TRUE BOOL "TRUE to build GDevelop C++ Platform")
+
+# Set options
+gd_set_option(BUILD_CORE TRUE BOOL "TRUE to build GDevelop Core library")
 gd_set_option(BUILD_GDJS TRUE BOOL "TRUE to build GDevelop JS Platform")
 gd_set_option(BUILD_EXTENSIONS TRUE BOOL "TRUE to build the extensions")
-gd_set_option(BUILD_TESTS FALSE BOOL "TRUE to build the tests")
-gd_set_option(FULL_VERSION_NUMBER TRUE BOOL "TRUE to build GDevelop with its full version number (lastest tag + commit hash), FALSE to only use the lastest tag (avoid rebulding many source file when developping)")
+gd_set_option(BUILD_TESTS TRUE BOOL "TRUE to build the tests")
 
 # Disable deprecated code
-set(NO_GUI TRUE CACHE BOOL "" FORCE) #Force disable old GUI related code.
+set(NO_GUI TRUE CACHE BOOL "" FORCE) # Force disable old GUI related code.
 
-#Setting up installation directory, for Linux (has to be done before "project" command).
-IF(NOT WIN32)
-	if (NOT APPLE)
-	gd_set_option(GD_INSTALL_PREFIX "/opt/gdevelop/" STRING "The directory where GDevelop should be installed")
-	ELSE()
-	gd_set_option(GD_INSTALL_PREFIX "." STRING "The directory where GDevelop should be installed")
-	ENDIF()
+# Setting up installation directory, for Linux (has to be done before "project" command).
+if(NOT WIN32)
+	if(NOT APPLE)
+		gd_set_option(GD_INSTALL_PREFIX "/opt/gdevelop/" STRING "The directory where GDevelop should be installed")
+	else()
+		gd_set_option(GD_INSTALL_PREFIX "." STRING "The directory where GDevelop should be installed")
+	endif()
 
-	#As we embed SFML, prevent it to be installed system-wide
+	# As we embed SFML, prevent it to be installed system-wide
 	set(CMAKE_INSTALL_PREFIX "${GD_INSTALL_PREFIX}/useless")
-ENDIF()
+endif()
 
 project(GDevelop)
 set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
-IF(NOT WIN32 AND NOT APPLE AND NOT BUILD_TESTS)
-	SET(CMAKE_SKIP_BUILD_RPATH  TRUE) #Avoid errors when packaging for linux.
-ENDIF()
-IF(APPLE)
+if(NOT WIN32 AND NOT APPLE AND NOT BUILD_TESTS)
+	set(CMAKE_SKIP_BUILD_RPATH TRUE) # Avoid errors when packaging for linux.
+endif()
+if(APPLE)
 	set(CMAKE_MACOSX_RPATH 1)
 	set(CMAKE_INSTALL_RPATH_USE_LINK_PATH FALSE)
 	set(CMAKE_INSTALL_RPATH ".")
 	set(CMAKE_BUILD_WITH_INSTALL_RPATH TRUE)
-	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -D_WCHAR_H_CPLUSPLUS_98_CONFORMANCE_")
-	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-potentially-evaluated-expression")
-ENDIF()
-
-#Sanity checks
-IF ("${CMAKE_BUILD_TYPE}" STREQUAL "")
-	message( "CMAKE_BUILD_TYPE is empty, assuming build type is Release" )
+	add_compile_options(
+		-D_WCHAR_H_CPLUSPLUS_98_CONFORMANCE_
+		-Wno-potentially-evaluated-expression)
+endif()
+# Sanity checks
+if("${CMAKE_BUILD_TYPE}" STREQUAL "")
+	message(STATUS "CMAKE_BUILD_TYPE is empty, assuming build type is Release")
 	set(CMAKE_BUILD_TYPE Release)
-ENDIF()
-IF (EMSCRIPTEN)
-	set(BUILD_GDCPP FALSE CACHE BOOL "" FORCE) #Force disable GDC++ when compiling with emscripten.
-ENDIF()
-
-IF("${CMAKE_BUILD_TYPE}" STREQUAL "Release" AND NOT WIN32 AND CMAKE_COMPILER_IS_GNUCXX)
-	SET(CMAKE_SHARED_LINKER_FLAGS "-s") #Force stripping to avoid errors when packaging for linux.
-ENDIF()
-
-#Activate C++11
-include(CheckCXXCompilerFlag)
-CHECK_CXX_COMPILER_FLAG("-std=gnu++11" COMPILER_SUPPORTS_CXX11)
-CHECK_CXX_COMPILER_FLAG("-std=gnu++0x" COMPILER_SUPPORTS_CXX0X)
-if(COMPILER_SUPPORTS_CXX11)
-       set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=gnu++11")
-elseif(COMPILER_SUPPORTS_CXX0X)
-       set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=gnu++0x")
-else()
-    message(FATAL_ERROR "The compiler ${CMAKE_CXX_COMPILER} has no C++11 support (with GNU extensions). Please use a different C++ compiler.")
 endif()
 
-#Define common directories:
+if("${CMAKE_BUILD_TYPE}" STREQUAL "Release" AND NOT WIN32 AND CMAKE_COMPILER_IS_GNUCXX)
+	set(CMAKE_SHARED_LINKER_FLAGS "-s") # Force stripping to avoid errors when packaging for linux.
+endif()
+
+#Activate C++11
+set(CMAKE_CXX_STANDARD 11) # Upgrading to C++17 would need to remove usage of bind2nd (should be easy).
+set(CMAKE_CXX_STANDARD_REQUIRED ON)
+
+# Mark some warnings as errors
+if(CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
+	# Activate as much warnings as possible to avoid errors like
+	# uninitialized variables or other hard to debug bugs.
+	add_compile_options(
+		-Wall
+		-Wno-unknown-warning-option
+		-Wno-reorder-ctor
+		-Wno-reorder
+		-Wno-pessimizing-move
+		-Wno-unused-variable
+		-Wno-unused-private-field
+
+		# Make as much warnings considered as errors as possible (only one for now).
+		-Werror=return-stack-address
+		-Werror=return-type)
+endif()
+
+# Define common directories:
 set(GD_base_dir ${CMAKE_CURRENT_SOURCE_DIR})
 
-#Add all the CMakeLists:
-ADD_SUBDIRECTORY(Version)
-ADD_SUBDIRECTORY(ExtLibs)
-IF(BUILD_CORE)
-	ADD_SUBDIRECTORY(Core)
-ENDIF()
-IF(BUILD_GDJS)
-	ADD_SUBDIRECTORY(GDJS)
-ENDIF()
-IF(BUILD_GDCPP)
-	ADD_SUBDIRECTORY(GDCpp)
-ENDIF()
-IF(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/GDevelop.js/CMakeLists.txt" AND EMSCRIPTEN)
-	ADD_SUBDIRECTORY(GDevelop.js)
-ENDIF()
-IF(BUILD_EXTENSIONS)
-	ADD_SUBDIRECTORY(Extensions)
-ENDIF()
+# Add all the CMakeLists:
+add_subdirectory(ExtLibs)
+if(BUILD_CORE)
+	add_subdirectory(Core)
+endif()
+if(BUILD_GDJS)
+	add_subdirectory(GDJS)
+endif()
+if(EMSCRIPTEN)
+	add_subdirectory(GDevelop.js)
+endif()
+if(BUILD_EXTENSIONS)
+	add_subdirectory(Extensions)
+endif()

Core/CMakeLists.txt

@@ -1,93 +1,98 @@
-cmake_minimum_required(VERSION 2.6)
-cmake_policy(SET CMP0015 NEW)
+cmake_minimum_required(VERSION 3.5)
 
 project(GDCore)
 
-SET(CMAKE_C_USE_RESPONSE_FILE_FOR_OBJECTS 1) #Force use response file: useful for Ninja build system on Windows.
-SET(CMAKE_CXX_USE_RESPONSE_FILE_FOR_OBJECTS 1)
-SET(CMAKE_C_USE_RESPONSE_FILE_FOR_INCLUDES 1)
-SET(CMAKE_CXX_USE_RESPONSE_FILE_FOR_INCLUDES 1)
+set(CMAKE_C_USE_RESPONSE_FILE_FOR_OBJECTS 1) # Force use response file: useful for Ninja build system on Windows.
+set(CMAKE_CXX_USE_RESPONSE_FILE_FOR_OBJECTS 1)
+set(CMAKE_C_USE_RESPONSE_FILE_FOR_INCLUDES 1)
+set(CMAKE_CXX_USE_RESPONSE_FILE_FOR_INCLUDES 1)
 
-#Define common directories:
+# Define common directories:
 set(GDCORE_include_dir ${GD_base_dir}/Core PARENT_SCOPE)
 set(GDCORE_lib_dir ${GD_base_dir}/Binaries/Output/${CMAKE_BUILD_TYPE}_${CMAKE_SYSTEM_NAME} PARENT_SCOPE)
 
-#Dependencies on external libraries:
-###
-include_directories(${sfml_include_dir})
+# Dependencies on external libraries:
+#
 
-#Defines
-###
-add_definitions( -DGD_IDE_ONLY )
-IF (EMSCRIPTEN)
-	add_definitions( -DEMSCRIPTEN )
-ENDIF()
-IF(CMAKE_BUILD_TYPE MATCHES "Debug")
-	add_definitions( -DDEBUG )
-ELSE()
-	add_definitions( -DRELEASE )
-ENDIF()
+# Defines
+#
+add_definitions(-DGD_IDE_ONLY)
+if(EMSCRIPTEN)
+	add_definitions(-DEMSCRIPTEN)
+endif()
+if("${CMAKE_BUILD_TYPE}" MATCHES "Debug")
+	add_definitions(-DDEBUG)
+else()
+	add_definitions(-DRELEASE)
+endif()
 
-IF(WIN32)
-	add_definitions( -DWINDOWS )
-	add_definitions( "-DGD_CORE_API=__declspec(dllexport)" )
-	add_definitions( -D__GNUWIN32__ )
-ELSE()
-    IF(APPLE)
-    add_definitions( -DMACOS )
-    ELSE()
-	add_definitions( -DLINUX )
-	ENDIF()
-	add_definitions( -DGD_API= )
-	add_definitions( -DGD_CORE_API= )
-ENDIF(WIN32)
+if(WIN32)
+	add_definitions(-DWINDOWS)
+	add_definitions("-DGD_CORE_API=__declspec(dllexport)")
+	add_definitions(-D__GNUWIN32__)
+else()
+	if(APPLE)
+		add_definitions(-DMACOS)
+	else()
+		add_definitions(-DLINUX)
+	endif()
+	add_definitions(-DGD_API=)
+	add_definitions(-DGD_CORE_API=)
+endif()
 
-#The target
-###
+# The target
+#
 include_directories(.)
-file(GLOB_RECURSE source_files GDCore/*)
+file(
+	GLOB_RECURSE
+	source_files
+	GDCore/*)
 
-file(GLOB_RECURSE formatted_source_files tests/* GDCore/Events/* GDCore/Extensions/* GDCore/IDE/* GDCore/Project/* GDCore/Serialization/* GDCore/Tools/*)
-list(REMOVE_ITEM formatted_source_files "${CMAKE_CURRENT_SOURCE_DIR}/GDCore/IDE/Dialogs/GDCoreDialogs.cpp" "${CMAKE_CURRENT_SOURCE_DIR}/GDCore/IDE/Dialogs/GDCoreDialogs.h" "${CMAKE_CURRENT_SOURCE_DIR}/GDCore/IDE/Dialogs/GDCoreDialogs_dialogs_bitmaps.cpp")
+file(
+	GLOB_RECURSE
+	formatted_source_files
+	tests/*
+	GDCore/Events/*
+	GDCore/Extensions/*
+	GDCore/IDE/*
+	GDCore/Project/*
+	GDCore/Serialization/*
+	GDCore/Tools/*)
+list(
+	REMOVE_ITEM
+	formatted_source_files
+	"${CMAKE_CURRENT_SOURCE_DIR}/GDCore/IDE/Dialogs/GDCoreDialogs.cpp"
+	"${CMAKE_CURRENT_SOURCE_DIR}/GDCore/IDE/Dialogs/GDCoreDialogs.h"
+	"${CMAKE_CURRENT_SOURCE_DIR}/GDCore/IDE/Dialogs/GDCoreDialogs_dialogs_bitmaps.cpp")
 gd_add_clang_utils(GDCore "${formatted_source_files}")
 
-IF(EMSCRIPTEN)
+if(EMSCRIPTEN)
 	# Emscripten treats all libraries as static libraries
 	add_library(GDCore STATIC ${source_files})
-ELSE()
+else()
 	add_library(GDCore SHARED ${source_files})
-ENDIF()
-add_dependencies(GDCore GDVersion)
-IF(EMSCRIPTEN)
+endif()
+if(EMSCRIPTEN)
 	set_target_properties(GDCore PROPERTIES SUFFIX ".bc")
-ELSEIF(WIN32)
+elseif(WIN32)
 	set_target_properties(GDCore PROPERTIES PREFIX "")
-ELSE()
+else()
 	set_target_properties(GDCore PROPERTIES PREFIX "lib")
-ENDIF()
+endif()
 set(LIBRARY_OUTPUT_PATH ${GD_base_dir}/Binaries/Output/${CMAKE_BUILD_TYPE}_${CMAKE_SYSTEM_NAME})
 set(ARCHIVE_OUTPUT_PATH ${GD_base_dir}/Binaries/Output/${CMAKE_BUILD_TYPE}_${CMAKE_SYSTEM_NAME})
 set(RUNTIME_OUTPUT_PATH ${GD_base_dir}/Binaries/Output/${CMAKE_BUILD_TYPE}_${CMAKE_SYSTEM_NAME})
 
-#Linker files
-###
-IF(EMSCRIPTEN)
-	#Nothing.
-ELSE()
-	target_link_libraries(GDCore ${sfml_LIBRARIES})
-ENDIF()
-
-#Tests
-###
+# Tests
+#
 if(BUILD_TESTS)
 	file(
-	    GLOB_RECURSE
-	    test_source_files
-	    tests/*
-	)
+		GLOB_RECURSE
+		test_source_files
+		tests/*)
 
 	add_executable(GDCore_tests ${test_source_files})
-	set_target_properties(GDCore_tests PROPERTIES BUILD_WITH_INSTALL_RPATH FALSE) #Allow finding dependencies directly from build path on Mac OS X.
+	set_target_properties(GDCore_tests PROPERTIES BUILD_WITH_INSTALL_RPATH FALSE) # Allow finding dependencies directly from build path on Mac OS X.
 	target_link_libraries(GDCore_tests GDCore)
-	target_link_libraries(GDCore_tests ${sfml_LIBRARIES})
+	target_link_libraries(GDCore_tests ${CMAKE_DL_LIBS})
 endif()

Core/GDCore/CommonTools.h

@@ -13,7 +13,6 @@
 #include <string>
 #include <vector>
 #include "Utf8/utf8.h"
-#include <SFML/System/String.hpp>
 
 #ifdef __GNUC__
     #define GD_DEPRECATED    __attribute__((deprecated))

Core/GDCore/DocMainPage.h

@@ -14,9 +14,8 @@
  *
  * \section other Other documentations
  *
- * GDevelop is architectured around a `Core` (this library), platforms (`GDJS`, `GDCpp`) and extensions (`Extensions` folder). The editor (`newIDE` folder) is using all of these libraries.
+ * GDevelop is architectured around a `Core` (this library), a game engine (`GDJS`) and extensions (`Extensions` folder). The editor (`newIDE` folder) is using all of these libraries.
  *
- *  - [Open GDevelop C++ Platform documentation](../GDCpp Documentation/index.html)
  *  - [Open GDevelop JS Platform documentation](../GDJS Documentation/index.html)
  *  - <a href="https://github.com/4ian/GDevelop/blob/master/newIDE/README.md">Getting started with the editor</a>
  *  - <a href="https://github.com/4ian/GDevelop/blob/master/newIDE/README-extensions.md">Getting started with the extensions</a>

Core/GDCore/Events/Builtin/AsyncEvent.cpp

@@ -0,0 +1,36 @@
+/*
+ * GDevelop Core
+ * Copyright 2008-2016 Florian Rival (Florian.Rival@gmail.com). All rights
+ * reserved. This project is released under the MIT License.
+ */
+
+#include "AsyncEvent.h"
+#include "GDCore/CommonTools.h"
+#include "GDCore/Events/CodeGeneration/EventsCodeGenerationContext.h"
+#include "GDCore/Events/CodeGeneration/EventsCodeGenerator.h"
+#include "GDCore/Events/Serialization.h"
+#include "GDCore/Serialization/SerializerElement.h"
+
+using namespace std;
+
+namespace gd {
+
+AsyncEvent::AsyncEvent() : BaseEvent() {}
+
+AsyncEvent::~AsyncEvent(){};
+
+vector<const gd::InstructionsList *> AsyncEvent::GetAllActionsVectors() const {
+  vector<const gd::InstructionsList *> allActions;
+  allActions.push_back(&actions);
+
+  return allActions;
+}
+
+vector<gd::InstructionsList *> AsyncEvent::GetAllActionsVectors() {
+  vector<gd::InstructionsList *> allActions;
+  allActions.push_back(&actions);
+
+  return allActions;
+}
+
+} // namespace gd

Core/GDCore/Events/Builtin/AsyncEvent.h

@@ -0,0 +1,61 @@
+/*
+ * GDevelop Core
+ * Copyright 2008-2016 Florian Rival (Florian.Rival@gmail.com). All rights
+ * reserved. This project is released under the MIT License.
+ */
+
+#ifndef GDCORE_ASYNCEVENT_H
+#define GDCORE_ASYNCEVENT_H
+#include "GDCore/Events/Event.h"
+#include "GDCore/Events/EventsList.h"
+#include "GDCore/Events/Instruction.h"
+#include "GDCore/Events/InstructionsList.h"
+namespace gd {
+class Instruction;
+class Project;
+} // namespace gd
+
+namespace gd {
+
+/**
+ * \brief Internal event for asynchronous actions.
+ * This event gets added internally to the events tree when an
+ * asynchronous action is used.
+ */
+class GD_CORE_API AsyncEvent : public gd::BaseEvent {
+public:
+  AsyncEvent();
+  AsyncEvent(const gd::Instruction &asyncAction_,
+             const gd::InstructionsList &actions_,
+             const gd::EventsList &subEvents_)
+      : asyncAction(asyncAction_), actions(actions_), subEvents(subEvents_) {
+    SetType("BuiltinAsync::Async");
+  };
+  virtual ~AsyncEvent();
+  virtual gd::AsyncEvent *Clone() const { return new AsyncEvent(*this); }
+
+  virtual bool IsExecutable() const { return true; }
+
+  virtual bool CanHaveSubEvents() const { return true; }
+  virtual const gd::EventsList &GetSubEvents() const { return subEvents; };
+  virtual gd::EventsList &GetSubEvents() { return subEvents; };
+
+  const gd::InstructionsList &GetActions() const { return actions; };
+  gd::InstructionsList &GetActions() { return actions; };
+
+  const gd::Instruction &GetInstruction() const { return asyncAction; };
+  gd::Instruction &GetInstruction() { return asyncAction; };
+
+  virtual std::vector<const gd::InstructionsList *>
+  GetAllActionsVectors() const;
+  virtual std::vector<gd::InstructionsList *> GetAllActionsVectors();
+
+private:
+  gd::Instruction asyncAction;
+  gd::InstructionsList actions;
+  EventsList subEvents;
+};
+
+} // namespace gd
+
+#endif // GDCORE_STANDARDEVENT_H

Core/GDCore/Events/Builtin/CommentEvent.cpp

@@ -21,6 +21,13 @@ vector<gd::String> CommentEvent::GetAllSearchableStrings() const {
   return allSearchableStrings;
 }
 
+bool CommentEvent::ReplaceAllSearchableStrings(
+    std::vector<gd::String> newSearchableString) {
+  if (newSearchableString[0] == com1) return false;
+  SetComment(newSearchableString[0]);
+  return true;
+}
+
 void CommentEvent::SerializeTo(SerializerElement &element) const {
   element.AddChild("color")
       .SetAttribute("r", r)
@@ -31,7 +38,7 @@ void CommentEvent::SerializeTo(SerializerElement &element) const {
       .SetAttribute("textB", textB);
 
   element.AddChild("comment").SetValue(com1);
-  element.AddChild("comment2").SetValue(com2);
+  if (!com2.empty()) element.AddChild("comment2").SetValue(com2);
 }
 
 void CommentEvent::UnserializeFrom(gd::Project &project,
@@ -46,7 +53,9 @@ void CommentEvent::UnserializeFrom(gd::Project &project,
   textB = colorElement.GetIntAttribute("textB");
 
   com1 = element.GetChild("comment", 0, "Com1").GetValue().GetString();
-  com2 = element.GetChild("comment2", 0, "Com2").GetValue().GetString();
+  if (element.HasChild("comment2")) {
+    com2 = element.GetChild("comment2", 0, "Com2").GetValue().GetString();
+  }
 }
 
 }  // namespace gd

Core/GDCore/Events/Builtin/CommentEvent.h

@@ -47,6 +47,8 @@ class GD_CORE_API CommentEvent : public gd::BaseEvent {
   void SetComment(const gd::String& comment) { com1 = comment; }
 
   virtual std::vector<gd::String> GetAllSearchableStrings() const;
+  virtual bool ReplaceAllSearchableStrings(
+      std::vector<gd::String> newSearchableString);
 
   virtual void SerializeTo(SerializerElement& element) const;
   virtual void UnserializeFrom(gd::Project& project,

Core/GDCore/Events/Builtin/ForEachChildVariableEvent.cpp

@@ -0,0 +1,108 @@
+/*
+ * GDevelop Core
+ * Copyright 2008-2016 Florian Rival (Florian.Rival@gmail.com). All rights
+ * reserved. This project is released under the MIT License.
+ */
+
+#include "ForEachChildVariableEvent.h"
+#include "GDCore/Events/Serialization.h"
+#include "GDCore/Serialization/SerializerElement.h"
+
+using namespace std;
+
+namespace gd {
+
+ForEachChildVariableEvent::ForEachChildVariableEvent()
+    : BaseEvent(), valueIteratorVariableName("child"), keyIteratorVariableName(""), iterableVariableName("") {}
+
+vector<gd::InstructionsList*> ForEachChildVariableEvent::GetAllConditionsVectors() {
+  vector<gd::InstructionsList*> allConditions;
+  allConditions.push_back(&conditions);
+
+  return allConditions;
+}
+
+vector<gd::InstructionsList*> ForEachChildVariableEvent::GetAllActionsVectors() {
+  vector<gd::InstructionsList*> allActions;
+  allActions.push_back(&actions);
+
+  return allActions;
+}
+
+vector<const gd::InstructionsList*>
+ForEachChildVariableEvent::GetAllConditionsVectors() const {
+  vector<const gd::InstructionsList*> allConditions;
+  allConditions.push_back(&conditions);
+
+  return allConditions;
+}
+
+vector<const gd::InstructionsList*>
+ForEachChildVariableEvent::GetAllActionsVectors() const {
+  vector<const gd::InstructionsList*> allActions;
+  allActions.push_back(&actions);
+
+  return allActions;
+}
+
+vector<pair<gd::Expression*, gd::ParameterMetadata> >
+    ForEachChildVariableEvent::GetAllExpressionsWithMetadata() {
+  vector<pair<gd::Expression*, gd::ParameterMetadata> >
+      allExpressionsWithMetadata;
+  auto metadata = gd::ParameterMetadata().SetType("scenevar");
+  allExpressionsWithMetadata.push_back(
+      std::make_pair(&iterableVariableName, metadata));
+  allExpressionsWithMetadata.push_back(
+      std::make_pair(&valueIteratorVariableName, metadata));
+  allExpressionsWithMetadata.push_back(
+      std::make_pair(&keyIteratorVariableName, metadata));
+
+  return allExpressionsWithMetadata;
+}
+vector<pair<const gd::Expression*, const gd::ParameterMetadata> >
+    ForEachChildVariableEvent::GetAllExpressionsWithMetadata() const {
+  vector<pair<const gd::Expression*, const gd::ParameterMetadata> >
+      allExpressionsWithMetadata;
+  auto metadata = gd::ParameterMetadata().SetType("scenevar");
+  allExpressionsWithMetadata.push_back(
+      std::make_pair(&iterableVariableName, metadata));
+  allExpressionsWithMetadata.push_back(
+      std::make_pair(&valueIteratorVariableName, metadata));
+  allExpressionsWithMetadata.push_back(
+      std::make_pair(&keyIteratorVariableName, metadata));
+
+  return allExpressionsWithMetadata;
+}
+
+void ForEachChildVariableEvent::SerializeTo(SerializerElement& element) const {
+  element.AddChild("iterableVariableName").SetValue(iterableVariableName.GetPlainString());
+  element.AddChild("valueIteratorVariableName").SetValue(valueIteratorVariableName.GetPlainString());
+  element.AddChild("keyIteratorVariableName").SetValue(keyIteratorVariableName.GetPlainString());
+  gd::EventsListSerialization::SerializeInstructionsTo(
+      conditions, element.AddChild("conditions"));
+  gd::EventsListSerialization::SerializeInstructionsTo(
+      actions, element.AddChild("actions"));
+
+  if (!events.IsEmpty())
+    gd::EventsListSerialization::SerializeEventsTo(events,
+                                                  element.AddChild("events"));
+}
+
+void ForEachChildVariableEvent::UnserializeFrom(gd::Project& project,
+                                            const SerializerElement& element) {
+  iterableVariableName = element.GetChild("iterableVariableName", 0, "").GetValue().GetString();
+  valueIteratorVariableName = element.GetChild("valueIteratorVariableName", 0, "").GetValue().GetString();
+  keyIteratorVariableName = element.GetChild("keyIteratorVariableName", 0, "").GetValue().GetString();
+  gd::EventsListSerialization::UnserializeInstructionsFrom(
+      project, conditions, element.GetChild("conditions", 0, "Conditions"));
+  gd::EventsListSerialization::UnserializeInstructionsFrom(
+      project, actions, element.GetChild("actions", 0, "Actions"));
+
+  events.Clear();
+  if (element.HasChild("events", "Events")) {
+    gd::EventsListSerialization::UnserializeEventsFrom(
+        project, events, element.GetChild("events", 0, "Events"));
+  }
+}
+
+}  // namespace gd

Core/GDCore/Events/Builtin/ForEachChildVariableEvent.h

@@ -0,0 +1,116 @@
+/*
+ * GDevelop Core
+ * Copyright 2008-2016 Florian Rival (Florian.Rival@gmail.com). All rights
+ * reserved. This project is released under the MIT License.
+ */
+
+#ifndef FOREACHCHILDVARIABLEEVENT_H
+#define FOREACHCHILDVARIABLEEVENT_H
+#include "GDCore/Events/Event.h"
+#include "GDCore/Events/EventsList.h"
+#include "GDCore/Events/Expression.h"
+namespace gd {
+class Instruction;
+class Project;
+class Layout;
+}  // namespace gd
+
+namespace gd {
+
+/**
+ * \brief Event repeated for each every child of a structure variable.
+ */
+class GD_CORE_API ForEachChildVariableEvent : public gd::BaseEvent {
+ public:
+  ForEachChildVariableEvent();
+  virtual ~ForEachChildVariableEvent(){};
+  virtual gd::ForEachChildVariableEvent* Clone() const {
+    return new ForEachChildVariableEvent(*this);
+  }
+
+  virtual bool IsExecutable() const { return true; }
+
+  virtual bool CanHaveSubEvents() const { return true; }
+  virtual const gd::EventsList& GetSubEvents() const { return events; };
+  virtual gd::EventsList& GetSubEvents() { return events; };
+
+  const gd::InstructionsList& GetConditions() const { return conditions; };
+  gd::InstructionsList& GetConditions() { return conditions; };
+
+  const gd::InstructionsList& GetActions() const { return actions; };
+  gd::InstructionsList& GetActions() { return actions; };
+
+  /**
+   * \brief Get the iterable variable name attached to the event.
+   *
+   * It is the structure variable that will be iterated on.
+   */
+  const gd::String& GetIterableVariableName() const { return iterableVariableName.GetPlainString(); };
+
+  /**
+   * \brief Set the iterable variable name attached to the event.
+   *
+   * It is the structure variable that will be iterated on.
+   */
+  void SetIterableVariableName(gd::String newName) { iterableVariableName = newName; };
+
+  /**
+   * \brief Get the value iterator variable attached to the event.
+   *
+   * It is the variable that will contain the value of the
+   * iterable's child being iterated on.
+   */
+  const gd::String& GetValueIteratorVariableName() const { return valueIteratorVariableName.GetPlainString(); };
+
+  /**
+   * \brief Set the value iterator variable attached to the event.
+   *
+   * It is the variable that will contain the value of the
+   * iterable's child being iterated on.
+   */
+  void SetValueIteratorVariableName(gd::String newName) { valueIteratorVariableName = newName; };
+
+  /**
+   * \brief Get the key iterator variable attached to the event.
+   *
+   * It is the variable that will contain the name of the
+   * iterable's child being iterated on.
+   */
+  const gd::String& GetKeyIteratorVariableName() const { return keyIteratorVariableName.GetPlainString(); };
+
+  /**
+   * \brief Set the key iterator variable attached to the event.
+   *
+   * It is the variable that will contain the name of the
+   * iterable's child being iterated on.
+   */
+  void SetKeyIteratorVariableName(gd::String newName) { keyIteratorVariableName = newName; };
+
+  virtual std::vector<const gd::InstructionsList*> GetAllConditionsVectors()
+      const;
+  virtual std::vector<const gd::InstructionsList*> GetAllActionsVectors() const;
+
+  virtual std::vector<gd::InstructionsList*> GetAllConditionsVectors();
+  virtual std::vector<gd::InstructionsList*> GetAllActionsVectors();
+
+  virtual std::vector<std::pair<const gd::Expression*, const gd::ParameterMetadata> >
+        GetAllExpressionsWithMetadata() const;
+  virtual std::vector<std::pair<gd::Expression*, gd::ParameterMetadata> >
+        GetAllExpressionsWithMetadata();
+
+  virtual void SerializeTo(SerializerElement& element) const;
+  virtual void UnserializeFrom(gd::Project& project,
+                               const SerializerElement& element);
+
+ private:
+  gd::Expression valueIteratorVariableName;
+  gd::Expression keyIteratorVariableName;
+  gd::Expression iterableVariableName;
+  gd::InstructionsList conditions;
+  gd::InstructionsList actions;
+  gd::EventsList events;
+};
+
+}  // namespace gd
+
+#endif  // FOREACHEVENT_H

Core/GDCore/Events/Builtin/ForEachEvent.cpp

@@ -15,7 +15,7 @@ using namespace std;
 namespace gd {
 
 ForEachEvent::ForEachEvent()
-    : BaseEvent(), objectsToPick(""), objectsToPickSelected(false) {}
+    : BaseEvent(), objectsToPick("") {}
 
 vector<gd::InstructionsList*> ForEachEvent::GetAllConditionsVectors() {
   vector<gd::InstructionsList*> allConditions;
@@ -31,12 +31,17 @@ vector<gd::InstructionsList*> ForEachEvent::GetAllActionsVectors() {
   return allActions;
 }
 
-vector<gd::Expression*> ForEachEvent::GetAllExpressions() {
-  vector<gd::Expression*> allExpressions;
-  allExpressions.push_back(&objectsToPick);
+vector<pair<gd::Expression*, gd::ParameterMetadata> >
+    ForEachEvent::GetAllExpressionsWithMetadata() {
+  vector<pair<gd::Expression*, gd::ParameterMetadata> >
+      allExpressionsWithMetadata;
+  auto metadata = gd::ParameterMetadata().SetType("object");
+  allExpressionsWithMetadata.push_back(
+      std::make_pair(&objectsToPick, metadata));
 
-  return allExpressions;
+  return allExpressionsWithMetadata;
 }
+
 vector<const gd::InstructionsList*> ForEachEvent::GetAllConditionsVectors()
     const {
   vector<const gd::InstructionsList*> allConditions;
@@ -52,11 +57,15 @@ vector<const gd::InstructionsList*> ForEachEvent::GetAllActionsVectors() const {
   return allActions;
 }
 
-vector<const gd::Expression*> ForEachEvent::GetAllExpressions() const {
-  vector<const gd::Expression*> allExpressions;
-  allExpressions.push_back(&objectsToPick);
+vector<pair<const gd::Expression*, const gd::ParameterMetadata> >
+    ForEachEvent::GetAllExpressionsWithMetadata() const {
+  vector<pair<const gd::Expression*, const gd::ParameterMetadata> >
+      allExpressionsWithMetadata;
+  auto metadata = gd::ParameterMetadata().SetType("object");
+  allExpressionsWithMetadata.push_back(
+      std::make_pair(&objectsToPick, metadata));
 
-  return allExpressions;
+  return allExpressionsWithMetadata;
 }
 
 void ForEachEvent::SerializeTo(SerializerElement& element) const {
@@ -65,8 +74,10 @@ void ForEachEvent::SerializeTo(SerializerElement& element) const {
       conditions, element.AddChild("conditions"));
   gd::EventsListSerialization::SerializeInstructionsTo(
       actions, element.AddChild("actions"));
-  gd::EventsListSerialization::SerializeEventsTo(events,
-                                                 element.AddChild("events"));
+
+  if (!events.IsEmpty())
+    gd::EventsListSerialization::SerializeEventsTo(events,
+                                                  element.AddChild("events"));
 }
 
 void ForEachEvent::UnserializeFrom(gd::Project& project,
@@ -77,8 +88,12 @@ void ForEachEvent::UnserializeFrom(gd::Project& project,
       project, conditions, element.GetChild("conditions", 0, "Conditions"));
   gd::EventsListSerialization::UnserializeInstructionsFrom(
       project, actions, element.GetChild("actions", 0, "Actions"));
-  gd::EventsListSerialization::UnserializeEventsFrom(
-      project, events, element.GetChild("events", 0, "Events"));
+
+  events.Clear();
+  if (element.HasChild("events", "Events")) {
+    gd::EventsListSerialization::UnserializeEventsFrom(
+        project, events, element.GetChild("events", 0, "Events"));
+  }
 }
 
 }  // namespace gd

Core/GDCore/Events/Builtin/ForEachEvent.h

@@ -6,6 +6,8 @@
 
 #ifndef FOREACHEVENT_H
 #define FOREACHEVENT_H
+#include <vector>
+
 #include "GDCore/Events/Event.h"
 #include "GDCore/Events/EventsList.h"
 namespace gd {
@@ -50,10 +52,13 @@ class GD_CORE_API ForEachEvent : public gd::BaseEvent {
   virtual std::vector<const gd::InstructionsList*> GetAllConditionsVectors()
       const;
   virtual std::vector<const gd::InstructionsList*> GetAllActionsVectors() const;
-  virtual std::vector<const gd::Expression*> GetAllExpressions() const;
+  virtual std::vector<std::pair<const gd::Expression*, const gd::ParameterMetadata> >
+      GetAllExpressionsWithMetadata() const;
+
   virtual std::vector<gd::InstructionsList*> GetAllConditionsVectors();
   virtual std::vector<gd::InstructionsList*> GetAllActionsVectors();
-  virtual std::vector<gd::Expression*> GetAllExpressions();
+  virtual std::vector<std::pair<gd::Expression*, gd::ParameterMetadata> >
+      GetAllExpressionsWithMetadata();
 
   virtual void SerializeTo(SerializerElement& element) const;
   virtual void UnserializeFrom(gd::Project& project,
@@ -64,8 +69,6 @@ class GD_CORE_API ForEachEvent : public gd::BaseEvent {
   gd::InstructionsList conditions;
   gd::InstructionsList actions;
   gd::EventsList events;
-
-  bool objectsToPickSelected;
 };
 
 }  // namespace gd

Core/GDCore/Events/Builtin/GroupEvent.cpp

@@ -27,6 +27,13 @@ vector<gd::String> GroupEvent::GetAllSearchableStrings() const {
   return allSearchableStrings;
 }
 
+bool GroupEvent::ReplaceAllSearchableStrings(
+    std::vector<gd::String> newSearchableString) {
+  if (newSearchableString[0] == name) return false;
+  SetName(newSearchableString[0]);
+  return true;
+}
+
 void GroupEvent::SerializeTo(SerializerElement& element) const {
   element.SetAttribute("name", name);
   element.SetAttribute("source", source);
@@ -69,5 +76,4 @@ void GroupEvent::SetBackgroundColor(unsigned int colorR_,
   colorB = colorB_;
 }
 
-
 }  // namespace gd

Core/GDCore/Events/Builtin/GroupEvent.h

@@ -13,6 +13,7 @@
 namespace gd {
 class Instruction;
 class Project;
+class EventVisitor;
 }
 class EventsCodeGenerationContext;
 
@@ -107,6 +108,8 @@ class GD_CORE_API GroupEvent : public gd::BaseEvent {
   virtual gd::EventsList& GetSubEvents() { return events; };
 
   virtual std::vector<gd::String> GetAllSearchableStrings() const;
+  virtual bool ReplaceAllSearchableStrings(
+      std::vector<gd::String> newSearchableString);
 
   virtual void SerializeTo(SerializerElement& element) const;
   virtual void UnserializeFrom(gd::Project& project,

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;
 
@@ -130,30 +131,46 @@ void LinkEvent::SerializeTo(SerializerElement& element) const {
 
 void LinkEvent::UnserializeFrom(gd::Project& project,
                                 const SerializerElement& element) {
-  SerializerElement& includeElement = element.GetChild("include", 0, "Limites");
-
   SetTarget(element.GetChild("target", 0, "Scene").GetValue().GetString());
 
-  if (includeElement.HasAttribute("includeAll")) {
-    // Compatibility with GDevelop <= 4.0.92
-    if (includeElement.GetBoolAttribute("includeAll", true)) {
-      SetIncludeAllEvents();
+  // Compatibility with GD <= 5
+  if (element.HasChild("include", "Limites")) {
+    SerializerElement& includeElement = element.GetChild("include", 0, "Limites");
+    if (includeElement.HasAttribute("includeAll")) {
+      // Compatibility with GDevelop <= 4.0.92
+      if (includeElement.GetBoolAttribute("includeAll", true)) {
+        SetIncludeAllEvents();
+      } else {
+        SetIncludeStartAndEnd(includeElement.GetIntAttribute("start"),
+                              includeElement.GetIntAttribute("end"));
+      }
     } else {
-      SetIncludeStartAndEnd(includeElement.GetIntAttribute("start"),
-                            includeElement.GetIntAttribute("end"));
+      // GDevelop > 4.0.92
+      IncludeConfig config = static_cast<IncludeConfig>(
+          includeElement.GetIntAttribute("includeConfig", 0));
+      if (config == INCLUDE_ALL)
+        SetIncludeAllEvents();
+      else if (config == INCLUDE_EVENTS_GROUP)
+        SetIncludeEventsGroup(includeElement.GetStringAttribute("eventsGroup"));
+      else if (config == INCLUDE_BY_INDEX)
+        SetIncludeStartAndEnd(includeElement.GetIntAttribute("start"),
+                              includeElement.GetIntAttribute("end"));
     }
   } else {
-    // GDevelop > 4.0.92
-    IncludeConfig config = static_cast<IncludeConfig>(
-        includeElement.GetIntAttribute("includeConfig", 0));
-    if (config == INCLUDE_ALL)
-      SetIncludeAllEvents();
-    else if (config == INCLUDE_EVENTS_GROUP)
-      SetIncludeEventsGroup(includeElement.GetStringAttribute("eventsGroup"));
-    else if (config == INCLUDE_BY_INDEX)
-      SetIncludeStartAndEnd(includeElement.GetIntAttribute("start"),
-                            includeElement.GetIntAttribute("end"));
+    // Since GDevelop 5, links always include all events.
+    SetIncludeAllEvents();
   }
+  // end of compatibility code
+}
+
+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/Builtin/RepeatEvent.cpp

@@ -31,11 +31,15 @@ vector<gd::InstructionsList*> RepeatEvent::GetAllActionsVectors() {
   return allActions;
 }
 
-vector<gd::Expression*> RepeatEvent::GetAllExpressions() {
-  vector<gd::Expression*> allExpressions;
-  allExpressions.push_back(&repeatNumberExpression);
+vector<pair<gd::Expression*, gd::ParameterMetadata> >
+    RepeatEvent::GetAllExpressionsWithMetadata() {
+  vector<pair<gd::Expression*, gd::ParameterMetadata> >
+      allExpressionsWithMetadata;
+  auto metadata = gd::ParameterMetadata().SetType("number");
+  allExpressionsWithMetadata.push_back(
+      std::make_pair(&repeatNumberExpression, metadata));
 
-  return allExpressions;
+  return allExpressionsWithMetadata;
 }
 
 vector<const gd::InstructionsList*> RepeatEvent::GetAllConditionsVectors()
@@ -53,11 +57,15 @@ vector<const gd::InstructionsList*> RepeatEvent::GetAllActionsVectors() const {
   return allActions;
 }
 
-vector<const gd::Expression*> RepeatEvent::GetAllExpressions() const {
-  vector<const gd::Expression*> allExpressions;
-  allExpressions.push_back(&repeatNumberExpression);
+vector<pair<const gd::Expression*, const gd::ParameterMetadata> >
+    RepeatEvent::GetAllExpressionsWithMetadata() const {
+  vector<pair<const gd::Expression*, const gd::ParameterMetadata> >
+      allExpressionsWithMetadata;
+  auto metadata = gd::ParameterMetadata().SetType("number");
+  allExpressionsWithMetadata.push_back(
+      std::make_pair(&repeatNumberExpression, metadata));
 
-  return allExpressions;
+  return allExpressionsWithMetadata;
 }
 
 void RepeatEvent::SerializeTo(SerializerElement& element) const {
@@ -67,8 +75,10 @@ void RepeatEvent::SerializeTo(SerializerElement& element) const {
       conditions, element.AddChild("conditions"));
   gd::EventsListSerialization::SerializeInstructionsTo(
       actions, element.AddChild("actions"));
-  gd::EventsListSerialization::SerializeEventsTo(events,
-                                                 element.AddChild("events"));
+
+  if (!events.IsEmpty())
+    gd::EventsListSerialization::SerializeEventsTo(events,
+                                                  element.AddChild("events"));
 }
 
 void RepeatEvent::UnserializeFrom(gd::Project& project,
@@ -81,8 +91,12 @@ void RepeatEvent::UnserializeFrom(gd::Project& project,
       project, conditions, element.GetChild("conditions", 0, "Conditions"));
   gd::EventsListSerialization::UnserializeInstructionsFrom(
       project, actions, element.GetChild("actions", 0, "Actions"));
-  gd::EventsListSerialization::UnserializeEventsFrom(
-      project, events, element.GetChild("events", 0, "Events"));
+
+  events.Clear();
+  if (element.HasChild("events", "Events")) {
+    gd::EventsListSerialization::UnserializeEventsFrom(
+        project, events, element.GetChild("events", 0, "Events"));
+  }
 }
 
 }  // namespace gd

Core/GDCore/Events/Builtin/RepeatEvent.h

@@ -45,11 +45,14 @@ class GD_CORE_API RepeatEvent : public gd::BaseEvent {
 
   virtual std::vector<gd::InstructionsList*> GetAllConditionsVectors();
   virtual std::vector<gd::InstructionsList*> GetAllActionsVectors();
-  virtual std::vector<gd::Expression*> GetAllExpressions();
+  virtual std::vector<std::pair<gd::Expression*, gd::ParameterMetadata> >
+      GetAllExpressionsWithMetadata();
+
   virtual std::vector<const gd::InstructionsList*> GetAllConditionsVectors()
       const;
   virtual std::vector<const gd::InstructionsList*> GetAllActionsVectors() const;
-  virtual std::vector<const gd::Expression*> GetAllExpressions() const;
+  virtual std::vector<std::pair<const gd::Expression*, const gd::ParameterMetadata> >
+      GetAllExpressionsWithMetadata() const;
 
   virtual void SerializeTo(SerializerElement& element) const;
   virtual void UnserializeFrom(gd::Project& project,

Core/GDCore/Events/Builtin/StandardEvent.cpp

@@ -53,8 +53,10 @@ void StandardEvent::SerializeTo(SerializerElement& element) const {
       conditions, element.AddChild("conditions"));
   gd::EventsListSerialization::SerializeInstructionsTo(
       actions, element.AddChild("actions"));
-  gd::EventsListSerialization::SerializeEventsTo(events,
-                                                 element.AddChild("events"));
+
+  if (!events.IsEmpty())
+    gd::EventsListSerialization::SerializeEventsTo(events,
+                                                  element.AddChild("events"));
 }
 
 void StandardEvent::UnserializeFrom(gd::Project& project,
@@ -63,8 +65,12 @@ void StandardEvent::UnserializeFrom(gd::Project& project,
       project, conditions, element.GetChild("conditions", 0, "Conditions"));
   gd::EventsListSerialization::UnserializeInstructionsFrom(
       project, actions, element.GetChild("actions", 0, "Actions"));
-  gd::EventsListSerialization::UnserializeEventsFrom(
-      project, events, element.GetChild("events", 0, "Events"));
+
+  events.Clear();
+  if (element.HasChild("events", "Events")) {
+    gd::EventsListSerialization::UnserializeEventsFrom(
+        project, events, element.GetChild("events", 0, "Events"));
+  }
 }
 
 }  // namespace gd

Core/GDCore/Events/Builtin/WhileEvent.cpp

@@ -52,8 +52,10 @@ void WhileEvent::SerializeTo(SerializerElement& element) const {
       conditions, element.AddChild("conditions"));
   gd::EventsListSerialization::SerializeInstructionsTo(
       actions, element.AddChild("actions"));
-  gd::EventsListSerialization::SerializeEventsTo(events,
-                                                 element.AddChild("events"));
+
+  if (!events.IsEmpty())
+    gd::EventsListSerialization::SerializeEventsTo(events,
+                                                  element.AddChild("events"));
 }
 
 void WhileEvent::UnserializeFrom(gd::Project& project,
@@ -68,8 +70,12 @@ void WhileEvent::UnserializeFrom(gd::Project& project,
       project, conditions, element.GetChild("conditions", 0, "Conditions"));
   gd::EventsListSerialization::UnserializeInstructionsFrom(
       project, actions, element.GetChild("actions", 0, "Actions"));
-  gd::EventsListSerialization::UnserializeEventsFrom(
-      project, events, element.GetChild("events", 0, "Events"));
+
+  events.Clear();
+  if (element.HasChild("events", "Events")) {
+    gd::EventsListSerialization::UnserializeEventsFrom(
+        project, events, element.GetChild("events", 0, "Events"));
+  }
 }
 
 }  // namespace gd

Core/GDCore/Events/CodeGeneration/EffectsCodeGenerator.cpp

@@ -3,56 +3,71 @@
  * Copyright 2008-present Florian Rival (Florian.Rival@gmail.com). All rights
  * reserved. This project is released under the MIT License.
  */
-#include <iostream>
 #include "EffectsCodeGenerator.h"
+
+#include <iostream>
+
 #include "GDCore/Extensions/Metadata/EffectMetadata.h"
 #include "GDCore/Extensions/Metadata/MetadataProvider.h"
 #include "GDCore/Project/Effect.h"
+#include "GDCore/Project/EffectsContainer.h"
 #include "GDCore/Project/Layer.h"
 #include "GDCore/Project/Layout.h"
+#include "GDCore/Project/Object.h"
 #include "GDCore/Project/Project.h"
+#include "GDCore/IDE/ProjectBrowserHelper.h"
 
 namespace gd {
 
-void ExposeProjectEffects(
-    const gd::Project& project,
-    const std::function<void(const gd::Effect& effect)>& worker) {
+void EffectsCodeGenerator::DoVisitObject(gd::Object &object) {
+  auto &effects = object.GetEffects();
+  for (std::size_t e = 0; e < effects.GetEffectsCount(); e++) {
+    auto &effect = effects.GetEffect(e);
+    AddEffectIncludeFiles(effect);
+  }
+};
+
+void EffectsCodeGenerator::AddEffectIncludeFiles(const gd::Effect &effect) {
+  // TODO: this browse all the extensions every time we're trying to find
+  // a new effect. Might be a good idea to rework MetadataProvider to be
+  // faster (not sure if it is a bottleneck at all though - but could be
+  // for events code generation).
+  const gd::EffectMetadata &effectMetadata =
+      MetadataProvider::GetEffectMetadata(platform, effect.GetEffectType());
+
+  for (auto &includeFile : effectMetadata.GetIncludeFiles())
+    includeFiles.insert(includeFile);
+};
+
+void EffectsCodeGenerator::GenerateEffectsIncludeFiles(
+    const gd::Platform &platform,
+    gd::Project &project,
+    std::set<gd::String> &includeFiles) {
+  // TODO Add unit tests on this function.
+  
+  // TODO Merge with UsedExtensionsFinder.
+
   // See also gd::Project::ExposeResources for a method that traverse the whole
   // project (this time for resources) and
   // WholeProjectRefactorer::ExposeProjectEvents.
 
+  EffectsCodeGenerator effectsCodeGenerator(platform, includeFiles);
+
   // Add layouts effects
   for (std::size_t s = 0; s < project.GetLayoutsCount(); s++) {
     auto& layout = project.GetLayout(s);
 
     for (std::size_t l = 0; l < layout.GetLayersCount(); ++l) {
-      auto& layer = layout.GetLayer(l);
-
-      for (std::size_t e = 0; e < layer.GetEffectsCount(); ++e) {
-        auto& effect = layer.GetEffect(e);
-        worker(effect);
+      auto& effects = layout.GetLayer(l).GetEffects();
+      for (std::size_t e = 0; e < effects.GetEffectsCount(); ++e) {
+        auto& effect = effects.GetEffect(e);
+        effectsCodeGenerator.AddEffectIncludeFiles(effect);
       }
     }
   }
-}
 
-void EffectsCodeGenerator::GenerateEffectsIncludeFiles(
-    const gd::Platform& platform,
-    const gd::Project& project,
-    std::set<gd::String>& includeFiles) {
-  ExposeProjectEffects(
-      project, [&platform, &includeFiles](const gd::Effect& effect) {
-        // TODO: this browse all the extensions every time we're trying to find
-        // a new effect. Might be a good idea to rework MetadataProvider to be
-        // faster (not sure if it is a bottleneck at all though - but could be
-        // for events code generation).
-        const gd::EffectMetadata& effectMetadata =
-            MetadataProvider::GetEffectMetadata(platform,
-                                                effect.GetEffectType());
-
-        for (auto& includeFile : effectMetadata.GetIncludeFiles())
-          includeFiles.insert(includeFile);
-      });
+  // Add objects effects
+  gd::ProjectBrowserHelper::ExposeProjectObjects(project, effectsCodeGenerator);
 }
 
 }  // namespace gd

Core/GDCore/Events/CodeGeneration/EffectsCodeGenerator.h

@@ -3,16 +3,18 @@
  * Copyright 2008-present Florian Rival (Florian.Rival@gmail.com). All rights
  * reserved. This project is released under the MIT License.
  */
-#ifndef GDCORE_EffectsCodeGenerator_H
-#define GDCORE_EffectsCodeGenerator_H
+#pragma once
 
 #include <set>
 #include <utility>
 #include <vector>
 #include "GDCore/String.h"
+#include "GDCore/IDE/Project/ArbitraryObjectsWorker.h"
+
 namespace gd {
 class Project;
 class Platform;
+class Effect;
 }  // namespace gd
 
 namespace gd {
@@ -20,16 +22,26 @@ namespace gd {
 /**
  * \brief Internal class used to generate code from events
  */
-class GD_CORE_API EffectsCodeGenerator {
- public:
+class GD_CORE_API EffectsCodeGenerator : public ArbitraryObjectsWorker {
+public:
   /**
    * \brief Add all the include files required by the project effects.
    */
   static void GenerateEffectsIncludeFiles(const gd::Platform& platform,
-                                          const gd::Project& project,
+                                          gd::Project& project,
                                           std::set<gd::String>& includeFiles);
+
+private:
+  EffectsCodeGenerator(const gd::Platform &platform_,
+                       std::set<gd::String> &includeFiles_)
+      : platform(platform_), includeFiles(includeFiles_){};
+
+  void AddEffectIncludeFiles(const gd::Effect& effect);
+
+  void DoVisitObject(gd::Object &object) override;
+
+  const gd::Platform &platform;
+  std::set<gd::String> &includeFiles;
 };
 
 }  // namespace gd
-
-#endif  // GDCORE_EffectsCodeGenerator_H

Core/GDCore/Events/CodeGeneration/EventsCodeGenerationContext.cpp

@@ -4,7 +4,9 @@
  * reserved. This project is released under the MIT License.
  */
 #include "GDCore/Events/CodeGeneration/EventsCodeGenerationContext.h"
+
 #include <set>
+
 #include "GDCore/CommonTools.h"
 #include "GDCore/Events/CodeGeneration/EventsCodeGenerator.h"
 #include "GDCore/Events/Tools/EventsCodeNameMangler.h"
@@ -14,7 +16,7 @@ using namespace std;
 namespace gd {
 
 void EventsCodeGenerationContext::InheritsFrom(
-    const EventsCodeGenerationContext& parent_) {
+    EventsCodeGenerationContext& parent_) {
   parent = &parent_;
 
   // Objects lists declared by parent became "already declared" in the child
@@ -24,8 +26,8 @@ void EventsCodeGenerationContext::InheritsFrom(
             parent_.objectsListsToBeDeclared.end(),
             std::inserter(alreadyDeclaredObjectsLists,
                           alreadyDeclaredObjectsLists.begin()));
-  std::copy(parent_.objectsListsWithoutPickingToBeDeclared.begin(),
-            parent_.objectsListsWithoutPickingToBeDeclared.end(),
+  std::copy(parent_.objectsListsOrEmptyToBeDeclared.begin(),
+            parent_.objectsListsOrEmptyToBeDeclared.end(),
             std::inserter(alreadyDeclaredObjectsLists,
                           alreadyDeclaredObjectsLists.begin()));
   std::copy(parent_.emptyObjectsListsToBeDeclared.begin(),
@@ -33,6 +35,8 @@ void EventsCodeGenerationContext::InheritsFrom(
             std::inserter(alreadyDeclaredObjectsLists,
                           alreadyDeclaredObjectsLists.begin()));
 
+  nearestAsyncParent = parent_.IsAsyncCallback() ? &parent_ : parent_.nearestAsyncParent;
+  asyncDepth = parent_.asyncDepth;
   depthOfLastUse = parent_.depthOfLastUse;
   customConditionDepth = parent_.customConditionDepth;
   contextDepth = parent_.GetContextDepth() + 1;
@@ -42,33 +46,59 @@ void EventsCodeGenerationContext::InheritsFrom(
   }
 }
 
+void EventsCodeGenerationContext::InheritsAsAsyncCallbackFrom(
+    EventsCodeGenerationContext& parent_) {
+  // Increasing the async depth is enough to mark the context as an async callback.
+  InheritsFrom(parent_);
+  asyncDepth = parent_.asyncDepth + 1;
+}
+
 void EventsCodeGenerationContext::Reuse(
-    const EventsCodeGenerationContext& parent_) {
+    EventsCodeGenerationContext& parent_) {
   InheritsFrom(parent_);
   if (parent_.CanReuse())
     contextDepth = parent_.GetContextDepth();  // Keep same context depth
 }
 
+void EventsCodeGenerationContext::NotifyAsyncParentsAboutDeclaredObject(const gd::String& objectName) {
+  gd::EventsCodeGenerationContext* asyncContext = IsAsyncCallback() ? this : nearestAsyncParent;
+  for (;
+        asyncContext != nullptr;
+        asyncContext = asyncContext->parent->nearestAsyncParent)
+    asyncContext->allObjectsListToBeDeclaredAcrossChildren.insert(objectName);
+}
+
 void EventsCodeGenerationContext::ObjectsListNeeded(
     const gd::String& objectName) {
-  if (!IsToBeDeclared(objectName))
+  if (!IsToBeDeclared(objectName)) {
     objectsListsToBeDeclared.insert(objectName);
 
+    if (IsInsideAsync()) {
+      NotifyAsyncParentsAboutDeclaredObject(objectName);
+    }
+  }
+
   depthOfLastUse[objectName] = GetContextDepth();
 }
 
-void EventsCodeGenerationContext::ObjectsListWithoutPickingNeeded(
+void EventsCodeGenerationContext::ObjectsListNeededOrEmptyIfJustDeclared(
     const gd::String& objectName) {
-  if (!IsToBeDeclared(objectName))
-    objectsListsWithoutPickingToBeDeclared.insert(objectName);
+  if (!IsToBeDeclared(objectName)) {
+    objectsListsOrEmptyToBeDeclared.insert(objectName);
+
+    if (IsInsideAsync()) {
+      NotifyAsyncParentsAboutDeclaredObject(objectName);
+    }
+  }
 
   depthOfLastUse[objectName] = GetContextDepth();
 }
 
 void EventsCodeGenerationContext::EmptyObjectsListNeeded(
     const gd::String& objectName) {
-  if (!IsToBeDeclared(objectName))
+  if (!IsToBeDeclared(objectName)) {
     emptyObjectsListsToBeDeclared.insert(objectName);
+  }
 
   depthOfLastUse[objectName] = GetContextDepth();
 }
@@ -77,8 +107,8 @@ std::set<gd::String> EventsCodeGenerationContext::GetAllObjectsToBeDeclared()
     const {
   std::set<gd::String> allObjectListsToBeDeclared(
       objectsListsToBeDeclared.begin(), objectsListsToBeDeclared.end());
-  allObjectListsToBeDeclared.insert(objectsListsWithoutPickingToBeDeclared.begin(),
-                                    objectsListsWithoutPickingToBeDeclared.end());
+  allObjectListsToBeDeclared.insert(objectsListsOrEmptyToBeDeclared.begin(),
+                                    objectsListsOrEmptyToBeDeclared.end());
   allObjectListsToBeDeclared.insert(emptyObjectsListsToBeDeclared.begin(),
                                     emptyObjectsListsToBeDeclared.end());
 
@@ -102,4 +132,21 @@ bool EventsCodeGenerationContext::IsSameObjectsList(
          otherContext.GetLastDepthObjectListWasNeeded(objectName);
 }
 
+bool EventsCodeGenerationContext::ShouldUseAsyncObjectsList(
+    const gd::String& objectName) const {
+  if (!IsInsideAsync()) return false;
+
+  // Check if the objects list was used after (or in) the nearest async callback context.
+  const gd::EventsCodeGenerationContext* asyncContext = IsAsyncCallback() ? this : nearestAsyncParent;
+  if (parent->GetLastDepthObjectListWasNeeded(objectName) >= asyncContext->GetContextDepth()) {
+    // The object was used in a context after (or in) the nearest async parent context, so we're not getting it from the
+    // async object lists (it was already gotten from there in this previous context).
+    return false;
+  }
+
+  // If the objects list is declared in a parent of the nearest async context, it means
+  // the async context had to use an async objects list to access it.
+  return asyncContext->ObjectAlreadyDeclaredByParents(objectName);
+};
+
 }  // namespace gd

Core/GDCore/Events/CodeGeneration/EventsCodeGenerationContext.h

@@ -8,6 +8,7 @@
 #include <map>
 #include <memory>
 #include <set>
+
 #include "GDCore/String.h"
 
 namespace gd {
@@ -33,11 +34,7 @@ class GD_CORE_API EventsCodeGenerationContext {
    * updated to contain the maximal scope depth reached.
    */
   EventsCodeGenerationContext(unsigned int* maxDepthLevel_ = nullptr)
-      : contextDepth(0),
-        customConditionDepth(0),
-        maxDepthLevel(maxDepthLevel_),
-        parent(NULL),
-        reuseExplicitlyForbidden(false){};
+      : maxDepthLevel(maxDepthLevel_){};
   virtual ~EventsCodeGenerationContext(){};
 
   /**
@@ -45,7 +42,13 @@ class GD_CORE_API EventsCodeGenerationContext {
    * another one. The child will then for example not declare again objects
    * already declared by its parent.
    */
-  void InheritsFrom(const EventsCodeGenerationContext& parent);
+  void InheritsFrom(EventsCodeGenerationContext& parent);
+
+  /**
+   * Call this method to make an EventsCodeGenerationContext as a "child" of
+   * another one, but in the context of an async function.
+   */
+  void InheritsAsAsyncCallbackFrom(EventsCodeGenerationContext& parent);
 
   /**
    * \brief As InheritsFrom, mark the context as being the child of another one,
@@ -53,7 +56,7 @@ class GD_CORE_API EventsCodeGenerationContext {
    *
    * Used for example for optimizing the last event of a list.
    */
-  void Reuse(const EventsCodeGenerationContext& parent);
+  void Reuse(EventsCodeGenerationContext& parent);
 
   /**
    * \brief Forbid any optimization that would reuse and modify the object list
@@ -88,19 +91,19 @@ class GD_CORE_API EventsCodeGenerationContext {
   const EventsCodeGenerationContext* GetParentContext() const { return parent; }
 
   /**
-   * Mark the object has being the object being handled by the instruction
+   * Mark the object as being the object being handled by the instruction.
    */
   void SetCurrentObject(const gd::String& objectName) {
     currentObject = objectName;
   };
 
   /**
-   * Set that no particular object is being handled by an instruction
+   * Set that no particular object is being handled by an instruction.
    */
   void SetNoCurrentObject() { currentObject = ""; };
 
   /**
-   * Get the object being handled by the instruction
+   * Get the object being handled by the instruction.
    */
   const gd::String& GetCurrentObject() const { return currentObject; };
 
@@ -109,7 +112,7 @@ class GD_CORE_API EventsCodeGenerationContext {
    *
    * The list will be filled with objects from the scene if it is the first time
    * it is requested, unless there is already an object list with this name
-   * (i.e. `ObjectAlreadyDeclared(objectName)` returns true).
+   * (i.e. `ObjectAlreadyDeclaredByParents(objectName)` returns true).
    */
   void ObjectsListNeeded(const gd::String& objectName);
 
@@ -121,7 +124,7 @@ class GD_CORE_API EventsCodeGenerationContext {
    * from the scene. If there is already an objects list with this name, no new
    * list will be declared again.
    */
-  void ObjectsListWithoutPickingNeeded(const gd::String& objectName);
+  void ObjectsListNeededOrEmptyIfJustDeclared(const gd::String& objectName);
 
   /**
    * Call this when an instruction in the event needs an empty object list,
@@ -134,29 +137,21 @@ class GD_CORE_API EventsCodeGenerationContext {
   void EmptyObjectsListNeeded(const gd::String& objectName);
 
   /**
-   * Return true if an object list has already been declared (or is going to be
-   * declared).
+   * Return true if an object list has already been declared by the parent contexts.
    */
-  bool ObjectAlreadyDeclared(const gd::String& objectName) const {
+  bool ObjectAlreadyDeclaredByParents(const gd::String& objectName) const {
     return (alreadyDeclaredObjectsLists.find(objectName) !=
             alreadyDeclaredObjectsLists.end());
   };
 
-  /**
-   * \brief Consider that \a objectName is now declared in the context.
-   */
-  void SetObjectDeclared(const gd::String& objectName) {
-    alreadyDeclaredObjectsLists.insert(objectName);
-  }
-
   /**
    * Return all the objects lists which will be declared by the current context
-   * ( the non empty as well as the empty objects lists )
+   * (normal, potentially empty or empty).
    */
   std::set<gd::String> GetAllObjectsToBeDeclared() const;
 
   /**
-   * Return the objects lists which will be declared by the current context
+   * Return the objects lists which will be declared by the current context.
    */
   const std::set<gd::String>& GetObjectsListsToBeDeclared() const {
     return objectsListsToBeDeclared;
@@ -166,9 +161,9 @@ class GD_CORE_API EventsCodeGenerationContext {
    * Return the objects lists which will be will be declared, without filling
    * them with objects from the scene.
    */
-  const std::set<gd::String>& GetObjectsListsToBeDeclaredWithoutPicking()
+  const std::set<gd::String>& GetObjectsListsToBeEmptyIfJustDeclared()
       const {
-    return objectsListsWithoutPickingToBeDeclared;
+    return objectsListsOrEmptyToBeDeclared;
   };
 
   /**
@@ -184,7 +179,7 @@ class GD_CORE_API EventsCodeGenerationContext {
    * Return the objects lists which are already declared and can be used in the
    * current context without declaration.
    */
-  const std::set<gd::String>& GetObjectsListsAlreadyDeclared() const {
+  const std::set<gd::String>& GetObjectsListsAlreadyDeclaredByParents() const {
     return alreadyDeclaredObjectsLists;
   };
 
@@ -227,22 +222,55 @@ class GD_CORE_API EventsCodeGenerationContext {
    */
   size_t GetCurrentConditionDepth() const { return customConditionDepth; }
 
- private:
+  /**
+   * \brief Returns the list of all objects declared in this context
+   * and subcontexts.
+   * \warning Only works on an async callback's context.
+   *
+   * It is to be used by the Async event code generator to know what objects
+   * lists to backup for the async callback and async callbacks after it.
+   */
+  const std::set<gd::String>& GetAllDeclaredObjectsAcrossChildren() {
+    return allObjectsListToBeDeclaredAcrossChildren;
+  };
+
+  /**
+   * Returns true if an object list should be gotten from a backed up
+   * objects list instead of the parent context. This can happen inside an
+   * asynchronous callback or a child context of an asynchronous callback (i.e:
+   * the `asyncDepth` is not 0).
+   */
+  bool ShouldUseAsyncObjectsList(const gd::String& objectName) const;
+
+  /**
+   * Returns true if the code currently being generated is inside an
+   * asynchronous context (either in an asynchronous callback, or in a children of
+   * an asynchronous callback).
+   */
+  bool IsInsideAsync() const { return asyncDepth != 0; };
+
+  /**
+   * Returns true if the code currently being generated is an asynchronous
+   * callback (but not a child of an asynchronous callback).
+   */
+  bool IsAsyncCallback() const { return parent != nullptr && parent->asyncDepth != asyncDepth; }
+
   /**
    * \brief Returns true if the given object is already going to be declared
-   * (either as a traditional objects list, or one without picking, or one
-   * empty).
-   *
+   * in this context (either as a traditional objects list, or an empty one).
    */
   bool IsToBeDeclared(const gd::String& objectName) {
     return objectsListsToBeDeclared.find(objectName) !=
                objectsListsToBeDeclared.end() ||
-           objectsListsWithoutPickingToBeDeclared.find(objectName) !=
-               objectsListsWithoutPickingToBeDeclared.end() ||
+           objectsListsOrEmptyToBeDeclared.find(objectName) !=
+               objectsListsOrEmptyToBeDeclared.end() ||
            emptyObjectsListsToBeDeclared.find(objectName) !=
                emptyObjectsListsToBeDeclared.end();
   };
 
+ private:
+  void NotifyAsyncParentsAboutDeclaredObject(const gd::String& objectName);
+
   std::set<gd::String>
       alreadyDeclaredObjectsLists;  ///< Objects lists already needed in a
                                     ///< parent context.
@@ -250,7 +278,7 @@ class GD_CORE_API EventsCodeGenerationContext {
       objectsListsToBeDeclared;  ///< Objects lists that will be declared in
                                  ///< this context.
   std::set<gd::String>
-      objectsListsWithoutPickingToBeDeclared;  ///< Objects lists that will be
+      objectsListsOrEmptyToBeDeclared;  ///< Objects lists that will be
                                                ///< declared in this context,
                                                ///< but not filled with scene's
                                                ///< objects.
@@ -260,21 +288,40 @@ class GD_CORE_API EventsCodeGenerationContext {
                                       ///< but not filled with scene's
                                       ///< objects and not filled with any
                                       ///< previously existing objects list.
+  std::set<gd::String>
+      allObjectsListToBeDeclaredAcrossChildren;  ///< This is only to be used by
+                                                 ///< the async callback
+                                                 ///< contexts to know all
+                                                 ///< objects declared across
+                                                 ///< all children, so that the
+                                                 ///< necessary objects can be
+                                                 ///< backed up.
+
   std::map<gd::String, unsigned int>
       depthOfLastUse;  ///< The context depth when an object was last used.
   gd::String
       currentObject;  ///< The object being used by an action or condition.
-  unsigned int contextDepth;  ///< The depth of the context : 0 for a newly
-                              ///< created context, n+1 for any context
-                              ///< inheriting from context with depth n.
-  unsigned int
-      customConditionDepth;  ///< The depth of the conditions being generated.
+  unsigned int contextDepth = 0;  ///< The depth of the context: 0 for a newly
+                                  ///< created context, n+1 for any context
+                                  ///< inheriting from context with depth n.
+  unsigned int customConditionDepth =
+      0;  ///< The depth of the conditions being generated.
+  unsigned int asyncDepth =
+      0;  ///< If higher than 0, the current context is an asynchronous callback,
+          ///< or a child context of an asynchronous callback:
+          ///< - If the parent's async depth != the current context async depth,
+          ///<   then the current context is an asynchronous callback context.
+          ///< - Otherwise, it's a child of an asynchronous callback.
   unsigned int* maxDepthLevel;  ///< A pointer to a unsigned int updated with
                                 ///< the maximum depth reached.
-  const EventsCodeGenerationContext*
-      parent;  ///< The parent of the current context. Can be NULL.
-  bool reuseExplicitlyForbidden;  ///< If set to true, forbid children context
-                                  ///< to reuse this one without inheriting.
+  const EventsCodeGenerationContext* parent =
+      nullptr;  ///< The parent of the current context. Can be NULL.
+  EventsCodeGenerationContext* nearestAsyncParent =
+      nullptr;  ///< The nearest parent context that is an async callback
+                ///< context.
+  bool reuseExplicitlyForbidden =
+      false;  ///< If set to true, forbid children contexts
+              ///< to reuse this one without inheriting.
 };
 
 }  // namespace gd

Core/GDCore/Events/CodeGeneration/EventsCodeGenerator.h

@@ -9,8 +9,10 @@
 #include <set>
 #include <utility>
 #include <vector>
+
 #include "GDCore/Events/Event.h"
 #include "GDCore/Events/Instruction.h"
+#include "GDCore/Project/ProjectScopedContainers.h"
 #include "GDCore/String.h"
 namespace gd {
 class EventsList;
@@ -18,6 +20,7 @@ class Expression;
 class Project;
 class Layout;
 class ObjectsContainer;
+class ObjectsContainersList;
 class ExternalEvents;
 class ParameterMetadata;
 class ObjectMetadata;
@@ -47,7 +50,7 @@ class GD_CORE_API EventsCodeGenerator {
    * \brief Construct a code generator for the specified
    * platform/project/layout.
    */
-  EventsCodeGenerator(gd::Project& project_,
+  EventsCodeGenerator(const gd::Project& project_,
                       const gd::Layout& layout,
                       const gd::Platform& platform_);
 
@@ -55,9 +58,9 @@ class GD_CORE_API EventsCodeGenerator {
    * \brief Construct a code generator for the specified
    * objects/groups and platform
    */
-  EventsCodeGenerator(const gd::Platform& platform,
-                      gd::ObjectsContainer& globalObjectsAndGroups_,
-                      const gd::ObjectsContainer& objectsAndGroups_);
+  EventsCodeGenerator(
+      const gd::Platform& platform,
+      const gd::ProjectScopedContainers& projectScopedContainers_);
   virtual ~EventsCodeGenerator(){};
 
   /**
@@ -76,7 +79,7 @@ class GD_CORE_API EventsCodeGenerator {
    * \return Code
    */
   virtual gd::String GenerateEventsListCode(
-      gd::EventsList& events, const EventsCodeGenerationContext& context);
+      gd::EventsList& events, EventsCodeGenerationContext& context);
 
   /**
    * \brief Generate code for executing a condition list
@@ -123,7 +126,7 @@ class GD_CORE_API EventsCodeGenerator {
    *
    */
   std::vector<gd::String> GenerateParametersCodes(
-      const std::vector<gd::Expression> & parameters,
+      const std::vector<gd::Expression>& parameters,
       const std::vector<gd::ParameterMetadata>& parametersInfo,
       EventsCodeGenerationContext& context,
       std::vector<std::pair<gd::String, gd::String> >*
@@ -153,8 +156,54 @@ class GD_CORE_API EventsCodeGenerator {
    * \param context Context used for generation
    * \return Code
    */
-  gd::String GenerateActionCode(gd::Instruction& action,
-                                EventsCodeGenerationContext& context);
+  gd::String GenerateActionCode(
+      gd::Instruction& action,
+      EventsCodeGenerationContext& context,
+      const gd::String& optionalAsyncCallbackName = "");
+
+  struct CallbackDescriptor {
+    CallbackDescriptor(const gd::String functionName_,
+                       const gd::String argumentsList_,
+                       const std::set<gd::String> requiredObjects_)
+        : functionName(functionName_),
+          argumentsList(argumentsList_),
+          requiredObjects(requiredObjects_){};
+    /**
+     * The name by which the function can be invoked.
+     */
+    const gd::String functionName;
+    /**
+     * The comma separated list of arguments that the function takes.
+     */
+    const gd::String argumentsList;
+    /**
+     * A set of all objects that need to be backed up to be passed to the
+     * callback code.
+     */
+    const std::set<gd::String> requiredObjects;
+  };
+
+  /**
+   * \brief Generates actions and events as a callback.
+   *
+   * This is used by asynchronous functions to run the code out of the normal
+   * events flow.
+   *
+   * \returns A set with all objects required by the callback code.
+   * The caller must take care of backing them up in a LongLivedObjectsList,
+   * and to pass it to the callback function as the last argument.
+   */
+  virtual const CallbackDescriptor GenerateCallback(
+      const gd::String& callbackFunctionName,
+      gd::EventsCodeGenerationContext& parentContext,
+      gd::InstructionsList& actions,
+      gd::EventsList* subEvents = nullptr);
+
+  /**
+   * \brief Generates the parameters list of an event's generated function.
+   */
+  const gd::String GenerateEventsParameters(
+      const gd::EventsCodeGenerationContext& context);
 
   /**
    * \brief Generate code for declaring objects lists.
@@ -279,18 +328,12 @@ class GD_CORE_API EventsCodeGenerator {
    */
   bool ErrorOccurred() const { return errorOccurred; };
 
-  /**
-   * \brief Get the global objects/groups used for code generation.
-   */
-  gd::ObjectsContainer& GetGlobalObjectsAndGroups() const {
-    return globalObjectsAndGroups;
-  }
+  const gd::ObjectsContainersList& GetObjectsContainersList() const {
+    return projectScopedContainers.GetObjectsContainersList();
+  };
 
-  /**
-   * \brief Get the objects/groups used for code generation.
-   */
-  const gd::ObjectsContainer& GetObjectsAndGroups() const {
-    return objectsAndGroups;
+  const gd::ProjectScopedContainers& GetProjectScopedContainers() const {
+    return projectScopedContainers;
   }
 
   /**
@@ -303,7 +346,7 @@ class GD_CORE_API EventsCodeGenerator {
    * \brief Get the project the code is being generated for.
    * \warning This is only valid if HasProjectAndLayout() is true.
    */
-  gd::Project& GetProject() const { return *project; }
+  const gd::Project& GetProject() const { return *project; }
 
   /**
    * \brief Get the layout the code is being generated for.
@@ -316,22 +359,6 @@ class GD_CORE_API EventsCodeGenerator {
    */
   const gd::Platform& GetPlatform() const { return platform; }
 
-  /**
-   * \brief Convert a group name to the full list of objects contained in the
-   * group.
-   *
-   * Get a list containing the "real" objects name when the events refers to \a
-   * objectName :<br> If \a objectName if really an object, the list will only
-   * contains \a objectName unchanged.<br> If \a objectName is a group, the list
-   * will contains all the objects of the group.<br> If \a objectName is the
-   * "current" object in the context ( i.e: The object being used for launching
-   * an action... ), none of the two rules below apply, and the list will only
-   * contains the context "current" object name.
-   */
-  std::vector<gd::String> ExpandObjectsName(
-      const gd::String& objectName,
-      const EventsCodeGenerationContext& context) const;
-
   /**
    * \brief Get the maximum depth of custom conditions reached during code
    * generation.
@@ -357,6 +384,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.
    *
@@ -411,7 +450,38 @@ class GD_CORE_API EventsCodeGenerator {
 
   enum VariableScope { LAYOUT_VARIABLE = 0, PROJECT_VARIABLE, OBJECT_VARIABLE };
 
+  /**
+   * Generate a single unique number for the specified instruction.
+   *
+   * This is useful for instructions that need to identify themselves in the
+   * generated code like the "Trigger Once" conditions. The id is stable across
+   * code generations if the instructions are the same objects in memory.
+   *
+   * Note that if this function is called multiple times with the same
+   * instruction, the unique number returned will be *different*. This is
+   * because a single instruction might appear at multiple places in events due
+   * to the usage of links.
+   */
+  size_t GenerateSingleUsageUniqueIdFor(const gd::Instruction* instruction);
+
+  /**
+   * Generate a single unique number for an events list.
+   *
+   * This is useful to create unique function names for events list, that are
+   * stable across code generation given the exact same list of events. They are
+   * *not* stable if events are moved/reorganized.
+   */
+  size_t GenerateSingleUsageUniqueIdForEventsList();
+
+  virtual gd::String GenerateRelationalOperation(
+      const gd::String& relationalOperator,
+      const gd::String& lhs,
+      const gd::String& rhs);
+
  protected:
+  virtual const gd::String GenerateRelationalOperatorCodes(
+      const gd::String& operatorString);
+
   /**
    * \brief Generate the code for a single parameter.
    *
@@ -420,9 +490,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,
@@ -438,28 +508,18 @@ class GD_CORE_API EventsCodeGenerator {
    * Other standard parameters type that should be implemented by platforms:
    * - currentScene: Reference to the current runtime scene.
    * - objectList : a map containing lists of objects which are specified by the
-  object name in another parameter. (C++: std::map <gd::String,
-  std::vector<RuntimeObject*> *>). Example:
-   * \code
-      AddExpression("Count", _("Object count"), _("Count the number of picked
-  objects"), _("Objects"), "res/conditions/nbObjet.png")
-      .AddParameter("objectList", _("Object"))
-      .SetFunctionName("PickedObjectsCount").SetIncludeFile("GDCpp/Extensions/Builtin/ObjectTools.h");
-
-   * \endcode
-   * - objectListWithoutPicking : Same as objectList but do not pick object if
-  they are not already picked.
-   * - objectPtr : Return a pointer to object specified by the object name in
-  another parameter ( C++: RuntimeObject* ). Example:
+  object name in another parameter.
+   * - objectListOrEmptyIfJustDeclared : Same as `objectList` but do not pick
+  object if they are not already picked.
+   * - objectPtr: Return a reference to the object specified by the object name
+  in another parameter. Example:
    * \code
   .AddParameter("object", _("Object"))
   .AddParameter("objectPtr", _("Target object"))
-  //The called function will be called with this signature on the C++ platform:
-  Function(gd::String, RuntimeObject*)
    * \endcode
    */
   virtual gd::String GenerateParameterCodes(
-      const gd::String& parameter,
+      const gd::Expression& parameter,
       const gd::ParameterMetadata& metadata,
       gd::EventsCodeGenerationContext& context,
       const gd::String& lastObjectName,
@@ -491,6 +551,12 @@ class GD_CORE_API EventsCodeGenerator {
     return ".getChild(" + ConvertToStringExplicit(childName) + ")";
   };
 
+  virtual gd::String GenerateVariableValueAs(const gd::String& type) {
+    return type == "number|string" ? ".getAsNumberOrString()"
+           : type == "string"      ? ".getAsString()"
+                                   : ".getAsNumber()";
+  }
+
   /**
    * \brief Generate the code to get the child of a variable,
    * using generated the expression.
@@ -519,6 +585,17 @@ class GD_CORE_API EventsCodeGenerator {
     return "fakeObjectListOf_" + objectName;
   }
 
+  virtual gd::String GeneratePropertyGetter(
+      const gd::PropertiesContainer& propertiesContainer,
+      const gd::NamedPropertyDescriptor& property,
+      const gd::String& type,
+      gd::EventsCodeGenerationContext& context);
+
+  virtual gd::String GenerateParameterGetter(
+      const gd::ParameterMetadata& parameter,
+      const gd::String& type,
+      gd::EventsCodeGenerationContext& context);
+
   /**
    * \brief Generate the code to reference an object which is
    * in an empty/null state.
@@ -593,28 +670,16 @@ class GD_CORE_API EventsCodeGenerator {
   };
 
   /**
-   * \brief Must negate a predicat.
+   * \brief Must negate a predicate.
    *
-   * The default implementation generates C-style code : It wraps the predicat
+   * The default implementation generates C-style code : It wraps the predicate
    * inside parenthesis and add a !.
    */
-  virtual gd::String GenerateNegatedPredicat(const gd::String& predicat) const {
-    return "!(" + predicat + ")";
+  virtual gd::String GenerateNegatedPredicate(
+      const gd::String& predicate) const {
+    return "!(" + predicate + ")";
   };
 
-  /**
-   * \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,
@@ -642,30 +707,37 @@ class GD_CORE_API EventsCodeGenerator {
       gd::EventsCodeGenerationContext& context);
 
   virtual gd::String GenerateFreeAction(
+      const gd::String& functionCallName,
       const std::vector<gd::String>& arguments,
       const gd::InstructionMetadata& instrInfos,
-      gd::EventsCodeGenerationContext& context);
+      gd::EventsCodeGenerationContext& context,
+      const gd::String& optionalAsyncCallbackName = "");
 
   virtual gd::String GenerateObjectAction(
       const gd::String& objectName,
       const gd::ObjectMetadata& objInfo,
+      const gd::String& functionCallName,
       const std::vector<gd::String>& arguments,
       const gd::InstructionMetadata& instrInfos,
-      gd::EventsCodeGenerationContext& context);
+      gd::EventsCodeGenerationContext& context,
+      const gd::String& optionalAsyncCallbackName = "");
 
   virtual gd::String GenerateBehaviorAction(
       const gd::String& objectName,
       const gd::String& behaviorName,
       const gd::BehaviorMetadata& autoInfo,
+      const gd::String& functionCallName,
       const std::vector<gd::String>& arguments,
       const gd::InstructionMetadata& instrInfos,
-      gd::EventsCodeGenerationContext& context);
+      gd::EventsCodeGenerationContext& context,
+      const gd::String& optionalAsyncCallbackName = "");
 
   gd::String GenerateRelationalOperatorCall(
       const gd::InstructionMetadata& instrInfos,
       const std::vector<gd::String>& arguments,
       const gd::String& callStartString,
       std::size_t startFromArgument = 0);
+
   gd::String GenerateOperatorCall(const gd::InstructionMetadata& instrInfos,
                                   const std::vector<gd::String>& arguments,
                                   const gd::String& callStartString,
@@ -704,19 +776,19 @@ class GD_CORE_API EventsCodeGenerator {
   /**
    * Generate the getter to get the name of the specified behavior.
    */
-  virtual gd::String GenerateGetBehaviorNameCode(const gd::String& behaviorName);
+  virtual gd::String GenerateGetBehaviorNameCode(
+      const gd::String& behaviorName);
 
   const gd::Platform& platform;  ///< The platform being used.
 
-  gd::ObjectsContainer& globalObjectsAndGroups;
-  const gd::ObjectsContainer& objectsAndGroups;
+  gd::ProjectScopedContainers projectScopedContainers;
 
   bool hasProjectAndLayout;  ///< true only if project and layout are valid
                              ///< references. If false, they should not be used.
-  gd::Project* project;      ///< The project being used.
-  const gd::Layout* scene;   ///< The scene being generated.
+  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.
 
@@ -732,6 +804,11 @@ class GD_CORE_API EventsCodeGenerator {
   size_t maxCustomConditionsDepth;  ///< The maximum depth value for all the
                                     ///< custom conditions created.
   size_t maxConditionsListsSize;  ///< The maximum size of a list of conditions.
+
+  std::set<size_t>
+      instructionUniqueIds;  ///< The unique ids generated for instructions.
+  size_t eventsListNextUniqueId;  ///< The next identifier to use for an events
+                                  ///< list function name.
 };
 
 }  // namespace gd

Core/GDCore/Events/CodeGeneration/ExpressionCodeGenerator.cpp

@@ -4,8 +4,11 @@
  * reserved. This project is released under the MIT License.
  */
 #include "ExpressionCodeGenerator.h"
+
 #include <memory>
 #include <vector>
+#include <vector>
+
 #include "GDCore/CommonTools.h"
 #include "GDCore/Events/CodeGeneration/EventsCodeGenerationContext.h"
 #include "GDCore/Events/CodeGeneration/EventsCodeGenerator.h"
@@ -23,29 +26,40 @@
 #include "GDCore/IDE/Events/ExpressionValidator.h"
 #include "GDCore/Project/Layout.h"
 #include "GDCore/Project/Project.h"
+#include "GDCore/Project/VariablesContainersList.h"
+#include "GDCore/Project/ObjectsContainersList.h"
+#include "GDCore/Project/ProjectScopedContainers.h"
+#include "GDCore/IDE/Events/ExpressionTypeFinder.h"
+#include "GDCore/IDE/Events/ExpressionVariableOwnerFinder.h"
 
 namespace gd {
 
 gd::String ExpressionCodeGenerator::GenerateExpressionCode(
     EventsCodeGenerator& codeGenerator,
     EventsCodeGenerationContext& context,
-    const gd::String& type,
-    const gd::String& expression,
-    const gd::String& objectName) {
-  gd::ExpressionParser2 parser(codeGenerator.GetPlatform(),
-                               codeGenerator.GetGlobalObjectsAndGroups(),
-                               codeGenerator.GetObjectsAndGroups());
-  auto node = parser.ParseExpression(type, expression, objectName);
-  gd::ExpressionValidator validator;
+    const gd::String& rootType,
+    const gd::Expression& expression,
+    const gd::String& rootObjectName) {
+  ExpressionCodeGenerator generator(rootType, rootObjectName, codeGenerator, context);
+
+  auto node = expression.GetRootNode();
+  if (!node) {
+    std::cout << "Error: error while parsing: \"" << expression.GetPlainString()
+              << "\" (" << rootType << ")" << std::endl;
+
+    return generator.GenerateDefaultValue(rootType);
+  }
+
+  gd::ExpressionValidator validator(codeGenerator.GetPlatform(),
+                                    codeGenerator.GetProjectScopedContainers(),
+                                    rootType);
   node->Visit(validator);
+  if (!validator.GetFatalErrors().empty()) {
+    std::cout << "Error: \"" << validator.GetFatalErrors()[0]->GetMessage()
+              << "\" in: \"" << expression.GetPlainString() << "\" ("
+              << rootType << ")" << std::endl;
 
-  ExpressionCodeGenerator generator(codeGenerator, context);
-  if (!validator.GetErrors().empty()) {
-    std::cout << "Error: \"" << validator.GetErrors()[0]->GetMessage()
-              << "\" in: \"" << expression << "\" (" << type << ")"
-              << std::endl;
-
-    return generator.GenerateDefaultValue(type);
+    return generator.GenerateDefaultValue(rootType);
   }
 
   node->Visit(generator);
@@ -88,27 +102,96 @@ void ExpressionCodeGenerator::OnVisitTextNode(TextNode& node) {
 void ExpressionCodeGenerator::OnVisitVariableNode(VariableNode& node) {
   // This "translation" from the type to an enum could be avoided
   // if all types were moved to an enum.
-  EventsCodeGenerator::VariableScope scope =
-      node.type == "globalvar"
-          ? gd::EventsCodeGenerator::PROJECT_VARIABLE
-          : ((node.type == "scenevar")
-                 ? gd::EventsCodeGenerator::LAYOUT_VARIABLE
-                 : gd::EventsCodeGenerator::OBJECT_VARIABLE);
+  auto type = gd::ExpressionTypeFinder::GetType(codeGenerator.GetPlatform(),
+                                            codeGenerator.GetProjectScopedContainers(),
+                                            rootType,
+                                            node);
 
-  output += codeGenerator.GenerateGetVariable(
-      node.name, scope, context, node.objectName);
-  if (node.child) node.child->Visit(*this);
+  if (gd::ParameterMetadata::IsExpression("variable", type)) {
+    // The node is a variable inside an expression waiting for a *variable* to be returned, not its value.
+    EventsCodeGenerator::VariableScope scope =
+        type == "globalvar"
+            ? gd::EventsCodeGenerator::PROJECT_VARIABLE
+            : ((type == "scenevar")
+                  ? gd::EventsCodeGenerator::LAYOUT_VARIABLE
+                  : gd::EventsCodeGenerator::OBJECT_VARIABLE);
+
+    auto objectName = gd::ExpressionVariableOwnerFinder::GetObjectName(codeGenerator.GetPlatform(),
+                                          codeGenerator.GetObjectsContainersList(),
+                                          rootObjectName,
+                                          node);
+    output += codeGenerator.GenerateGetVariable(
+        node.name, scope, context, objectName);
+    if (node.child) node.child->Visit(*this);
+  } else {
+    // The node represents a variable or an object variable in an expression waiting for its *value* to be returned.
+
+    codeGenerator.GetProjectScopedContainers().MatchIdentifierWithName<void>(node.name, [&](){
+      // Generate the code to access the object variables.
+
+      // Defer generation of the access to the object and variable to the child,
+      // once we know the name of the variable.
+      objectNameToUseForVariableAccessor = node.name;
+      if (node.child) node.child->Visit(*this);
+      objectNameToUseForVariableAccessor = "";
+
+      output += codeGenerator.GenerateVariableValueAs(type);
+    }, [&]() {
+      if (!codeGenerator.HasProjectAndLayout()) {
+        gd::LogWarning("Tried to generate access to a variable without a project/scene - the code generator only works for global and scene variables for now.");
+        output += GenerateDefaultValue(type);
+        return;
+      }
+
+      // This could be adapted in the future if more scopes are supported.
+      EventsCodeGenerator::VariableScope scope = gd::EventsCodeGenerator::PROJECT_VARIABLE;
+      if (codeGenerator.GetProjectScopedContainers().GetVariablesContainersList().GetBottomMostVariablesContainer()->Has(node.name)) {
+        scope = gd::EventsCodeGenerator::LAYOUT_VARIABLE;
+      }
+
+      output += codeGenerator.GenerateGetVariable(node.name, scope, context, "");
+      if (node.child) node.child->Visit(*this);
+      output += codeGenerator.GenerateVariableValueAs(type);
+    }, [&]() {
+      // Properties are not supported.
+      output += GenerateDefaultValue(type);
+    }, [&]() {
+      // Parameters are not supported.
+      output += GenerateDefaultValue(type);
+    }, [&]() {
+      // The identifier does not represents a variable (or a child variable), or not at least an existing
+      // one, nor an object variable. It's invalid.
+      output += GenerateDefaultValue(type);
+    });
+  }
 }
 
 void ExpressionCodeGenerator::OnVisitVariableAccessorNode(
     VariableAccessorNode& node) {
-  output += codeGenerator.GenerateVariableAccessor(node.name);
+    if (!objectNameToUseForVariableAccessor.empty()) {
+      // Use the name of the object passed by the parent, as we need both to access an object variable.
+      output += codeGenerator.GenerateGetVariable(node.name,
+          gd::EventsCodeGenerator::OBJECT_VARIABLE, context, objectNameToUseForVariableAccessor);
+
+      // We have accessed an object variable, from now we can continue accessing the child variables
+      // (including using the bracket notation).
+      objectNameToUseForVariableAccessor = "";
+    } else {
+        output += codeGenerator.GenerateVariableAccessor(node.name);
+    }
   if (node.child) node.child->Visit(*this);
 }
 
 void ExpressionCodeGenerator::OnVisitVariableBracketAccessorNode(
     VariableBracketAccessorNode& node) {
-  ExpressionCodeGenerator generator(codeGenerator, context);
+  if (!objectNameToUseForVariableAccessor.empty()) {
+    // Bracket notation can't be used to directly access a variable of an object (`MyObject["MyVariable"]`).
+    // This would be rejected by the ExpressionValidator.
+    output += codeGenerator.GenerateBadVariable();
+    return;
+  }
+
+  ExpressionCodeGenerator generator("number|string", "", codeGenerator, context);
   node.expression->Visit(generator);
   output +=
       codeGenerator.GenerateVariableBracketAccessor(generator.GetOutput());
@@ -116,39 +199,108 @@ void ExpressionCodeGenerator::OnVisitVariableBracketAccessorNode(
 }
 
 void ExpressionCodeGenerator::OnVisitIdentifierNode(IdentifierNode& node) {
-  if (gd::ParameterMetadata::IsObject(node.type)) {
+  auto type = gd::ExpressionTypeFinder::GetType(codeGenerator.GetPlatform(),
+                                            codeGenerator.GetProjectScopedContainers(),
+                                            rootType,
+                                            node);
+
+  if (gd::ParameterMetadata::IsObject(type)) {
     output +=
-        codeGenerator.GenerateObject(node.identifierName, node.type, context);
+        codeGenerator.GenerateObject(node.identifierName, type, context);
+  } else if (gd::ParameterMetadata::IsExpression("variable", type)) {
+      EventsCodeGenerator::VariableScope scope =
+          type == "globalvar"
+              ? gd::EventsCodeGenerator::PROJECT_VARIABLE
+              : ((type == "scenevar")
+                    ? gd::EventsCodeGenerator::LAYOUT_VARIABLE
+                    : gd::EventsCodeGenerator::OBJECT_VARIABLE);
+
+      auto objectName = gd::ExpressionVariableOwnerFinder::GetObjectName(codeGenerator.GetPlatform(),
+                                            codeGenerator.GetObjectsContainersList(),
+                                            rootObjectName,
+                                            node);
+      output += codeGenerator.GenerateGetVariable(
+          node.identifierName, scope, context, objectName);
+      if (!node.childIdentifierName.empty()) {
+        output += codeGenerator.GenerateVariableAccessor(node.childIdentifierName);
+      }
   } else {
-    output += "/* Error during generation, unrecognized identifier type: " +
-              codeGenerator.ConvertToString(node.type) + " with value " +
-              codeGenerator.ConvertToString(node.identifierName) + " */ " +
-              codeGenerator.ConvertToStringExplicit(node.identifierName);
+    const auto& variablesContainersList = codeGenerator.GetProjectScopedContainers().GetVariablesContainersList();
+    const auto& propertiesContainersList = codeGenerator.GetProjectScopedContainers().GetPropertiesContainersList();
+    const auto& parametersVectorsList = codeGenerator.GetProjectScopedContainers().GetParametersVectorsList();
+
+    // The node represents a variable, property, parameter or an object.
+    codeGenerator.GetProjectScopedContainers().MatchIdentifierWithName<void>(node.identifierName, [&]() {
+      // Generate the code to access the object variable.
+      output += codeGenerator.GenerateGetVariable(
+        node.childIdentifierName, gd::EventsCodeGenerator::OBJECT_VARIABLE, context, node.identifierName);
+      output += codeGenerator.GenerateVariableValueAs(type);
+    }, [&]() {
+      if (!codeGenerator.HasProjectAndLayout()) {
+        gd::LogWarning("Tried to generate access to a variable without a project/scene - the code generator only works for global and scene variables for now.");
+        output += GenerateDefaultValue(type);
+        return;
+      }
+
+      // This could be adapted in the future if more scopes are supported at runtime.
+      EventsCodeGenerator::VariableScope scope = gd::EventsCodeGenerator::PROJECT_VARIABLE;
+      if (variablesContainersList.GetBottomMostVariablesContainer()->Has(node.identifierName)) {
+        scope = gd::EventsCodeGenerator::LAYOUT_VARIABLE;
+      }
+
+      output += codeGenerator.GenerateGetVariable(node.identifierName, scope, context, "");
+      if (!node.childIdentifierName.empty()) {
+        output += codeGenerator.GenerateVariableAccessor(node.childIdentifierName);
+      }
+      output += codeGenerator.GenerateVariableValueAs(type);
+    }, [&]() {
+      const auto& propertiesContainerAndProperty = propertiesContainersList.Get(node.identifierName);
+
+      output += codeGenerator.GeneratePropertyGetter(
+        propertiesContainerAndProperty.first, propertiesContainerAndProperty.second, type, context);
+    }, [&]() {
+      const auto& parameter = gd::ParameterMetadataTools::Get(parametersVectorsList, node.identifierName);
+      output += codeGenerator.GenerateParameterGetter(parameter, type, context);
+    }, [&]() {
+      // The identifier does not represents a variable (or a child variable), or not at least an existing
+      // one, nor an object variable. It's invalid.
+      output += GenerateDefaultValue(type);
+    });
   }
 }
 
 void ExpressionCodeGenerator::OnVisitFunctionCallNode(FunctionCallNode& node) {
-  if (gd::MetadataProvider::IsBadExpressionMetadata(node.expressionMetadata)) {
+  auto type = gd::ExpressionTypeFinder::GetType(codeGenerator.GetPlatform(),
+                                            codeGenerator.GetProjectScopedContainers(),
+                                            rootType,
+                                            node);
+
+  const gd::ExpressionMetadata &metadata = MetadataProvider::GetFunctionCallMetadata(
+      codeGenerator.GetPlatform(),
+      codeGenerator.GetObjectsContainersList(),
+      node);
+
+  if (gd::MetadataProvider::IsBadExpressionMetadata(metadata)) {
     output += "/* Error during generation, function not found: " +
-              codeGenerator.ConvertToString(node.functionName) + " for type " +
-              node.type + " */ " + GenerateDefaultValue(node.type);
+              codeGenerator.ConvertToString(node.functionName) + " */ " +
+              GenerateDefaultValue(type);
     return;
   }
 
   if (!node.objectName.empty()) {
     if (!node.behaviorName.empty()) {
-      output += GenerateBehaviorFunctionCode(node.type,
+      output += GenerateBehaviorFunctionCode(type,
                                              node.objectName,
                                              node.behaviorName,
                                              node.parameters,
-                                             node.expressionMetadata);
+                                             metadata);
     } else {
       output += GenerateObjectFunctionCode(
-          node.type, node.objectName, node.parameters, node.expressionMetadata);
+          type, node.objectName, node.parameters, metadata);
     }
   } else {
     output +=
-        GenerateFreeFunctionCode(node.parameters, node.expressionMetadata);
+        GenerateFreeFunctionCode(node.parameters, metadata);
   }
 }
 
@@ -156,10 +308,10 @@ gd::String ExpressionCodeGenerator::GenerateFreeFunctionCode(
     const std::vector<std::unique_ptr<ExpressionNode>>& parameters,
     const ExpressionMetadata& expressionMetadata) {
   codeGenerator.AddIncludeFiles(
-      expressionMetadata.codeExtraInformation.GetIncludeFiles());
+      expressionMetadata.GetIncludeFiles());
 
   // Launch custom code generator if needed
-  if (expressionMetadata.codeExtraInformation.HasCustomCodeGenerator()) {
+  if (expressionMetadata.HasCustomCodeGenerator()) {
     return expressionMetadata.codeExtraInformation.customCodeGenerator(
         PrintParameters(parameters), codeGenerator, context);
   }
@@ -176,16 +328,11 @@ gd::String ExpressionCodeGenerator::GenerateObjectFunctionCode(
     const gd::String& objectName,
     const std::vector<std::unique_ptr<ExpressionNode>>& parameters,
     const ExpressionMetadata& expressionMetadata) {
-  const gd::ObjectsContainer& globalObjectsAndGroups =
-      codeGenerator.GetGlobalObjectsAndGroups();
-  const gd::ObjectsContainer& objectsAndGroups =
-      codeGenerator.GetObjectsAndGroups();
-
   codeGenerator.AddIncludeFiles(
-      expressionMetadata.codeExtraInformation.GetIncludeFiles());
+      expressionMetadata.GetIncludeFiles());
 
   // Launch custom code generator if needed
-  if (expressionMetadata.codeExtraInformation.HasCustomCodeGenerator()) {
+  if (expressionMetadata.HasCustomCodeGenerator()) {
     return expressionMetadata.codeExtraInformation.customCodeGenerator(
         PrintParameters(parameters), codeGenerator, context);
   }
@@ -201,23 +348,22 @@ gd::String ExpressionCodeGenerator::GenerateObjectFunctionCode(
 
   // Get object(s) concerned by function call
   std::vector<gd::String> realObjects =
-      codeGenerator.ExpandObjectsName(objectName, context);
+      codeGenerator.GetObjectsContainersList().ExpandObjectName(objectName, context.GetCurrentObject());
   for (std::size_t i = 0; i < realObjects.size(); ++i) {
     context.ObjectsListNeeded(realObjects[i]);
 
-    gd::String objectType = gd::GetTypeOfObject(
-        globalObjectsAndGroups, objectsAndGroups, realObjects[i]);
+    gd::String objectType = codeGenerator.GetObjectsContainersList().GetTypeOfObject(realObjects[i]);
     const ObjectMetadata& objInfo = MetadataProvider::GetObjectMetadata(
         codeGenerator.GetPlatform(), objectType);
 
-    codeGenerator.AddIncludeFiles(objInfo.includeFiles);
-    functionOutput = codeGenerator.GenerateObjectFunctionCall(
-        realObjects[i],
-        objInfo,
-        expressionMetadata.codeExtraInformation,
-        parametersCode,
-        functionOutput,
-        context);
+      codeGenerator.AddIncludeFiles(objInfo.includeFiles);
+      functionOutput = codeGenerator.GenerateObjectFunctionCall(
+          realObjects[i],
+          objInfo,
+          expressionMetadata.codeExtraInformation,
+          parametersCode,
+          functionOutput,
+          context);
   }
 
   return functionOutput;
@@ -228,16 +374,11 @@ gd::String ExpressionCodeGenerator::GenerateBehaviorFunctionCode(
     const gd::String& behaviorName,
     const std::vector<std::unique_ptr<ExpressionNode>>& parameters,
     const ExpressionMetadata& expressionMetadata) {
-  const gd::ObjectsContainer& globalObjectsAndGroups =
-      codeGenerator.GetGlobalObjectsAndGroups();
-  const gd::ObjectsContainer& objectsAndGroups =
-      codeGenerator.GetObjectsAndGroups();
-
   codeGenerator.AddIncludeFiles(
-      expressionMetadata.codeExtraInformation.GetIncludeFiles());
+      expressionMetadata.GetIncludeFiles());
 
   // Launch custom code generator if needed
-  if (expressionMetadata.codeExtraInformation.HasCustomCodeGenerator()) {
+  if (expressionMetadata.HasCustomCodeGenerator()) {
     return expressionMetadata.codeExtraInformation.customCodeGenerator(
         PrintParameters(parameters), codeGenerator, context);
   }
@@ -251,12 +392,11 @@ gd::String ExpressionCodeGenerator::GenerateBehaviorFunctionCode(
 
   // Get object(s) concerned by function call
   std::vector<gd::String> realObjects =
-      codeGenerator.ExpandObjectsName(objectName, context);
+      codeGenerator.GetObjectsContainersList().ExpandObjectName(objectName, context.GetCurrentObject());
 
   gd::String functionOutput = GenerateDefaultValue(type);
 
-  gd::String behaviorType = gd::GetTypeOfBehavior(
-      globalObjectsAndGroups, objectsAndGroups, behaviorName);
+  gd::String behaviorType = codeGenerator.GetObjectsContainersList().GetTypeOfBehavior(behaviorName);
   const BehaviorMetadata& autoInfo = MetadataProvider::GetBehaviorMetadata(
       codeGenerator.GetPlatform(), behaviorType);
 
@@ -290,18 +430,20 @@ gd::String ExpressionCodeGenerator::GenerateParametersCodes(
 
     auto& parameterMetadata = expressionMetadata.parameters[i];
     if (!parameterMetadata.IsCodeOnly()) {
-      ExpressionCodeGenerator generator(codeGenerator, context);
       if (nonCodeOnlyParameterIndex < parameters.size()) {
+        auto objectName = gd::ExpressionVariableOwnerFinder::GetObjectName(codeGenerator.GetPlatform(),
+                                              codeGenerator.GetObjectsContainersList(),
+                                              rootObjectName,
+                                              *parameters[nonCodeOnlyParameterIndex].get());
+        ExpressionCodeGenerator generator(parameterMetadata.GetType(), objectName, codeGenerator, context);
         parameters[nonCodeOnlyParameterIndex]->Visit(generator);
         parametersCode += generator.GetOutput();
       } else if (parameterMetadata.IsOptional()) {
+        ExpressionCodeGenerator generator(parameterMetadata.GetType(), "", codeGenerator, context);
         // Optional parameters default value were not parsed at the time of the
         // expression parsing. Parse them now.
-        ExpressionParser2 parser(codeGenerator.GetPlatform(),
-                                 codeGenerator.GetGlobalObjectsAndGroups(),
-                                 codeGenerator.GetObjectsAndGroups());
-        auto node = parser.ParseExpression(parameterMetadata.GetType(),
-                                           parameterMetadata.GetDefaultValue());
+        ExpressionParser2 parser;
+        auto node = parser.ParseExpression(parameterMetadata.GetDefaultValue());
 
         node->Visit(generator);
         parametersCode += generator.GetOutput();
@@ -351,16 +493,28 @@ gd::String ExpressionCodeGenerator::GenerateDefaultValue(
   if (gd::ParameterMetadata::IsObject(type)) {
     return codeGenerator.GenerateBadObject();
   }
+  if (gd::ParameterMetadata::IsExpression("string", type)) {
+    return "\"\"";
+  }
 
-  return (type == "string") ? "\"\"" : "0";
+  return "0";
 }
 
 void ExpressionCodeGenerator::OnVisitEmptyNode(EmptyNode& node) {
-  output += GenerateDefaultValue(node.type);
+  auto type = gd::ExpressionTypeFinder::GetType(codeGenerator.GetPlatform(),
+                                            codeGenerator.GetProjectScopedContainers(),
+                                            rootType,
+                                            node);
+  output += GenerateDefaultValue(type);
 }
 
-void ExpressionCodeGenerator::OnVisitObjectFunctionNameNode(ObjectFunctionNameNode& node) {
-  output += GenerateDefaultValue(node.type);
+void ExpressionCodeGenerator::OnVisitObjectFunctionNameNode(
+    ObjectFunctionNameNode& node) {
+  auto type = gd::ExpressionTypeFinder::GetType(codeGenerator.GetPlatform(),
+                                            codeGenerator.GetProjectScopedContainers(),
+                                            rootType,
+                                            node);
+  output += GenerateDefaultValue(type);
 }
 
 }  // namespace gd

Core/GDCore/Events/CodeGeneration/ExpressionCodeGenerator.h

@@ -9,7 +9,6 @@
 
 #include <memory>
 #include <vector>
-#include "GDCore/Events/Parsers/ExpressionParser2.h"
 #include "GDCore/Events/Parsers/ExpressionParser2Node.h"
 #include "GDCore/Events/Parsers/ExpressionParser2NodeWorker.h"
 #include "GDCore/String.h"
@@ -35,9 +34,11 @@ namespace gd {
  */
 class GD_CORE_API ExpressionCodeGenerator : public ExpressionParser2NodeWorker {
  public:
-  ExpressionCodeGenerator(EventsCodeGenerator& codeGenerator_,
+  ExpressionCodeGenerator(const gd::String &rootType_,
+                          const gd::String &rootObjectName_,
+                          EventsCodeGenerator& codeGenerator_,
                           EventsCodeGenerationContext& context_)
-      : codeGenerator(codeGenerator_), context(context_){};
+      : rootType(rootType_), rootObjectName(rootObjectName_), codeGenerator(codeGenerator_), context(context_){};
   virtual ~ExpressionCodeGenerator(){};
 
   /**
@@ -57,7 +58,7 @@ class GD_CORE_API ExpressionCodeGenerator : public ExpressionParser2NodeWorker {
   static gd::String GenerateExpressionCode(EventsCodeGenerator& codeGenerator,
                                            EventsCodeGenerationContext& context,
                                            const gd::String& type,
-                                           const gd::String& expression,
+                                           const gd::Expression& expression,
                                            const gd::String& objectName = "");
 
   const gd::String& GetOutput() { return output; };
@@ -101,8 +102,11 @@ class GD_CORE_API ExpressionCodeGenerator : public ExpressionParser2NodeWorker {
       const std::vector<std::unique_ptr<ExpressionNode>>& parameters);
 
   gd::String output;
+  gd::String objectNameToUseForVariableAccessor;
   EventsCodeGenerator& codeGenerator;
   EventsCodeGenerationContext& context;
+  const gd::String rootType;
+  const gd::String rootObjectName;
 };
 
 }  // namespace gd

Core/GDCore/Events/Event.cpp

@@ -5,8 +5,12 @@
  */
 
 #include "GDCore/Events/Event.h"
+
+#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"
 
@@ -65,10 +69,41 @@ gd::String BaseEvent::GenerateEventCode(
   return "";
 }
 
+void BaseEvent::PreprocessAsyncActions(const gd::Platform& platform) {
+  if (!CanHaveSubEvents()) return;
+  for (const auto& actionsList : GetAllActionsVectors())
+    for (std::size_t aId = 0; aId < actionsList->size(); ++aId) {
+      const auto& action = actionsList->at(aId);
+      const gd::InstructionMetadata& actionMetadata =
+          gd::MetadataProvider::GetActionMetadata(platform, action.GetType());
+      if (actionMetadata.IsAsync() &&
+          (!actionMetadata.IsOptionallyAsync() || action.IsAwaited())) {
+        gd::InstructionsList remainingActions;
+        remainingActions.InsertInstructions(
+            *actionsList, aId + 1, actionsList->size() - 1);
+        gd::AsyncEvent asyncEvent(action, remainingActions, GetSubEvents());
+
+        // Ensure that the local event no longer has any of the actions/subevent
+        // after the async function
+        actionsList->RemoveAfter(aId);
+        GetSubEvents().Clear();
+
+        GetSubEvents().InsertEvent(asyncEvent);
+
+        // We just moved all the rest, there's nothing left to do in this event.
+        return;
+      }
+    }
+};
+
 void BaseEvent::Preprocess(gd::EventsCodeGenerator& codeGenerator,
                            gd::EventsList& eventList,
                            std::size_t indexOfTheEventInThisList) {
-  if (IsDisabled() || !MustBePreprocessed()) return;
+  if (IsDisabled()) return;
+
+  PreprocessAsyncActions(codeGenerator.GetPlatform());
+
+  if (!MustBePreprocessed()) return;
 
   try {
     if (type.empty()) return;
@@ -106,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

@@ -10,12 +10,13 @@
 #include <iostream>
 #include <memory>
 #include <vector>
+
 #include "GDCore/Events/Instruction.h"
 #include "GDCore/Events/InstructionsList.h"
+#include "GDCore/Extensions/Metadata/InstructionMetadata.h"
 #include "GDCore/String.h"
 namespace gd {
 class EventsList;
-class MainFrameWrapper;
 class Project;
 class Layout;
 class EventsCodeGenerator;
@@ -23,7 +24,9 @@ class EventsCodeGenerationContext;
 class Platform;
 class SerializerElement;
 class Instruction;
-}
+class EventVisitor;
+class ReadOnlyEventVisitor;
+}  // namespace gd
 
 namespace gd {
 
@@ -126,16 +129,25 @@ class GD_CORE_API BaseEvent {
     return noSearchableStrings;
   };
 
+  virtual bool ReplaceAllSearchableStrings(
+      std::vector<gd::String> newSearchableString) {
+    return false;
+  };
+
   /**
-   * \brief Return a list of all expressions of the event.
-   * \note Used to preprocess or search in the expressions.
+   * \brief Return a list of all expressions of the event, each with their associated metadata.
+   * \note Used to preprocess or search in the expressions of the event.
    */
-  virtual std::vector<gd::Expression*> GetAllExpressions() {
-    std::vector<gd::Expression*> noExpr;
+  virtual std::vector<std::pair<gd::Expression*, gd::ParameterMetadata> >
+  GetAllExpressionsWithMetadata() {
+    std::vector<std::pair<gd::Expression*, gd::ParameterMetadata> > noExpr;
     return noExpr;
   };
-  virtual std::vector<const gd::Expression*> GetAllExpressions() const {
-    std::vector<const gd::Expression*> noExpr;
+  virtual std::vector<
+      std::pair<const gd::Expression*, const gd::ParameterMetadata> >
+  GetAllExpressionsWithMetadata() const {
+    std::vector<std::pair<const gd::Expression*, const gd::ParameterMetadata> >
+        noExpr;
     return noExpr;
   };
 
@@ -199,6 +211,11 @@ class GD_CORE_API BaseEvent {
                           gd::EventsList& eventList,
                           std::size_t indexOfTheEventInThisList);
 
+  /**
+   * A function that turns all async member actions into an Async subevent for code generation.
+   */
+  void PreprocessAsyncActions(const gd::Platform& platform);
+
   /**
    * \brief If MustBePreprocessed is redefined to return true, the
    * gd::EventMetadata::preprocessing associated to the event will be called to
@@ -223,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
@@ -261,7 +281,6 @@ class GD_CORE_API BaseEvent {
    * \brief True if the event should be folded in the events editor.
    */
   bool IsFolded() const { return folded; }
-
   ///@}
 
   std::weak_ptr<gd::BaseEvent>

Core/GDCore/Events/EventVisitor.h

@@ -0,0 +1,76 @@
+/*
+ * 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;
+
+  /**
+   * @brief Abort the iteration on the events.
+   */
+  virtual void StopAnyEventIteration() = 0;
+};
+
+}

Core/GDCore/Events/EventsList.cpp

@@ -5,6 +5,7 @@
  */
 
 #include "EventsList.h"
+
 #include "GDCore/Events/Event.h"
 #include "GDCore/Project/Project.h"
 #include "GDCore/Tools/Log.h"
@@ -100,9 +101,8 @@ bool EventsList::Contains(const gd::BaseEvent& eventToSearch,
 }
 
 bool EventsList::MoveEventToAnotherEventsList(const gd::BaseEvent& eventToMove,
-                                  gd::EventsList& newEventsList,
-                                  std::size_t newPosition) {
-
+                                              gd::EventsList& newEventsList,
+                                              std::size_t newPosition) {
   for (std::size_t i = 0; i < GetEventsCount(); ++i) {
     if (events[i].get() == &eventToMove) {
       std::shared_ptr<BaseEvent> event = events[i];

Core/GDCore/Events/Expression.cpp

@@ -0,0 +1,41 @@
+/*
+ * GDevelop Core
+ * Copyright 2008-2016 Florian Rival (Florian.Rival@gmail.com). All rights
+ * reserved. This project is released under the MIT License.
+ */
+
+#include "GDCore/Events/Expression.h"
+
+#include "GDCore/Events/Parsers/ExpressionParser2.h"
+#include "GDCore/String.h"
+
+namespace gd {
+
+Expression::Expression() : node(nullptr) {};
+
+Expression::Expression(gd::String plainString_)
+    : node(nullptr), plainString(plainString_) {};
+
+Expression::Expression(const char* plainString_)
+    : node(nullptr), plainString(plainString_) {};
+
+Expression::Expression(const Expression& copy)
+    : node(nullptr), plainString{copy.plainString} {};
+
+Expression& Expression::operator=(const Expression& expression) {
+  plainString = expression.plainString;
+  node = nullptr;
+  return *this;
+};
+
+Expression::~Expression(){};
+
+ExpressionNode* Expression::GetRootNode() const {
+  if (!node) {
+    gd::ExpressionParser2 parser = ExpressionParser2();
+    node = std::move(parser.ParseExpression(plainString));
+  }
+  return node.get();
+}
+
+}  // namespace gd

Core/GDCore/Events/Expression.h

@@ -6,7 +6,15 @@
 
 #ifndef GDCORE_EXPRESSION_H
 #define GDCORE_EXPRESSION_H
+
 #include "GDCore/String.h"
+#include <memory>
+
+namespace gd {
+class ExpressionParser2;
+class ObjectsContainer;
+struct ExpressionNode;
+}  // namespace gd
 
 namespace gd {
 
@@ -24,32 +32,49 @@ class GD_CORE_API Expression {
   /**
    * \brief Construct an empty expression
    */
-  Expression(){};
+  Expression();
 
   /**
    * \brief Construct an expression from a string
    */
-  Expression(gd::String plainString_) : plainString(plainString_){};
+  Expression(gd::String plainString_);
 
   /**
    * \brief Construct an expression from a const char *
    */
-  Expression(const char* plainString_) : plainString(plainString_){};
+  Expression(const char* plainString_);
+
+  /**
+   * \brief Copy construct an expression.
+   */
+  Expression(const Expression& copy);
+
+  /**
+   * \brief Expression affectation overriding.
+   */
+  Expression& operator=(const Expression& expression);
 
   /**
    * \brief Get the plain string representing the expression
    */
   inline const gd::String& GetPlainString() const { return plainString; };
 
+  /**
+   * @brief Get the expression node.
+   * @return std::unique_ptr<gd::ExpressionNode>
+   */
+  gd::ExpressionNode* GetRootNode() const;
+
   /**
    * \brief Mimics std::string::c_str
    */
   inline const char* c_str() const { return plainString.c_str(); };
 
-  virtual ~Expression(){};
+  virtual ~Expression();
 
  private:
   gd::String plainString;  ///< The expression string
+  mutable std::unique_ptr<gd::ExpressionNode> node;
 };
 
 }  // namespace gd

Core/GDCore/Events/Instruction.cpp

@@ -4,9 +4,12 @@
  * reserved. This project is released under the MIT License.
  */
 #include "GDCore/Events/Instruction.h"
+
 #include <assert.h>
+
 #include <iostream>
 #include <vector>
+
 #include "GDCore/Events/Expression.h"
 #include "GDCore/Events/InstructionsList.h"
 #include "GDCore/String.h"
@@ -15,18 +18,14 @@ namespace gd {
 
 gd::Expression Instruction::badExpression("");
 
-Instruction::Instruction(gd::String type_)
-    : type(type_),
-      inverted(false) {
+Instruction::Instruction(gd::String type_) : type(type_), inverted(false) {
   parameters.reserve(8);
 }
 
 Instruction::Instruction(gd::String type_,
                          const std::vector<gd::Expression>& parameters_,
                          bool inverted_)
-    : type(type_),
-      inverted(inverted_),
-      parameters(parameters_) {
+    : type(type_), inverted(inverted_), parameters(parameters_) {
   parameters.reserve(8);
 }
 
@@ -56,4 +55,21 @@ void Instruction::SetParameter(std::size_t nb, const gd::Expression& val) {
   parameters[nb] = val;
 }
 
+void Instruction::AddParameter(const gd::Expression& val) {
+  parameters.push_back(val);
+}
+
+std::shared_ptr<Instruction> GD_CORE_API
+CloneRememberingOriginalElement(std::shared_ptr<Instruction> instruction) {
+  std::shared_ptr<Instruction> copy =
+      std::make_shared<Instruction>(*instruction);
+  // Original instruction is either the original instruction of the copied
+  // instruction, or the instruction copied.
+  copy->originalInstruction = instruction->originalInstruction.expired()
+                                  ? instruction
+                                  : instruction->originalInstruction;
+
+  return copy;
+}
+
 }  // namespace gd

Core/GDCore/Events/Instruction.h

@@ -5,7 +5,9 @@
  */
 #ifndef INSTRUCTION_H
 #define INSTRUCTION_H
+#include <memory>
 #include <vector>
+
 #include "GDCore/Events/Expression.h"
 #include "GDCore/Events/InstructionsList.h"
 #include "GDCore/String.h"
@@ -70,6 +72,22 @@ class GD_CORE_API Instruction {
    */
   void SetInverted(bool inverted_) { inverted = inverted_; }
 
+  /**
+   * \brief Return true if the async instruction should be awaited.
+   * This is not relevant if the instruction is not optionally asynchronous.
+   *
+   * \return true if the instruction is to be awaited
+   */
+  bool IsAwaited() const { return awaitAsync; }
+
+  /**
+   * \brief Set if the async instruction is to be awaited or not.
+   * This is not relevant if the instruction is not optionally asynchronous.
+   *
+   * \param inverted true if the instruction must be awaited
+   */
+  void SetAwaited(bool awaited) { awaitAsync = awaited; }
+
   /**
    * \brief Return the number of parameters of the instruction.
    */
@@ -105,6 +123,11 @@ class GD_CORE_API Instruction {
    */
   void SetParameter(std::size_t nb, const gd::Expression& val);
 
+  /** Add a parameter at the end
+   * \param val The new value of the parameter
+   */
+  void AddParameter(const gd::Expression& val);
+
   /** \brief Get a reference to the std::vector containing the parameters.
    * \return A std::vector containing the parameters
    */
@@ -131,17 +154,47 @@ class GD_CORE_API Instruction {
    */
   inline gd::InstructionsList& GetSubInstructions() { return subInstructions; };
 
+  /**
+   * \brief Return the original instruction this instruction was copied from.
+   *
+   * Useful to get reference to the original instruction in memory during code
+   * generation, to ensure stable unique identifiers.
+   */
+  std::weak_ptr<Instruction> GetOriginalInstruction() {
+    return originalInstruction;
+  };
+
+  friend std::shared_ptr<Instruction> CloneRememberingOriginalElement(
+      std::shared_ptr<Instruction> instruction);
+
  private:
   gd::String type;  ///< Instruction type
   bool inverted;  ///< True if the instruction if inverted. Only applicable for
                   ///< instruction used as conditions by events
+  bool awaitAsync =
+      false;  ///< Tells the code generator whether the optionally asynchronous
+              ///< instruction should be generated as asynchronous (awaited) or not.
   mutable std::vector<gd::Expression>
       parameters;                        ///< Vector containing the parameters
   gd::InstructionsList subInstructions;  ///< Sub instructions, if applicable.
 
+  std::weak_ptr<Instruction>
+      originalInstruction;  ///< Pointer used to remember which gd::Instruction
+                            ///< this instruction was copied from. Useful to
+                            ///< ensure the stability of code generation (as
+                            ///< some part of code generation uses the pointer
+                            ///< to the instruction as a unique identifier).
+
   static gd::Expression badExpression;
 };
 
+/**
+ * Clone the given instruction, returning an instruction for which
+ * `GetOriginalInstruction()` returns the originally copied instruction.
+ */
+std::shared_ptr<Instruction> GD_CORE_API
+CloneRememberingOriginalElement(std::shared_ptr<Instruction> instruction);
+
 }  // namespace gd
 
 #endif  // INSTRUCTION_H

Core/GDCore/Events/InstructionsList.cpp

@@ -5,6 +5,7 @@
  */
 
 #include "InstructionsList.h"
+
 #include "GDCore/Events/Instruction.h"
 #include "GDCore/Project/Project.h"
 #include "Serialization.h"
@@ -31,6 +32,10 @@ void InstructionsList::InsertInstructions(const InstructionsList& list,
   }
 }
 
+void InstructionsList::RemoveAfter(const size_t position) {
+  elements.resize(position);
+}
+
 void InstructionsList::SerializeTo(SerializerElement& element) const {
   EventsListSerialization::SerializeInstructionsTo(*this, element);
 }

Core/GDCore/Events/InstructionsList.h

@@ -6,9 +6,10 @@
 
 #ifndef GDCORE_INSTRUCTIONSLIST_H
 #define GDCORE_INSTRUCTIONSLIST_H
+#include "GDCore/Tools/SPtrList.h"
 #include <memory>
 #include <vector>
-#include "GDCore/Tools/SPtrList.h"
+
 namespace gd {
 class Instruction;
 }
@@ -22,11 +23,11 @@ class SerializerElement;
 namespace gd {
 
 class InstructionsList : public SPtrList<gd::Instruction> {
- public:
-  void InsertInstructions(const InstructionsList& list,
-                          size_t begin,
-                          size_t end,
-                          size_t position = (size_t)-1);
+public:
+  void InsertInstructions(const InstructionsList &list, size_t begin,
+                          size_t end, size_t position = (size_t)-1);
+
+  void RemoveAfter(size_t position);
 
   /** \name Serialization
    */
@@ -35,17 +36,17 @@ class InstructionsList : public SPtrList<gd::Instruction> {
    * \brief Serialize the instructions to the specified element
    * \see EventsListSerialization
    */
-  void SerializeTo(gd::SerializerElement& element) const;
+  void SerializeTo(gd::SerializerElement &element) const;
 
   /**
    * \brief Load the instructions from the specified element
    * \see EventsListSerialization
    */
-  void UnserializeFrom(gd::Project& project,
-                       const gd::SerializerElement& element);
+  void UnserializeFrom(gd::Project &project,
+                       const gd::SerializerElement &element);
   ///@}
 };
 
-}  // namespace gd
+} // namespace gd
 
 #endif

Core/GDCore/Events/Parsers/ExpressionParser2.cpp

@@ -4,9 +4,11 @@
  * reserved. This project is released under the MIT License.
  */
 #include "GDCore/Events/Parsers/ExpressionParser2.h"
+
 #include <algorithm>
 #include <memory>
 #include <vector>
+
 #include "GDCore/CommonTools.h"
 #include "GDCore/Events/Expression.h"
 #include "GDCore/Extensions/Metadata/ExpressionMetadata.h"
@@ -17,105 +19,29 @@
 #include "GDCore/Project/Project.h"
 #include "GDCore/Tools/Localization.h"
 #include "GDCore/Tools/MakeUnique.h"
+#include "GrammarTerminals.h"
 
 using namespace std;
+using namespace gd::GrammarTerminals;
 
 namespace gd {
 
 gd::String ExpressionParser2::NAMESPACE_SEPARATOR = "::";
 
-ExpressionParser2::ExpressionParser2(
-    const gd::Platform& platform_,
-    const gd::ObjectsContainer& globalObjectsContainer_,
-    const gd::ObjectsContainer& objectsContainer_)
+ExpressionParser2::ExpressionParser2()
     : expression(""),
-      currentPosition(0),
-      platform(platform_),
-      globalObjectsContainer(globalObjectsContainer_),
-      objectsContainer(objectsContainer_) {}
-
-namespace {
-/**
- * Return the minimum number of parameters, starting from a given parameter
- * (by convention, 1 for object functions and 2 for behavior functions).
- */
-size_t GetMinimumParametersNumber(
-    const std::vector<gd::ParameterMetadata>& parameters,
-    size_t initialParameterIndex) {
-  size_t nb = 0;
-  for (std::size_t i = initialParameterIndex; i < parameters.size(); ++i) {
-    if (!parameters[i].optional && !parameters[i].codeOnly) nb++;
-  }
-
-  return nb;
-}
-
-/**
- * Return the maximum number of parameters, starting from a given parameter
- * (by convention, 1 for object functions and 2 for behavior functions).
- */
-size_t GetMaximumParametersNumber(
-    const std::vector<gd::ParameterMetadata>& parameters,
-    size_t initialParameterIndex) {
-  size_t nb = 0;
-  for (std::size_t i = initialParameterIndex; i < parameters.size(); ++i) {
-    if (!parameters[i].codeOnly) nb++;
-  }
-
-  return nb;
-}
-}  // namespace
-
-std::unique_ptr<ExpressionParserDiagnostic> ExpressionParser2::ValidateFunction(
-    const gd::FunctionCallNode& function, size_t functionStartPosition) {
-  if (gd::MetadataProvider::IsBadExpressionMetadata(
-          function.expressionMetadata)) {
-    return gd::make_unique<ExpressionParserError>(
-        "invalid_function_name",
-        _("Cannot find an expression with this name: ") +
-            function.functionName + "\n" +
-            _("Double check that you've not made any typo in the name."),
-        functionStartPosition,
-        GetCurrentPosition());
-  }
-
-  size_t minParametersCount = GetMinimumParametersNumber(
-      function.expressionMetadata.parameters,
-      WrittenParametersFirstIndex(function.objectName, function.behaviorName));
-  size_t maxParametersCount = GetMaximumParametersNumber(
-      function.expressionMetadata.parameters,
-      WrittenParametersFirstIndex(function.objectName, function.behaviorName));
-  if (function.parameters.size() < minParametersCount ||
-      function.parameters.size() > maxParametersCount) {
-    gd::String expectedCountMessage =
-        minParametersCount == maxParametersCount
-            ? _("The number of parameters must be exactly ") +
-                  gd::String::From(minParametersCount)
-            : _("The number of parameters must be: ") +
-                  gd::String::From(minParametersCount) + "-" +
-                  gd::String::From(maxParametersCount);
-
-    if (function.parameters.size() < minParametersCount) {
-      return gd::make_unique<ExpressionParserError>(
-          "too_few_parameters",
-          "You have not entered enough parameters for the expression. " +
-              expectedCountMessage,
-          functionStartPosition,
-          GetCurrentPosition());
-    }
-  }
-
-  return gd::make_unique<ExpressionParserDiagnostic>();
-}
+      currentPosition(0) {}
 
 std::unique_ptr<TextNode> ExpressionParser2::ReadText() {
   size_t textStartPosition = GetCurrentPosition();
   SkipAllWhitespaces();
   if (!CheckIfChar(IsQuote)) {
     auto text = gd::make_unique<TextNode>("");
+	  // It can't happen.
     text->diagnostic =
         RaiseSyntaxError(_("A text must start with a double quote (\")."));
-    text->location = ExpressionParserLocation(textStartPosition, GetCurrentPosition());
+    text->location =
+        ExpressionParserLocation(textStartPosition, GetCurrentPosition());
     return text;
   }
   SkipChar();
@@ -150,7 +76,8 @@ std::unique_ptr<TextNode> ExpressionParser2::ReadText() {
   }
 
   auto text = gd::make_unique<TextNode>(parsedText);
-  text->location = ExpressionParserLocation(textStartPosition, GetCurrentPosition());
+  text->location =
+      ExpressionParserLocation(textStartPosition, GetCurrentPosition());
   if (!textParsingHasEnded) {
     text->diagnostic =
         RaiseSyntaxError(_("A text must end with a double quote (\"). Add a "
@@ -172,7 +99,7 @@ std::unique_ptr<NumberNode> ExpressionParser2::ReadNumber() {
     if (CheckIfChar(IsZeroDigit)) {
       numberHasStarted = true;
       digitFound = true;
-      if (!parsedNumber.empty()) { // Ignore leading 0s.
+      if (!parsedNumber.empty()) {  // Ignore leading 0s.
         parsedNumber += GetCurrentChar();
       }
     } else if (CheckIfChar(IsNonZeroDigit)) {
@@ -183,7 +110,8 @@ std::unique_ptr<NumberNode> ExpressionParser2::ReadNumber() {
       numberHasStarted = true;
       dotFound = true;
       if (parsedNumber == "") {
-        parsedNumber += "0."; //Normalize by adding a leading 0, only in this case.
+        parsedNumber +=
+            "0.";  // Normalize by adding a leading 0, only in this case.
       } else {
         parsedNumber += ".";
       }
@@ -204,7 +132,8 @@ std::unique_ptr<NumberNode> ExpressionParser2::ReadNumber() {
   // valid in most languages so we allow this.
 
   auto number = gd::make_unique<NumberNode>(parsedNumber);
-  number->location = ExpressionParserLocation(numberStartPosition, GetCurrentPosition());
+  number->location =
+      ExpressionParserLocation(numberStartPosition, GetCurrentPosition());
   if (!numberHasStarted || !digitFound) {
     number->diagnostic = RaiseSyntaxError(
         _("A number was expected. You must enter a number here."));

Core/GDCore/Events/Parsers/ExpressionParser2.h

@@ -9,13 +9,16 @@
 #include <memory>
 #include <utility>
 #include <vector>
+
 #include "ExpressionParser2Node.h"
 #include "GDCore/Extensions/Metadata/ExpressionMetadata.h"
 #include "GDCore/Extensions/Metadata/MetadataProvider.h"
+#include "GDCore/Extensions/Metadata/ObjectMetadata.h"
 #include "GDCore/Project/Layout.h"  // For GetTypeOfObject and GetTypeOfBehavior
 #include "GDCore/String.h"
 #include "GDCore/Tools/Localization.h"
 #include "GDCore/Tools/MakeUnique.h"
+#include "GrammarTerminals.h"
 namespace gd {
 class Expression;
 class ObjectsContainer;
@@ -26,6 +29,8 @@ class ExpressionMetadata;
 
 namespace gd {
 
+using namespace gd::GrammarTerminals;
+
 /** \brief Parse an expression, returning a tree of node corresponding
  * to the parsed expression.
  *
@@ -38,31 +43,38 @@ namespace gd {
  */
 class GD_CORE_API ExpressionParser2 {
  public:
-  ExpressionParser2(const gd::Platform &platform_,
-                    const gd::ObjectsContainer &globalObjectsContainer_,
-                    const gd::ObjectsContainer &objectsContainer_);
+  ExpressionParser2();
   virtual ~ExpressionParser2(){};
 
   /**
-   * Parse the given expression with the specified type.
+   * Parse the given expression into a tree of nodes.
    *
-   * \param type Type of the expression: "string", "number",
-   * type supported by gd::ParameterMetadata::IsObject, types supported by
-   * gd::ParameterMetadata::IsExpression or "unknown".
-   * \param expression The expression to parse
-   * \param objectName Specify the object name, only for the
-   * case of "objectvar" type.
+   * \param expression The expression to parse.
    *
    * \return The node representing the expression as a parsed tree.
    */
   std::unique_ptr<ExpressionNode> ParseExpression(
-      const gd::String &type,
-      const gd::String &expression_,
-      const gd::String &objectName = "") {
+      const gd::String &expression_) {
     expression = expression_;
 
     currentPosition = 0;
-    return Start(type, objectName);
+    return Start();
+  }
+
+  /**
+   * Given an object name (or empty if none) and a behavior name (or empty if
+   * none), return the index of the first parameter that is inside the
+   * parenthesis: 0, 1 or 2.
+   *
+   * For example, in an expression like `Object.MyBehavior::Method("hello")`,
+   * the parameter "hello" is the second parameter (the first being by
+   * convention Object, and the second MyBehavior, also by convention).
+   */
+  static size_t WrittenParametersFirstIndex(const gd::String &objectName,
+                                            const gd::String &behaviorName) {
+    // By convention, object is always the first parameter, and behavior the
+    // second one.
+    return !behaviorName.empty() ? 2 : (!objectName.empty() ? 1 : 0);
   }
 
  private:
@@ -70,16 +82,16 @@ class GD_CORE_API ExpressionParser2 {
    * Each method is a part of the grammar.
    */
   ///@{
-  std::unique_ptr<ExpressionNode> Start(const gd::String &type,
-                                        const gd::String &objectName = "") {
+  std::unique_ptr<ExpressionNode> Start() {
     size_t expressionStartPosition = GetCurrentPosition();
-    auto expression = Expression(type, objectName);
+    auto expression = Expression();
 
     // Check for extra characters at the end of the expression
     if (!IsEndReached()) {
-      auto op = gd::make_unique<OperatorNode>(type, ' ');
+      auto op = gd::make_unique<OperatorNode>(' ');
       op->leftHandSide = std::move(expression);
-      op->rightHandSide = ReadUntilEnd("unknown");
+      op->rightHandSide = ReadUntilEnd();
+      op->rightHandSide->parent = op.get();
 
       op->rightHandSide->diagnostic = RaiseSyntaxError(
           _("The expression has extra character at the end that should be "
@@ -93,57 +105,49 @@ class GD_CORE_API ExpressionParser2 {
     return expression;
   }
 
-  std::unique_ptr<ExpressionNode> Expression(
-      const gd::String &type, const gd::String &objectName = "") {
+  std::unique_ptr<ExpressionNode> Expression() {
     SkipAllWhitespaces();
 
     size_t expressionStartPosition = GetCurrentPosition();
-    std::unique_ptr<ExpressionNode> leftHandSide = Term(type, objectName);
+    std::unique_ptr<ExpressionNode> leftHandSide = Term();
 
     SkipAllWhitespaces();
 
     if (IsEndReached()) return leftHandSide;
     if (CheckIfChar(IsExpressionEndingChar)) return leftHandSide;
     if (CheckIfChar(IsExpressionOperator)) {
-      auto op = gd::make_unique<OperatorNode>(type, GetCurrentChar());
+      auto op = gd::make_unique<OperatorNode>(GetCurrentChar());
       op->leftHandSide = std::move(leftHandSide);
-      op->diagnostic = ValidateOperator(type, GetCurrentChar());
+      op->leftHandSide->parent = op.get();
+      op->diagnostic = ValidateOperator(GetCurrentChar());
       SkipChar();
-      op->rightHandSide = Expression(type, objectName);
+      op->rightHandSide = Expression();
+      op->rightHandSide->parent = op.get();
 
       op->location = ExpressionParserLocation(expressionStartPosition,
                                               GetCurrentPosition());
       return std::move(op);
     }
 
-    if (type == "string") {
-      leftHandSide->diagnostic = RaiseSyntaxError(
-          "You must add the operator + between texts or expressions. For "
-          "example: \"Your name: \" + VariableString(PlayerName).");
-    } else if (type == "number") {
-      leftHandSide->diagnostic = RaiseSyntaxError(
-          "No operator found. Did you forget to enter an operator (like +, -, "
-          "* or /) between numbers or expressions?");
-    } else {
-      leftHandSide->diagnostic = RaiseSyntaxError(
-          "More than one term was found. Verify that your expression is "
-          "properly written.");
-    }
+    leftHandSide->diagnostic = RaiseSyntaxError(
+        "More than one term was found. Verify that your expression is "
+        "properly written.");
 
-    auto op = gd::make_unique<OperatorNode>(type, ' ');
+    auto op = gd::make_unique<OperatorNode>(' ');
     op->leftHandSide = std::move(leftHandSide);
-    op->rightHandSide = Expression(type, objectName);
+    op->leftHandSide->parent = op.get();
+    op->rightHandSide = Expression();
+    op->rightHandSide->parent = op.get();
     op->location =
         ExpressionParserLocation(expressionStartPosition, GetCurrentPosition());
     return std::move(op);
   }
 
-  std::unique_ptr<ExpressionNode> Term(const gd::String &type,
-                                       const gd::String &objectName) {
+  std::unique_ptr<ExpressionNode> Term() {
     SkipAllWhitespaces();
 
     size_t expressionStartPosition = GetCurrentPosition();
-    std::unique_ptr<ExpressionNode> factor = Factor(type, objectName);
+    std::unique_ptr<ExpressionNode> factor = Factor();
 
     SkipAllWhitespaces();
 
@@ -151,11 +155,13 @@ class GD_CORE_API ExpressionParser2 {
     // to guarantee the proper operator precedence. (Expression could also
     // be reworked to use a while loop).
     while (CheckIfChar(IsTermOperator)) {
-      auto op = gd::make_unique<OperatorNode>(type, GetCurrentChar());
+      auto op = gd::make_unique<OperatorNode>(GetCurrentChar());
       op->leftHandSide = std::move(factor);
-      op->diagnostic = ValidateOperator(type, GetCurrentChar());
+      op->leftHandSide->parent = op.get();
+      op->diagnostic = ValidateOperator(GetCurrentChar());
       SkipChar();
-      op->rightHandSide = Factor(type, objectName);
+      op->rightHandSide = Factor();
+      op->rightHandSide->parent = op.get();
       op->location = ExpressionParserLocation(expressionStartPosition,
                                               GetCurrentPosition());
       SkipAllWhitespaces();
@@ -166,46 +172,35 @@ class GD_CORE_API ExpressionParser2 {
     return factor;
   };
 
-  std::unique_ptr<ExpressionNode> Factor(const gd::String &type,
-                                         const gd::String &objectName) {
+  std::unique_ptr<ExpressionNode> Factor() {
     SkipAllWhitespaces();
-
     size_t expressionStartPosition = GetCurrentPosition();
-    std::unique_ptr<ExpressionNode> factor;
 
     if (CheckIfChar(IsQuote)) {
-      factor = ReadText();
-      if (type == "number")
-        factor->diagnostic =
-            RaiseTypeError(_("You entered a text, but a number was expected."),
-                           expressionStartPosition);
-      else if (type != "string")
-        factor->diagnostic = RaiseTypeError(
-            _("You entered a text, but this type was expected:") + type,
-            expressionStartPosition);
+      std::unique_ptr<ExpressionNode> factor = ReadText();
+      return factor;
     } else if (CheckIfChar(IsUnaryOperator)) {
-      auto unaryOperator =
-          gd::make_unique<UnaryOperatorNode>(type, GetCurrentChar());
-      unaryOperator->diagnostic = ValidateUnaryOperator(type, GetCurrentChar());
+      auto unaryOperatorCharacter = GetCurrentChar();
       SkipChar();
-      unaryOperator->factor = Factor(type, objectName);
 
+      auto operatorOperand = Factor();
+
+      auto unaryOperator = gd::make_unique<UnaryOperatorNode>(
+          unaryOperatorCharacter);
+      unaryOperator->diagnostic = ValidateUnaryOperator(
+          unaryOperatorCharacter, expressionStartPosition);
+      unaryOperator->factor = std::move(operatorOperand);
+      unaryOperator->factor->parent = unaryOperator.get();
       unaryOperator->location = ExpressionParserLocation(
           expressionStartPosition, GetCurrentPosition());
-      factor = std::move(unaryOperator);
+
+      return std::move(unaryOperator);
     } else if (CheckIfChar(IsNumberFirstChar)) {
-      factor = ReadNumber();
-      if (type == "string")
-        factor->diagnostic = RaiseTypeError(
-            _("You entered a number, but a text was expected (in quotes)."),
-            expressionStartPosition);
-      else if (type != "number")
-        factor->diagnostic = RaiseTypeError(
-            _("You entered a number, but this type was expected:") + type,
-            expressionStartPosition);
+      std::unique_ptr<ExpressionNode> factor = ReadNumber();
+      return factor;
     } else if (CheckIfChar(IsOpeningParenthesis)) {
       SkipChar();
-      factor = SubExpression(type, objectName);
+      std::unique_ptr<ExpressionNode> factor = SubExpression();
 
       if (!CheckIfChar(IsClosingParenthesis)) {
         factor->diagnostic =
@@ -213,27 +208,22 @@ class GD_CORE_API ExpressionParser2 {
                                "parenthesis for each opening parenthesis."));
       }
       SkipIfChar(IsClosingParenthesis);
-    } else if (IsIdentifierAllowedChar()) {
-      // This is a place where the grammar differs according to the
-      // type being expected.
-      if (gd::ParameterMetadata::IsExpression("variable", type)) {
-        factor = Variable(type, objectName);
-      } else {
-        factor = Identifier(type);
-      }
-    } else {
-      factor = ReadUntilWhitespace(type);
-      factor->diagnostic = RaiseEmptyError(type, expressionStartPosition);
+      return factor;
+    } else if (CheckIfChar(IsAllowedInIdentifier)) {
+      return Identifier();
     }
 
+    std::unique_ptr<ExpressionNode> factor = ReadUntilWhitespace();
     return factor;
   }
 
-  std::unique_ptr<SubExpressionNode> SubExpression(
-      const gd::String &type, const gd::String &objectName) {
+  std::unique_ptr<SubExpressionNode> SubExpression() {
     size_t expressionStartPosition = GetCurrentPosition();
+
+    auto expression = Expression();
+
     auto subExpression =
-        gd::make_unique<SubExpressionNode>(type, Expression(type, objectName));
+        gd::make_unique<SubExpressionNode>(std::move(expression));
     subExpression->location =
         ExpressionParserLocation(expressionStartPosition, GetCurrentPosition());
 
@@ -241,7 +231,7 @@ class GD_CORE_API ExpressionParser2 {
   };
 
   std::unique_ptr<IdentifierOrFunctionCallOrObjectFunctionNameOrEmptyNode>
-  Identifier(const gd::String &type) {
+  Identifier() {
     auto identifierAndLocation = ReadIdentifierName();
     gd::String name = identifierAndLocation.name;
     auto nameLocation = identifierAndLocation.location;
@@ -268,42 +258,30 @@ class GD_CORE_API ExpressionParser2 {
 
     if (CheckIfChar(IsOpeningParenthesis)) {
       ExpressionParserLocation openingParenthesisLocation = SkipChar();
-      return FreeFunction(type, name, nameLocation, openingParenthesisLocation);
+      return FreeFunction(name, nameLocation, openingParenthesisLocation);
     } else if (CheckIfChar(IsDot)) {
       ExpressionParserLocation dotLocation = SkipChar();
       SkipAllWhitespaces();
-      return ObjectFunctionOrBehaviorFunction(
-          type, name, nameLocation, dotLocation);
+      return ObjectFunctionOrBehaviorFunctionOrVariable(
+          name, nameLocation, dotLocation);
+    } else if (CheckIfChar(IsOpeningSquareBracket)) {
+      return Variable(name, nameLocation);
     } else {
-      auto identifier = gd::make_unique<IdentifierNode>(name, type);
-      if (type == "string") {
-        identifier->diagnostic =
-            RaiseTypeError(_("You must wrap your text inside double quotes "
-                             "(example: \"Hello world\")."),
-                           nameLocation.GetStartPosition());
-      } else if (type == "number") {
-        identifier->diagnostic = RaiseTypeError(
-            _("You must enter a number."), nameLocation.GetStartPosition());
-      } else if (!gd::ParameterMetadata::IsObject(type)) {
-        identifier->diagnostic = RaiseTypeError(
-            _("You've entered a name, but this type was expected:") + type,
-            nameLocation.GetStartPosition());
-      }
-
+      auto identifier = gd::make_unique<IdentifierNode>(name);
       identifier->location = ExpressionParserLocation(
           nameLocation.GetStartPosition(), GetCurrentPosition());
+      identifier->identifierNameLocation = identifier->location;
       return std::move(identifier);
     }
   }
 
-  std::unique_ptr<VariableNode> Variable(const gd::String &type,
-                                         const gd::String &objectName) {
-    auto identifierAndLocation = ReadIdentifierName();
-    const gd::String &name = identifierAndLocation.name;
-    const auto &nameLocation = identifierAndLocation.location;
+  std::unique_ptr<VariableNode> Variable(const gd::String &name, gd::ExpressionParserLocation nameLocation) {
+    auto variable = gd::make_unique<VariableNode>(name);
 
-    auto variable = gd::make_unique<VariableNode>(type, name, objectName);
-    variable->child = VariableAccessorOrVariableBracketAccessor();
+    if (CheckIfChar(IsOpeningSquareBracket) || CheckIfChar(IsDot)) {
+      variable->child = VariableAccessorOrVariableBracketAccessor();
+      variable->child->parent = variable.get();
+    }
 
     variable->location = ExpressionParserLocation(
         nameLocation.GetStartPosition(), GetCurrentPosition());
@@ -318,8 +296,8 @@ class GD_CORE_API ExpressionParser2 {
     SkipAllWhitespaces();
     if (CheckIfChar(IsOpeningSquareBracket)) {
       SkipChar();
-      auto child =
-          gd::make_unique<VariableBracketAccessorNode>(Expression("string"));
+      auto child = gd::make_unique<VariableBracketAccessorNode>(Expression());
+      child->expression->parent = child.get();
 
       if (!CheckIfChar(IsClosingSquareBracket)) {
         child->diagnostic =
@@ -327,7 +305,12 @@ class GD_CORE_API ExpressionParser2 {
                                "bracket for each opening bracket."));
       }
       SkipIfChar(IsClosingSquareBracket);
-      child->child = VariableAccessorOrVariableBracketAccessor();
+
+      SkipAllWhitespaces();
+      if (CheckIfChar(IsOpeningSquareBracket) || CheckIfChar(IsDot)) {
+        child->child = VariableAccessorOrVariableBracketAccessor();
+        child->child->parent = child.get();
+      }
       child->location =
           ExpressionParserLocation(childStartPosition, GetCurrentPosition());
 
@@ -336,10 +319,18 @@ class GD_CORE_API ExpressionParser2 {
       auto dotLocation = SkipChar();
       SkipAllWhitespaces();
 
-      auto identifierAndLocation = ReadIdentifierName();
+      auto identifierAndLocation = ReadIdentifierName(/*allowDeprecatedSpacesInName=*/ false);
       auto child =
           gd::make_unique<VariableAccessorNode>(identifierAndLocation.name);
-      child->child = VariableAccessorOrVariableBracketAccessor();
+      if (identifierAndLocation.name.empty()) {
+        child->diagnostic = RaiseSyntaxError(_("A name should be entered after the dot."));
+      }
+
+      SkipAllWhitespaces();
+      if (CheckIfChar(IsOpeningSquareBracket) || CheckIfChar(IsDot)) {
+        child->child = VariableAccessorOrVariableBracketAccessor();
+        child->child->parent = child.get();
+      }
       child->nameLocation = identifierAndLocation.location;
       child->dotLocation = dotLocation;
       child->location =
@@ -348,33 +339,25 @@ class GD_CORE_API ExpressionParser2 {
       return std::move(child);
     }
 
-    return std::move(
-        std::unique_ptr<VariableAccessorOrVariableBracketAccessorNode>());
+    // Should never happen, unless a node called this function without checking if the current character
+    // was a dot or an opening bracket - this means there is an error in the grammar.
+    auto unrecognisedNode = gd::make_unique<VariableAccessorOrVariableBracketAccessorNode>();
+    unrecognisedNode->diagnostic = RaiseSyntaxError(_("A dot or bracket was expected here."));
+    return std::move(unrecognisedNode);
   }
 
   std::unique_ptr<FunctionCallNode> FreeFunction(
-      const gd::String &type,
       const gd::String &functionFullName,
       const ExpressionParserLocation &identifierLocation,
       const ExpressionParserLocation &openingParenthesisLocation) {
     // TODO: error if trying to use function for type != "number" && != "string"
     // + Test for it
 
-    // This could be improved to have the type passed to a single
-    // GetExpressionMetadata function.
-    const gd::ExpressionMetadata &metadata =
-        type == "number" ? MetadataProvider::GetExpressionMetadata(
-                               platform, functionFullName)
-                         : MetadataProvider::GetStrExpressionMetadata(
-                               platform, functionFullName);
-
-    auto parametersNode = Parameters(metadata.parameters);
-    auto function = gd::make_unique<FunctionCallNode>(
-        type, std::move(parametersNode.parameters), metadata, functionFullName);
+    auto function =
+        gd::make_unique<FunctionCallNode>(functionFullName);
+    auto parametersNode = Parameters(function.get());
+    function->parameters = std::move(parametersNode.parameters);
     function->diagnostic = std::move(parametersNode.diagnostic);
-    if (!function->diagnostic)
-      function->diagnostic =
-          ValidateFunction(*function, identifierLocation.GetStartPosition());
 
     function->location = ExpressionParserLocation(
         identifierLocation.GetStartPosition(), GetCurrentPosition());
@@ -382,19 +365,22 @@ class GD_CORE_API ExpressionParser2 {
     function->openingParenthesisLocation = openingParenthesisLocation;
     function->closingParenthesisLocation =
         parametersNode.closingParenthesisLocation;
+
     return std::move(function);
   }
 
-  std::unique_ptr<FunctionCallOrObjectFunctionNameOrEmptyNode>
-  ObjectFunctionOrBehaviorFunction(
-      const gd::String &type,
-      const gd::String &objectName,
-      const ExpressionParserLocation &objectNameLocation,
-      const ExpressionParserLocation &objectNameDotLocation) {
-    auto identifierAndLocation = ReadIdentifierName();
-    const gd::String &objectFunctionOrBehaviorName = identifierAndLocation.name;
-    const auto &objectFunctionOrBehaviorNameLocation =
-        identifierAndLocation.location;
+  std::unique_ptr<IdentifierOrFunctionCallOrObjectFunctionNameOrEmptyNode>
+  ObjectFunctionOrBehaviorFunctionOrVariable(
+      const gd::String &parentIdentifier,
+      const ExpressionParserLocation &parentIdentifierLocation,
+      const ExpressionParserLocation &parentIdentifierDotLocation) {
+    auto childIdentifierAndLocation = ReadIdentifierName(/*allowDeprecatedSpacesInName=*/ false);
+    const gd::String &childIdentifierName = childIdentifierAndLocation.name;
+    const auto &childIdentifierNameLocation =
+        childIdentifierAndLocation.location;
+
+    std::unique_ptr<gd::ExpressionParserError> emptyNameError = childIdentifierName.empty() ?
+      RaiseSyntaxError(_("A name should be entered after the dot.")) : nullptr;
 
     SkipAllWhitespaces();
 
@@ -402,68 +388,68 @@ class GD_CORE_API ExpressionParser2 {
       ExpressionParserLocation namespaceSeparatorLocation =
           SkipNamespaceSeparator();
       SkipAllWhitespaces();
-      return BehaviorFunction(type,
-                              objectName,
-                              objectFunctionOrBehaviorName,
-                              objectNameLocation,
-                              objectNameDotLocation,
-                              objectFunctionOrBehaviorNameLocation,
+      auto behaviorFunction = BehaviorFunction(parentIdentifier,
+                              childIdentifierName,
+                              parentIdentifierLocation,
+                              parentIdentifierDotLocation,
+                              childIdentifierNameLocation,
                               namespaceSeparatorLocation);
+
+      if (emptyNameError) behaviorFunction->diagnostic = std::move(emptyNameError);
+      return std::move(behaviorFunction);
     } else if (CheckIfChar(IsOpeningParenthesis)) {
       ExpressionParserLocation openingParenthesisLocation = SkipChar();
 
-      gd::String objectType =
-          GetTypeOfObject(globalObjectsContainer, objectsContainer, objectName);
-
-      // This could be improved to have the type passed to a single
-      // GetExpressionMetadata function.
-      const gd::ExpressionMetadata &metadata =
-          type == "number"
-              ? MetadataProvider::GetObjectExpressionMetadata(
-                    platform, objectType, objectFunctionOrBehaviorName)
-              : MetadataProvider::GetObjectStrExpressionMetadata(
-                    platform, objectType, objectFunctionOrBehaviorName);
-
-      auto parametersNode = Parameters(metadata.parameters, objectName);
       auto function = gd::make_unique<FunctionCallNode>(
-          type,
-          objectName,
-          std::move(parametersNode.parameters),
-          metadata,
-          objectFunctionOrBehaviorName);
-      function->diagnostic = std::move(parametersNode.diagnostic);
-      if (!function->diagnostic)
-        function->diagnostic =
-            ValidateFunction(*function, objectNameLocation.GetStartPosition());
+          parentIdentifier,
+          childIdentifierName);
+      auto parametersNode = Parameters(function.get(), parentIdentifier);
+      function->parameters = std::move(parametersNode.parameters),
+      function->diagnostic = emptyNameError ? std::move(emptyNameError) : std::move(parametersNode.diagnostic);
 
       function->location = ExpressionParserLocation(
-          objectNameLocation.GetStartPosition(), GetCurrentPosition());
-      function->objectNameLocation = objectNameLocation;
-      function->objectNameDotLocation = objectNameDotLocation;
-      function->functionNameLocation = objectFunctionOrBehaviorNameLocation;
+          parentIdentifierLocation.GetStartPosition(), GetCurrentPosition());
+      function->objectNameLocation = parentIdentifierLocation;
+      function->objectNameDotLocation = parentIdentifierDotLocation;
+      function->functionNameLocation = childIdentifierNameLocation;
       function->openingParenthesisLocation = openingParenthesisLocation;
       function->closingParenthesisLocation =
           parametersNode.closingParenthesisLocation;
       return std::move(function);
+    } else if (CheckIfChar(IsDot) || CheckIfChar(IsOpeningSquareBracket)) {
+      auto variable = gd::make_unique<VariableNode>(parentIdentifier);
+      variable->diagnostic = std::move(emptyNameError);
+
+      auto child =
+          gd::make_unique<VariableAccessorNode>(childIdentifierName);
+      child->child = VariableAccessorOrVariableBracketAccessor();
+      child->child->parent = child.get();
+      child->nameLocation = childIdentifierNameLocation;
+      child->dotLocation = parentIdentifierDotLocation;
+      child->location = ExpressionParserLocation(
+          parentIdentifierDotLocation.GetStartPosition(), GetCurrentPosition());
+      variable->child = std::move(child);
+      variable->child->parent = variable.get();
+
+      variable->location = ExpressionParserLocation(
+          parentIdentifierLocation.GetStartPosition(), GetCurrentPosition());
+      variable->nameLocation = parentIdentifierLocation;
+
+      return std::move(variable);
     }
 
-    auto node = gd::make_unique<ObjectFunctionNameNode>(
-        type, objectName, objectFunctionOrBehaviorName);
-    node->diagnostic = RaiseSyntaxError(
-        _("An opening parenthesis (for an object expression), or double colon "
-          "(::) was expected (for a behavior expression)."));
-
+    auto node = gd::make_unique<IdentifierNode>(
+        parentIdentifier, childIdentifierName);
     node->location = ExpressionParserLocation(
-        objectNameLocation.GetStartPosition(), GetCurrentPosition());
-    node->objectNameLocation = objectNameLocation;
-    node->objectNameDotLocation = objectNameDotLocation;
-    node->objectFunctionOrBehaviorNameLocation =
-        objectFunctionOrBehaviorNameLocation;
+        parentIdentifierLocation.GetStartPosition(), GetCurrentPosition());
+    node->identifierNameLocation = parentIdentifierLocation;
+    node->identifierNameDotLocation = parentIdentifierDotLocation;
+    node->childIdentifierNameLocation = childIdentifierNameLocation;
+    node->diagnostic = std::move(emptyNameError);
     return std::move(node);
   }
 
   std::unique_ptr<FunctionCallOrObjectFunctionNameOrEmptyNode> BehaviorFunction(
-      const gd::String &type,
       const gd::String &objectName,
       const gd::String &behaviorName,
       const ExpressionParserLocation &objectNameLocation,
@@ -479,30 +465,14 @@ class GD_CORE_API ExpressionParser2 {
     if (CheckIfChar(IsOpeningParenthesis)) {
       ExpressionParserLocation openingParenthesisLocation = SkipChar();
 
-      gd::String behaviorType = GetTypeOfBehavior(
-          globalObjectsContainer, objectsContainer, behaviorName);
-
-      // This could be improved to have the type passed to a single
-      // GetExpressionMetadata function.
-      const gd::ExpressionMetadata &metadata =
-          type == "number" ? MetadataProvider::GetBehaviorExpressionMetadata(
-                                 platform, behaviorType, functionName)
-                           : MetadataProvider::GetBehaviorStrExpressionMetadata(
-                                 platform, behaviorType, functionName);
-
-      auto parametersNode =
-          Parameters(metadata.parameters, objectName, behaviorName);
       auto function = gd::make_unique<FunctionCallNode>(
-          type,
           objectName,
           behaviorName,
-          std::move(parametersNode.parameters),
-          metadata,
           functionName);
+      auto parametersNode =
+          Parameters(function.get(), objectName, behaviorName);
+      function->parameters = std::move(parametersNode.parameters);
       function->diagnostic = std::move(parametersNode.diagnostic);
-      if (!function->diagnostic)
-        function->diagnostic =
-            ValidateFunction(*function, objectNameLocation.GetStartPosition());
 
       function->location = ExpressionParserLocation(
           objectNameLocation.GetStartPosition(), GetCurrentPosition());
@@ -518,7 +488,7 @@ class GD_CORE_API ExpressionParser2 {
       return std::move(function);
     } else {
       auto node = gd::make_unique<ObjectFunctionNameNode>(
-          type, objectName, behaviorName, functionName);
+          objectName, behaviorName, functionName);
       node->diagnostic = RaiseSyntaxError(
           _("An opening parenthesis was expected here to call a function."));
 
@@ -542,64 +512,30 @@ class GD_CORE_API ExpressionParser2 {
   };
 
   ParametersNode Parameters(
-      std::vector<gd::ParameterMetadata> parameterMetadata,
+      FunctionCallNode *functionCallNode,
       const gd::String &objectName = "",
       const gd::String &behaviorName = "") {
     std::vector<std::unique_ptr<ExpressionNode>> parameters;
+    gd::String lastObjectName = "";
 
-    // By convention, object is always the first parameter, and behavior the
-    // second one.
-    size_t parameterIndex =
-        WrittenParametersFirstIndex(objectName, behaviorName);
-
+    bool previousCharacterIsParameterSeparator = false;
     while (!IsEndReached()) {
       SkipAllWhitespaces();
 
-      if (CheckIfChar(IsClosingParenthesis)) {
+      if (CheckIfChar(IsClosingParenthesis) && !previousCharacterIsParameterSeparator) {
         auto closingParenthesisLocation = SkipChar();
         return ParametersNode{
             std::move(parameters), nullptr, closingParenthesisLocation};
-      } else {
-        if (parameterIndex < parameterMetadata.size()) {
-          const gd::String &type = parameterMetadata[parameterIndex].GetType();
-          if (parameterMetadata[parameterIndex].IsCodeOnly()) {
-            // Do nothing, code only parameters are not written in expressions.
-          } else if (gd::ParameterMetadata::IsExpression("number", type)) {
-            parameters.push_back(Expression("number"));
-          } else if (gd::ParameterMetadata::IsExpression("string", type)) {
-            parameters.push_back(Expression("string"));
-          } else if (gd::ParameterMetadata::IsExpression("variable", type)) {
-            parameters.push_back(Expression(type, objectName));
-          } else if (gd::ParameterMetadata::IsObject(type)) {
-            parameters.push_back(Expression(type));
-          } else {
-            size_t parameterStartPosition = GetCurrentPosition();
-            parameters.push_back(Expression("unknown"));
-            parameters.back()->diagnostic =
-                gd::make_unique<ExpressionParserError>(
-                    "unknown_parameter_type",
-                    _("This function is improperly set up. Reach out to the "
-                      "extension developer or a GDevelop maintainer to fix "
-                      "this issue"),
-                    parameterStartPosition,
-                    GetCurrentPosition());
-          }
-        } else {
-          size_t parameterStartPosition = GetCurrentPosition();
-          parameters.push_back(Expression("unknown"));
-          parameters.back()
-              ->diagnostic = gd::make_unique<ExpressionParserError>(
-              "extra_parameter",
-              _("This parameter was not expected by this expression. Remove it "
-                "or verify that you've entered the proper expression name."),
-              parameterStartPosition,
-              GetCurrentPosition());
-        }
-
-        SkipAllWhitespaces();
-        SkipIfChar(IsParameterSeparator);
-        parameterIndex++;
       }
+      bool isEmptyParameter = CheckIfChar(IsParameterSeparator)
+          || (CheckIfChar(IsClosingParenthesis) && previousCharacterIsParameterSeparator);
+      auto parameter = isEmptyParameter ? gd::make_unique<EmptyNode>() : Expression();
+      parameter->parent = functionCallNode;
+      parameters.push_back(std::move(parameter));
+
+      SkipAllWhitespaces();
+      previousCharacterIsParameterSeparator = CheckIfChar(IsParameterSeparator);
+      SkipIfChar(IsParameterSeparator);
     }
 
     ExpressionParserLocation invalidClosingParenthesisLocation;
@@ -611,88 +547,32 @@ class GD_CORE_API ExpressionParser2 {
   }
   ///@}
 
-  /** \name Validators
-   * Return a diagnostic if any error is found
-   */
-  ///@{
-  std::unique_ptr<ExpressionParserDiagnostic> ValidateFunction(
-      const gd::FunctionCallNode &function, size_t functionStartPosition);
-
   std::unique_ptr<ExpressionParserDiagnostic> ValidateOperator(
-      const gd::String &type, gd::String::value_type operatorChar) {
-    if (type == "number") {
-      if (operatorChar == '+' || operatorChar == '-' || operatorChar == '/' ||
-          operatorChar == '*') {
-        return gd::make_unique<ExpressionParserDiagnostic>();
-      }
-
-      return gd::make_unique<ExpressionParserError>(
-          "invalid_operator",
-          _("You've used an operator that is not supported. Operator should be "
-            "either +, -, / or *."),
-          GetCurrentPosition());
-    } else if (type == "string") {
-      if (operatorChar == '+') {
-        return gd::make_unique<ExpressionParserDiagnostic>();
-      }
-
-      return gd::make_unique<ExpressionParserError>(
-          "invalid_operator",
-          _("You've used an operator that is not supported. Only + can be used "
-            "to concatenate texts."),
-          GetCurrentPosition());
-    } else if (gd::ParameterMetadata::IsObject(type)) {
-      return gd::make_unique<ExpressionParserError>(
-          "invalid_operator",
-          _("Operators (+, -, /, *) can't be used with an object name. Remove "
-            "the operator."),
-          GetCurrentPosition());
-    } else if (gd::ParameterMetadata::IsExpression("variable", type)) {
-      return gd::make_unique<ExpressionParserError>(
-          "invalid_operator",
-          _("Operators (+, -, /, *) can't be used in variable names. Remove "
-            "the operator from the variable name."),
-          GetCurrentPosition());
+      gd::String::value_type operatorChar) {
+    if (operatorChar == '+' || operatorChar == '-' || operatorChar == '/' ||
+        operatorChar == '*') {
+      return gd::make_unique<ExpressionParserDiagnostic>();
     }
-
-    return gd::make_unique<ExpressionParserDiagnostic>();
+    return gd::make_unique<ExpressionParserError>(
+        "invalid_operator",
+        _("You've used an operator that is not supported. Operator should be "
+          "either +, -, / or *."),
+        GetCurrentPosition());
   }
 
   std::unique_ptr<ExpressionParserDiagnostic> ValidateUnaryOperator(
-      const gd::String &type, gd::String::value_type operatorChar) {
-    if (type == "number") {
-      if (operatorChar == '+' || operatorChar == '-') {
-        return gd::make_unique<ExpressionParserDiagnostic>();
-      }
-
-      return gd::make_unique<ExpressionParserError>(
-          "invalid_operator",
-          _("You've used an \"unary\" operator that is not supported. Operator "
-            "should be "
-            "either + or -."),
-          GetCurrentPosition());
-    } else if (type == "string") {
-      return gd::make_unique<ExpressionParserError>(
-          "invalid_operator",
-          _("You've used an operator that is not supported. Only + can be used "
-            "to concatenate texts, and must be placed between two texts (or "
-            "expressions)."),
-          GetCurrentPosition());
-    } else if (gd::ParameterMetadata::IsObject(type)) {
-      return gd::make_unique<ExpressionParserError>(
-          "invalid_operator",
-          _("Operators (+, -) can't be used with an object name. Remove the "
-            "operator."),
-          GetCurrentPosition());
-    } else if (gd::ParameterMetadata::IsExpression("variable", type)) {
-      return gd::make_unique<ExpressionParserError>(
-          "invalid_operator",
-          _("Operators (+, -) can't be used in variable names. Remove "
-            "the operator from the variable name."),
-          GetCurrentPosition());
+      gd::String::value_type operatorChar,
+      size_t position) {
+    if (operatorChar == '+' || operatorChar == '-') {
+      return gd::make_unique<ExpressionParserDiagnostic>();
     }
 
-    return gd::make_unique<ExpressionParserDiagnostic>();
+    return gd::make_unique<ExpressionParserError>(
+        "invalid_operator",
+        _("You've used an \"unary\" operator that is not supported. Operator "
+          "should be "
+          "either + or -."),
+        position);
   }
   ///@}
 
@@ -738,95 +618,6 @@ class GD_CORE_API ExpressionParser2 {
     return predicate(character);
   }
 
-  bool IsIdentifierAllowedChar() {
-    if (currentPosition >= expression.size()) return false;
-    gd::String::value_type character = expression[currentPosition];
-
-    // Quickly compare if the character is a number or ASCII character.
-    if ((character >= '0' && character <= '9') ||
-        (character >= 'A' && character <= 'Z') ||
-        (character >= 'a' && character <= 'z'))
-      return true;
-
-    // Otherwise do the full check against separators forbidden in identifiers.
-    if (!IsParameterSeparator(character) && !IsDot(character) &&
-        !IsQuote(character) && !IsBracket(character) &&
-        !IsExpressionOperator(character) && !IsTermOperator(character)) {
-      return true;
-    }
-
-    return false;
-  }
-
-  static bool IsWhitespace(gd::String::value_type character) {
-    return character == ' ' || character == '\n' || character == '\r';
-  }
-
-  static bool IsParameterSeparator(gd::String::value_type character) {
-    return character == ',';
-  }
-
-  static bool IsDot(gd::String::value_type character) {
-    return character == '.';
-  }
-
-  static bool IsQuote(gd::String::value_type character) {
-    return character == '"';
-  }
-
-  static bool IsBracket(gd::String::value_type character) {
-    return character == '(' || character == ')' || character == '[' ||
-           character == ']' || character == '{' || character == '}';
-  }
-
-  static bool IsOpeningParenthesis(gd::String::value_type character) {
-    return character == '(';
-  }
-
-  static bool IsClosingParenthesis(gd::String::value_type character) {
-    return character == ')';
-  }
-
-  static bool IsOpeningSquareBracket(gd::String::value_type character) {
-    return character == '[';
-  }
-
-  static bool IsClosingSquareBracket(gd::String::value_type character) {
-    return character == ']';
-  }
-
-  static bool IsExpressionEndingChar(gd::String::value_type character) {
-    return character == ',' || IsClosingParenthesis(character) ||
-           IsClosingSquareBracket(character);
-  }
-
-  static bool IsExpressionOperator(gd::String::value_type character) {
-    return character == '+' || character == '-' || character == '<' ||
-           character == '>' || character == '?' || character == '^' ||
-           character == '=' || character == '\\' || character == ':' ||
-           character == '!';
-  }
-
-  static bool IsUnaryOperator(gd::String::value_type character) {
-    return character == '+' || character == '-';
-  }
-
-  static bool IsTermOperator(gd::String::value_type character) {
-    return character == '/' || character == '*';
-  }
-
-  static bool IsNumberFirstChar(gd::String::value_type character) {
-    return character == '.' || (character >= '0' && character <= '9');
-  }
-
-  static bool IsNonZeroDigit(gd::String::value_type character) {
-    return (character >= '1' && character <= '9');
-  }
-
-  static bool IsZeroDigit(gd::String::value_type character) {
-    return character == '0';
-  }
-
   bool IsNamespaceSeparator() {
     // Namespace separator is a special kind of delimiter as it is 2 characters
     // long
@@ -843,14 +634,13 @@ class GD_CORE_API ExpressionParser2 {
     ExpressionParserLocation location;
   };
 
-  IdentifierAndLocation ReadIdentifierName() {
+  IdentifierAndLocation ReadIdentifierName(bool allowDeprecatedSpacesInName = true) {
     gd::String name;
     size_t startPosition = currentPosition;
     while (currentPosition < expression.size() &&
-           (IsIdentifierAllowedChar()
+           (CheckIfChar(IsAllowedInIdentifier)
             // Allow whitespace in identifier name for compatibility
-            ||
-            expression[currentPosition] == ' ')) {
+            || (allowDeprecatedSpacesInName && expression[currentPosition] == ' '))) {
       name += expression[currentPosition];
       currentPosition++;
     }
@@ -881,7 +671,7 @@ class GD_CORE_API ExpressionParser2 {
 
   std::unique_ptr<NumberNode> ReadNumber();
 
-  std::unique_ptr<EmptyNode> ReadUntilWhitespace(gd::String type) {
+  std::unique_ptr<EmptyNode> ReadUntilWhitespace() {
     size_t startPosition = GetCurrentPosition();
     gd::String text;
     while (currentPosition < expression.size() &&
@@ -890,13 +680,13 @@ class GD_CORE_API ExpressionParser2 {
       currentPosition++;
     }
 
-    auto node = gd::make_unique<EmptyNode>(type, text);
+    auto node = gd::make_unique<EmptyNode>(text);
     node->location =
         ExpressionParserLocation(startPosition, GetCurrentPosition());
     return node;
   }
 
-  std::unique_ptr<EmptyNode> ReadUntilEnd(gd::String type) {
+  std::unique_ptr<EmptyNode> ReadUntilEnd() {
     size_t startPosition = GetCurrentPosition();
     gd::String text;
     while (currentPosition < expression.size()) {
@@ -904,7 +694,7 @@ class GD_CORE_API ExpressionParser2 {
       currentPosition++;
     }
 
-    auto node = gd::make_unique<EmptyNode>(type, text);
+    auto node = gd::make_unique<EmptyNode>(text);
     node->location =
         ExpressionParserLocation(startPosition, GetCurrentPosition());
     return node;
@@ -937,41 +727,11 @@ class GD_CORE_API ExpressionParser2 {
     return std::move(gd::make_unique<ExpressionParserError>(
         "type_error", message, beginningPosition, GetCurrentPosition()));
   }
-
-  std::unique_ptr<ExpressionParserError> RaiseEmptyError(
-      const gd::String &type, size_t beginningPosition) {
-    gd::String message;
-    if (type == "number") {
-      message = _("You must enter a number or a valid expression call.");
-    } else if (type == "string") {
-      message = _(
-          "You must enter a text (between quotes) or a valid expression call.");
-    } else if (gd::ParameterMetadata::IsExpression("variable", type)) {
-      message = _("You must enter a variable name.");
-    } else if (gd::ParameterMetadata::IsObject(type)) {
-      message = _("You must enter a valid object name.");
-    } else {
-      message = _("You must enter a valid expression.");
-    }
-
-    return std::move(RaiseTypeError(message, beginningPosition));
-  }
   ///@}
 
-  static size_t WrittenParametersFirstIndex(const gd::String &objectName,
-                                            const gd::String &behaviorName) {
-    // By convention, object is always the first parameter, and behavior the
-    // second one.
-    return !behaviorName.empty() ? 2 : (!objectName.empty() ? 1 : 0);
-  }
-
   gd::String expression;
   std::size_t currentPosition;
 
-  const gd::Platform &platform;
-  const gd::ObjectsContainer &globalObjectsContainer;
-  const gd::ObjectsContainer &objectsContainer;
-
   static gd::String NAMESPACE_SEPARATOR;
 };
 

Core/GDCore/Events/Parsers/ExpressionParser2Node.h

@@ -8,6 +8,7 @@
 
 #include <memory>
 #include <vector>
+
 #include "ExpressionParser2NodeWorker.h"
 #include "GDCore/String.h"
 namespace gd {
@@ -16,11 +17,12 @@ class ObjectsContainer;
 class Platform;
 class ParameterMetadata;
 class ExpressionMetadata;
+struct FunctionCallNode;
 }  // namespace gd
 
 namespace gd {
 
-struct ExpressionParserLocation {
+struct GD_CORE_API ExpressionParserLocation {
   ExpressionParserLocation() : isValid(false){};
   ExpressionParserLocation(size_t position)
       : isValid(true), startPosition(position), endPosition(position){};
@@ -41,7 +43,8 @@ struct ExpressionParserLocation {
 /**
  * \brief A diagnostic that can be attached to a gd::ExpressionNode.
  */
-struct ExpressionParserDiagnostic {
+struct GD_CORE_API ExpressionParserDiagnostic {
+  virtual ~ExpressionParserDiagnostic() = default;
   virtual bool IsError() { return false; }
   virtual const gd::String &GetMessage() { return noMessage; }
   virtual size_t GetStartPosition() { return 0; }
@@ -54,7 +57,11 @@ struct ExpressionParserDiagnostic {
 /**
  * \brief An error that can be attached to a gd::ExpressionNode.
  */
-struct ExpressionParserError : public ExpressionParserDiagnostic {
+struct GD_CORE_API ExpressionParserError : public ExpressionParserDiagnostic {
+  ExpressionParserError(const gd::String &type_,
+                        const gd::String &message_,
+                        const ExpressionParserLocation &location_)
+      : type(type_), message(message_), location(location_){};
   ExpressionParserError(const gd::String &type_,
                         const gd::String &message_,
                         size_t position_)
@@ -83,40 +90,38 @@ struct ExpressionParserError : public ExpressionParserDiagnostic {
  * \brief The base node, from which all nodes in the tree of
  * an expression inherits from.
  */
-struct ExpressionNode {
+struct GD_CORE_API ExpressionNode {
+  ExpressionNode() : parent(nullptr) {};
   virtual ~ExpressionNode(){};
   virtual void Visit(ExpressionParser2NodeWorker &worker){};
 
   std::unique_ptr<ExpressionParserDiagnostic> diagnostic;
   ExpressionParserLocation location;  ///< The location of the entire node. Some
-                                      ///nodes might have other locations stored
-                                      ///inside them. For example, a function
-                                      ///can store the position of the object
-                                      ///name, the dot, the function name,
-                                      ///etc...
+                                      /// nodes might have other locations
+                                      /// stored inside them. For example, a
+                                      /// function can store the position of the
+                                      /// object name, the dot, the function
+                                      /// name, etc...
+  ExpressionNode *parent;
 };
 
-struct SubExpressionNode : public ExpressionNode {
-  SubExpressionNode(const gd::String &type_,
-                    std::unique_ptr<ExpressionNode> expression_)
-      : type(type_), expression(std::move(expression_)){};
+struct GD_CORE_API SubExpressionNode : public ExpressionNode {
+  SubExpressionNode(std::unique_ptr<ExpressionNode> expression_)
+      : ExpressionNode(), expression(std::move(expression_)){};
   virtual ~SubExpressionNode(){};
   virtual void Visit(ExpressionParser2NodeWorker &worker) {
     worker.OnVisitSubExpressionNode(*this);
   };
 
-  gd::String type;  // "string", "number", type supported by
-                    // gd::ParameterMetadata::IsObject, types supported by
-                    // gd::ParameterMetadata::IsExpression or "unknown".
   std::unique_ptr<ExpressionNode> expression;
 };
 
 /**
  * \brief An operator node. For example: "lhs + rhs".
  */
-struct OperatorNode : public ExpressionNode {
-  OperatorNode(const gd::String &type_, gd::String::value_type op_)
-      : type(type_), op(op_){};
+struct GD_CORE_API OperatorNode : public ExpressionNode {
+  OperatorNode(gd::String::value_type op_)
+      : ExpressionNode(), op(op_){};
   virtual ~OperatorNode(){};
   virtual void Visit(ExpressionParser2NodeWorker &worker) {
     worker.OnVisitOperatorNode(*this);
@@ -124,48 +129,46 @@ struct OperatorNode : public ExpressionNode {
 
   std::unique_ptr<ExpressionNode> leftHandSide;
   std::unique_ptr<ExpressionNode> rightHandSide;
-  gd::String type;  // "string", "number", type supported by
-                    // gd::ParameterMetadata::IsObject, types supported by
-                    // gd::ParameterMetadata::IsExpression or "unknown".
   gd::String::value_type op;
 };
 
 /**
  * \brief A unary operator node. For example: "-2".
  */
-struct UnaryOperatorNode : public ExpressionNode {
-  UnaryOperatorNode(const gd::String &type_, gd::String::value_type op_)
-      : type(type_), op(op_){};
+struct GD_CORE_API UnaryOperatorNode : public ExpressionNode {
+  UnaryOperatorNode(gd::String::value_type op_)
+      : ExpressionNode(), op(op_){};
   virtual ~UnaryOperatorNode(){};
   virtual void Visit(ExpressionParser2NodeWorker &worker) {
     worker.OnVisitUnaryOperatorNode(*this);
   };
 
   std::unique_ptr<ExpressionNode> factor;
-  gd::String type;  // "string", "number", type supported by
-                    // gd::ParameterMetadata::IsObject, types supported by
-                    // gd::ParameterMetadata::IsExpression or "unknown".
   gd::String::value_type op;
 };
 
 /**
  * \brief A number node. For example: "123".
+ * Its `type` is always "number".
  */
-struct NumberNode : public ExpressionNode {
-  NumberNode(const gd::String &number_) : number(number_){};
+struct GD_CORE_API NumberNode : public ExpressionNode {
+  NumberNode(const gd::String &number_)
+      : ExpressionNode(), number(number_){};
   virtual ~NumberNode(){};
   virtual void Visit(ExpressionParser2NodeWorker &worker) {
     worker.OnVisitNumberNode(*this);
   };
 
+  //
   gd::String number;
 };
 
 /**
  * \brief A text node. For example: "Hello World".
+ * Its `type` is always "string".
  */
-struct TextNode : public ExpressionNode {
-  TextNode(const gd::String &text_) : text(text_){};
+struct GD_CORE_API TextNode : public ExpressionNode {
+  TextNode(const gd::String &text_) : ExpressionNode(), text(text_){};
   virtual ~TextNode(){};
   virtual void Visit(ExpressionParser2NodeWorker &worker) {
     worker.OnVisitTextNode(*this);
@@ -174,31 +177,89 @@ struct TextNode : public ExpressionNode {
   gd::String text;
 };
 
-struct VariableAccessorOrVariableBracketAccessorNode : public ExpressionNode {
+struct GD_CORE_API IdentifierOrFunctionCallOrObjectFunctionNameOrEmptyNode
+    : public ExpressionNode {
+  IdentifierOrFunctionCallOrObjectFunctionNameOrEmptyNode()
+      : ExpressionNode(){};
+};
+
+/**
+ * \brief An identifier node, usually representing an object or a variable
+ * with an optional function name or child variable name respectively.
+ *
+ * The name of a function to call on an object or the behavior,
+ * for example: "MyObject.Function" or "MyObject.Physics".
+ *
+ * A variable, potentially with accessor to its child,
+ * for example: MyVariable or MyVariable.MyChild
+ */
+struct GD_CORE_API IdentifierNode
+    : public IdentifierOrFunctionCallOrObjectFunctionNameOrEmptyNode {
+  IdentifierNode(
+  const gd::String &identifierName_)
+      : IdentifierOrFunctionCallOrObjectFunctionNameOrEmptyNode(),
+        identifierName(identifierName_),
+        childIdentifierName(""){};
+  IdentifierNode(
+  const gd::String &identifierName_,
+  const gd::String &childIdentifierName_)
+      : IdentifierOrFunctionCallOrObjectFunctionNameOrEmptyNode(),
+        identifierName(identifierName_),
+        childIdentifierName(childIdentifierName_){};
+  virtual ~IdentifierNode(){};
+  virtual void Visit(ExpressionParser2NodeWorker &worker) {
+    worker.OnVisitIdentifierNode(*this);
+  };
+
+  gd::String identifierName;  ///< The object or variable name.
+  gd::String childIdentifierName;  ///< The object function or variable child name.
+
+
+  ExpressionParserLocation
+      identifierNameLocation;  ///< Location of the object or variable name.
+  ExpressionParserLocation
+      identifierNameDotLocation;  ///< Location of the "." after the object or variable name.
+  ExpressionParserLocation childIdentifierNameLocation;  ///< Location of object
+                                                         /// function, behavior or
+                                                         /// child variable name.
+};
+
+struct GD_CORE_API FunctionCallOrObjectFunctionNameOrEmptyNode
+    : public IdentifierOrFunctionCallOrObjectFunctionNameOrEmptyNode {
+  FunctionCallOrObjectFunctionNameOrEmptyNode()
+      : IdentifierOrFunctionCallOrObjectFunctionNameOrEmptyNode(){};
+  virtual ~FunctionCallOrObjectFunctionNameOrEmptyNode(){};
+  void Visit(ExpressionParser2NodeWorker &worker) override{};
+};
+
+struct GD_CORE_API VariableAccessorOrVariableBracketAccessorNode : public ExpressionNode {
+  VariableAccessorOrVariableBracketAccessorNode() : ExpressionNode(){};
+
   std::unique_ptr<VariableAccessorOrVariableBracketAccessorNode> child;
 };
 
 /**
- * \brief A variable, potentially with accessor to its children.
+ * \brief A variable, or object variable, with bracket accessor or at least 2 "dot" accessors.
  *
- * Example: MyVariable or MyVariable.MyChildren
+ * Example: `MyVariable["MyChildren"]` or `MyVariable.MyChildren.MyGrandChildren`.
+ * Example: `MyObject["MyVariable"]` or `MyObject.MyVariable.MyChildren`.
  *
+ * Other cases like "MyVariable" or "MyVariable.MyChildren" are IdentifierNode
+ * to allow handling ambiguities.
+ *
+ * \see gd::IdentifierNode
  * \see gd::VariableAccessorNode
  * \see gd::VariableBracketAccessorNode
  */
-struct VariableNode : public ExpressionNode {
-  VariableNode(const gd::String &type_,
-               const gd::String &name_,
-               const gd::String &objectName_)
-      : type(type_), name(name_), objectName(objectName_){};
+struct GD_CORE_API VariableNode : public FunctionCallOrObjectFunctionNameOrEmptyNode {
+  VariableNode(const gd::String &name_)
+      : FunctionCallOrObjectFunctionNameOrEmptyNode(), name(name_){};
   virtual ~VariableNode(){};
   virtual void Visit(ExpressionParser2NodeWorker &worker) {
     worker.OnVisitVariableNode(*this);
   };
 
-  gd::String type;
   gd::String name;
-  gd::String objectName;
 
   std::unique_ptr<VariableAccessorOrVariableBracketAccessorNode>
       child;  // Can be nullptr if no accessor
@@ -207,12 +268,13 @@ struct VariableNode : public ExpressionNode {
 };
 
 /**
- * \brief A bracket accessor of a variable. Example: MyChild
+ * \brief A direct accessor to a child variable. Example: MyChild
  * in MyVariable.MyChild
  */
-struct VariableAccessorNode
+struct GD_CORE_API VariableAccessorNode
     : public VariableAccessorOrVariableBracketAccessorNode {
-  VariableAccessorNode(const gd::String &name_) : name(name_){};
+  VariableAccessorNode(const gd::String &name_)
+      : VariableAccessorOrVariableBracketAccessorNode(), name(name_){};
   virtual ~VariableAccessorNode(){};
   virtual void Visit(ExpressionParser2NodeWorker &worker) {
     worker.OnVisitVariableAccessorNode(*this);
@@ -224,13 +286,13 @@ struct VariableAccessorNode
 };
 
 /**
- * \brief A bracket accessor of a variable. Example: ["MyChild"]
+ * \brief A bracket accessor to a child variable. Example: ["MyChild"]
  * (in MyVariable["MyChild"]).
  */
-struct VariableBracketAccessorNode
+struct GD_CORE_API VariableBracketAccessorNode
     : public VariableAccessorOrVariableBracketAccessorNode {
   VariableBracketAccessorNode(std::unique_ptr<ExpressionNode> expression_)
-      : expression(std::move(expression_)){};
+      : VariableAccessorOrVariableBracketAccessorNode(), expression(std::move(expression_)){};
   virtual ~VariableBracketAccessorNode(){};
   virtual void Visit(ExpressionParser2NodeWorker &worker) {
     worker.OnVisitVariableBracketAccessorNode(*this);
@@ -239,49 +301,26 @@ struct VariableBracketAccessorNode
   std::unique_ptr<ExpressionNode> expression;
 };
 
-struct IdentifierOrFunctionCallOrObjectFunctionNameOrEmptyNode
-    : public ExpressionNode {};
-
-/**
- * \brief An identifier node, usually representing an object or a function name.
- */
-struct IdentifierNode
-    : public IdentifierOrFunctionCallOrObjectFunctionNameOrEmptyNode {
-  IdentifierNode(const gd::String &identifierName_, const gd::String &type_)
-      : identifierName(identifierName_), type(type_){};
-  virtual ~IdentifierNode(){};
-  virtual void Visit(ExpressionParser2NodeWorker &worker) {
-    worker.OnVisitIdentifierNode(*this);
-  };
-
-  gd::String identifierName;
-  gd::String type;
-};
-
-struct FunctionCallOrObjectFunctionNameOrEmptyNode
-    : public IdentifierOrFunctionCallOrObjectFunctionNameOrEmptyNode {
-  virtual ~FunctionCallOrObjectFunctionNameOrEmptyNode(){};
-  void Visit(ExpressionParser2NodeWorker &worker) override{};
-};
-
 /**
  * \brief The name of a function to call on an object or the behavior
- * For example: "MyObject.Function" or "MyObject.Physics" or
- * "MyObject.Physics::LinearVelocity".
+ * For example: "MyObject.Physics::LinearVelocity".
+ *
+ * Other cases like "MyObject.Function" or "MyObject.Physics" are IdentifierNode
+ * to allow handling ambiguities.
+ *
+ * \see gd::IdentifierNode
  */
-struct ObjectFunctionNameNode
+struct GD_CORE_API ObjectFunctionNameNode
     : public FunctionCallOrObjectFunctionNameOrEmptyNode {
-  ObjectFunctionNameNode(const gd::String &type_,
-                         const gd::String &objectName_,
+  ObjectFunctionNameNode(const gd::String &objectName_,
                          const gd::String &objectFunctionOrBehaviorName_)
-      : type(type_),
+      : FunctionCallOrObjectFunctionNameOrEmptyNode(),
         objectName(objectName_),
         objectFunctionOrBehaviorName(objectFunctionOrBehaviorName_) {}
-  ObjectFunctionNameNode(const gd::String &type_,
-                         const gd::String &objectName_,
+  ObjectFunctionNameNode(const gd::String &objectName_,
                          const gd::String &behaviorName_,
                          const gd::String &behaviorFunctionName_)
-      : type(type_),
+      : FunctionCallOrObjectFunctionNameOrEmptyNode(),
         objectName(objectName_),
         objectFunctionOrBehaviorName(behaviorName_),
         behaviorFunctionName(behaviorFunctionName_) {}
@@ -290,34 +329,30 @@ struct ObjectFunctionNameNode
     worker.OnVisitObjectFunctionNameNode(*this);
   };
 
-  gd::String type;  // This could be removed if the type ("string", "number",
-                    // type supported by gd::ParameterMetadata::IsObject, types
-                    // supported by gd::ParameterMetadata::IsExpression or
-                    // "unknown") was stored in ExpressionMetadata.
   gd::String objectName;
   gd::String objectFunctionOrBehaviorName;  ///< Behavior name if
                                             ///`behaviorFunctionName` is not
-                                            ///empty.
+                                            /// empty.
   gd::String behaviorFunctionName;          ///< If empty, then
-                                    ///objectFunctionOrBehaviorName is filled
-                                    ///with the behavior name.
+                                    /// objectFunctionOrBehaviorName is filled
+                                    /// with the behavior name.
 
   ExpressionParserLocation
       objectNameLocation;  ///< Location of the object name.
   ExpressionParserLocation
       objectNameDotLocation;  ///< Location of the "." after the object name.
   ExpressionParserLocation objectFunctionOrBehaviorNameLocation;  ///< Location
-                                                                  ///of object
-                                                                  ///function
-                                                                  ///name or
-                                                                  ///behavior
-                                                                  ///name.
+                                                                  /// of object
+                                                                  /// function
+                                                                  /// name or
+                                                                  /// behavior
+                                                                  /// name.
   ExpressionParserLocation
       behaviorNameNamespaceSeparatorLocation;  ///< Location of the "::"
-                                               ///separator, if any.
+                                               /// separator, if any.
   ExpressionParserLocation behaviorFunctionNameLocation;  ///< Location of the
-                                                          ///behavior function
-                                                          ///name, if any.
+                                                          /// behavior function
+                                                          /// name, if any.
 };
 
 /**
@@ -326,50 +361,35 @@ struct ObjectFunctionNameNode
  * For example: "MyExtension::MyFunction(1, 2)", "MyObject.Function()" or
  * "MyObject.Physics::LinearVelocity()".
  */
-struct FunctionCallNode : public FunctionCallOrObjectFunctionNameOrEmptyNode {
-  FunctionCallNode(const gd::String &type_,
-                   std::vector<std::unique_ptr<ExpressionNode>> parameters_,
-                   const ExpressionMetadata &expressionMetadata_,
-                   const gd::String &functionName_)
-      : type(type_),
-        parameters(std::move(parameters_)),
-        expressionMetadata(expressionMetadata_),
+struct GD_CORE_API FunctionCallNode : public FunctionCallOrObjectFunctionNameOrEmptyNode {
+  /** \brief Construct a free function call node. */
+  FunctionCallNode(const gd::String &functionName_)
+      : FunctionCallOrObjectFunctionNameOrEmptyNode(),
         functionName(functionName_){};
-  FunctionCallNode(const gd::String &type_,
-                   const gd::String &objectName_,
-                   std::vector<std::unique_ptr<ExpressionNode>> parameters_,
-                   const ExpressionMetadata &expressionMetadata_,
+
+  /** \brief Construct an object function call node. */
+  FunctionCallNode(const gd::String &objectName_,
                    const gd::String &functionName_)
-      : type(type_),
+      : FunctionCallOrObjectFunctionNameOrEmptyNode(),
         objectName(objectName_),
-        parameters(std::move(parameters_)),
-        expressionMetadata(expressionMetadata_),
         functionName(functionName_){};
-  FunctionCallNode(const gd::String &type_,
-                   const gd::String &objectName_,
+
+  /** \brief Construct a behavior function call node. */
+  FunctionCallNode(const gd::String &objectName_,
                    const gd::String &behaviorName_,
-                   std::vector<std::unique_ptr<ExpressionNode>> parameters_,
-                   const ExpressionMetadata &expressionMetadata_,
                    const gd::String &functionName_)
-      : type(type_),
+      : FunctionCallOrObjectFunctionNameOrEmptyNode(),
         objectName(objectName_),
         behaviorName(behaviorName_),
-        parameters(std::move(parameters_)),
-        expressionMetadata(expressionMetadata_),
         functionName(functionName_){};
   virtual ~FunctionCallNode(){};
   virtual void Visit(ExpressionParser2NodeWorker &worker) {
     worker.OnVisitFunctionCallNode(*this);
   };
 
-  gd::String type;  // This could be removed if the type ("string", "number",
-                    // type supported by gd::ParameterMetadata::IsObject, types
-                    // supported by gd::ParameterMetadata::IsExpression or
-                    // "unknown") was stored in ExpressionMetadata.
   gd::String objectName;
   gd::String behaviorName;
   std::vector<std::unique_ptr<ExpressionNode>> parameters;
-  const ExpressionMetadata &expressionMetadata;
   gd::String functionName;
 
   ExpressionParserLocation
@@ -382,7 +402,7 @@ struct FunctionCallNode : public FunctionCallOrObjectFunctionNameOrEmptyNode {
       behaviorNameLocation;  ///< Location of the behavior name, if any.
   ExpressionParserLocation
       behaviorNameNamespaceSeparatorLocation;  ///< Location of the "::"
-                                               ///separator, if any.
+                                               /// separator, if any.
   ExpressionParserLocation
       openingParenthesisLocation;  ///< Location of the "(".
   ExpressionParserLocation
@@ -393,17 +413,14 @@ struct FunctionCallNode : public FunctionCallOrObjectFunctionNameOrEmptyNode {
  * \brief An empty node, used when parsing failed/a syntax error was
  * encountered and any other node could not make sense.
  */
-struct EmptyNode : public FunctionCallOrObjectFunctionNameOrEmptyNode {
-  EmptyNode(const gd::String &type_, const gd::String &text_ = "")
-      : type(type_), text(text_){};
+struct GD_CORE_API EmptyNode : public FunctionCallOrObjectFunctionNameOrEmptyNode {
+  EmptyNode(const gd::String &text_ = "")
+      : FunctionCallOrObjectFunctionNameOrEmptyNode(), text(text_){};
   virtual ~EmptyNode(){};
   virtual void Visit(ExpressionParser2NodeWorker &worker) {
     worker.OnVisitEmptyNode(*this);
   };
 
-  gd::String type;  // "string", "number", type supported by
-                    // gd::ParameterMetadata::IsObject, types supported by
-                    // gd::ParameterMetadata::IsExpression or "unknown".
   gd::String text;
 };
 

Core/GDCore/Events/Parsers/ExpressionParser2NodePrinter.h

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

Core/GDCore/Events/Parsers/ExpressionParser2NodeWorker.h

@@ -7,21 +7,21 @@
 #define GDCORE_EXPRESSIONPARSER2NODEWORKER_H
 
 namespace gd {
-class ExpressionNode;
-class SubExpressionNode;
-class OperatorNode;
-class UnaryOperatorNode;
-class NumberNode;
-class TextNode;
-class VariableNode;
-class VariableAccessorNode;
-class VariableBracketAccessorNode;
-class IdentifierOrFunctionCallOrObjectFunctionNameOrEmptyNode;
-class IdentifierNode;
-class FunctionCallOrObjectFunctionNameOrEmptyNode;
-class ObjectFunctionNameNode;
-class FunctionCallNode;
-class EmptyNode;
+struct ExpressionNode;
+struct SubExpressionNode;
+struct OperatorNode;
+struct UnaryOperatorNode;
+struct NumberNode;
+struct TextNode;
+struct VariableNode;
+struct VariableAccessorNode;
+struct VariableBracketAccessorNode;
+struct IdentifierOrFunctionCallOrObjectFunctionNameOrEmptyNode;
+struct IdentifierNode;
+struct FunctionCallOrObjectFunctionNameOrEmptyNode;
+struct ObjectFunctionNameNode;
+struct FunctionCallNode;
+struct EmptyNode;
 }  // namespace gd
 
 namespace gd {
@@ -34,21 +34,21 @@ namespace gd {
  * \see gd::ExpressionNode
  */
 class GD_CORE_API ExpressionParser2NodeWorker {
-  friend class ExpressionNode;
-  friend class SubExpressionNode;
-  friend class OperatorNode;
-  friend class UnaryOperatorNode;
-  friend class NumberNode;
-  friend class TextNode;
-  friend class VariableNode;
-  friend class VariableAccessorNode;
-  friend class VariableBracketAccessorNode;
-  friend class IdentifierOrFunctionCallOrObjectFunctionNameOrEmptyNode;
-  friend class IdentifierNode;
-  friend class FunctionCallOrObjectFunctionNameOrEmptyNode;
-  friend class ObjectFunctionNameNode;
-  friend class FunctionCallNode;
-  friend class EmptyNode;
+  friend struct ExpressionNode;
+  friend struct SubExpressionNode;
+  friend struct OperatorNode;
+  friend struct UnaryOperatorNode;
+  friend struct NumberNode;
+  friend struct TextNode;
+  friend struct VariableNode;
+  friend struct VariableAccessorNode;
+  friend struct VariableBracketAccessorNode;
+  friend struct IdentifierOrFunctionCallOrObjectFunctionNameOrEmptyNode;
+  friend struct IdentifierNode;
+  friend struct FunctionCallOrObjectFunctionNameOrEmptyNode;
+  friend struct ObjectFunctionNameNode;
+  friend struct FunctionCallNode;
+  friend struct EmptyNode;
 
  public:
   virtual ~ExpressionParser2NodeWorker();

Core/GDCore/Events/Parsers/GrammarTerminals.h

@@ -0,0 +1,118 @@
+#pragma once
+#include "GDCore/String.h"
+
+namespace gd {
+
+/**
+ * Contains functions to handle the grammar of the expressions accepted by GDevelop.
+ */
+namespace GrammarTerminals {
+
+inline bool IsWhitespace(gd::String::value_type character) {
+  return character == ' ' || character == '\n' || character == '\r';
+}
+
+inline bool IsParameterSeparator(gd::String::value_type character) {
+  return character == ',';
+}
+
+inline bool IsDot(gd::String::value_type character) { return character == '.'; }
+
+inline bool IsQuote(gd::String::value_type character) {
+  return character == '"';
+}
+
+inline bool IsBracket(gd::String::value_type character) {
+  return character == '(' || character == ')' || character == '[' ||
+         character == ']' || character == '{' || character == '}';
+}
+
+inline bool IsOpeningParenthesis(gd::String::value_type character) {
+  return character == '(';
+}
+
+inline bool IsClosingParenthesis(gd::String::value_type character) {
+  return character == ')';
+}
+
+inline bool IsOpeningSquareBracket(gd::String::value_type character) {
+  return character == '[';
+}
+
+inline bool IsClosingSquareBracket(gd::String::value_type character) {
+  return character == ']';
+}
+
+inline bool IsExpressionEndingChar(gd::String::value_type character) {
+  return character == ',' || IsClosingParenthesis(character) ||
+         IsClosingSquareBracket(character);
+}
+
+inline bool IsExpressionOperator(gd::String::value_type character) {
+  return character == '+' || character == '-' || character == '<' ||
+         character == '>' || character == '?' || character == '^' ||
+         character == '=' || character == '\\' || character == ':' ||
+         character == '!';
+}
+
+inline bool IsUnaryOperator(gd::String::value_type character) {
+  return character == '+' || character == '-';
+}
+
+inline bool IsTermOperator(gd::String::value_type character) {
+  return character == '/' || character == '*';
+}
+
+inline bool IsNumberFirstChar(gd::String::value_type character) {
+  return character == '.' || (character >= '0' && character <= '9');
+}
+
+inline bool IsNonZeroDigit(gd::String::value_type character) {
+  return (character >= '1' && character <= '9');
+}
+
+inline bool IsZeroDigit(gd::String::value_type character) {
+  return character == '0';
+}
+
+inline bool IsAdditionalReservedCharacter(gd::String::value_type character) {
+  // These characters are not part of the grammar - but are often used in programming language
+  // and could become operators or part of the grammar one day.
+  return character == '~' || character == '\'' || character == '%' ||
+         character == '#' || character == '@' || character == '|' ||
+         character == '&' || character == '`' || character == '$' ||
+         character == ';';
+
+}
+
+/**
+ * Check if the given character can be used in an identifier. This is
+ * any unicode character, except for:
+ * `, . " () [] {} + - < > ? ^ = \ : ! / * ~ ' % # @ | & $ ;`
+ * and backtick and whitespaces (space, line break, carriage return).
+ *
+ * This is loosely based on what is allowed in languages like JavaScript
+ * (see https://mathiasbynens.be/notes/javascript-properties), without support
+ * for unicode escape syntax, and allowing all unicode ranges. The only
+ * disallowed characters are the one used for the grammar.
+ */
+inline bool IsAllowedInIdentifier(gd::String::value_type character) {
+  // Quickly compare if the character is a number or ASCII character.
+  if ((character >= '0' && character <= '9') ||
+      (character >= 'A' && character <= 'Z') ||
+      (character >= 'a' && character <= 'z'))
+    return true;
+
+  // Otherwise do the full check against separators forbidden in identifiers.
+  if (!IsParameterSeparator(character) && !IsDot(character) &&
+      !IsQuote(character) && !IsBracket(character) &&
+      !IsExpressionOperator(character) && !IsTermOperator(character) &&
+      !IsWhitespace(character) && !IsAdditionalReservedCharacter(character)) {
+    return true;
+  }
+
+  return false;
+}
+
+}  // namespace GrammarTerminals
+}  // namespace gd

Core/GDCore/Events/Serialization.cpp

@@ -4,6 +4,7 @@
  * reserved. This project is released under the MIT License.
  */
 #include "GDCore/Events/Serialization.h"
+
 #include "GDCore/CommonTools.h"
 #include "GDCore/Events/Event.h"
 #include "GDCore/Events/EventsList.h"
@@ -183,8 +184,8 @@ void EventsListSerialization::UpdateInstructionsFromGD2x(
     for (std::size_t j = 0;
          j < parameters.size() && j < metadata.parameters.size();
          ++j) {
-      if (metadata.parameters[j].type == "relationalOperator" ||
-          metadata.parameters[j].type == "operator") {
+      if (metadata.parameters[j].GetType() == "relationalOperator" ||
+          metadata.parameters[j].GetType() == "operator") {
         if (j == parameters.size() - 1) {
           std::cout << "ERROR: No more parameters after a [relational]operator "
                        "when trying to update an instruction from GD2.x";
@@ -218,8 +219,8 @@ void EventsListSerialization::UnserializeEventsFrom(
       event = std::make_shared<EmptyEvent>();
     }
 
-    event->SetDisabled(eventElem.GetBoolAttribute("disabled"));
-    event->SetFolded(eventElem.GetBoolAttribute("folded"));
+    event->SetDisabled(eventElem.GetBoolAttribute("disabled", false));
+    event->SetFolded(eventElem.GetBoolAttribute("folded", false));
 
     list.InsertEvent(event, list.GetEventsCount());
   }
@@ -232,8 +233,9 @@ void EventsListSerialization::SerializeEventsTo(const EventsList& list,
     const gd::BaseEvent& event = list.GetEvent(j);
     SerializerElement& eventElem = events.AddChild("event");
 
-    eventElem.SetAttribute("disabled", event.IsDisabled());
-    eventElem.SetAttribute("folded", event.IsFolded());
+    if (event.IsDisabled())
+      eventElem.SetAttribute("disabled", event.IsDisabled());
+    if (event.IsFolded()) eventElem.SetAttribute("folded", event.IsFolded());
     eventElem.AddChild("type").SetValue(event.GetType());
 
     event.SerializeTo(eventElem);
@@ -267,6 +269,9 @@ void gd::EventsListSerialization::UnserializeInstructionsFrom(
         instrElement.GetChild("type", 0, "Type")
             .GetBoolAttribute("inverted", false, "Contraire"));
 
+    instruction.SetAwaited(
+        instrElement.GetChild("type", 0, "Type").GetBoolAttribute("await"));
+
     // Read parameters
     vector<gd::Expression> parameters;
 
@@ -340,9 +345,12 @@ void gd::EventsListSerialization::SerializeInstructionsTo(
   instructions.ConsiderAsArrayOf("instruction");
   for (std::size_t k = 0; k < list.size(); k++) {
     SerializerElement& instruction = instructions.AddChild("instruction");
-    instruction.AddChild("type")
-        .SetAttribute("value", list[k].GetType())
-        .SetAttribute("inverted", list[k].IsInverted());
+    instruction.AddChild("type").SetAttribute("value", list[k].GetType());
+
+    if (list[k].IsInverted())
+      instruction.GetChild("type").SetAttribute("inverted", true);
+    if (list[k].IsAwaited())
+      instruction.GetChild("type").SetAttribute("await", true);
 
     // Parameters
     SerializerElement& parameters = instruction.AddChild("parameters");
@@ -352,9 +360,10 @@ void gd::EventsListSerialization::SerializeInstructionsTo(
           .SetValue(list[k].GetParameter(l).GetPlainString());
 
     // Sub instructions
-    SerializerElement& subInstructions =
-        instruction.AddChild("subInstructions");
-    SerializeInstructionsTo(list[k].GetSubInstructions(), subInstructions);
+    if (!list[k].GetSubInstructions().empty()) {
+      SerializeInstructionsTo(list[k].GetSubInstructions(),
+                              instruction.AddChild("subInstructions"));
+    }
   }
 }
 

Core/GDCore/Events/Tools/EventsCodeNameMangler.cpp

@@ -17,7 +17,7 @@ const gd::String& EventsCodeNameMangler::GetMangledObjectsListName(
     return it->second;
   }
 
-  gd::String partiallyMangledName = originalObjectName;
+  gd::String partiallyMangledName = GetMangledNameWithForbiddenUnderscore(originalObjectName);
   static const gd::String allowedCharacters =
       "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789";
 
@@ -43,7 +43,15 @@ const gd::String& EventsCodeNameMangler::GetExternalEventsFunctionMangledName(
     return it->second;
   }
 
-  gd::String partiallyMangledName = externalEventsName;
+  gd::String partiallyMangledName = GetMangledNameWithForbiddenUnderscore(externalEventsName);
+
+  mangledExternalEventsNames[externalEventsName] = "GDExternalEvents" + partiallyMangledName;
+  return mangledExternalEventsNames[externalEventsName];
+}
+
+gd::String EventsCodeNameMangler::GetMangledNameWithForbiddenUnderscore(
+    const gd::String &name) {
+  gd::String partiallyMangledName = name;
   static const gd::String allowedCharacters =
       "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789";
 
@@ -57,11 +65,30 @@ const gd::String& EventsCodeNameMangler::GetExternalEventsFunctionMangledName(
       partiallyMangledName.replace(i, 1, "_" + gd::String::From(unallowedChar));
     }
   }
-
-  mangledExternalEventsNames[externalEventsName] = "GDExternalEvents" + partiallyMangledName;
-  return mangledExternalEventsNames[externalEventsName];
+  return partiallyMangledName;
 }
 
+gd::String EventsCodeNameMangler::GetMangledName(
+    const gd::String &name) {
+  gd::String partiallyMangledName = name;
+  static const gd::String allowedCharacters =
+      "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789_";
+
+  for (size_t i = 0; i < partiallyMangledName.size();
+       ++i)  // Replace all unallowed letter by an underscore and the ascii
+             // number of the letter
+  {
+    if (allowedCharacters.find_first_of(
+            std::u32string(1, partiallyMangledName[i])) == gd::String::npos) {
+      char32_t unallowedChar = partiallyMangledName[i];
+      partiallyMangledName.replace(i, 1, "_" + gd::String::From(unallowedChar));
+    }
+  }
+  return partiallyMangledName;
+}
+
+
+
 const gd::String& ManObjListName(const gd::String &objectName) {
   return EventsCodeNameMangler::Get()->GetMangledObjectsListName(objectName);
 }

Core/GDCore/Events/Tools/EventsCodeNameMangler.h

@@ -36,6 +36,8 @@ class GD_CORE_API EventsCodeNameMangler {
   const gd::String &GetExternalEventsFunctionMangledName(
       const gd::String &externalEventsName);
 
+  static gd::String GetMangledName(const gd::String &name);
+
   static EventsCodeNameMangler *Get();
   static void DestroySingleton();
 
@@ -44,6 +46,9 @@ class GD_CORE_API EventsCodeNameMangler {
   virtual ~EventsCodeNameMangler(){};
   static EventsCodeNameMangler *_singleton;
 
+  // This method is inlined to avoid to copy the returned string.
+  static inline gd::String GetMangledNameWithForbiddenUnderscore(const gd::String &name);
+
   std::unordered_map<gd::String, gd::String>
       mangledObjectNames;  ///< Memoized results of mangling for objects
   std::unordered_map<gd::String, gd::String>

Core/GDCore/Extensions/Builtin/AdvancedExtension.cpp

@@ -11,26 +11,16 @@ namespace gd {
 
 void GD_CORE_API BuiltinExtensionsImplementer::ImplementsAdvancedExtension(
     gd::PlatformExtension& extension) {
-  extension.SetExtensionInformation(
-      "BuiltinAdvanced",
-      _("Advanced control features"),
-      _("Built-in extension providing advanced control features."),
-      "Florian Rival",
-      "Open source (MIT License)");
-
-#if defined(GD_IDE_ONLY)
   extension
-      .AddCondition("Toujours",
-                    _("Always"),
-                    _("This condition always returns true (or always false, if "
-                      "the condition is inverted)."),
-                    _("Always"),
-                    _("Other"),
-                    "res/conditions/toujours24.png",
-                    "res/conditions/toujours.png")
-      .SetHelpPath("/all-features/advanced-conditions")
-      .AddCodeOnlyParameter("conditionInverted", "")
-      .MarkAsAdvanced();
+      .SetExtensionInformation(
+          "BuiltinAdvanced",
+          _("Event functions"),
+          _("Advanced control features for functions made with events."),
+          "Florian Rival",
+          "Open source (MIT License)")
+      .SetCategory("Advanced");
+  extension.AddInstructionOrExpressionGroupMetadata(_("Event functions"))
+      .SetIcon("res/function32.png");
 
   extension
       .AddAction(
@@ -39,11 +29,12 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsAdvancedExtension(
           _("Set the return value of the events function to the specified "
             "number (to be used with \"Expression\" functions)."),
           _("Set return value to number _PARAM0_"),
-          _("Functions"),
-          "res/function24.png",
-          "res/function16.png")
+          "",
+          "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
@@ -53,11 +44,12 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsAdvancedExtension(
           _("Set the return value of the events function to the specified text "
             "(to be used with \"String Expression\" functions)."),
           _("Set return value to text _PARAM0_"),
-          _("Functions"),
-          "res/function24.png",
-          "res/function16.png")
+          "",
+          "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
@@ -66,31 +58,108 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsAdvancedExtension(
                  _("Set the return value of the Condition events function to "
                    "either true (condition will pass) or false."),
                  _("Set return value of the condition to _PARAM0_"),
-                 _("Functions"),
-                 "res/function24.png",
-                 "res/function16.png")
+                 "",
+                 "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
+      .AddCondition("GetArgumentAsBoolean",
+                    _("Check if a function parameter is set to true (or yes)"),
+                    _("Check if the specified function parameter (also called "
+                      "\"argument\") is set to True or Yes. If the argument is "
+                      "a string, an empty string is considered as \"false\". "
+                      "If it's a number, 0 is considered as \"false\"."),
+                    _("Parameter _PARAM0_ is true"),
+                    "",
+                    "res/function32.png",
+                    "res/function32.png")
+      .AddParameter("functionParameterName", _("Parameter name"), "number,string,boolean")
+      .SetRelevantForFunctionEventsOnly()
       .MarkAsAdvanced();
 
   extension
       .AddExpression(
           "GetArgumentAsNumber",
           _("Get function parameter value"),
-          _("Get function parameter (also called \"argument\") value"),
-          _("Functions"),
+          _("Get function parameter (also called \"argument\") value. You don't need this most of the time as you can simply write the parameter name in an expression."),
+          "",
           "res/function16.png")
-      .AddParameter("string", "Parameter name");
+      .AddParameter("functionParameterName", _("Parameter name"), "number,string,boolean")
+      .SetRelevantForFunctionEventsOnly()
+      .SetHidden();
 
   extension
       .AddStrExpression(
           "GetArgumentAsString",
           _("Get function parameter text"),
-          _("Get function parameter (also called \"argument\") text "),
-          _("Functions"),
+          _("Get function parameter (also called \"argument\") text. You don't need this most of the time as you can simply write the parameter name in an expression."),
+          "",
           "res/function16.png")
-      .AddParameter("string", "Parameter name");
-#endif
+      .AddParameter("functionParameterName", _("Parameter name"), "number,string,boolean")
+      .SetRelevantForFunctionEventsOnly()
+      .SetHidden();
+
+  extension
+      .AddCondition(
+          "CompareArgumentAsNumber",
+          _("Compare function parameter value"),
+          _("Compare function parameter (also called \"argument\") value."),
+          _("Parameter _PARAM0_"),
+          "",
+          "res/function32.png",
+          "res/function16.png")
+      .AddParameter("functionParameterName", _("Parameter name"), "number,string,boolean")
+      .UseStandardRelationalOperatorParameters(
+          "number", gd::ParameterOptions::MakeNewOptions())
+      .SetRelevantForFunctionEventsOnly();
+
+  extension
+      .AddCondition(
+          "CompareArgumentAsString",
+          _("Compare function parameter text"),
+          _("Compare function parameter (also called \"argument\") text."),
+          _("Parameter _PARAM0_"),
+          "",
+          "res/function32.png",
+          "res/function16.png")
+      .AddParameter("functionParameterName", _("Parameter name"), "number,string,boolean")
+      .UseStandardRelationalOperatorParameters(
+          "string", gd::ParameterOptions::MakeNewOptions())
+      .SetRelevantForFunctionEventsOnly();
 }
 
 }  // namespace gd

Core/GDCore/Extensions/Builtin/AllBuiltinExtensions.h

@@ -15,8 +15,6 @@ namespace gd {
  * so that it provides standards events, objects or instructions of an
  * extension.
  *
- * TOOD: Usage example.
- *
  * \ingroup BuiltinExtensions
  */
 class GD_CORE_API BuiltinExtensionsImplementer {
@@ -32,7 +30,6 @@ class GD_CORE_API BuiltinExtensionsImplementer {
   static void ImplementsExternalLayoutsExtension(
       gd::PlatformExtension& extension);
   static void ImplementsFileExtension(gd::PlatformExtension& extension);
-  static void ImplementsJoystickExtension(gd::PlatformExtension& extension);
   static void ImplementsKeyboardExtension(gd::PlatformExtension& extension);
   static void ImplementsMathematicalToolsExtension(
       gd::PlatformExtension& extension);
@@ -45,6 +42,14 @@ class GD_CORE_API BuiltinExtensionsImplementer {
   static void ImplementsTimeExtension(gd::PlatformExtension& extension);
   static void ImplementsVariablesExtension(gd::PlatformExtension& extension);
   static void ImplementsWindowExtension(gd::PlatformExtension& extension);
+  static void ImplementsAsyncExtension(gd::PlatformExtension& extension);
+  static void ImplementsResizableExtension(gd::PlatformExtension& extension);
+  static void ImplementsScalableExtension(gd::PlatformExtension& extension);
+  static void ImplementsFlippableExtension(gd::PlatformExtension& extension);
+  static void ImplementsAnimatableExtension(gd::PlatformExtension& extension);
+  static void ImplementsEffectExtension(gd::PlatformExtension& extension);
+  static void ImplementsOpacityExtension(gd::PlatformExtension& extension);
+  static void ImplementsTextContainerExtension(gd::PlatformExtension& extension);
 };
 
 }  // namespace gd

Core/GDCore/Extensions/Builtin/AsyncExtension.cpp

@@ -0,0 +1,47 @@
+/*
+ * GDevelop Core
+ * Copyright 2008-2016 Florian Rival (Florian.Rival@gmail.com). All rights
+ * reserved. This project is released under the MIT License.
+ */
+#include "AllBuiltinExtensions.h"
+#include "GDCore/Events/Builtin/AsyncEvent.h"
+#include "GDCore/Tools/Localization.h"
+
+using namespace std;
+namespace gd {
+
+void GD_CORE_API BuiltinExtensionsImplementer::ImplementsAsyncExtension(
+    gd::PlatformExtension &extension) {
+  extension
+      .SetExtensionInformation(
+          "BuiltinAsync",
+          _("Asynchronous functions"),
+          _("Functions that defer the execution of the events after it."),
+          "Arthur Pacaud (arthuro555)",
+          "Open source (MIT License)")
+      .SetCategory("Advanced");
+  extension.AddInstructionOrExpressionGroupMetadata(_("Asynchronous functions"))
+      .SetIcon("res/function32.png");
+
+  extension.AddEvent("Async",
+                     _("Async event"),
+                     _("Internal event for asynchronous actions"),
+                     "",
+                     "res/eventaddicon.png",
+                     std::make_shared<gd::AsyncEvent>());
+
+  extension
+      .AddAction(
+          "ResolveAsyncEventsFunction",
+          _("End asynchronous function"),
+          _("Mark an asynchronous function as finished. This will allow the "
+            "actions and subevents following it to be run."),
+          "Mark asynchronous function as ended",
+          "",
+          "res/actions/quit24.png",
+          "res/actions/quit.png")
+      .AddCodeOnlyParameter("eventsFunctionContext", "")
+      .SetRelevantForAsynchronousFunctionEventsOnly();
+}
+
+}  // namespace gd

Core/GDCore/Extensions/Builtin/AudioExtension.cpp

@@ -12,14 +12,20 @@ namespace gd {
 void GD_CORE_API BuiltinExtensionsImplementer::ImplementsAudioExtension(
     gd::PlatformExtension& extension) {
   extension
-      .SetExtensionInformation("BuiltinAudio",
-                               _("Audio"),
-                               _("Builtin audio extension"),
-                               "Florian Rival",
-                               "Open source (MIT License)")
-      .SetExtensionHelpPath("/all-features/audio");
+      .SetExtensionInformation(
+          "BuiltinAudio",
+          _("Sounds and music"),
+          _("GDevelop provides several conditions and actions to play audio "
+            "files. They can be either long music or short sound effects."),
+          "Florian Rival",
+          "Open source (MIT License)")
+      .SetExtensionHelpPath("/all-features/audio")
+      .SetCategory("Audio");
+  extension.AddInstructionOrExpressionGroupMetadata(_("Sounds and music"))
+      .SetIcon("res/actions/music24.png");
+  extension.AddInstructionOrExpressionGroupMetadata(_("Sounds on channels"))
+      .SetIcon("res/actions/son24.png");
 
-#if defined(GD_IDE_ONLY)
   extension
       .AddAction("PlaySoundCanal",
                  _("Play a sound on a channel"),
@@ -27,7 +33,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsAudioExtension(
                    "you'll be able to manipulate it."),
                  _("Play the sound _PARAM1_ on the channel _PARAM2_, vol.: "
                    "_PARAM4_, loop: _PARAM3_"),
-                 _("Audio/Sounds on channels"),
+                 _("Sounds on channels"),
                  "res/actions/son24.png",
                  "res/actions/son.png")
       .AddCodeOnlyParameter("currentScene", "")
@@ -48,7 +54,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsAudioExtension(
                  _("Stop the sound of a channel"),
                  _("Stop the sound on the specified channel."),
                  _("Stop the sound of channel _PARAM1_"),
-                 _("Audio/Sounds on channels"),
+                 _("Sounds on channels"),
                  "res/actions/son24.png",
                  "res/actions/son.png")
       .AddCodeOnlyParameter("currentScene", "")
@@ -60,7 +66,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsAudioExtension(
                  _("Pause the sound of a channel"),
                  _("Pause the sound played on the specified channel."),
                  _("Pause the sound of channel _PARAM1_"),
-                 _("Audio/Sounds on channels"),
+                 _("Sounds on channels"),
                  "res/actions/son24.png",
                  "res/actions/son.png")
       .AddCodeOnlyParameter("currentScene", "")
@@ -69,10 +75,10 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsAudioExtension(
 
   extension
       .AddAction("RePlaySoundCanal",
-                 _("Play the sound of a channel"),
-                 _("Play the sound of the channel."),
-                 _("Play the sound of channel _PARAM1_"),
-                 _("Audio/Sounds on channels"),
+                 _("Resume playing a sound on a channel"),
+                 _("Resume playing a sound on a channel that was paused."),
+                 _("Resume the sound of channel _PARAM1_"),
+                 _("Sounds on channels"),
                  "res/actions/son24.png",
                  "res/actions/son.png")
       .AddCodeOnlyParameter("currentScene", "")
@@ -86,7 +92,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsAudioExtension(
                    "able to interact with it later."),
                  _("Play the music _PARAM1_ on channel _PARAM2_, vol.: "
                    "_PARAM4_, loop: _PARAM3_"),
-                 _("Audio/Music on channels"),
+                 _("Music on channels"),
                  "res/actions/music24.png",
                  "res/actions/music.png")
       .AddCodeOnlyParameter("currentScene", "")
@@ -107,7 +113,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsAudioExtension(
                  _("Stop the music on a channel"),
                  _("Stop the music on the specified channel"),
                  _("Stop the music of channel _PARAM1_"),
-                 _("Audio/Music on channels"),
+                 _("Music on channels"),
                  "res/actions/music24.png",
                  "res/actions/music.png")
       .AddCodeOnlyParameter("currentScene", "")
@@ -119,7 +125,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsAudioExtension(
                  _("Pause the music of a channel"),
                  _("Pause the music on the specified channel."),
                  _("Pause the music of channel _PARAM1_"),
-                 _("Audio/Music on channels"),
+                 _("Music on channels"),
                  "res/actions/music24.png",
                  "res/actions/music.png")
       .AddCodeOnlyParameter("currentScene", "")
@@ -128,10 +134,10 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsAudioExtension(
 
   extension
       .AddAction("RePlayMusicCanal",
-                 _("Play the music of a channel"),
-                 _("Play the music of the channel."),
-                 _("Play the music of channel _PARAM1_"),
-                 _("Audio/Music on channels"),
+                 _("Resume playing a music on a channel"),
+                 _("Resume playing a music on a channel that was paused."),
+                 _("Resume the music of channel _PARAM1_"),
+                 _("Music on channels"),
                  "res/actions/music24.png",
                  "res/actions/music.png")
       .AddCodeOnlyParameter("currentScene", "")
@@ -142,69 +148,83 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsAudioExtension(
       .AddAction("ModVolumeSoundCanal",
                  _("Volume of the sound on a channel"),
                  _("This action modifies the volume of the sound on the "
-                   "specified channel. The volume is between 0 and 100."),
+                   "specified channel."),
                  _("the volume of the sound on channel _PARAM1_"),
-                 _("Audio/Sounds on channels"),
+                 _("Sounds on channels"),
                  "res/actions/sonVolume24.png",
                  "res/actions/sonVolume.png")
       .AddCodeOnlyParameter("currentScene", "")
       .AddParameter("expression", _("Channel identifier"))
-      .UseStandardOperatorParameters("number")
+      .UseStandardOperatorParameters(
+          "number",
+          ParameterOptions::MakeNewOptions().SetDescription(
+              _("Volume (0-100)")))
       .MarkAsAdvanced();
 
   extension
       .AddAction("ModVolumeMusicCanal",
                  _("Volume of the music on a channel"),
                  _("This action modifies the volume of the music on the "
-                   "specified channel. The volume is between 0 and 100."),
+                   "specified channel."),
                  _("the volume of the music on channel _PARAM1_"),
-                 _("Audio/Music on channels"),
+                 _("Music on channels"),
                  "res/actions/musicVolume24.png",
                  "res/actions/musicVolume.png")
       .AddCodeOnlyParameter("currentScene", "")
       .AddParameter("expression", _("Channel identifier"))
-      .UseStandardOperatorParameters("number")
+      .UseStandardOperatorParameters(
+          "number",
+          ParameterOptions::MakeNewOptions().SetDescription(
+              _("Volume (0-100)")))
       .MarkAsAdvanced();
 
   extension
       .AddAction("ModGlobalVolume",
                  _("Game global volume"),
-                 _("This action modifies the global volume of the game. The "
-                   "volume is between 0 and 100."),
+                 _("This action modifies the global volume of the game."),
                  _("the global sound level"),
-                 _("Audio"),
+                 "",
                  "res/actions/volume24.png",
                  "res/actions/volume.png")
       .AddCodeOnlyParameter("currentScene", "")
-      .UseStandardOperatorParameters("number")
+      .UseStandardOperatorParameters(
+          "number",
+          ParameterOptions::MakeNewOptions().SetDescription(
+              _("Volume (0-100)")))
       .MarkAsSimple();
 
   extension
       .AddAction("ModPitchSoundChannel",
                  _("Pitch of the sound of a channel"),
                  _("This action modifies the pitch (speed) of the sound on a "
-                   "channel.\n1 is the default pitch."),
+                   "channel."),
                  _("the pitch of the sound on channel _PARAM1_"),
-                 _("Audio/Sounds on channels"),
+                 _("Sounds on channels"),
                  "res/actions/son24.png",
                  "res/actions/son.png")
       .AddCodeOnlyParameter("currentScene", "")
       .AddParameter("expression", _("Channel identifier"))
-      .UseStandardOperatorParameters("number")
+      .UseStandardOperatorParameters(
+          "number",
+          ParameterOptions::MakeNewOptions().SetDescription(
+              _("Pitch (1 by default)")))
       .MarkAsAdvanced();
 
   extension
       .AddAction("ModPitchMusicChannel",
                  _("Pitch of the music on a channel"),
                  _("This action modifies the pitch of the music on the "
-                   "specified channel. 1 is the default pitch"),
+                   "specified channel."),
                  _("the pitch of the music on channel _PARAM1_"),
-                 _("Audio/Music on channels"),
+                 _("Music on channels"),
                  "res/actions/music24.png",
                  "res/actions/music.png")
       .AddCodeOnlyParameter("currentScene", "")
       .AddParameter("expression", _("Channel identifier"))
-      .UseStandardOperatorParameters("number")
+      .UseStandardOperatorParameters(
+          "number",
+          ParameterOptions::MakeNewOptions().SetDescription(
+              _("Pitch (1 by default)")))
       .MarkAsAdvanced();
 
   extension
@@ -213,12 +233,15 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsAudioExtension(
                  _("This action modifies the playing offset of the sound on a "
                    "channel"),
                  _("the playing offset of the sound on channel _PARAM1_"),
-                 _("Audio/Sounds on channels"),
+                 _("Sounds on channels"),
                  "res/actions/son24.png",
                  "res/actions/son.png")
       .AddCodeOnlyParameter("currentScene", "")
       .AddParameter("expression", _("Channel identifier"))
-      .UseStandardOperatorParameters("number")
+      .UseStandardOperatorParameters(
+          "number",
+          ParameterOptions::MakeNewOptions().SetDescription(
+              _("Position (in seconds)")))
       .MarkAsAdvanced();
 
   extension
@@ -227,12 +250,15 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsAudioExtension(
                  _("This action modifies the playing offset of the music on "
                    "the specified channel"),
                  _("the playing offset of the music on channel _PARAM1_"),
-                 _("Audio/Music on channels"),
+                 _("Music on channels"),
                  "res/actions/music24.png",
                  "res/actions/music.png")
       .AddCodeOnlyParameter("currentScene", "")
       .AddParameter("expression", _("Channel identifier"))
-      .UseStandardOperatorParameters("number")
+      .UseStandardOperatorParameters(
+          "number",
+          ParameterOptions::MakeNewOptions().SetDescription(
+              _("Position (in seconds)")))
       .MarkAsAdvanced();
 
   extension
@@ -240,7 +266,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsAudioExtension(
                  _("Play a sound"),
                  _("Play a sound."),
                  _("Play the sound _PARAM1_, vol.: _PARAM3_, loop: _PARAM2_"),
-                 _("Audio"),
+                 "",
                  "res/actions/son24.png",
                  "res/actions/son.png")
       .AddCodeOnlyParameter("currentScene", "")
@@ -260,7 +286,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsAudioExtension(
                  _("Play a music file"),
                  _("Play a music file."),
                  _("Play the music _PARAM1_, vol.: _PARAM3_, loop: _PARAM2_"),
-                 _("Audio"),
+                 "",
                  "res/actions/music24.png",
                  "res/actions/music.png")
       .AddCodeOnlyParameter("currentScene", "")
@@ -275,12 +301,105 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsAudioExtension(
       .SetDefaultValue("1")
       .MarkAsSimple();
 
+  extension
+      .AddAction("PreloadMusic",
+                 _("Preload a music file"),
+                 _("Preload a music file in memory."),
+                 _("Preload the music file _PARAM1_"),
+                 _("Loading"),
+                 "res/actions/music24.png",
+                 "res/actions/music.png")
+      .AddCodeOnlyParameter("currentScene", "")
+      .AddParameter("musicfile", _("Audio file (or audio resource name)"))
+      .MarkAsComplex();
+
+  extension
+      .AddAction("PreloadSound",
+                 _("Preload a sound file"),
+                 _("Preload a sound file in memory."),
+                 _("Preload the sound file _PARAM1_"),
+                 _("Loading"),
+                 "res/actions/son24.png",
+                 "res/actions/son.png")
+      .AddCodeOnlyParameter("currentScene", "")
+      .AddParameter("soundfile", _("Sound file (or sound resource name)"))
+      .MarkAsComplex();
+
+  extension
+      .AddAction(
+          "UnloadMusic",
+          _("Unload a music file"),
+          _("Unload a music file from memory. "
+            "Unloading a music file will cause any music playing it to stop."),
+          _("Unload the music file _PARAM1_"),
+          _("Loading"),
+          "res/actions/music24.png",
+          "res/actions/music.png")
+      .AddCodeOnlyParameter("currentScene", "")
+      .AddParameter("musicfile", _("Audio file (or audio resource name)"))
+      .MarkAsComplex();
+
+  extension
+      .AddAction(
+          "UnloadSound",
+          _("Unload a sound file"),
+          _("Unload a sound file from memory. "
+            "Unloading a sound file will cause any sounds playing it to stop."),
+          _("Unload the sound file _PARAM1_"),
+          _("Loading"),
+          "res/actions/son24.png",
+          "res/actions/son.png")
+      .AddCodeOnlyParameter("currentScene", "")
+      .AddParameter("soundfile", _("Sound file (or sound resource name)"))
+      .MarkAsComplex();
+
+  extension
+      .AddAction(
+          "UnloadAllAudio",
+          _("Unload all audio"),
+          _("Unload all the audio in memory. "
+            "This will cause every sound and music of the game to stop."),
+          _("Unload all audio files"),
+          _("Loading"),
+          "res/actions/music24.png",
+          "res/actions/music.png")
+      .AddCodeOnlyParameter("currentScene", "")
+      .MarkAsComplex();
+  extension
+      .AddAction(
+          "FadeSoundVolume",
+          _("Fade the volume of a sound played on a channel."),
+          _("Fade the volume of a sound played on a channel to the specified volume within the specified duration."),
+          _("Fade the sound on channel _PARAM1_ to volume _PARAM2_ within _PARAM3_ seconds"),
+          _("Sounds on channels"),
+          "res/actions/son24.png",
+          "res/actions/son.png")
+      .AddCodeOnlyParameter("currentScene", "")
+      .AddParameter("expression", _("Channel identifier"))
+      .AddParameter("expression", _("Final volume (0-100)"))
+      .AddParameter("expression", _("Fading time in seconds"))
+      .MarkAsAdvanced();
+  extension
+      .AddAction(
+          "FadeMusicVolume",
+          _("Fade the volume of a music played on a channel."),
+          _("Fade the volume of a music played on a channel to the specified volume within the specified duration."),
+          _("Fade the music on channel _PARAM1_ to volume _PARAM2_ within _PARAM3_ seconds"),
+          _("Music on channels"),
+          "res/actions/music24.png",
+          "res/actions/music.png")
+      .AddCodeOnlyParameter("currentScene", "")
+      .AddParameter("expression", _("Channel identifier"))
+      .AddParameter("expression", _("Final volume (0-100)"))
+      .AddParameter("expression", _("Fading time in seconds"))
+      .MarkAsAdvanced();
+
   extension
       .AddCondition("MusicPlaying",
                     _("A music file is being played"),
                     _("Test if the music on a channel is being played"),
                     _("Music on channel _PARAM1_ is being played"),
-                    _("Audio/Music on channels"),
+                    _("Music on channels"),
                     "res/conditions/musicplaying24.png",
                     "res/conditions/musicplaying.png")
       .AddCodeOnlyParameter("currentScene", "")
@@ -292,7 +411,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsAudioExtension(
                     _("A music file is paused"),
                     _("Test if the music on the specified channel is paused."),
                     _("Music on channel _PARAM1_ is paused"),
-                    _("Audio/Music on channels"),
+                    _("Music on channels"),
                     "res/conditions/musicpaused24.png",
                     "res/conditions/musicpaused.png")
       .AddCodeOnlyParameter("currentScene", "")
@@ -304,7 +423,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsAudioExtension(
                     _("A music file is stopped"),
                     _("Test if the music on the specified channel is stopped."),
                     _("Music on channel _PARAM1_ is stopped"),
-                    _("Audio/Music on channels"),
+                    _("Music on channels"),
                     "res/conditions/musicstopped24.png",
                     "res/conditions/musicstopped.png")
       .AddCodeOnlyParameter("currentScene", "")
@@ -316,7 +435,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsAudioExtension(
                     _("A sound is being played"),
                     _("Test if the sound on a channel is being played."),
                     _("Sound on channel _PARAM1_ is being played"),
-                    _("Audio/Sounds on channels"),
+                    _("Sounds on channels"),
                     "res/conditions/sonplaying24.png",
                     "res/conditions/sonplaying.png")
       .AddCodeOnlyParameter("currentScene", "")
@@ -328,7 +447,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsAudioExtension(
                     _("A sound is paused"),
                     _("Test if the sound on the specified channel is paused."),
                     _("Sound on channel _PARAM1_ is paused"),
-                    _("Audio/Sounds on channels"),
+                    _("Sounds on channels"),
                     "res/conditions/sonpaused24.png",
                     "res/conditions/sonpaused.png")
       .AddCodeOnlyParameter("currentScene", "")
@@ -340,7 +459,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsAudioExtension(
                     _("A sound is stopped"),
                     _("Test if the sound on the specified channel is stopped."),
                     _("Sound on channel _PARAM1_ is stopped"),
-                    _("Audio/Sounds on channels"),
+                    _("Sounds on channels"),
                     "res/conditions/sonstopped24.png",
                     "res/conditions/sonstopped.png")
       .AddCodeOnlyParameter("currentScene", "")
@@ -351,15 +470,17 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsAudioExtension(
       .AddCondition(
           "SoundCanalVolume",
           _("Volume of the sound on a channel"),
-          _("Test the volume of the sound on the specified channel. The volume "
-            "is between 0 and 100."),
+          _("Test the volume of the sound on the specified channel."),
           _("the volume of the sound on channel _PARAM1_"),
-          _("Audio/Sounds on channels"),
+          _("Sounds on channels"),
           "res/conditions/sonVolume24.png",
           "res/conditions/sonVolume.png")
       .AddCodeOnlyParameter("currentScene", "")
       .AddParameter("expression", _("Channel identifier"))
-      .UseStandardRelationalOperatorParameters("number")
+      .UseStandardRelationalOperatorParameters(
+          "number",
+          ParameterOptions::MakeNewOptions().SetDescription(
+              _("Volume to compare to (0-100)")))
       .MarkAsAdvanced();
 
   extension
@@ -369,12 +490,15 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsAudioExtension(
           _("Test the volume of the music on a specified channel. The volume "
             "is between 0 and 100."),
           _("the volume of the music on channel _PARAM1_"),
-          _("Audio/Music on channels"),
+          _("Music on channels"),
           "res/conditions/musicVolume24.png",
           "res/conditions/musicVolume.png")
       .AddCodeOnlyParameter("currentScene", "")
       .AddParameter("expression", _("Channel identifier"))
-      .UseStandardRelationalOperatorParameters("number")
+      .UseStandardRelationalOperatorParameters(
+          "number",
+          ParameterOptions::MakeNewOptions().SetDescription(
+              _("Volume to compare to (0-100)")))
       .MarkAsAdvanced();
 
   extension
@@ -383,11 +507,14 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsAudioExtension(
           _("Global volume"),
           _("Test the global sound level. The volume is between 0 and 100."),
           _("the global game volume"),
-          _("Audio"),
+          "",
           "res/conditions/volume24.png",
           "res/conditions/volume.png")
       .AddCodeOnlyParameter("currentScene", "")
-      .UseStandardRelationalOperatorParameters("number");
+      .UseStandardRelationalOperatorParameters(
+          "number",
+          ParameterOptions::MakeNewOptions().SetDescription(
+              _("Volume to compare to (0-100)")));
 
   extension
       .AddCondition(
@@ -396,27 +523,32 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsAudioExtension(
           _("Test the pitch of the sound on the specified channel. 1 is the "
             "default pitch."),
           _("the pitch of the sound on channel _PARAM1_"),
-          _("Audio/Sounds on channels"),
+          _("Sounds on channels"),
           "res/conditions/sonVolume24.png",
           "res/conditions/sonVolume.png")
       .AddCodeOnlyParameter("currentScene", "")
       .AddParameter("expression", _("Channel identifier"))
-      .UseStandardRelationalOperatorParameters("number")
+      .UseStandardRelationalOperatorParameters(
+          "number",
+          ParameterOptions::MakeNewOptions().SetDescription(
+              _("Pitch to compare to (1 by default)")))
       .MarkAsAdvanced();
 
   extension
       .AddCondition(
           "MusicChannelPitch",
           _("Pitch of the music on a channel"),
-          _("Test the pitch (speed) of the music on a specified channel. 1 is "
-            "the default pitch."),
+          _("Test the pitch (speed) of the music on a specified channel."),
           _("the pitch of the music on channel _PARAM1_"),
-          _("Audio/Music on channels"),
+          _("Music on channels"),
           "res/conditions/musicVolume24.png",
           "res/conditions/musicVolume.png")
       .AddCodeOnlyParameter("currentScene", "")
       .AddParameter("expression", _("Channel identifier"))
-      .UseStandardRelationalOperatorParameters("number")
+      .UseStandardRelationalOperatorParameters(
+          "number",
+          ParameterOptions::MakeNewOptions().SetDescription(
+              _("Pitch to compare to (1 by default)")))
       .MarkAsAdvanced();
 
   extension
@@ -425,12 +557,15 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsAudioExtension(
           _("Playing offset of the sound on a channel"),
           _("Test the playing offset of the sound on the specified channel."),
           _("the playing offset of the sound on channel _PARAM1_"),
-          _("Audio/Sounds on channels"),
+          _("Sounds on channels"),
           "res/conditions/sonVolume24.png",
           "res/conditions/sonVolume.png")
       .AddCodeOnlyParameter("currentScene", "")
       .AddParameter("expression", _("Channel identifier"))
-      .UseStandardRelationalOperatorParameters("number")
+      .UseStandardRelationalOperatorParameters(
+          "number",
+          ParameterOptions::MakeNewOptions().SetDescription(
+              _("Position to compare to (in seconds)")))
       .MarkAsAdvanced();
 
   extension
@@ -439,12 +574,15 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsAudioExtension(
           _("Playing offset of the music on a channel"),
           _("Test the playing offset of the music on the specified channel."),
           _("the playing offset of the music on channel _PARAM1_"),
-          _("Audio/Music on channels"),
+          _("Music on channels"),
           "res/conditions/musicVolume24.png",
           "res/conditions/musicVolume.png")
       .AddCodeOnlyParameter("currentScene", "")
       .AddParameter("expression", _("Channel identifier"))
-      .UseStandardRelationalOperatorParameters("number")
+      .UseStandardRelationalOperatorParameters(
+          "number",
+          ParameterOptions::MakeNewOptions().SetDescription(
+              _("Position to compare to (in seconds)")))
       .MarkAsAdvanced();
 
   extension
@@ -508,8 +646,6 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsAudioExtension(
                      _("Sound level"),
                      "res/conditions/volume.png")
       .AddCodeOnlyParameter("currentScene", "");
-
-#endif
 }
 
 }  // namespace gd

Core/GDCore/Extensions/Builtin/CameraExtension.cpp

@@ -4,6 +4,7 @@
  * reserved. This project is released under the MIT License.
  */
 #include "AllBuiltinExtensions.h"
+#include "GDCore/Extensions/Metadata/MultipleInstructionMetadata.h"
 #include "GDCore/Tools/Localization.h"
 
 using namespace std;
@@ -12,152 +13,218 @@ namespace gd {
 void GD_CORE_API BuiltinExtensionsImplementer::ImplementsCameraExtension(
     gd::PlatformExtension& extension) {
   extension
-      .SetExtensionInformation("BuiltinCamera",
-                               _("Cameras and layers features"),
-                               _("Built-in camera extension"),
-                               "Florian Rival",
-                               "Open source (MIT License)")
+      .SetExtensionInformation(
+          "BuiltinCamera",
+          _("Layers and cameras"),
+          "Each scene can be composed of multiple layers. These conditions "
+          "and actions allow to manipulate them during the game. In "
+          "particular, you can move the camera of a layer to center it on an "
+          "object or a position.",
+          "Florian Rival",
+          "Open source (MIT License)")
+      .SetCategory("Camera")
       .SetExtensionHelpPath("/interface/scene-editor/layers-and-cameras");
-
-#if defined(GD_IDE_ONLY)
-  extension
-      .AddCondition("CameraX",
-                    _("Camera center X position"),
-                    _("Compare the X position of the center of a camera."),
-                    _("the X position of camera _PARAM4_ (layer: _PARAM3_)"),
-                    _("Layers and cameras"),
-                    "res/conditions/camera24.png",
-                    "res/conditions/camera.png")
-      .AddCodeOnlyParameter("currentScene", "")
-      .UseStandardRelationalOperatorParameters("number")
-      .AddParameter("layer", _("Layer (base layer if empty)"), "", true)
-      .SetDefaultValue("\"\"")
-      .AddParameter("expression", _("Camera number (default : 0)"), "", true)
-      .SetDefaultValue("0")
-      .MarkAsAdvanced();
+  extension.AddInstructionOrExpressionGroupMetadata(_("Layers and cameras"))
+      .SetIcon("res/conditions/camera24.png");
+  extension.AddInstructionOrExpressionGroupMetadata(_("Effects"))
+      .SetIcon("res/actions/effect_black.svg");
 
   extension
-      .AddCondition("CameraY",
-                    _("Camera center Y position"),
-                    _("Compare the Y position of the center of a camera."),
-                    _("the Y position of camera _PARAM4_ (layer: _PARAM3_)"),
-                    _("Layers and cameras"),
-                    "res/conditions/camera24.png",
-                    "res/conditions/camera.png")
-      .AddCodeOnlyParameter("currentScene", "")
-      .UseStandardRelationalOperatorParameters("number")
-      .AddParameter("layer", _("Layer (base layer if empty)"))
-      .SetDefaultValue("\"\"")
-      .AddParameter("expression", _("Camera number (default : 0)"))
-      .SetDefaultValue("0")
-      .MarkAsAdvanced();
-
-  extension
-      .AddAction(
-          "CameraX",
+      .AddExpressionAndConditionAndAction(
+          "number",
+          "CameraCenterX",
           _("Camera center X position"),
-          _("Change the X position of the center of the specified camera."),
+          _("the X position of the center of a camera"),
           _("the X position of camera _PARAM4_ (layer: _PARAM3_)"),
-          _("Layers and cameras"),
-          "res/conditions/camera24.png",
-          "res/conditions/camera.png")
+          "",
+          "res/conditions/camera24.png")
       .AddCodeOnlyParameter("currentScene", "")
-      .UseStandardOperatorParameters("number")
-      .AddParameter("layer", _("Layer (base layer if empty)"), "", true)
+      .UseStandardParameters("number", ParameterOptions::MakeNewOptions())
+      .AddParameter("layer", _("Layer"), "", true)
       .SetDefaultValue("\"\"")
       .AddParameter("expression", _("Camera number (default : 0)"), "", true)
       .SetDefaultValue("0")
       .MarkAsAdvanced();
 
+  // Compatibility with GD <= 5.0.135
+  extension.AddDuplicatedCondition("CameraX", "CameraCenterX")
+      .SetHidden();  // Deprecated
+  extension.AddDuplicatedExpression("CameraX", "CameraCenterX")
+      .SetHidden();  // Deprecated
+  extension.AddDuplicatedAction("SetCameraX", "SetCameraCenterX")
+      .SetHidden();  // Deprecated
+
+  extension.AddDuplicatedAction("CameraX", "SetCameraX")
+      .SetHidden();  // Deprecated
+
+  extension.AddDuplicatedExpression("VueX", "CameraX")
+      .SetHidden();  // Deprecated
+  // end of compatibility code
+
   extension
-      .AddAction(
-          "CameraY",
+      .AddExpressionAndConditionAndAction(
+          "number",
+          "CameraCenterY",
           _("Camera center Y position"),
-          _("Change the Y position of the center of the specified camera."),
+          _("the Y position of the center of a camera"),
           _("the Y position of camera _PARAM4_ (layer: _PARAM3_)"),
-          _("Layers and cameras"),
-          "res/conditions/camera24.png",
-          "res/conditions/camera.png")
+          "",
+          "res/conditions/camera24.png")
       .AddCodeOnlyParameter("currentScene", "")
-      .UseStandardOperatorParameters("number")
-      .AddParameter("layer", _("Layer (base layer if empty)"), "", true)
+      .UseStandardParameters("number", ParameterOptions::MakeNewOptions())
+      .AddParameter("layer", _("Layer"), "", true)
       .SetDefaultValue("\"\"")
       .AddParameter("expression", _("Camera number (default : 0)"), "", true)
       .SetDefaultValue("0")
       .MarkAsAdvanced();
 
+  // Compatibility with GD <= 5.0.135
+  extension.AddDuplicatedCondition("CameraY", "CameraCenterY")
+      .SetHidden();  // Deprecated
+  extension.AddDuplicatedExpression("CameraY", "CameraCenterY")
+      .SetHidden();  // Deprecated
+  extension.AddDuplicatedAction("SetCameraY", "SetCameraCenterY")
+      .SetHidden();  // Deprecated
+
+  extension.AddDuplicatedAction("CameraY", "SetCameraY")
+      .SetHidden();  // Deprecated
+
+  extension.AddDuplicatedExpression("VueY", "CameraY")
+      .SetHidden();  // Deprecated
+  // end of compatibility code
+
   extension
-      .AddCondition("CameraWidth",
-                    _("Width of a camera"),
-                    _("Test the width of a camera of a layer"),
-                    _("the width of camera _PARAM2_ of layer _PARAM1_"),
-                    _("Layers and cameras"),
-                    "res/conditions/camera24.png",
-                    "res/conditions/camera.png")
+      .AddExpressionAndCondition(
+          "number",
+          "CameraWidth",
+          _("Width of a camera"),
+          _("the width of a camera of a layer"),
+          _("the width of camera _PARAM2_ of layer _PARAM1_"),
+          "",
+          "res/conditions/camera24.png")
       .AddCodeOnlyParameter("currentScene", "")
-      .AddParameter("layer", _("Layer"))
+      .AddParameter("layer", _("Layer"), "", true)
       .SetDefaultValue("\"\"")
-      .AddParameter("expression", _("Camera number"))
-      .UseStandardRelationalOperatorParameters("number")
+      .AddParameter("expression", _("Camera number"), "", true)
+      .UseStandardParameters("number", ParameterOptions::MakeNewOptions())
       .MarkAsAdvanced();
 
   extension
-      .AddCondition("CameraHeight",
-                    _("Height of a camera"),
-                    _("Test the height of a camera of a layer"),
-                    _("the height of camera _PARAM2_ of layer _PARAM1_"),
-                    _("Layers and cameras"),
-                    "res/conditions/camera24.png",
-                    "res/conditions/camera.png")
+      .AddExpressionAndCondition(
+          "number",
+          "CameraHeight",
+          _("Height of a camera"),
+          _("the height of a camera of a layer"),
+          _("the height of camera _PARAM2_ of layer _PARAM1_"),
+          "",
+          "res/conditions/camera24.png")
       .AddCodeOnlyParameter("currentScene", "")
-      .AddParameter("layer", _("Layer (base layer if empty)"))
+      .AddParameter("layer", _("Layer"), "", true)
       .SetDefaultValue("\"\"")
-      .AddParameter("expression", _("Camera number"))
-      .UseStandardRelationalOperatorParameters("number")
+      .AddParameter("expression", _("Camera number"), "", true)
+      .UseStandardParameters("number", ParameterOptions::MakeNewOptions())
       .MarkAsAdvanced();
 
   extension
-      .AddCondition("CameraAngle",
-                    _("Angle of a camera of a layer"),
-                    _("Test a camera angle."),
-                    _("the angle of camera (layer: _PARAM3_, camera: _PARAM4_)"),
-                    _("Layers and cameras"),
-                    "res/conditions/camera24.png",
-                    "res/conditions/camera.png")
+      .AddExpressionAndCondition(
+          "number",
+          "CameraBorderLeft",
+          _("Camera left border position"),
+          _("the position of the left border of a camera"),
+          _("the position of the left border of camera _PARAM2_ of layer "
+            "_PARAM1_"),
+          "",
+          "res/conditions/camera24.png")
       .AddCodeOnlyParameter("currentScene", "")
-      .UseStandardRelationalOperatorParameters("number")
-      .AddParameter("layer", _("Layer (base layer if empty)"), "", true)
+      .AddParameter("layer", _("Layer"), "", true)
+      .SetDefaultValue("\"\"")
+      .AddParameter("expression", _("Camera number"), "", true)
+      .UseStandardParameters("number", ParameterOptions::MakeNewOptions())
+      .MarkAsAdvanced();
+
+  extension
+      .AddExpressionAndCondition(
+          "number",
+          "CameraBorderRight",
+          _("Camera right border position"),
+          _("the position of the right border of a camera"),
+          _("the position of the right border of camera _PARAM2_ of layer "
+            "_PARAM1_"),
+          "",
+          "res/conditions/camera24.png")
+      .AddCodeOnlyParameter("currentScene", "")
+      .AddParameter("layer", _("Layer"), "", true)
+      .SetDefaultValue("\"\"")
+      .AddParameter("expression", _("Camera number"), "", true)
+      .UseStandardParameters("number", ParameterOptions::MakeNewOptions())
+      .MarkAsAdvanced();
+
+  extension
+      .AddExpressionAndCondition(
+          "number",
+          "CameraBorderTop",
+          _("Camera top border position"),
+          _("the position of the top border of a camera"),
+          _("the position of the top border of camera _PARAM2_ of layer "
+            "_PARAM1_"),
+          "",
+          "res/conditions/camera24.png")
+      .AddCodeOnlyParameter("currentScene", "")
+      .AddParameter("layer", _("Layer"), "", true)
+      .SetDefaultValue("\"\"")
+      .AddParameter("expression", _("Camera number"), "", true)
+      .UseStandardParameters("number", ParameterOptions::MakeNewOptions())
+      .MarkAsAdvanced();
+
+  extension
+      .AddExpressionAndCondition(
+          "number",
+          "CameraBorderBottom",
+          _("Camera bottom border position"),
+          _("the position of the bottom border of a camera"),
+          _("the position of the bottom border of camera _PARAM2_ of layer "
+            "_PARAM1_"),
+          "",
+          "res/conditions/camera24.png")
+      .AddCodeOnlyParameter("currentScene", "")
+      .AddParameter("layer", _("Layer"), "", true)
+      .SetDefaultValue("\"\"")
+      .AddParameter("expression", _("Camera number"), "", true)
+      .UseStandardParameters("number", ParameterOptions::MakeNewOptions())
+      .MarkAsAdvanced();
+
+  extension
+      .AddExpressionAndConditionAndAction(
+          "number",
+          "CameraAngle",
+          _("Angle of a camera of a layer"),
+          _("the angle of rotation of a camera (in degrees)"),
+          _("the angle of camera (layer: _PARAM3_, camera: _PARAM4_)"),
+          "",
+          "res/conditions/camera24.png")
+      .AddCodeOnlyParameter("currentScene", "")
+      .UseStandardParameters("number", ParameterOptions::MakeNewOptions())
+      .AddParameter("layer", _("Layer"), "", true)
       .SetDefaultValue("\"\"")
       .AddParameter("expression", _("Camera number (default : 0)"), "", true)
       .SetDefaultValue("0")
       .MarkAsAdvanced();
 
-  extension
-      .AddAction("RotateCamera",
-                 _("Change camera angle"),
-                 _("This action modifies the angle of a camera in the "
-                   "specified layer."),
-                 _("the angle of camera (layer: _PARAM3_, camera: _PARAM4_)"),
-                 _("Layers and cameras"),
-                 "res/actions/camera24.png",
-                 "res/actions/camera.png")
-      .AddCodeOnlyParameter("currentScene", "")
-      .UseStandardOperatorParameters("number")
-      .AddParameter("layer", _("Layer (base layer if empty)"), "", true)
-      .SetDefaultValue("\"\"")
-      .AddParameter("expression", _("Camera number (default : 0)"), "", true)
-      .SetDefaultValue("0");
+  extension.AddDuplicatedAction("RotateCamera", "SetCameraAngle").SetHidden();
+  extension.AddDuplicatedExpression("CameraRotation", "CameraAngle")
+      .SetHidden();
+  extension.AddDuplicatedExpression("VueRotation", "CameraAngle").SetHidden();
 
   extension
       .AddAction("AddCamera",
                  _("Add a camera to a layer"),
                  _("This action adds a camera to a layer"),
                  _("Add a camera to layer _PARAM1_"),
-                 _("Layers and cameras"),
+                 "",
                  "res/actions/camera24.png",
                  "res/actions/camera.png")
       .AddCodeOnlyParameter("currentScene", "")
-      .AddParameter("layer", _("Layer (base layer if empty)"))
+      .AddParameter("layer", _("Layer"))
       .SetDefaultValue("\"\"")
       .AddParameter("expression", _("Width"), "", true)
       .AddParameter("expression", _("Height"), "", true)
@@ -188,11 +255,11 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsCameraExtension(
                  _("Delete a camera of a layer"),
                  _("Remove the specified camera from a layer"),
                  _("Delete camera _PARAM2_ from layer _PARAM1_"),
-                 _("Layers and cameras"),
+                 "",
                  "res/actions/camera24.png",
                  "res/actions/camera.png")
       .AddCodeOnlyParameter("currentScene", "")
-      .AddParameter("layer", _("Layer (base layer if empty)"))
+      .AddParameter("layer", _("Layer"))
       .SetDefaultValue("\"\"")
       .AddParameter("expression", _("Camera number"))
       .MarkAsComplex();
@@ -204,11 +271,11 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsCameraExtension(
                    "layer. The zoom will be reset."),
                  _("Change the size of camera _PARAM2_ of _PARAM1_ to "
                    "_PARAM3_*_PARAM4_"),
-                 _("Layers and cameras"),
+                 "",
                  "res/actions/camera24.png",
                  "res/actions/camera.png")
       .AddCodeOnlyParameter("currentScene", "")
-      .AddParameter("layer", _("Layer (base layer if empty)"))
+      .AddParameter("layer", _("Layer"))
       .SetDefaultValue("\"\"")
       .AddParameter("expression", _("Camera number"))
       .AddParameter("expression", _("Width"))
@@ -222,11 +289,11 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsCameraExtension(
                    "specified layer."),
                  _("Set the render zone of camera _PARAM2_ from layer _PARAM1_ "
                    "to _PARAM3_;_PARAM4_ _PARAM5_;_PARAM6_"),
-                 _("Layers and cameras"),
+                 "",
                  "res/actions/camera24.png",
                  "res/actions/camera.png")
       .AddCodeOnlyParameter("currentScene", "")
-      .AddParameter("layer", _("Layer (base layer if empty)"))
+      .AddParameter("layer", _("Layer"))
       .SetDefaultValue("\"\"")
       .AddParameter("expression", _("Camera number"))
       .AddParameter(
@@ -245,17 +312,17 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsCameraExtension(
 
   extension
       .AddAction("ZoomCamera",
+                 _("Camera zoom"),
                  _("Change camera zoom."),
-                 _("Change camera zoom."),
-                 _("Change camera zoom to _PARAM1_ (layer : _PARAM2_, camera : "
+                 _("Change camera zoom to _PARAM1_ (layer: _PARAM2_, camera: "
                    "_PARAM3_)"),
-                 _("Layers and cameras"),
+                 "",
                  "res/actions/camera24.png",
                  "res/actions/camera.png")
       .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");
@@ -268,9 +335,10 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsCameraExtension(
             "specified limits."),
           _("Center the camera on _PARAM1_ (limit : from _PARAM2_;_PARAM3_ to "
             "_PARAM4_;_PARAM5_) (layer: _PARAM7_, camera: _PARAM8_)"),
-          _("Layers and cameras"),
+          "",
           "res/actions/camera24.png",
           "res/actions/camera.png")
+      .SetHidden()
       .AddCodeOnlyParameter("currentScene", "")
       .AddParameter("objectPtr", _("Object"))
       .AddParameter("expression",
@@ -286,21 +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(
-          "CentreCamera",
-          _("Center the camera on an object"),
-          _("Center the camera on the specified object."),
-          _("Center camera on _PARAM1_ (layer: _PARAM3_, camera: _PARAM4_)"),
-          _("Layers and cameras"),
-          "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"), "", 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_)"),
+                 _("Layers and cameras"),
+                 "res/actions/camera24.png",
+                 "res/actions/camera.png")
       .AddCodeOnlyParameter("currentScene", "")
       .AddParameter("objectPtr", _("Object"))
       .AddParameter("yesorno",
@@ -308,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")
@@ -319,11 +407,11 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsCameraExtension(
                  _("Show a layer"),
                  _("Show a layer."),
                  _("Show layer _PARAM1_"),
-                 _("Layers and cameras"),
+                 "",
                  "res/actions/layer24.png",
                  "res/actions/layer.png")
       .AddCodeOnlyParameter("currentScene", "")
-      .AddParameter("layer", _("Layer (base layer if empty)"))
+      .AddParameter("layer", _("Layer"))
       .SetDefaultValue("\"\"")
       .MarkAsAdvanced();
 
@@ -332,11 +420,11 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsCameraExtension(
                  _("Hide a layer"),
                  _("Hide a layer."),
                  _("Hide layer _PARAM1_"),
-                 _("Layers and cameras"),
+                 "",
                  "res/actions/layer24.png",
                  "res/actions/layer.png")
       .AddCodeOnlyParameter("currentScene", "")
-      .AddParameter("layer", _("Layer (base layer if empty)"))
+      .AddParameter("layer", _("Layer"))
       .SetDefaultValue("\"\"")
       .MarkAsAdvanced();
 
@@ -345,69 +433,69 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsCameraExtension(
                     _("Visibility of a layer"),
                     _("Test if a layer is set as visible."),
                     _("Layer _PARAM1_ is visible"),
-                    _("Layers and cameras"),
+                    "",
                     "res/conditions/layer24.png",
                     "res/conditions/layer.png")
       .AddCodeOnlyParameter("currentScene", "")
-      .AddParameter("layer", _("Layer (base layer if empty)"))
+      .AddParameter("layer", _("Layer"))
       .SetDefaultValue("\"\"")
       .MarkAsAdvanced();
 
   extension
       .AddAction(
           "SetLayerEffectParameter",
-          _("Effect parameter (number)"),
-          _("Change the value of a parameter of an effect.") + "\n" +
-              _("You can find the parameter names (and change the effect "
+          _("Effect property (number)"),
+          _("Change the value of a property of an effect.") + "\n" +
+              _("You can find the property names (and change the effect "
                 "names) in the effects window."),
           _("Set _PARAM3_ to _PARAM4_ for effect _PARAM2_ of layer _PARAM1_"),
-          _("Layers and cameras/Effects"),
-          "res/conditions/camera24.png",
-          "res/conditions/camera.png")
+          _("Effects"),
+          "res/actions/effect_black.svg",
+          "res/actions/effect_black.svg")
       .AddCodeOnlyParameter("currentScene", "")
-      .AddParameter("layer", _("Layer (base layer if empty)"), "", true)
+      .AddParameter("layer", _("Layer"), "", true)
       .SetDefaultValue("\"\"")
-      .AddParameter("string", _("Effect"))
-      .AddParameter("string", _("Parameter name"))
+      .AddParameter("layerEffectName", _("Effect name"))
+      .AddParameter("layerEffectParameterName", _("Property name"))
       .AddParameter("expression", _("New value"))
       .MarkAsAdvanced();
 
   extension
       .AddAction(
           "SetLayerEffectStringParameter",
-          _("Effect parameter (string)"),
-          _("Change the value (string) of a parameter of an effect.") + "\n" +
-              _("You can find the parameter names (and change the effect "
+          _("Effect property (string)"),
+          _("Change the value (string) of a property of an effect.") + "\n" +
+              _("You can find the property names (and change the effect "
                 "names) in the effects window."),
           _("Set _PARAM3_ to _PARAM4_ for effect _PARAM2_ of layer _PARAM1_"),
-          _("Layers and cameras/Effects"),
-          "res/conditions/camera24.png",
-          "res/conditions/camera.png")
+          _("Effects"),
+          "res/actions/effect_black.svg",
+          "res/actions/effect_black.svg")
       .AddCodeOnlyParameter("currentScene", "")
-      .AddParameter("layer", _("Layer (base layer if empty)"), "", true)
+      .AddParameter("layer", _("Layer"), "", true)
       .SetDefaultValue("\"\"")
-      .AddParameter("string", _("Effect"))
-      .AddParameter("string", _("Parameter name"))
+      .AddParameter("layerEffectName", _("Effect name"))
+      .AddParameter("layerEffectParameterName", _("Property name"))
       .AddParameter("string", _("New value"))
       .MarkAsAdvanced();
 
   extension
       .AddAction(
           "SetLayerEffectBooleanParameter",
-          _("Effect parameter (enable or disable)"),
-          _("Enable or disable a parameter of an effect.") + "\n" +
-              _("You can find the parameter names (and change the effect "
+          _("Effect property (enable or disable)"),
+          _("Enable or disable a property of an effect.") + "\n" +
+              _("You can find the property names (and change the effect "
                 "names) in the effects window."),
           _("Enable _PARAM3_ for effect _PARAM2_ of layer _PARAM1_: _PARAM4_"),
-          _("Layers and cameras/Effects"),
-          "res/conditions/camera24.png",
-          "res/conditions/camera.png")
+          _("Effects"),
+          "res/actions/effect_black.svg",
+          "res/actions/effect_black.svg")
       .AddCodeOnlyParameter("currentScene", "")
-      .AddParameter("layer", _("Layer (base layer if empty)"), "", true)
+      .AddParameter("layer", _("Layer"), "", true)
       .SetDefaultValue("\"\"")
-      .AddParameter("string", _("Effect"))
-      .AddParameter("string", _("Parameter name"))
-      .AddParameter("yesorno", _("Enable this parameter"))
+      .AddParameter("layerEffectName", _("Effect name"))
+      .AddParameter("layerEffectParameterName", _("Property name"))
+      .AddParameter("yesorno", _("Enable this property"))
       .MarkAsAdvanced();
 
   extension
@@ -415,13 +503,13 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsCameraExtension(
                     _("Layer effect is enabled"),
                     _("The effect on a layer is enabled"),
                     _("Effect _PARAM2_ on layer _PARAM1_ is enabled"),
-                    _("Layers and cameras/Effects"),
-                    "res/conditions/camera24.png",
-                    "res/conditions/camera.png")
+                    _(""),
+                    "res/actions/effect_black.svg",
+                    "res/actions/effect_black.svg")
       .AddCodeOnlyParameter("currentScene", "")
-      .AddParameter("layer", _("Layer (base layer if empty)"), "", true)
+      .AddParameter("layer", _("Layer"), "", true)
       .SetDefaultValue("\"\"")
-      .AddParameter("string", _("Effect"))
+      .AddParameter("layerEffectName", _("Effect name"))
       .MarkAsAdvanced();
 
   extension
@@ -429,13 +517,13 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsCameraExtension(
                  _("Enable layer effect"),
                  _("Enable an effect on a layer"),
                  _("Enable effect _PARAM2_ on layer _PARAM1_: _PARAM3_"),
-                 _("Layers and cameras/Effects"),
-                 "res/conditions/camera24.png",
-                 "res/conditions/camera.png")
+                 _("Effects"),
+                 "res/actions/effect_black.svg",
+                 "res/actions/effect_black.svg")
       .AddCodeOnlyParameter("currentScene", "")
-      .AddParameter("layer", _("Layer (base layer if empty)"), "", true)
+      .AddParameter("layer", _("Layer"), "", true)
       .SetDefaultValue("\"\"")
-      .AddParameter("string", _("Effect"))
+      .AddParameter("layerEffectName", _("Effect name"))
       .AddParameter("yesorno", _("Enable"), "", true)
       .MarkAsAdvanced();
 
@@ -445,58 +533,86 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsCameraExtension(
           _("Layer time scale"),
           _("Compare the time scale applied to the objects of the layer."),
           _("the time scale of layer _PARAM1_"),
-          _("Layers and cameras/Time"),
+          "",
           "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")
+      .UseStandardRelationalOperatorParameters(
+          "number",
+          gd::ParameterOptions::MakeNewOptions().SetDescription(
+              _("Time scale (1 by default)")))
       .MarkAsAdvanced();
 
   extension
       .AddAction(
           "ChangeLayerTimeScale",
-          _("Change layer time scale"),
+          _("Layer time scale"),
           _("Change the time scale applied to the objects of the layer."),
-          _("Set time scale of layer _PARAM1_ to _PARAM2_"),
-          _("Layers and cameras/Time"),
+          _("Set the time scale of layer _PARAM1_ to _PARAM2_"),
+          "",
           "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...)"));
 
   extension
-      .AddExpression("CameraWidth",
-                     _("Width of a camera of a layer"),
-                     _("Width of a camera of a layer"),
-                     _("Layers and cameras"),
-                     "res/actions/camera.png")
+      .AddCondition("LayerDefaultZOrder",
+                    _("Layer default Z order"),
+                    _("Compare the default Z order set to objects when they "
+                      "are created on a layer."),
+                    _("the default Z order of objects created on _PARAM1_"),
+                    "",
+                    "res/conditions/layer24.png",
+                    "res/conditions/layer.png")
       .AddCodeOnlyParameter("currentScene", "")
-      .AddParameter("layer", _("Layer"))
-      .AddParameter("expression", _("Camera number (default : 0)"))
-      .SetDefaultValue("0");
+      .AddParameter("layer", _("Layer"), "", true)
+      .SetDefaultValue("\"\"")
+      .UseStandardRelationalOperatorParameters(
+          "number", gd::ParameterOptions::MakeNewOptions())
+      .MarkAsAdvanced();
 
   extension
-      .AddExpression("CameraHeight",
-                     _("Height of a camera of a layer"),
-                     _("Height of a camera of a layer"),
-                     _("Layers and cameras"),
-                     "res/actions/camera.png")
+      .AddAction("SetLayerDefaultZOrder",
+                 _("Layer default Z order"),
+                 _("Change the default Z order set to objects when they are "
+                   "created on a layer."),
+                 _("Set the default Z order of objects created on _PARAM1_ to "
+                   "_PARAM2_"),
+                 "",
+                 "res/actions/layer24.png",
+                 "res/actions/layer.png")
       .AddCodeOnlyParameter("currentScene", "")
-      .AddParameter("layer", _("Layer"))
-      .AddParameter("expression", _("Camera number (default : 0)"))
-      .SetDefaultValue("0");
+      .AddParameter("layer", _("Layer"), "", true)
+      .SetDefaultValue("\"\"")
+      .AddParameter("expression", _("New default Z order"));
+
+  extension
+      .AddAction(
+          "SetLayerAmbientLightColor",
+          _("Ambient light color"),
+          _("Set the ambient light color of the lighting layer in format "
+            "\"R;G;B\" string."),
+          _("Set the ambient color of the lighting layer _PARAM1_ to _PARAM2_"),
+          _(""),
+          "res/actions/color24.png",
+          "res/actions/color.png")
+      .AddCodeOnlyParameter("currentScene", "")
+      .AddParameter("layer", _("Layer"), "", true)
+      .SetDefaultValue("\"Lighting\"")
+      .AddParameter("color", _("Color"))
+      .MarkAsAdvanced();
 
   extension
       .AddExpression(
           "CameraViewportLeft",
           _("X position of the top left side point of a render zone"),
           _("X position of the top left side point of a render zone"),
-          _("Layers and cameras"),
+          "",
           "res/actions/camera.png")
       .AddCodeOnlyParameter("currentScene", "")
       .AddParameter("layer", _("Layer"))
@@ -508,7 +624,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsCameraExtension(
           "CameraViewportTop",
           _("Y position of the top left side point of a render zone"),
           _("Y position of the top left side point of a render zone"),
-          _("Layers and cameras"),
+          "",
           "res/actions/camera.png")
       .AddCodeOnlyParameter("currentScene", "")
       .AddParameter("layer", _("Layer"))
@@ -520,7 +636,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsCameraExtension(
           "CameraViewportRight",
           _("X position of the bottom right side point of a render zone"),
           _("X position of the bottom right side point of a render zone"),
-          _("Layers and cameras"),
+          "",
           "res/actions/camera.png")
       .AddCodeOnlyParameter("currentScene", "")
       .AddParameter("layer", _("Layer"))
@@ -532,7 +648,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsCameraExtension(
           "CameraViewportBottom",
           _("Y position of the bottom right side point of a render zone"),
           _("Y position of the bottom right side point of a render zone"),
-          _("Layers and cameras"),
+          "",
           "res/actions/camera.png")
       .AddCodeOnlyParameter("currentScene", "")
       .AddParameter("layer", _("Layer"))
@@ -540,10 +656,10 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsCameraExtension(
       .SetDefaultValue("0");
 
   extension
-      .AddExpression("CameraX",
-                     _("Camera X position"),
-                     _("Camera X position"),
-                     _("Layers and cameras"),
+      .AddExpression("CameraZoom",
+                     _("Zoom of a camera of a layer"),
+                     _("Zoom of a camera of a layer"),
+                     "",
                      "res/actions/camera.png")
       .AddCodeOnlyParameter("currentScene", "")
       .AddParameter("layer", _("Layer"), "", true)
@@ -551,78 +667,23 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsCameraExtension(
       .AddParameter("expression", _("Camera number (default : 0)"), "", true)
       .SetDefaultValue("0");
 
-  extension
-      .AddExpression("VueX",
-                     _("Camera X position"),
-                     _("Camera X position"),
-                     _("Layers and cameras"),
-                     "res/actions/camera.png")
-      .SetHidden()
-      .AddCodeOnlyParameter("currentScene", "")
-      .AddParameter("layer", _("Layer"), "", true)
-      .SetDefaultValue("\"\"")
-      .AddParameter("expression", _("Camera number (default : 0)"), "", true)
-      .SetDefaultValue("0");
-
-  extension
-      .AddExpression("CameraY",
-                     _("Camera Y position"),
-                     _("Camera Y position"),
-                     _("Layers and cameras"),
-                     "res/actions/camera.png")
-      .AddCodeOnlyParameter("currentScene", "")
-      .AddParameter("layer", _("Layer"), "", true)
-      .SetDefaultValue("\"\"")
-      .AddParameter("expression", _("Camera number (default : 0)"), "", true)
-      .SetDefaultValue("0");
-
-  extension
-      .AddExpression("VueY",
-                     _("Camera Y position"),
-                     _("Camera Y position"),
-                     _("Layers and cameras"),
-                     "res/actions/camera.png")
-      .SetHidden()
-      .AddCodeOnlyParameter("currentScene", "")
-      .AddParameter("layer", _("Layer"), "", true)
-      .SetDefaultValue("\"\"")
-      .AddParameter("expression", _("Camera number (default : 0)"), "", true)
-      .SetDefaultValue("0");
-
-  extension
-      .AddExpression("CameraRotation",
-                     _("Angle of a camera of a layer"),
-                     _("Angle of a camera of a layer"),
-                     _("Layers and cameras"),
-                     "res/actions/camera.png")
-      .AddCodeOnlyParameter("currentScene", "")
-      .AddParameter("layer", _("Layer"), "", true)
-      .SetDefaultValue("\"\"")
-      .AddParameter("expression", _("Camera number (default : 0)"), "", true)
-      .SetDefaultValue("0");
-
-  extension
-      .AddExpression("VueRotation",
-                     _("Angle of a camera of a layer"),
-                     _("Angle of a camera of a layer"),
-                     _("Layers and cameras"),
-                     "res/actions/camera.png")
-      .SetHidden()
-      .AddCodeOnlyParameter("currentScene", "")
-      .AddParameter("layer", _("Layer"), "", true)
-      .SetDefaultValue("\"\"")
-      .AddParameter("expression", _("Camera number (default : 0)"), "", true)
-      .SetDefaultValue("0");
-
   extension
       .AddExpression("LayerTimeScale",
-                     _("Time scale"),
-                     _("Time scale"),
-                     _("Layers and cameras"),
+                     _("Layer time scale"),
+                     _("Returns the time scale of the specified layer."),
+                     "",
                      "res/actions/time.png")
       .AddCodeOnlyParameter("currentScene", "")
       .AddParameter("layer", _("Layer"));
-#endif
+
+  extension
+      .AddExpression("LayerDefaultZOrder",
+                     _("Default Z Order for a layer"),
+                     _("Default Z Order for a layer"),
+                     "",
+                     "res/actions/camera.png")
+      .AddCodeOnlyParameter("currentScene", "")
+      .AddParameter("layer", _("Layer"));
 }
 
 }  // namespace gd

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

@@ -0,0 +1,165 @@
+/*
+ * GDevelop Core
+ * Copyright 2008-2016 Florian Rival (Florian.Rival@gmail.com). All rights
+ * reserved. This project is released under the GNU Lesser General Public
+ * License.
+ */
+#include "GDCore/Extensions/Builtin/AllBuiltinExtensions.h"
+#include "GDCore/Extensions/Metadata/MultipleInstructionMetadata.h"
+#include "GDCore/Project/Behavior.h"
+#include "GDCore/Project/BehaviorsSharedData.h"
+#include "GDCore/Project/Object.h"
+#include "GDCore/Tools/Localization.h"
+
+using namespace std;
+namespace gd {
+
+void GD_CORE_API BuiltinExtensionsImplementer::ImplementsAnimatableExtension(
+    gd::PlatformExtension& extension) {
+  extension
+      .SetExtensionInformation("AnimatableCapability",
+                               _("Animatable capability"),
+                               _("Animate objects."),
+                               "Florian Rival",
+                               "Open source (MIT License)")
+      .SetExtensionHelpPath("/objects");
+  extension.AddInstructionOrExpressionGroupMetadata(_("Animatable capability"))
+      .SetIcon("res/actions/animation24.png");
+  extension.AddInstructionOrExpressionGroupMetadata(_("Animations and images"))
+      .SetIcon("res/actions/animation24.png");
+
+  gd::BehaviorMetadata& aut = extension.AddBehavior(
+      "AnimatableBehavior",
+      _("Animatable capability"),
+      "Animation",
+      _("Animate objects."),
+      "",
+      "res/actions/animation24.png",
+      "AnimatableBehavior",
+      std::make_shared<gd::Behavior>(),
+      std::make_shared<gd::BehaviorsSharedData>())
+    .SetHidden();
+
+  aut.AddExpressionAndConditionAndAction(
+         "number",
+         "Index",
+         _("Animation (by number)"),
+         _("the animation played by the object using the animation number (from "
+           "the animations list)"),
+         _("the number of the animation"),
+         _("Animations and images"),
+         "res/actions/animation24.png")
+      .AddParameter("object", _("Object"))
+      .AddParameter("behavior", _("Behavior"), "AnimatableBehavior")
+      .UseStandardParameters(
+          "number", gd::ParameterOptions::MakeNewOptions().SetDescription(
+                        _("Animation index")))
+      .MarkAsSimple();
+  aut.GetAllExpressions()["Index"].SetGroup("");
+
+  aut.AddExpressionAndConditionAndAction(
+         "string",
+         "Name",
+         _("Animation (by name)"),
+         _("the animation played by the object using the name of the "
+           "animation"),
+         _("the animation"),
+         _("Animations and images"),
+         "res/actions/animation24.png")
+      .AddParameter("object", _("Object"))
+      .AddParameter("behavior", _("Behavior"), "AnimatableBehavior")
+      .UseStandardParameters(
+          "objectAnimationName", gd::ParameterOptions::MakeNewOptions().SetDescription(
+                        _("Animation name")))
+      .MarkAsSimple();
+  aut.GetAllStrExpressions()["Name"].SetGroup("");
+
+  aut.AddScopedAction("PauseAnimation",
+                _("Pause the animation"),
+                _("Pause the animation of the object."),
+                _("Pause the animation of _PARAM0_"),
+                _("Animations and images"),
+                "res/actions/animation24.png",
+                "res/actions/animation.png")
+      .AddParameter("object", _("Object"))
+      .AddParameter("behavior", _("Behavior"), "AnimatableBehavior")
+      .MarkAsSimple();
+
+  aut.AddScopedAction("PlayAnimation",
+                _("Resume the animation"),
+                _("Resume the animation of the object."),
+                _("Resume the animation of _PARAM0_"),
+                _("Animations and images"),
+                "res/actions/animation24.png",
+                "res/actions/animation.png")
+      .AddParameter("object", _("Object"))
+      .AddParameter("behavior", _("Behavior"), "AnimatableBehavior")
+      .MarkAsSimple();
+
+  aut.AddExpressionAndConditionAndAction(
+         "number",
+         "SpeedScale",
+         _("Animation speed scale"),
+         _("the animation speed scale (1 = the default speed, >1 = faster and "
+           "<1 = slower)"),
+         _("the animation speed scale"),
+         _("Animations and images"),
+         "res/actions/animation24.png")
+      .AddParameter("object", _("Object"))
+      .AddParameter("behavior", _("Behavior"), "AnimatableBehavior")
+      .UseStandardParameters(
+          "number", gd::ParameterOptions::MakeNewOptions().SetDescription(
+                        _("Speed scale")))
+      .MarkAsSimple();
+  aut.GetAllExpressions()["SpeedScale"].SetGroup("");
+
+  aut.AddScopedCondition("IsAnimationPaused",
+                   _("Animation paused"),
+                   _("Check if the animation of an object is paused."),
+                   _("The animation of _PARAM0_ is paused"),
+                   _("Animations and images"),
+                   "res/conditions/animation24.png",
+                   "res/conditions/animation.png")
+      .AddParameter("object", _("Object"))
+      .AddParameter("behavior", _("Behavior"), "AnimatableBehavior")
+      .MarkAsSimple();
+
+  aut.AddScopedCondition("HasAnimationEnded",
+                   _("Animation finished"),
+                   _("Check if the animation being played by the Sprite object "
+                     "is finished."),
+                   _("The animation of _PARAM0_ is finished"),
+                   _("Animations and images"),
+                   "res/conditions/animation24.png",
+                   "res/conditions/animation.png")
+      .AddParameter("object", _("Object"))
+      .AddParameter("behavior", _("Behavior"), "AnimatableBehavior")
+      .MarkAsSimple();
+
+  aut.AddExpressionAndConditionAndAction(
+         "number",
+         "ElapsedTime",
+         _("Animation elapsed time"),
+         _("the elapsed time from the beginning of the animation (in seconds)"),
+         _("the animation elapsed time"),
+         _("Animations and images"),
+         "res/actions/animation24.png")
+      .AddParameter("object", _("Object"))
+      .AddParameter("behavior", _("Behavior"), "AnimatableBehavior")
+      .UseStandardParameters(
+          "number", gd::ParameterOptions::MakeNewOptions().SetDescription(
+                        _("Elapsed time (in seconds)")))
+      .MarkAsAdvanced();
+  aut.GetAllExpressions()["ElapsedTime"].SetGroup("");
+
+  aut.AddExpression(
+         "Duration",
+         _("Animation duration"),
+         _("Return the current animation duration (in seconds)."),
+         _("Animations and images"),
+         "res/actions/animation24.png")
+      .AddParameter("object", _("Object"))
+      .AddParameter("behavior", _("Behavior"), "AnimatableBehavior");
+}
+
+}  // namespace gd

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

@@ -0,0 +1,116 @@
+/*
+ * GDevelop Core
+ * Copyright 2008-2016 Florian Rival (Florian.Rival@gmail.com). All rights
+ * reserved. This project is released under the GNU Lesser General Public
+ * License.
+ */
+#include "GDCore/Extensions/Builtin/AllBuiltinExtensions.h"
+#include "GDCore/Extensions/Metadata/MultipleInstructionMetadata.h"
+#include "GDCore/Project/Behavior.h"
+#include "GDCore/Project/BehaviorsSharedData.h"
+#include "GDCore/Project/Object.h"
+#include "GDCore/Tools/Localization.h"
+
+using namespace std;
+namespace gd {
+
+void GD_CORE_API BuiltinExtensionsImplementer::ImplementsEffectExtension(
+    gd::PlatformExtension& extension) {
+  extension
+      .SetExtensionInformation("EffectCapability",
+                               _("Effect capability"),
+                               _("Apply visual effects to objects."),
+                               "Florian Rival",
+                               "Open source (MIT License)")
+      .SetExtensionHelpPath("/objects");
+  extension.AddInstructionOrExpressionGroupMetadata(_("Effects"))
+      .SetIcon("res/actions/effect_black.svg");
+
+  gd::BehaviorMetadata& aut = extension.AddBehavior(
+      "EffectBehavior",
+      _("Effect capability"),
+      "Effect",
+      _("Apply visual effects to objects."),
+      "",
+      "res/actions/effect_black.svg",
+      "EffectBehavior",
+      std::make_shared<gd::Behavior>(),
+      std::make_shared<gd::BehaviorsSharedData>())
+    .SetHidden();
+
+  aut.AddScopedAction("EnableEffect",
+                _("Enable an object effect"),
+                _("Enable an effect on the object"),
+                _("Enable effect _PARAM2_ on _PARAM0_: _PARAM3_"),
+                _("Effects"),
+                "res/actions/effect_black.svg",
+                "res/actions/effect_black.svg")
+      .AddParameter("object", _("Object"))
+      .AddParameter("behavior", _("Behavior"), "EffectBehavior")
+      .AddParameter("objectEffectName", _("Effect name"))
+      .AddParameter("yesorno", _("Enable?"))
+      .MarkAsSimple();
+
+  aut.AddScopedAction("SetEffectDoubleParameter",
+                _("Effect property (number)"),
+                _("Change the value of a property of an effect.") + "\n" +
+                    _("You can find the property names (and change the effect "
+                      "names) in the effects window."),
+                _("Set _PARAM3_ to _PARAM4_ for effect _PARAM2_ of _PARAM0_"),
+                _("Effects"),
+                "res/actions/effect_black.svg",
+                "res/actions/effect_black.svg")
+      .AddParameter("object", _("Object"))
+      .AddParameter("behavior", _("Behavior"), "EffectBehavior")
+      .AddParameter("objectEffectName", _("Effect name"))
+      .AddParameter("objectEffectParameterName", _("Property name"))
+      .AddParameter("expression", _("New value"))
+      .MarkAsSimple();
+
+  aut.AddScopedAction("SetEffectStringParameter",
+                _("Effect property (string)"),
+                _("Change the value (string) of a property of an effect.") +
+                    "\n" +
+                    _("You can find the property names (and change the effect "
+                      "names) in the effects window."),
+                _("Set _PARAM3_ to _PARAM4_ for effect _PARAM2_ of _PARAM0_"),
+                _("Effects"),
+                "res/actions/effect_black.svg",
+                "res/actions/effect_black.svg")
+      .AddParameter("object", _("Object"))
+      .AddParameter("behavior", _("Behavior"), "EffectBehavior")
+      .AddParameter("objectEffectName", _("Effect name"))
+      .AddParameter("objectEffectParameterName", _("Property name"))
+      .AddParameter("string", _("New value"))
+      .MarkAsSimple();
+
+  aut.AddScopedAction("SetEffectBooleanParameter",
+                _("Effect property (enable or disable)"),
+                _("Enable or disable a property of an effect.") + "\n" +
+                    _("You can find the property names (and change the effect "
+                      "names) in the effects window."),
+                _("Enable _PARAM3_ for effect _PARAM2_ of _PARAM0_: _PARAM4_"),
+                _("Effects"),
+                "res/actions/effect_black.svg",
+                "res/actions/effect_black.svg")
+      .AddParameter("object", _("Object"))
+      .AddParameter("behavior", _("Behavior"), "EffectBehavior")
+      .AddParameter("objectEffectName", _("Effect name"))
+      .AddParameter("objectEffectParameterName", _("Property name"))
+      .AddParameter("yesorno", _("Enable this property"))
+      .MarkAsSimple();
+
+  aut.AddScopedCondition("IsEffectEnabled",
+                   _("Effect is enabled"),
+                   _("Check if the effect on an object is enabled."),
+                   _("Effect _PARAM2_ of _PARAM0_ is enabled"),
+                   _("Effects"),
+                   "res/actions/effect_black.svg",
+                   "res/actions/effect_black.svg")
+      .AddParameter("object", _("Object"))
+      .AddParameter("behavior", _("Behavior"), "EffectBehavior")
+      .AddParameter("objectEffectName", _("Effect name"))
+      .MarkAsSimple();
+}
+
+}  // namespace gd

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

@@ -0,0 +1,86 @@
+/*
+ * GDevelop Core
+ * Copyright 2008-2016 Florian Rival (Florian.Rival@gmail.com). All rights
+ * reserved. This project is released under the GNU Lesser General Public
+ * License.
+ */
+#include "GDCore/Extensions/Builtin/AllBuiltinExtensions.h"
+#include "GDCore/Extensions/Metadata/MultipleInstructionMetadata.h"
+#include "GDCore/Project/Behavior.h"
+#include "GDCore/Project/BehaviorsSharedData.h"
+#include "GDCore/Project/Object.h"
+#include "GDCore/Tools/Localization.h"
+
+using namespace std;
+namespace gd {
+
+void GD_CORE_API BuiltinExtensionsImplementer::ImplementsFlippableExtension(
+    gd::PlatformExtension& extension) {
+  extension
+      .SetExtensionInformation("FlippableCapability",
+                               _("Flippable capability"),
+                               _("Flip objects."),
+                               "Florian Rival",
+                               "Open source (MIT License)")
+      .SetExtensionHelpPath("/objects");
+  extension.AddInstructionOrExpressionGroupMetadata(_("Effects"))
+      .SetIcon("res/actions/effect_black.svg");
+
+  gd::BehaviorMetadata& aut = extension.AddBehavior(
+      "FlippableBehavior",
+      _("Flippable capability"),
+      "Flippable",
+      _("Flip objects."),
+      "",
+      "res/actions/flipX24.png",
+      "FlippableBehavior",
+      std::make_shared<gd::Behavior>(),
+      std::make_shared<gd::BehaviorsSharedData>())
+    .SetHidden();
+
+  aut.AddScopedAction("FlipX",
+                _("Flip the object horizontally"),
+                _("Flip the object horizontally"),
+                _("Flip horizontally _PARAM0_: _PARAM2_"),
+                _("Effects"),
+                "res/actions/flipX24.png",
+                "res/actions/flipX.png")
+      .AddParameter("object", _("Object"))
+      .AddParameter("behavior", _("Behavior"), "FlippableBehavior")
+      .AddParameter("yesorno", _("Activate flipping"))
+      .MarkAsSimple();
+
+  aut.AddScopedAction("FlipY",
+                _("Flip the object vertically"),
+                _("Flip the object vertically"),
+                _("Flip vertically _PARAM0_: _PARAM2_"),
+                _("Effects"),
+                "res/actions/flipY24.png",
+                "res/actions/flipY.png")
+      .AddParameter("object", _("Object"))
+      .AddParameter("behavior", _("Behavior"), "FlippableBehavior")
+      .AddParameter("yesorno", _("Activate flipping"))
+      .MarkAsSimple();
+
+  aut.AddScopedCondition("FlippedX",
+                   _("Horizontally flipped"),
+                   _("Check if the object is horizontally flipped"),
+                   _("_PARAM0_ is horizontally flipped"),
+                   _("Effects"),
+                   "res/actions/flipX24.png",
+                   "res/actions/flipX.png")
+      .AddParameter("object", _("Object"))
+      .AddParameter("behavior", _("Behavior"), "FlippableBehavior");
+
+  aut.AddScopedCondition("FlippedY",
+                   _("Vertically flipped"),
+                   _("Check if the object is vertically flipped"),
+                   _("_PARAM0_ is vertically flipped"),
+                   _("Effects"),
+                   "res/actions/flipY24.png",
+                   "res/actions/flipY.png")
+      .AddParameter("object", _("Object"))
+      .AddParameter("behavior", _("Behavior"), "FlippableBehavior");
+}
+
+}  // namespace gd

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

@@ -0,0 +1,62 @@
+/*
+ * GDevelop Core
+ * Copyright 2008-2016 Florian Rival (Florian.Rival@gmail.com). All rights
+ * reserved. This project is released under the GNU Lesser General Public
+ * License.
+ */
+#include "GDCore/Extensions/Builtin/AllBuiltinExtensions.h"
+#include "GDCore/Extensions/Metadata/MultipleInstructionMetadata.h"
+#include "GDCore/Project/Behavior.h"
+#include "GDCore/Project/BehaviorsSharedData.h"
+#include "GDCore/Project/Object.h"
+#include "GDCore/Tools/Localization.h"
+
+using namespace std;
+namespace gd {
+
+void GD_CORE_API BuiltinExtensionsImplementer::ImplementsOpacityExtension(
+    gd::PlatformExtension& extension) {
+  extension
+      .SetExtensionInformation("OpacityCapability",
+                               _("Opacity capability"),
+                               _("Change the object opacity."),
+                               "Florian Rival",
+                               "Open source (MIT License)")
+      .SetExtensionHelpPath("/objects");
+  extension.AddInstructionOrExpressionGroupMetadata(_("Opacity capability"))
+      .SetIcon("res/actions/opacity24.png");
+  extension.AddInstructionOrExpressionGroupMetadata(_("Visibility"))
+      .SetIcon("res/actions/opacity24.png");
+
+  gd::BehaviorMetadata& aut = extension.AddBehavior(
+      "OpacityBehavior",
+      _("Opacity capability"),
+      "Opacity",
+      _("Change the object opacity."),
+      "",
+      "res/actions/opacity24.png",
+      "OpacityBehavior",
+      std::make_shared<gd::Behavior>(),
+      std::make_shared<gd::BehaviorsSharedData>())
+    .SetHidden();
+
+  aut.AddExpressionAndConditionAndAction(
+         "number",
+         "Value",
+         _("Opacity"),
+         _("the opacity of an object, between 0 (fully transparent) to 255 "
+           "(opaque)"),
+         _("the opacity"),
+         _("Visibility"),
+         "res/actions/opacity24.png")
+      .AddParameter("object", _("Object"))
+      .AddParameter("behavior", _("Behavior"), "OpacityBehavior")
+      .UseStandardParameters(
+          "number", gd::ParameterOptions::MakeNewOptions().SetDescription(
+                        _("Opacity (0-255)")))
+      .SetFunctionName("setOpacity")
+      .SetGetter("getOpacity");
+  aut.GetAllExpressions()["Value"].SetGroup("");
+}
+
+}  // namespace gd

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

@@ -0,0 +1,112 @@
+/*
+ * GDevelop Core
+ * Copyright 2008-2016 Florian Rival (Florian.Rival@gmail.com). All rights
+ * reserved. This project is released under the GNU Lesser General Public
+ * License.
+ */
+#include "GDCore/Extensions/Builtin/AllBuiltinExtensions.h"
+#include "GDCore/Project/Behavior.h"
+#include "GDCore/Project/BehaviorsSharedData.h"
+#include "GDCore/Project/Object.h"
+#include "GDCore/Tools/Localization.h"
+
+using namespace std;
+namespace gd {
+
+void GD_CORE_API BuiltinExtensionsImplementer::ImplementsResizableExtension(
+    gd::PlatformExtension &extension) {
+  extension
+      .SetExtensionInformation("ResizableCapability",
+                               _("Resizable capability"),
+                               _("Change the object dimensions."),
+                               "Florian Rival",
+                               "Open source (MIT License)")
+      .SetExtensionHelpPath("/objects");
+  extension.AddInstructionOrExpressionGroupMetadata(_("Size")).SetIcon(
+      "res/actions/scale24_black.png");
+
+  gd::BehaviorMetadata &aut =
+      extension
+          .AddBehavior("ResizableBehavior",
+                       _("Resizable capability"),
+                       "Resizable",
+                       _("Change the object dimensions."),
+                       "",
+                       "res/actions/scale24_black.png",
+                       "ResizableBehavior",
+                       std::make_shared<gd::Behavior>(),
+                       std::make_shared<gd::BehaviorsSharedData>())
+          .SetHidden();
+
+  aut.AddScopedAction("SetWidth",
+                      _("Width"),
+                      _("Change the width of the object."),
+                      _("the width"),
+                      _("Size"),
+                      "res/actions/scaleWidth24_black.png",
+                      "res/actions/scaleWidth_black.png")
+      .AddParameter("object", _("Object"))
+      .AddParameter("behavior", _("Behavior"), "ResizableBehavior")
+      .UseStandardOperatorParameters(
+          "number",
+          ParameterOptions::MakeNewOptions().SetDescription(_("Width")))
+      .MarkAsAdvanced();
+
+  aut.AddScopedCondition("Width",
+                         _("Width"),
+                         _("Compare the width of the object."),
+                         _("the width"),
+                         _("Size"),
+                         "res/conditions/scaleWidth24_black.png",
+                         "res/conditions/scaleWidth_black.png")
+      .AddParameter("object", _("Object"))
+      .AddParameter("behavior", _("Behavior"), "ResizableBehavior")
+      .UseStandardRelationalOperatorParameters(
+          "number",
+          ParameterOptions::MakeNewOptions().SetDescription(_("Width")))
+      .MarkAsAdvanced();
+
+  aut.AddScopedAction("SetHeight",
+                      _("Height"),
+                      _("Change the height of the object."),
+                      _("the height"),
+                      _("Size"),
+                      "res/actions/scaleHeight24_black.png",
+                      "res/actions/scaleHeight_black.png")
+      .AddParameter("object", _("Object"))
+      .AddParameter("behavior", _("Behavior"), "ResizableBehavior")
+      .UseStandardOperatorParameters(
+          "number",
+          ParameterOptions::MakeNewOptions().SetDescription(_("Height")))
+      .MarkAsAdvanced();
+
+  aut.AddScopedCondition("Height",
+                         _("Height"),
+                         _("Compare the height of the object."),
+                         _("the height"),
+                         _("Size"),
+                         "res/conditions/scaleHeight24_black.png",
+                         "res/conditions/scaleHeight_black.png")
+      .AddParameter("object", _("Object"))
+      .AddParameter("behavior", _("Behavior"), "ResizableBehavior")
+      .UseStandardRelationalOperatorParameters(
+          "number",
+          ParameterOptions::MakeNewOptions().SetDescription(_("Height")))
+      .MarkAsAdvanced();
+
+  aut.AddScopedAction(
+         "SetSize",
+         _("Size"),
+         _("Change the size of an object."),
+         _("Change the size of _PARAM0_: set to _PARAM2_ x _PARAM3_"),
+         _("Size"),
+         "res/actions/scale24_black.png",
+         "res/actions/scale_black.png")
+      .AddParameter("object", _("Object"))
+      .AddParameter("behavior", _("Behavior"), "ResizableBehavior")
+      .AddParameter("expression", _("Width"))
+      .AddParameter("expression", _("Height"))
+      .MarkAsAdvanced();
+}
+
+}  // namespace gd

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

@@ -0,0 +1,95 @@
+/*
+ * GDevelop Core
+ * Copyright 2008-2016 Florian Rival (Florian.Rival@gmail.com). All rights
+ * reserved. This project is released under the GNU Lesser General Public
+ * License.
+ */
+#include "GDCore/Extensions/Builtin/AllBuiltinExtensions.h"
+#include "GDCore/Extensions/Metadata/MultipleInstructionMetadata.h"
+#include "GDCore/Project/Behavior.h"
+#include "GDCore/Project/BehaviorsSharedData.h"
+#include "GDCore/Project/Object.h"
+#include "GDCore/Tools/Localization.h"
+
+using namespace std;
+namespace gd {
+
+void GD_CORE_API BuiltinExtensionsImplementer::ImplementsScalableExtension(
+    gd::PlatformExtension& extension) {
+  extension
+      .SetExtensionInformation("ScalableCapability",
+                               _("Scalable capability"),
+                               _("Change the object scale."),
+                               "Florian Rival",
+                               "Open source (MIT License)")
+      .SetExtensionHelpPath("/objects");
+  extension.AddInstructionOrExpressionGroupMetadata(_("Scalable capability"))
+      .SetIcon("res/actions/scale24_black.png");
+  extension.AddInstructionOrExpressionGroupMetadata(_("Size"))
+      .SetIcon("res/actions/scale24_black.png");
+
+  gd::BehaviorMetadata& aut = extension.AddBehavior(
+      "ScalableBehavior",
+      _("Scalable capability"),
+      "Scale",
+      _("Change the object scale."),
+      "",
+      "res/actions/scale24_black.png",
+      "ResizableBehavior",
+      std::make_shared<gd::Behavior>(),
+      std::make_shared<gd::BehaviorsSharedData>())
+    .SetHidden();
+
+  aut.AddExpressionAndConditionAndAction(
+         "number",
+         "Value",
+         _("Scale"),
+         _("the scale of the object (default scale is 1)"),
+         _("the scale"),
+         _("Size"),
+         "res/actions/scale24_black.png")
+      .AddParameter("object", _("Object"))
+      .AddParameter("behavior", _("Behavior"), "ScalableBehavior")
+      .UseStandardParameters(
+          "number",
+          gd::ParameterOptions::MakeNewOptions().SetDescription(
+              _("Scale (1 by default)")))
+      .MarkAsAdvanced();
+  aut.GetAllExpressions()["Value"].SetGroup("");
+
+  aut.AddExpressionAndConditionAndAction(
+         "number",
+         "X",
+         _("Scale on X axis"),
+         _("the scale on X axis of the object (default scale is 1)"),
+         _("the scale on X axis"),
+         _("Size"),
+         "res/actions/scaleWidth24_black.png")
+      .AddParameter("object", _("Object"))
+      .AddParameter("behavior", _("Behavior"), "ScalableBehavior")
+      .UseStandardParameters(
+          "number",
+          gd::ParameterOptions::MakeNewOptions().SetDescription(
+              _("Scale (1 by default)")))
+      .MarkAsAdvanced();
+  aut.GetAllExpressions()["X"].SetGroup("");
+
+  aut.AddExpressionAndConditionAndAction(
+         "number",
+         "Y",
+         _("Scale on Y axis"),
+         _("the scale on Y axis of the object (default scale is 1)"),
+         _("the scale on Y axis"),
+         _("Size"),
+         "res/actions/scaleHeight24_black.png")
+      .AddParameter("object", _("Object"))
+      .AddParameter("behavior", _("Behavior"), "ScalableBehavior")
+      .UseStandardParameters(
+          "number",
+          gd::ParameterOptions::MakeNewOptions().SetDescription(
+              _("Scale (1 by default)")))
+      .MarkAsAdvanced();
+  aut.GetAllExpressions()["Y"].SetGroup("");
+}
+
+}  // namespace gd

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

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

Core/GDCore/Extensions/Builtin/CommonConversionsExtension.cpp

@@ -15,28 +15,28 @@ BuiltinExtensionsImplementer::ImplementsCommonConversionsExtension(
   extension
       .SetExtensionInformation(
           "BuiltinCommonConversions",
-          _("Standard Conversions"),
-          _("Built-in extension providing standard conversions expressions."),
+          _("Conversion"),
+          "Expressions to convert number, texts and quantities.",
           "Florian Rival",
           "Open source (MIT License)")
       .SetExtensionHelpPath("/all-features/common-conversions");
-
-#if defined(GD_IDE_ONLY)
+  extension.AddInstructionOrExpressionGroupMetadata(_("Conversion"))
+      .SetIcon("res/conditions/toujours24_black.png");
 
   extension
       .AddExpression("ToNumber",
                      _("Text > Number"),
                      _("Convert the text to a number"),
-                     _("Conversion"),
-                     "res/conditions/toujours24.png")
+                     "",
+                     "res/conditions/toujours24_black.png")
       .AddParameter("string", _("Text to convert to a number"));
 
   extension
       .AddStrExpression("ToString",
                         _("Number > Text"),
                         _("Convert the result of the expression to text"),
-                        _("Conversion"),
-                        "res/conditions/toujours24.png")
+                        "",
+                        "res/conditions/toujours24_black.png")
       .AddParameter("expression", _("Expression to be converted to text"));
 
   extension
@@ -44,8 +44,8 @@ BuiltinExtensionsImplementer::ImplementsCommonConversionsExtension(
                         _("Number > Text ( without scientific notation )"),
                         _("Convert the result of the expression to text, "
                           "without using the scientific notation"),
-                        _("Conversion"),
-                        "res/conditions/toujours24.png")
+                        "",
+                        "res/conditions/toujours24_black.png")
       .AddParameter("expression", _("Expression to be converted to text"));
 
   extension
@@ -53,8 +53,8 @@ BuiltinExtensionsImplementer::ImplementsCommonConversionsExtension(
           "ToRad",
           _("Degrees > Radians"),
           _("Converts the angle, expressed in degrees, into radians"),
-          _("Conversion"),
-          "res/conditions/toujours24.png")
+          "",
+          "res/conditions/toujours24_black.png")
       .AddParameter("expression", _("Angle, in degrees"));
 
   extension
@@ -62,10 +62,76 @@ BuiltinExtensionsImplementer::ImplementsCommonConversionsExtension(
           "ToDeg",
           _("Radians > Degrees"),
           _("Converts the angle, expressed in radians, into degrees"),
-          _("Conversion"),
-          "res/conditions/toujours24.png")
+          "",
+          "res/conditions/toujours24_black.png")
       .AddParameter("expression", _("Angle, in radians"));
-#endif
+
+  extension
+      .AddStrExpression("ToJSON",
+                        _("Convert scene variable to JSON"),
+                        _("Convert a scene variable to JSON"),
+                        _("JSON"),
+                        "res/conditions/toujours24_black.png")
+      .AddParameter("scenevar", _("Scene variable to be stringified"));
+
+  extension
+      .AddStrExpression("GlobalVarToJSON",
+                        _("Convert global variable to JSON"),
+                        _("Convert a global variable to JSON"),
+                        _("JSON"),
+                        "res/conditions/toujours24_black.png")
+      .AddParameter("globalvar", _("The global variable to be stringified"));
+
+  extension
+      .AddStrExpression("ObjectVarToJSON",
+                        _("Convert object variable to JSON"),
+                        _("Convert an object variable to JSON"),
+                        _("JSON"),
+                        "res/conditions/toujours24_black.png")
+      .AddParameter("objectPtr", _("The object with the variable"))
+      .AddParameter("objectvar", _("The object variable to be stringified"));
+
+  extension
+      .AddAction(
+          "JSONToVariableStructure",
+          _("Convert JSON to a scene variable"),
+          _("Parse a JSON object and store it into a scene variable"),
+          _("Convert JSON string _PARAM0_ and store it into variable _PARAM1_"),
+          "",
+          "res/actions/net24.png",
+          "res/actions/net.png")
+      .AddParameter("string", _("JSON string"))
+      .AddParameter("scenevar", _("Variable where store the JSON object"))
+      .MarkAsAdvanced();
+
+  extension
+      .AddAction("JSONToGlobalVariableStructure",
+                 _("Convert JSON to global variable"),
+                 _("Parse a JSON object and store it into a global variable"),
+                 _("Convert JSON string _PARAM0_ and store it into global "
+                   "variable _PARAM1_"),
+                 "",
+                 "res/actions/net24.png",
+                 "res/actions/net.png")
+      .AddParameter("string", _("JSON string"))
+      .AddParameter("globalvar",
+                    _("Global variable where store the JSON object"))
+      .MarkAsAdvanced();
+
+  extension
+      .AddAction("JSONToObjectVariableStructure",
+                 _("Convert JSON to object variable"),
+                 _("Parse a JSON object and store it into an object variable"),
+                 _("Parse JSON string _PARAM0_ and store it into variable "
+                   "_PARAM2_ of _PARAM1_"),
+                 "",
+                 "res/actions/net24.png",
+                 "res/actions/net.png")
+      .AddParameter("string", _("JSON string"))
+      .AddParameter("objectPtr", _("Object"))
+      .AddParameter("objectvar",
+                    _("Object variable where store the JSON object"))
+      .MarkAsAdvanced();
 }
 
 }  // namespace gd

Core/GDCore/Extensions/Builtin/CommonInstructionsExtension.cpp

@@ -4,9 +4,8 @@
  * reserved. This project is released under the MIT License.
  */
 #include "AllBuiltinExtensions.h"
-#include "GDCore/Tools/Localization.h"
-#if defined(GD_IDE_ONLY)
 #include "GDCore/Events/Builtin/CommentEvent.h"
+#include "GDCore/Events/Builtin/ForEachChildVariableEvent.h"
 #include "GDCore/Events/Builtin/ForEachEvent.h"
 #include "GDCore/Events/Builtin/GroupEvent.h"
 #include "GDCore/Events/Builtin/LinkEvent.h"
@@ -14,7 +13,7 @@
 #include "GDCore/Events/Builtin/StandardEvent.h"
 #include "GDCore/Events/Builtin/WhileEvent.h"
 #include "GDCore/Events/Event.h"
-#endif
+#include "GDCore/Tools/Localization.h"
 
 using namespace std;
 namespace gd {
@@ -25,32 +24,59 @@ BuiltinExtensionsImplementer::ImplementsCommonInstructionsExtension(
   extension
       .SetExtensionInformation(
           "BuiltinCommonInstructions",
-          _("Standard events"),
-          _("Built-in extension providing standard events."),
+          _("Events and control flow"),
+          "GDevelop comes with a set of events and conditions that allow to "
+          "express the game logic and rules.",
           "Florian Rival",
           "Open source (MIT License)")
+      .SetCategory("Advanced")
       .SetExtensionHelpPath("/all-features/advanced-conditions");
+  extension
+      .AddInstructionOrExpressionGroupMetadata(_("Events and control flow"))
+      .SetIcon("res/conditions/toujours24_black.png");
+
+  // This condition is deprecated as this does not bring anything new
+  // and can be confusing or misleading for beginners.
+  extension
+      .AddCondition("Always",
+                    _("Always"),
+                    _("This condition always returns true (or always false, if "
+                      "the condition is inverted)."),
+                    _("Always"),
+                    "",
+                    "res/conditions/toujours24_black.png",
+                    "res/conditions/toujours_black.png")
+      .SetHelpPath("/all-features/advanced-conditions")
+      .AddCodeOnlyParameter("conditionInverted", "")
+      .MarkAsAdvanced()
+      .SetHidden();
+
+  // Compatibility with GD <= 5.0.127
+  extension
+      .AddDuplicatedCondition(
+          "Toujours", "BuiltinCommonInstructions::Always", {.unscoped = true})
+      .SetHidden();
+  // end of compatibility code
 
-#if defined(GD_IDE_ONLY)
   extension
       .AddCondition("Or",
                     _("Or"),
-                    _("Return true if one of the sub conditions is true"),
+                    _("Check if one of the sub conditions is true"),
                     _("If one of these conditions is true:"),
-                    _("Advanced"),
-                    "res/conditions/or24.png",
-                    "res/conditions/or.png")
+                    "",
+                    "res/conditions/or24_black.png",
+                    "res/conditions/or_black.png")
       .SetCanHaveSubInstructions()
       .MarkAsAdvanced();
 
   extension
       .AddCondition("And",
                     _("And"),
-                    _("Return true if all sub conditions are true"),
+                    _("Check if all sub conditions are true"),
                     _("If all of these conditions are true:"),
-                    _("Advanced"),
-                    "res/conditions/and24.png",
-                    "res/conditions/and.png")
+                    "",
+                    "res/conditions/and24_black.png",
+                    "res/conditions/and_black.png")
       .SetCanHaveSubInstructions()
       .MarkAsAdvanced();
 
@@ -60,9 +86,9 @@ BuiltinExtensionsImplementer::ImplementsCommonInstructionsExtension(
           _("Not"),
           _("Return the contrary of the result of the sub conditions"),
           _("Invert the logical result of these conditions:"),
-          _("Advanced"),
-          "res/conditions/not24.png",
-          "res/conditions/not.png")
+          "",
+          "res/conditions/not24_black.png",
+          "res/conditions/not_black.png")
       .SetCanHaveSubInstructions()
       .MarkAsAdvanced();
 
@@ -71,10 +97,54 @@ BuiltinExtensionsImplementer::ImplementsCommonInstructionsExtension(
       _("Trigger once while true"),
       _("Run actions only once, for each time the conditions have been met."),
       _("Trigger once"),
-      _("Advanced"),
+      "",
       "res/conditions/once24.png",
       "res/conditions/once.png");
 
+  extension
+      .AddCondition("CompareNumbers",
+                    _("Compare two numbers"),
+                    _("Compare the two numbers."),
+                    _("_PARAM0_ _PARAM1_ _PARAM2_"),
+                    "",
+                    "res/conditions/egal24_black.png",
+                    "res/conditions/egal_black.png")
+      .SetHelpPath("/all-features/advanced-conditions")
+      .AddParameter("expression", _("First expression"))
+      .AddParameter("relationalOperator", _("Sign of the test"), "number")
+      .AddParameter("expression", _("Second expression"))
+      .MarkAsAdvanced();
+
+  // Compatibility with GD <= 5.0.127
+  extension
+      .AddDuplicatedCondition("Egal",
+                              "BuiltinCommonInstructions::CompareNumbers",
+                              {.unscoped = true})
+      .SetHidden();
+  // end of compatibility code
+
+  extension
+      .AddCondition("CompareStrings",
+                    _("Compare two strings"),
+                    _("Compare the two strings."),
+                    _("_PARAM0_ _PARAM1_ _PARAM2_"),
+                    "",
+                    "res/conditions/egal24_black.png",
+                    "res/conditions/egal_black.png")
+      .SetHelpPath("/all-features/advanced-conditions")
+      .AddParameter("string", _("First string expression"))
+      .AddParameter("relationalOperator", _("Sign of the test"), "string")
+      .AddParameter("string", _("Second string expression"))
+      .MarkAsAdvanced();
+
+  // Compatibility with GD <= 5.0.127
+  extension
+      .AddDuplicatedCondition("StrEqual",
+                              "BuiltinCommonInstructions::CompareStrings",
+                              {.unscoped = true})
+      .SetHidden();
+  // end of compatibility code
+
   extension.AddEvent(
       "Standard",
       _("Standard event"),
@@ -84,29 +154,29 @@ BuiltinExtensionsImplementer::ImplementsCommonInstructionsExtension(
       std::make_shared<gd::StandardEvent>());
 
   extension.AddEvent("Link",
-                     _("Link"),
-                     _("Link to some external events"),
+                     _("Link external events"),
+                     _("Link to external events."),
                      "",
                      "res/lienaddicon.png",
                      std::make_shared<gd::LinkEvent>());
 
   extension.AddEvent("Comment",
                      _("Comment"),
-                     _("Event displaying a text in the events editor"),
+                     _("Event displaying a text in the events editor."),
                      "",
                      "res/comment.png",
                      std::make_shared<gd::CommentEvent>());
 
   extension.AddEvent("While",
                      _("While"),
-                     _("The event is repeated while the conditions are true"),
+                     _("Repeat the event while the conditions are true."),
                      "",
                      "res/while.png",
                      std::make_shared<gd::WhileEvent>());
 
   extension.AddEvent("Repeat",
                      _("Repeat"),
-                     _("Event repeated a number of times"),
+                     _("Repeat the event for a specified number of times."),
                      "",
                      "res/repeat.png",
                      std::make_shared<gd::RepeatEvent>());
@@ -118,13 +188,20 @@ BuiltinExtensionsImplementer::ImplementsCommonInstructionsExtension(
                      "res/foreach.png",
                      std::make_shared<gd::ForEachEvent>());
 
+  extension.AddEvent(
+      "ForEachChildVariable",
+      _("For each child variable (of a structure or array)"),
+      _("Repeat the event for each child variable of a structure or array."),
+      "",
+      "res/foreach.png",
+      std::make_shared<gd::ForEachChildVariableEvent>());
+
   extension.AddEvent("Group",
-                     _("Group"),
-                     _("Group containing events"),
+                     _("Event group"),
+                     _("Group containing events."),
                      "",
                      "res/foreach.png",
                      std::make_shared<gd::GroupEvent>());
-#endif
 }
 
 }  // namespace gd

Core/GDCore/Extensions/Builtin/ExternalLayoutsExtension.cpp

@@ -13,32 +13,34 @@ void GD_CORE_API
 BuiltinExtensionsImplementer::ImplementsExternalLayoutsExtension(
     gd::PlatformExtension& extension) {
   extension
-      .SetExtensionInformation(
-          "BuiltinExternalLayouts",
-          _("External layouts"),
-          _("Built-in extension providing actions and conditions related to "
-            "external layouts"),
-          "Florian Rival",
-          "Open source (MIT License)")
-      .SetExtensionHelpPath("/interface/scene-editor/external-layouts");
+      .SetExtensionInformation("BuiltinExternalLayouts",
+                               _("External layouts"),
+                               "Provides actions and conditions related to "
+                               "external layouts.",
+                               "Florian Rival",
+                               "Open source (MIT License)")
+      .SetExtensionHelpPath("/interface/scene-editor/external-layouts")
+      .SetCategory("Advanced");
+  extension.AddInstructionOrExpressionGroupMetadata(_("External layouts"))
+      .SetIcon("res/ribbon_default/externallayout32.png");
 
-#if defined(GD_IDE_ONLY)
   extension
       .AddAction("CreateObjectsFromExternalLayout",
                  _("Create objects from an external layout"),
                  _("Create objects from an external layout."),
                  _("Create objects from the external layout named _PARAM1_"),
-                 _("External layouts"),
-                 "res/conditions/fichier24.png",
-                 "res/conditions/fichier.png")
+                 "",
+                 "res/ribbon_default/externallayout32.png",
+                 "res/ribbon_default/externallayout32.png")
       .AddCodeOnlyParameter("currentScene", "")
-      .AddParameter("string", _("Name of the external layout"))
+      .AddParameter("externalLayoutName", _("Name of the external layout"))
       .AddParameter("expression", _("X position of the origin"), "", true)
       .SetDefaultValue("0")
       .AddParameter("expression", _("Y position of the origin"), "", true)
       .SetDefaultValue("0")
+      .AddParameter("expression", _("Z position of the origin"), "", true)
+      .SetDefaultValue("0")
       .MarkAsAdvanced();
-#endif
 }
 
 }  // namespace gd

Core/GDCore/Extensions/Builtin/FileExtension.cpp

@@ -12,15 +12,19 @@ namespace gd {
 void GD_CORE_API BuiltinExtensionsImplementer::ImplementsFileExtension(
     gd::PlatformExtension& extension) {
   extension
-      .SetExtensionInformation("BuiltinFile",
-                               _("Storage"),
-                               _("Built-in extension providing functions "
-                                 "to store data."),
-                               "Florian Rival",
-                               "Open source (MIT License)")
-      .SetExtensionHelpPath("/all-features/storage");
+      .SetExtensionInformation(
+          "BuiltinFile",
+          _("Storage"),
+          "Actions and conditions to store data (like the player progress or "
+          "anything else to be persisted across game sessions). Data are "
+          "stored on the device and erased when the game is uninstalled.",
+          "Florian Rival",
+          "Open source (MIT License)")
+      .SetExtensionHelpPath("/all-features/storage")
+      .SetCategory("Advanced");
+  extension.AddInstructionOrExpressionGroupMetadata(_("Storage"))
+      .SetIcon("res/conditions/fichier24.png");
 
-#if defined(GD_IDE_ONLY)
   extension
       .AddCondition(
           "GroupExists",
@@ -28,7 +32,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsFileExtension(
           _("Check if an element (example : PlayerState/CurrentLevel) exists "
             "in the stored data.\nSpaces are forbidden in element names."),
           _("_PARAM1_ exists in storage _PARAM0_"),
-          _("Storage"),
+          "",
           "res/conditions/fichier24.png",
           "res/conditions/fichier.png")
       .AddParameter("string", _("Storage name"))
@@ -44,7 +48,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsFileExtension(
             "action, but it will be slower.\nIf you use this action, do not "
             "forget to unload the storage from memory."),
           _("Load storage _PARAM0_ in memory"),
-          _("Storage"),
+          "",
           "res/actions/fichier24.png",
           "res/actions/fichier.png")
       .AddParameter("string", _("Storage name"))
@@ -56,7 +60,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsFileExtension(
                  _("This action closes the structured data previously loaded "
                    "in memory, saving all changes made."),
                  _("Close structured data _PARAM0_"),
-                 _("Storage"),
+                 "",
                  "res/actions/fichier24.png",
                  "res/actions/fichier.png")
       .AddParameter("string", _("Storage name"))
@@ -65,13 +69,13 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsFileExtension(
   extension
       .AddAction(
           "EcrireFichierExp",
-          _("Write a value"),
-          _("Write the result of the expression in the stored data, in the "
+          _("Save a value"),
+          _("Save the result of the expression in the stored data, in the "
             "specified element.\nSpecify the structure leading to the "
             "element using / (example : Root/Level/Current)\nSpaces are "
             "forbidden in element names."),
-          _("Write _PARAM2_ in _PARAM1_ of storage _PARAM0_"),
-          _("Storage"),
+          _("Save _PARAM2_ in _PARAM1_ of storage _PARAM0_"),
+          "",
           "res/actions/fichier24.png",
           "res/actions/fichier.png")
       .AddParameter("string", _("Storage name"))
@@ -81,13 +85,13 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsFileExtension(
   extension
       .AddAction(
           "EcrireFichierTxt",
-          _("Write a text"),
-          _("Write the text in the specified storage, in the specified "
+          _("Save a text"),
+          _("Save the text in the specified storage, in the specified "
             "element.\nSpecify "
             "the structure leading to the element using / (example : "
             "Root/Level/Current)\nSpaces are forbidden in element names."),
-          _("Write _PARAM2_ in _PARAM1_ of storage _PARAM0_"),
-          _("Storage"),
+          _("Save _PARAM2_ in _PARAM1_ of storage _PARAM0_"),
+          "",
           "res/actions/fichier24.png",
           "res/actions/fichier.png")
       .AddParameter("string", _("Storage name"))
@@ -97,13 +101,14 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsFileExtension(
   extension
       .AddAction(
           "LireFichierExp",
-          _("Read a value"),
-          _("Read the value saved in the specified element and store it in a scene"
+          _("Load a value"),
+          _("Load the value saved in the specified element and store it in a "
+            "scene "
             "variable.\nSpecify the structure leading to the element using / "
             "(example : Root/Level/Current)\nSpaces are forbidden in element "
             "names."),
-          _("Read _PARAM1_ from storage _PARAM0_ and store value in _PARAM3_"),
-          _("Storage"),
+          _("Load _PARAM1_ from storage _PARAM0_ and store value in _PARAM3_"),
+          "",
           "res/actions/fichier24.png",
           "res/actions/fichier.png")
       .AddParameter("string", _("Storage name"))
@@ -114,14 +119,15 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsFileExtension(
   extension
       .AddAction(
           "LireFichierTxt",
-          _("Read a text"),
-          _("Read the text saved in the specified element and store it in a scene "
+          _("Load a text"),
+          _("Load the text saved in the specified element and store it in a "
+            "scene "
             "variable.\nSpecify the structure leading to the element using / "
             "(example : Root/Level/Current)\nSpaces are forbidden in element "
             "names."),
-          _("Read _PARAM1_ from storage _PARAM0_ and store as text in "
+          _("Load _PARAM1_ from storage _PARAM0_ and store as text in "
             "_PARAM3_"),
-          _("Storage"),
+          "",
           "res/actions/fichier24.png",
           "res/actions/fichier.png")
       .AddParameter("string", _("Storage name"))
@@ -137,7 +143,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsFileExtension(
                    "element using / (example : Root/Level/Current)\nSpaces are "
                    "forbidden in element names."),
                  _("Delete _PARAM1_ from storage _PARAM0_"),
-                 _("Storage"),
+                 "",
                  "res/actions/delete24.png",
                  "res/actions/delete.png")
       .AddParameter("string", _("Storage name"))
@@ -150,7 +156,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsFileExtension(
           _("Clear a storage"),
           _("Clear the specified storage, removing all data saved in it."),
           _("Delete storage _PARAM0_"),
-          _("Storage"),
+          "",
           "res/actions/delete24.png",
           "res/actions/delete.png")
       .AddParameter("string", _("Storage name"));
@@ -160,37 +166,22 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsFileExtension(
                     _("A storage exists"),
                     _("Test if the specified storage exists."),
                     _("Storage _PARAM0_ exists"),
-                    _("Storage"),
+                    "",
                     "res/conditions/fichier24.png",
                     "res/conditions/fichier.png")
       .AddParameter("string", _("Storage name"))
       .MarkAsAdvanced();
 
-  extension
-      .AddAction("LaunchFile",
-                 _("Open a URL or a file"),
-                 _("This action launches the specified file or URL, in a "
-                   "browser (or in a new tab if the game is using the Web "
-                   "platform and is launched inside a browser)."),
-                 _("Open URL (or file) _PARAM0_"),
-                 _("Files"),
-                 "res/actions/launchFile24.png",
-                 "res/actions/launchFile.png")
-      .AddParameter("string", _("URL (or filename)"))
-      .AddCodeOnlyParameter("currentScene", "")
-      .MarkAsAdvanced();
-
   extension
       .AddAction("ExecuteCmd",
                  _("Execute a command"),
                  _("This action executes the specified command."),
                  _("Execute _PARAM0_"),
-                 _("Files"),
+                 _("Network"),
                  "res/actions/launchFile24.png",
                  "res/actions/launchFile.png")
       .AddParameter("string", _("Command"))
       .MarkAsAdvanced();
-#endif
 }
 
 }  // namespace gd

Core/GDCore/Extensions/Builtin/JoystickExtension.cpp

@@ -1,77 +0,0 @@
-/*
- * GDevelop Core
- * Copyright 2008-2016 Florian Rival (Florian.Rival@gmail.com). All rights
- * reserved. This project is released under the MIT License.
- */
-#include "AllBuiltinExtensions.h"
-#include "GDCore/Tools/Localization.h"
-
-using namespace std;
-namespace gd {
-
-void GD_CORE_API BuiltinExtensionsImplementer::ImplementsJoystickExtension(
-    gd::PlatformExtension& extension) {
-  extension
-      .SetExtensionInformation(
-          "BuiltinJoystick",
-          _("Joysticks features"),
-          _("Built-in extension that enables the use of joysticks"),
-          "Florian Rival",
-          "Open source (MIT License)")
-      .SetExtensionHelpPath("" /*TODO: Add a documentation page for this */);
-
-#if defined(GD_IDE_ONLY)
-  extension
-      .AddCondition("JoystickButtonDown",
-                    _("A button on a joystick is pressed"),
-                    _("Test if a button on a joystick is pressed."),
-                    _("The button _PARAM2_ of joystick _PARAM1_ is pressed"),
-                    _("Joystick"),
-                    "res/conditions/joystick24.png",
-                    "res/conditions/joystick.png")
-      .AddCodeOnlyParameter("currentScene", "")
-      .AddParameter("expression", _("Joystick number (first joystick: 0)"))
-      .AddParameter("expression", _("Button"));
-
-  extension
-      .AddCondition("JoystickAxis",
-                    _("Value of an axis of a joystick"),
-                    _("Test the value of an axis of a joystick."),
-                    _("the value of the axis _PARAM2_ of joystick _PARAM1_"),
-                    _("Joystick"),
-                    "res/conditions/joystick24.png",
-                    "res/conditions/joystick.png")
-      .AddCodeOnlyParameter("currentScene", "")
-      .AddParameter("expression", _("Joystick number (first joystick: 0)"))
-      .AddParameter("joyaxis", _("Axis"))
-      .UseStandardRelationalOperatorParameters("number");
-
-  extension
-      .AddAction(
-          "GetJoystickAxis",
-          _("Get the value of the axis of a joystick"),
-          _("Save the value of the axis of the joystick (from -100 to 100)."),
-          _("Save in _PARAM3_ the value of axis _PARAM2_ of joystick _PARAM1_"),
-          _("Joystick"),
-          "res/actions/joystick24.png",
-          "res/actions/joystick.png")
-      .AddCodeOnlyParameter("currentScene", "")
-      .AddParameter("expression", _("Joystick number (first joystick: 0)"))
-      .AddParameter("joyaxis", _("Axis"))
-      .AddParameter("scenevar", _("Save the result to the scene variable"))
-      .SetManipulatedType("number");
-
-  extension
-      .AddExpression("GetJoystickAxis",
-                     _("Joystick axis"),
-                     _("Value of an axis of a joystick"),
-                     _("Joystick"),
-                     "res/conditions/joystick.png")
-
-      .AddCodeOnlyParameter("currentScene", "")
-      .AddParameter("expression", _("Joystick number (first joystick: 0)"))
-      .AddParameter("joyaxis", _("Axis"));
-#endif
-}
-
-}  // namespace gd

Core/GDCore/Extensions/Builtin/KeyboardExtension.cpp

@@ -14,19 +14,24 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsKeyboardExtension(
   extension
       .SetExtensionInformation(
           "BuiltinKeyboard",
-          _("Keyboard features"),
-          _("Built-in extension that enables the use of a keyboard"),
+          _("Keyboard"),
+          _("Allows your game to respond to keyboard input. Note that this "
+            "does not work with on-screen keyboard on touch devices: use "
+            "instead conditions related to touch when making a game for "
+            "mobile/touchscreen devices."),
           "Florian Rival",
           "Open source (MIT License)")
-      .SetExtensionHelpPath("/all-features/keyboard");
+      .SetExtensionHelpPath("/all-features/keyboard")
+      .SetCategory("Input");
+  extension.AddInstructionOrExpressionGroupMetadata(_("Keyboard"))
+      .SetIcon("res/conditions/keyboard24.png");
 
-#if defined(GD_IDE_ONLY)
   extension
       .AddCondition("KeyPressed",
                     _("Key pressed"),
-                    _("Test if a key is pressed"),
+                    _("Check if a key is pressed"),
                     _("_PARAM1_ key is pressed"),
-                    _("Keyboard"),
+                    "",
                     "res/conditions/keyboard24.png",
                     "res/conditions/keyboard.png")
       .AddCodeOnlyParameter("currentScene", "")
@@ -35,9 +40,9 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsKeyboardExtension(
   extension
       .AddCondition("KeyReleased",
                     _("Key released"),
-                    _("Test if a key was just released"),
+                    _("Check if a key was just released"),
                     _("_PARAM1_ key is released"),
-                    _("Keyboard"),
+                    "",
                     "res/conditions/keyboard24.png",
                     "res/conditions/keyboard.png")
       .AddCodeOnlyParameter("currentScene", "")
@@ -46,35 +51,45 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsKeyboardExtension(
   extension
       .AddCondition("KeyFromTextPressed",
                     _("Key pressed (text expression)"),
-                    _("Test if a key, retrieved from the result of the "
+                    _("Check if a key, retrieved from the result of the "
                       "expression, is pressed"),
                     _("_PARAM1_ key is pressed"),
-                    _("Keyboard"),
+                    "",
                     "res/conditions/keyboard24.png",
                     "res/conditions/keyboard.png")
       .AddCodeOnlyParameter("currentScene", "")
-      .AddParameter("string", _("Expression generating the key to test"))
+      .AddParameter("string", _("Expression generating the key to check"))
       .MarkAsAdvanced();
 
   extension
       .AddCondition("KeyFromTextReleased",
                     _("Key released (text expression)"),
-                    _("Test if a key, retrieved from the result of the "
+                    _("Check if a key, retrieved from the result of the "
                       "expression, was just released"),
                     _("_PARAM1_ key is released"),
-                    _("Keyboard"),
+                    "",
                     "res/conditions/keyboard24.png",
                     "res/conditions/keyboard.png")
       .AddCodeOnlyParameter("currentScene", "")
-      .AddParameter("string", _("Expression generating the key to test"))
+      .AddParameter("string", _("Expression generating the key to check"))
       .MarkAsAdvanced();
 
   extension
       .AddCondition("AnyKeyPressed",
                     _("Any key pressed"),
-                    _("Test if any key is pressed"),
+                    _("Check if any key is pressed"),
                     _("Any key is pressed"),
-                    _("Keyboard"),
+                    "",
+                    "res/conditions/keyboard24.png",
+                    "res/conditions/keyboard.png")
+      .AddCodeOnlyParameter("currentScene", "");
+
+ extension
+      .AddCondition("AnyKeyReleased",
+                    _("Any key released"),
+                    _("Check if any key is released"),
+                    _("Any key is released"),
+                    "",
                     "res/conditions/keyboard24.png",
                     "res/conditions/keyboard.png")
       .AddCodeOnlyParameter("currentScene", "");
@@ -84,10 +99,9 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsKeyboardExtension(
           "LastPressedKey",
           _("Last pressed key"),
           _("Get the name of the latest key pressed on the keyboard"),
-          _("Keyboard"),
+          "",
           "res/conditions/keyboard.png")
       .AddCodeOnlyParameter("currentScene", "");
-#endif
 }
 
 }  // namespace gd

Core/GDCore/Extensions/Builtin/MathematicalToolsExtension.cpp

@@ -15,17 +15,76 @@ BuiltinExtensionsImplementer::ImplementsMathematicalToolsExtension(
   extension.SetExtensionInformation(
       "BuiltinMathematicalTools",
       _("Mathematical tools"),
-      _("Built-in extension providing mathematical tools"),
+      "A set of mathematical functions that can be used in expressions.",
       "Florian Rival",
       "Open source (MIT License)");
+  extension.AddInstructionOrExpressionGroupMetadata(_("Mathematical tools"))
+      .SetIcon("res/mathfunction.png");
 
-#if defined(GD_IDE_ONLY)
+  extension
+      .AddExpression("Random",
+                     _("Random integer"),
+                     _("Random integer"),
+                     "",
+                     "res/dice-6.svg")
+      .SetHelpPath("/all-features/expressions")
+      .AddParameter("expression", _("Maximum value"));
+
+  extension
+      .AddExpression("RandomInRange",
+                     _("Random integer in range"),
+                     _("Random integer in range"),
+                     "",
+                     "res/dice-6.svg")
+      .SetHelpPath("/all-features/expressions")
+      .AddParameter("expression", _("Minimum value"))
+      .AddParameter("expression", _("Maximum value"));
+
+  extension
+      .AddExpression("RandomFloat",
+                     _("Random float"),
+                     _("Random float"),
+                     "",
+                     "res/dice-6.svg")
+      .SetHelpPath("/all-features/expressions")
+      .AddParameter("expression", _("Maximum value"));
+
+  extension
+      .AddExpression("RandomFloatInRange",
+                     _("Random float in range"),
+                     _("Random float in range"),
+                     "",
+                     "res/dice-6.svg")
+      .SetHelpPath("/all-features/expressions")
+      .AddParameter("expression", _("Minimum value"))
+      .AddParameter("expression", _("Maximum value"));
+
+  extension
+      .AddExpression("RandomWithStep",
+                     _("Random value in steps"),
+                     _("Random value in steps"),
+                     "",
+                     "res/dice-6.svg")
+      .SetHelpPath("/all-features/expressions")
+      .AddParameter("expression", _("Minimum value"))
+      .AddParameter("expression", _("Maximum value"))
+      .AddParameter("expression", _("Step"));
+
+  extension
+      .AddExpression("normalize",
+                     _("Normalize a value between `min` and `max` to a value between 0 and 1."),
+                     _("Remap a value between 0 and 1."),
+                     "",
+                     "res/mathfunction.png")
+      .AddParameter("expression", _("Value"))
+      .AddParameter("expression", _("Min"))
+      .AddParameter("expression", _("Max"));
 
   extension
       .AddExpression("clamp",
                      _("Clamp (restrict a value to a given range)"),
                      _("Restrict a value to a given range"),
-                     _("Mathematical tools"),
+                     "",
                      "res/mathfunction.png")
       .AddParameter("expression", _("Value"))
       .AddParameter("expression", _("Min"))
@@ -35,16 +94,38 @@ BuiltinExtensionsImplementer::ImplementsMathematicalToolsExtension(
       .AddExpression("AngleDifference",
                      _("Difference between two angles"),
                      _("Difference between two angles"),
-                     _("Mathematical tools"),
+                     "",
                      "res/mathfunction.png")
-      .AddParameter("expression", _("First angle"))
-      .AddParameter("expression", _("Second angle"));
+      .AddParameter("expression", _("First angle, in degrees"))
+      .AddParameter("expression", _("Second angle, in degrees"));
+
+  extension
+      .AddExpression("AngleBetweenPositions",
+                     _("Angle between two positions"),
+                     _("Compute the angle between two positions (in degrees)."),
+                     "",
+                     "res/mathfunction.png")
+      .AddParameter("expression", _("First point X position"))
+      .AddParameter("expression", _("First point Y position"))
+      .AddParameter("expression", _("Second point X position"))
+      .AddParameter("expression", _("Second point Y position"));
+
+  extension
+      .AddExpression("DistanceBetweenPositions",
+                     _("Distance between two positions"),
+                     _("Compute the distance between two positions."),
+                     "",
+                     "res/mathfunction.png")
+      .AddParameter("expression", _("First point X position"))
+      .AddParameter("expression", _("First point Y position"))
+      .AddParameter("expression", _("Second point X position"))
+      .AddParameter("expression", _("Second point Y position"));
 
   extension
       .AddExpression("mod",
                      _("Modulo"),
                      _("x mod y"),
-                     _("Mathematical tools"),
+                     "",
                      "res/mathfunction.png")
       .AddParameter("expression", _("x (as in x mod y)"))
       .AddParameter("expression", _("y (as in x mod y)"));
@@ -53,7 +134,7 @@ BuiltinExtensionsImplementer::ImplementsMathematicalToolsExtension(
       .AddExpression("min",
                      _("Minimum of two numbers"),
                      _("Minimum of two numbers"),
-                     _("Mathematical tools"),
+                     "",
                      "res/mathfunction.png")
       .AddParameter("expression", _("First expression"))
       .AddParameter("expression", _("Second expression"));
@@ -62,7 +143,7 @@ BuiltinExtensionsImplementer::ImplementsMathematicalToolsExtension(
       .AddExpression("max",
                      _("Maximum of two numbers"),
                      _("Maximum of two numbers"),
-                     _("Mathematical tools"),
+                     "",
                      "res/mathfunction.png")
       .AddParameter("expression", _("First expression"))
       .AddParameter("expression", _("Second expression"));
@@ -71,15 +152,16 @@ BuiltinExtensionsImplementer::ImplementsMathematicalToolsExtension(
       .AddExpression("abs",
                      _("Absolute value"),
                      _("Absolute value"),
-                     _("Mathematical tools"),
+                     "",
                      "res/mathfunction.png")
       .AddParameter("expression", _("Expression"));
 
   extension
       .AddExpression("acos",
                      _("Arccosine"),
-                     _("Arccosine"),
-                     _("Mathematical tools"),
+                     _("Arccosine, return an angle (in radian). "
+                       "`ToDeg` allows to convert it to degrees."),
+                     "",
                      "res/mathfunction.png")
       .AddParameter("expression", _("Expression"));
 
@@ -87,15 +169,16 @@ BuiltinExtensionsImplementer::ImplementsMathematicalToolsExtension(
       .AddExpression("acosh",
                      _("Hyperbolic arccosine"),
                      _("Hyperbolic arccosine"),
-                     _("Mathematical tools"),
+                     "",
                      "res/mathfunction.png")
       .AddParameter("expression", _("Expression"));
 
   extension
       .AddExpression("asin",
                      _("Arcsine"),
-                     _("Arcsine"),
-                     _("Mathematical tools"),
+                     _("Arcsine, return an angle (in radian). "
+                       "`ToDeg` allows to convert it to degrees."),
+                     "",
                      "res/mathfunction.png")
       .AddParameter("expression", _("Expression"));
 
@@ -103,15 +186,16 @@ BuiltinExtensionsImplementer::ImplementsMathematicalToolsExtension(
       .AddExpression("asinh",
                      _("Arcsine"),
                      _("Arcsine"),
-                     _("Mathematical tools"),
+                     "",
                      "res/mathfunction.png")
       .AddParameter("expression", _("Expression"));
 
   extension
       .AddExpression("atan",
                      _("Arctangent"),
-                     _("Arctangent"),
-                     _("Mathematical tools"),
+                     _("Arctangent, return an angle (in radian). "
+                       "`ToDeg` allows to convert it to degrees."),
+                     "",
                      "res/mathfunction.png")
       .AddParameter("expression", _("Expression"));
 
@@ -119,7 +203,7 @@ BuiltinExtensionsImplementer::ImplementsMathematicalToolsExtension(
       .AddExpression("atan2",
                      _("2 argument arctangent"),
                      _("2 argument arctangent (atan2)"),
-                     _("Mathematical tools"),
+                     "",
                      "res/mathfunction.png")
       .AddParameter("expression", _("Y"))
       .AddParameter("expression", _("X"));
@@ -128,7 +212,7 @@ BuiltinExtensionsImplementer::ImplementsMathematicalToolsExtension(
       .AddExpression("atanh",
                      _("Hyperbolic arctangent"),
                      _("Hyperbolic arctangent"),
-                     _("Mathematical tools"),
+                     "",
                      "res/mathfunction.png")
       .AddParameter("expression", _("Expression"));
 
@@ -136,7 +220,7 @@ BuiltinExtensionsImplementer::ImplementsMathematicalToolsExtension(
       .AddExpression("cbrt",
                      _("Cube root"),
                      _("Cube root"),
-                     _("Mathematical tools"),
+                     "",
                      "res/mathfunction.png")
       .AddParameter("expression", _("Expression"));
 
@@ -144,23 +228,42 @@ BuiltinExtensionsImplementer::ImplementsMathematicalToolsExtension(
       .AddExpression("ceil",
                      _("Ceil (round up)"),
                      _("Round number up to an integer"),
-                     _("Mathematical tools"),
+                     "",
                      "res/mathfunction.png")
       .AddParameter("expression", _("Expression"));
 
+  extension
+      .AddExpression("ceilTo",
+                     _("Ceil (round up) to a decimal point"),
+                     _("Round number up to the Nth decimal place"),
+                     "",
+                     "res/mathfunction.png")
+      .AddParameter("expression", _("Expression"))
+      .AddParameter("expression", _("Expression"), "", true);
+
   extension
       .AddExpression("floor",
                      _("Floor (round down)"),
                      _("Round number down to an integer"),
-                     _("Mathematical tools"),
+                     "",
                      "res/mathfunction.png")
       .AddParameter("expression", _("Expression"));
 
+  extension
+      .AddExpression("floorTo",
+                     _("Floor (round down) to a decimal point"),
+                     _("Round number down to the Nth decimal place"),
+                     "",
+                     "res/mathfunction.png")
+      .AddParameter("expression", _("Expression"))
+      .AddParameter("expression", _("Expression"), "", true);
+
   extension
       .AddExpression("cos",
                      _("Cosine"),
-                     _("Cosine of a number"),
-                     _("Mathematical tools"),
+                     _("Cosine of an angle (in radian). "
+                       "If you want to use degrees, use`ToRad`: `sin(ToRad(45))`."),
+                     "",
                      "res/mathfunction.png")
       .AddParameter("expression", _("Expression"));
 
@@ -168,7 +271,7 @@ BuiltinExtensionsImplementer::ImplementsMathematicalToolsExtension(
       .AddExpression("cosh",
                      _("Hyperbolic cosine"),
                      _("Hyperbolic cosine"),
-                     _("Mathematical tools"),
+                     "",
                      "res/mathfunction.png")
       .AddParameter("expression", _("Expression"));
 
@@ -176,7 +279,7 @@ BuiltinExtensionsImplementer::ImplementsMathematicalToolsExtension(
       .AddExpression("cot",
                      _("Cotangent"),
                      _("Cotangent of a number"),
-                     _("Mathematical tools"),
+                     "",
                      "res/mathfunction.png")
       .AddParameter("expression", _("Expression"));
 
@@ -184,7 +287,7 @@ BuiltinExtensionsImplementer::ImplementsMathematicalToolsExtension(
       .AddExpression("csc",
                      _("Cosecant"),
                      _("Cosecant of a number"),
-                     _("Mathematical tools"),
+                     "",
                      "res/mathfunction.png")
       .AddParameter("expression", _("Expression"));
 
@@ -192,7 +295,7 @@ BuiltinExtensionsImplementer::ImplementsMathematicalToolsExtension(
       .AddExpression("int",
                      _("Round"),
                      _("Round a number"),
-                     _("Mathematical tools"),
+                     "",
                      "res/mathfunction.png")
       .SetHidden()
       .AddParameter("expression", _("Expression"));
@@ -201,7 +304,7 @@ BuiltinExtensionsImplementer::ImplementsMathematicalToolsExtension(
       .AddExpression("rint",
                      _("Round"),
                      _("Round a number"),
-                     _("Mathematical tools"),
+                     "",
                      "res/mathfunction.png")
       .SetHidden()
       .AddParameter("expression", _("Expression"));
@@ -210,15 +313,24 @@ BuiltinExtensionsImplementer::ImplementsMathematicalToolsExtension(
       .AddExpression("round",
                      _("Round"),
                      _("Round a number"),
-                     _("Mathematical tools"),
+                     "",
                      "res/mathfunction.png")
       .AddParameter("expression", _("Expression"));
 
+  extension
+      .AddExpression("roundTo",
+                     _("Round to a decimal point"),
+                     _("Round a number to the Nth decimal place"),
+                     "",
+                     "res/mathfunction.png")
+      .AddParameter("expression", _("Expression"))
+      .AddParameter("expression", _("Expression"), "", true);
+
   extension
       .AddExpression("exp",
                      _("Exponential"),
                      _("Exponential of a number"),
-                     _("Mathematical tools"),
+                     "",
                      "res/mathfunction.png")
       .AddParameter("expression", _("Expression"));
 
@@ -226,7 +338,7 @@ BuiltinExtensionsImplementer::ImplementsMathematicalToolsExtension(
       .AddExpression("log",
                      _("Logarithm"),
                      _("Logarithm"),
-                     _("Mathematical tools"),
+                     "",
                      "res/mathfunction.png")
       .AddParameter("expression", _("Expression"));
 
@@ -234,7 +346,7 @@ BuiltinExtensionsImplementer::ImplementsMathematicalToolsExtension(
       .AddExpression("ln",
                      _("Logarithm"),
                      _("Logarithm"),
-                     _("Mathematical tools"),
+                     "",
                      "res/mathfunction.png")
       .SetHidden()
       .AddParameter("expression", _("Expression"));
@@ -243,7 +355,7 @@ BuiltinExtensionsImplementer::ImplementsMathematicalToolsExtension(
       .AddExpression("log2",
                      _("Base-2 logarithm"),
                      _("Base 2 Logarithm"),
-                     _("Mathematical tools"),
+                     "",
                      "res/mathfunction.png")
       .AddParameter("expression", _("Expression"));
 
@@ -251,7 +363,7 @@ BuiltinExtensionsImplementer::ImplementsMathematicalToolsExtension(
       .AddExpression("log10",
                      _("Base-10 logarithm"),
                      _("Base-10 logarithm"),
-                     _("Mathematical tools"),
+                     "",
                      "res/mathfunction.png")
       .AddParameter("expression", _("Expression"));
 
@@ -259,7 +371,7 @@ BuiltinExtensionsImplementer::ImplementsMathematicalToolsExtension(
       .AddExpression("nthroot",
                      _("Nth root"),
                      _("Nth root of a number"),
-                     _("Mathematical tools"),
+                     "",
                      "res/mathfunction.png")
       .AddParameter("expression", _("Number"))
       .AddParameter("expression", _("N"));
@@ -268,7 +380,7 @@ BuiltinExtensionsImplementer::ImplementsMathematicalToolsExtension(
       .AddExpression("pow",
                      _("Power"),
                      _("Raise a number to power n"),
-                     _("Mathematical tools"),
+                     "",
                      "res/mathfunction.png")
       .AddParameter("expression", _("Number"))
       .AddParameter("expression", _("The exponent (n in x^n)"));
@@ -277,7 +389,7 @@ BuiltinExtensionsImplementer::ImplementsMathematicalToolsExtension(
       .AddExpression("sec",
                      _("Secant"),
                      _("Secant"),
-                     _("Mathematical tools"),
+                     "",
                      "res/mathfunction.png")
       .AddParameter("expression", _("Expression"));
 
@@ -285,15 +397,16 @@ BuiltinExtensionsImplementer::ImplementsMathematicalToolsExtension(
       .AddExpression("sign",
                      _("Sign of a number"),
                      _("Return the sign of a number (1,-1 or 0)"),
-                     _("Mathematical tools"),
+                     "",
                      "res/mathfunction.png")
       .AddParameter("expression", _("Expression"));
 
   extension
       .AddExpression("sin",
                      _("Sine"),
-                     _("Sine of a number"),
-                     _("Mathematical tools"),
+                     _("Sine of an angle (in radian). "
+                       "If you want to use degrees, use`ToRad`: `sin(ToRad(45))`."),
+                     "",
                      "res/mathfunction.png")
       .AddParameter("expression", _("Expression"));
 
@@ -301,7 +414,7 @@ BuiltinExtensionsImplementer::ImplementsMathematicalToolsExtension(
       .AddExpression("sinh",
                      _("Hyperbolic sine"),
                      _("Hyperbolic sine"),
-                     _("Mathematical tools"),
+                     "",
                      "res/mathfunction.png")
       .AddParameter("expression", _("Expression"));
 
@@ -309,15 +422,16 @@ BuiltinExtensionsImplementer::ImplementsMathematicalToolsExtension(
       .AddExpression("sqrt",
                      _("Square root"),
                      _("Square root of a number"),
-                     _("Mathematical tools"),
+                     "",
                      "res/mathfunction.png")
       .AddParameter("expression", _("Expression"));
 
   extension
       .AddExpression("tan",
                      _("Tangent"),
-                     _("Tangent of a number"),
-                     _("Mathematical tools"),
+                     _("Tangent of an angle (in radian). "
+                       "If you want to use degrees, use`ToRad`: `tan(ToRad(45))`."),
+                     "",
                      "res/mathfunction.png")
       .AddParameter("expression", _("Expression"));
 
@@ -325,7 +439,7 @@ BuiltinExtensionsImplementer::ImplementsMathematicalToolsExtension(
       .AddExpression("tanh",
                      _("Hyperbolic tangent"),
                      _("Hyperbolic tangent"),
-                     _("Mathematical tools"),
+                     "",
                      "res/mathfunction.png")
       .AddParameter("expression", _("Expression"));
 
@@ -333,7 +447,7 @@ BuiltinExtensionsImplementer::ImplementsMathematicalToolsExtension(
       .AddExpression("trunc",
                      _("Truncation"),
                      _("Truncate a number"),
-                     _("Mathematical tools"),
+                     "",
                      "res/mathfunction.png")
       .AddParameter("expression", _("Expression"));
 
@@ -341,13 +455,53 @@ BuiltinExtensionsImplementer::ImplementsMathematicalToolsExtension(
       .AddExpression("lerp",
                      _("Lerp (Linear interpolation)"),
                      _("Linearly interpolate a to b by x"),
-                     _("Mathematical tools"),
+                     "",
                      "res/mathfunction.png")
       .AddParameter("expression", _("a (in a+(b-a)*x)"))
       .AddParameter("expression", _("b (in a+(b-a)*x)"))
       .AddParameter("expression", _("x (in a+(b-a)*x)"));
 
-#endif
+  extension
+      .AddExpression("XFromAngleAndDistance",
+                     _("X position from angle and distance"),
+                     _("Compute the X position when given an angle and distance "
+                      "relative to the origin (0;0). This is also known as "
+                      "getting the cartesian coordinates of a 2D vector, using "
+                      "its polar coordinates."),
+                     "",
+                     "res/mathfunction.png")
+      .AddParameter("expression", _("Angle, in degrees"))
+      .AddParameter("expression", _("Distance"));
+
+  extension
+      .AddExpression("YFromAngleAndDistance",
+                     _("Y position from angle and distance"),
+                     _("Compute the Y position when given an angle and distance "
+                      "relative to the origin (0;0). This is also known as "
+                      "getting the cartesian coordinates of a 2D vector, using "
+                      "its polar coordinates."),
+                     "",
+                     "res/mathfunction.png")
+      .AddParameter("expression", _("Angle, in degrees"))
+      .AddParameter("expression", _("Distance"));
+
+  extension
+      .AddExpression("Pi",
+                     _("Number Pi (3.1415...)"),
+                     _("The number Pi (3.1415...)"),
+                     "",
+                     "res/mathfunction.png")
+      .SetHelpPath("/all-features/expressions");
+
+  extension
+      .AddExpression("lerpAngle",
+                     _("Lerp (Linear interpolation) between two angles"),
+                     _("Linearly interpolates between two angles (in degrees) by taking the shortest direction around the circle."),
+                     "",
+                     "res/mathfunction.png")
+      .AddParameter("expression", _("Starting angle, in degrees"))
+      .AddParameter("expression", _("Destination angle, in degrees"))
+      .AddParameter("expression", _("Interpolation value between 0 and 1."));
 }
 
 }  // namespace gd

Core/GDCore/Extensions/Builtin/MouseExtension.cpp

@@ -4,6 +4,7 @@
  * reserved. This project is released under the MIT License.
  */
 #include "AllBuiltinExtensions.h"
+#include "GDCore/Extensions/Metadata/MultipleInstructionMetadata.h"
 #include "GDCore/Tools/Localization.h"
 
 using namespace std;
@@ -14,13 +15,21 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsMouseExtension(
   extension
       .SetExtensionInformation(
           "BuiltinMouse",
-          _("Mouse features"),
-          _("Built-in extension that enables the use of a mouse"),
+          _("Mouse and touch"),
+          "Conditions and actions to handle either the mouse or touches on "
+          "touchscreen. By default, conditions related to the mouse will also "
+          "handle the touches - so that it's easier to handle both in your "
+          "game. You can disable this behavior if you want to handle them "
+          "separately in different events.",
           "Florian Rival",
           "Open source (MIT License)")
-      .SetExtensionHelpPath("/all-features/mouse-touch");
+      .SetExtensionHelpPath("/all-features/mouse-touch")
+      .SetCategory("Input");
+  extension.AddInstructionOrExpressionGroupMetadata(_("Mouse and touch"))
+      .SetIcon("res/actions/mouse24.png");
+  extension.AddInstructionOrExpressionGroupMetadata(_("Multitouch"))
+      .SetIcon("res/conditions/touch24.png");
 
-#if defined(GD_IDE_ONLY)
   extension
       .AddCondition(
           "IsMouseWheelScrollingUp",
@@ -28,7 +37,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsMouseExtension(
           _("Check if the mouse wheel is scrolling up. Use MouseWheelDelta "
             "expression if you want to know the amount that was scrolled."),
           _("The mouse wheel is scrolling up"),
-          _("Mouse and touch"),
+          "",
           "res/actions/mouse24.png",
           "res/actions/mouse.png")
 
@@ -42,7 +51,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsMouseExtension(
           _("Check if the mouse wheel is scrolling down. Use MouseWheelDelta "
             "expression if you want to know the amount that was scrolled."),
           _("The mouse wheel is scrolling down"),
-          _("Mouse and touch"),
+          "",
           "res/actions/mouse24.png",
           "res/actions/mouse.png")
 
@@ -60,7 +69,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsMouseExtension(
             "touchscreens. If you want to have multitouch and differentiate "
             "mouse movement and touches, just deactivate it with this action."),
           _("Move mouse cursor when touching screen: _PARAM1_"),
-          _("Mouse and touch"),
+          "",
           "res/conditions/touch24.png",
           "res/conditions/touch.png")
 
@@ -75,7 +84,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsMouseExtension(
                  _("Center cursor horizontally"),
                  _("Put the cursor in the middle of the screen horizontally."),
                  _("Center cursor horizontally"),
-                 _("Mouse and touch"),
+                 "",
                  "res/actions/mouse24.png",
                  "res/actions/mouse.png")
 
@@ -87,7 +96,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsMouseExtension(
                  _("Center cursor vertically"),
                  _("Put the cursor in the middle of the screen vertically."),
                  _("Center cursor vertically"),
-                 _("Mouse and touch"),
+                 "",
                  "res/actions/mouse24.png",
                  "res/actions/mouse.png")
 
@@ -99,7 +108,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsMouseExtension(
                  _("Hide the cursor"),
                  _("Hide the cursor."),
                  _("Hide the cursor"),
-                 _("Mouse and touch"),
+                 "",
                  "res/actions/mouse24.png",
                  "res/actions/mouse.png")
       .AddCodeOnlyParameter("currentScene", "")
@@ -110,7 +119,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsMouseExtension(
                  _("Show the cursor"),
                  _("Show the cursor."),
                  _("Show the cursor"),
-                 _("Mouse and touch"),
+                 "",
                  "res/actions/mouse24.png",
                  "res/actions/mouse.png")
 
@@ -122,7 +131,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsMouseExtension(
                  _("Position the cursor of the mouse"),
                  _("Position the cursor at the given coordinates."),
                  _("Position cursor at _PARAM1_;_PARAM2_"),
-                 _("Mouse and touch"),
+                 "",
                  "res/actions/mouse24.png",
                  "res/actions/mouse.png")
 
@@ -136,7 +145,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsMouseExtension(
                  _("Center the cursor"),
                  _("Center the cursor on the screen."),
                  _("Center the cursor"),
-                 _("Mouse and touch"),
+                 "",
                  "res/actions/mouse24.png",
                  "res/actions/mouse.png")
 
@@ -144,89 +153,187 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsMouseExtension(
       .MarkAsAdvanced();
 
   extension
-      .AddCondition("SourisX",
-                    _("Cursor X position"),
-                    _("Compare the X position of the cursor or of a touch."),
-                    _("the cursor X position"),
-                    _("Mouse and touch"),
-                    "res/conditions/mouse24.png",
-                    "res/conditions/mouse.png")
+      .AddExpressionAndCondition(
+          "number",
+          "CursorX",
+          _("Cursor X position"),
+          _("the X position of the cursor or of a touch"),
+          _("the cursor (or touch) X position"),
+          "",
+          "res/conditions/mouse24.png")
       .AddCodeOnlyParameter("currentScene", "")
-      .UseStandardRelationalOperatorParameters("number")
-      .AddParameter("layer", _("Layer (base layer if empty)"), "", true)
+      .UseStandardParameters("number", ParameterOptions::MakeNewOptions())
+      .AddParameter("layer", _("Layer"), "", true)
       .SetDefaultValue("\"\"")
       .AddParameter("expression", _("Camera number (default : 0)"), "", true)
       .SetDefaultValue("0");
 
+  // Support for deprecated names:
+  extension.AddDuplicatedCondition("MouseX", "CursorX").SetHidden();
+  extension.AddDuplicatedExpression("MouseX", "CursorX").SetHidden();
+  extension.AddDuplicatedCondition("SourisX", "CursorX").SetHidden();
+  extension.AddDuplicatedExpression("SourisX", "CursorX").SetHidden();
+
   extension
-      .AddCondition("SourisY",
-                    _("Cursor Y position"),
-                    _("Compare the Y position of the cursor or of a touch."),
-                    _("the cursor Y position"),
-                    _("Mouse and touch"),
-                    "res/conditions/mouse24.png",
-                    "res/conditions/mouse.png")
+      .AddExpressionAndCondition(
+          "number",
+          "CursorY",
+          _("Cursor Y position"),
+          _("the Y position of the cursor or of a touch"),
+          _("the cursor (or touch) Y position"),
+          "",
+          "res/conditions/mouse24.png")
       .AddCodeOnlyParameter("currentScene", "")
-      .UseStandardRelationalOperatorParameters("number")
-      .AddParameter("layer", _("Layer (base layer if empty)"), "", true)
+      .UseStandardParameters("number", ParameterOptions::MakeNewOptions())
+      .AddParameter("layer", _("Layer"), "", true)
       .SetDefaultValue("\"\"")
       .AddParameter("expression", _("Camera number (default : 0)"), "", true)
       .SetDefaultValue("0");
 
+  // Support for deprecated names:
+  extension.AddDuplicatedCondition("MouseY", "CursorY").SetHidden();
+  extension.AddDuplicatedExpression("MouseY", "CursorY").SetHidden();
+  extension.AddDuplicatedCondition("SourisY", "CursorY").SetHidden();
+  extension.AddDuplicatedExpression("SourisY", "CursorY").SetHidden();
+
   extension
-      .AddCondition("SourisBouton",
+      .AddExpressionAndCondition("number",
+                                 "MouseOnlyCursorX",
+                                 _("Mouse cursor X position"),
+                                 _("the X position of the mouse cursor"),
+                                 _("the mouse cursor X position"),
+                                 "",
+                                 "res/conditions/mouse24.png")
+      .AddCodeOnlyParameter("currentScene", "")
+      .UseStandardParameters("number", ParameterOptions::MakeNewOptions())
+      .AddParameter("layer", _("Layer"), "", true)
+      .SetDefaultValue("\"\"")
+      .AddParameter("expression", _("Camera number (default : 0)"), "", true)
+      .SetDefaultValue("0")
+      // It's only useful for extensions as they can't use TouchSimulateMouse.
+      .SetHidden();
+
+  extension
+      .AddExpressionAndCondition("number",
+                                 "MouseOnlyCursorY",
+                                 _("Mouse cursor Y position"),
+                                 _("the Y position of the mouse cursor"),
+                                 _("the mouse cursor Y position"),
+                                 "",
+                                 "res/conditions/mouse24.png")
+      .AddCodeOnlyParameter("currentScene", "")
+      .UseStandardParameters("number", ParameterOptions::MakeNewOptions())
+      .AddParameter("layer", _("Layer"), "", true)
+      .SetDefaultValue("\"\"")
+      .AddParameter("expression", _("Camera number (default : 0)"), "", true)
+      .SetDefaultValue("0")
+      // It's only useful for extensions as they can't use TouchSimulateMouse.
+      .SetHidden();
+
+  extension
+      .AddCondition("IsMouseInsideCanvas",
+                    _("Mouse cursor is inside the window"),
+                    _("Check if the mouse cursor is inside the window."),
+                    _("The mouse cursor is inside the window"),
+                    "",
+                    "res/conditions/mouse24.png",
+                    "res/conditions/mouse.png")
+      .AddCodeOnlyParameter("currentScene", "")
+      .MarkAsAdvanced();
+
+  extension
+      .AddCondition("MouseButtonPressed",
                     _("Mouse button pressed or touch held"),
-                    _("Return true if the specified mouse button is pressed or "
+                    _("Check if the specified mouse button is pressed or "
                       "if a touch is in contact with the screen."),
                     _("Touch or _PARAM1_ mouse button is down"),
-                    _("Mouse and touch"),
+                    "",
                     "res/conditions/mouse24.png",
                     "res/conditions/mouse.png")
       .AddCodeOnlyParameter("currentScene", "")
-      .AddParameter("mouse", _("Button to test"))
+      .AddParameter("mouse", _("Button to check"))
+      .MarkAsSimple();
+
+  // Support for deprecated names:
+  extension.AddDuplicatedCondition("SourisBouton", "MouseButtonPressed")
+      .SetHidden();
+
+  extension
+      .AddCondition("MouseButtonReleased",
+                    _("Mouse button released"),
+                    _("Check if the specified mouse button was released."),
+                    _("_PARAM1_ mouse button was released"),
+                    "",
+                    "res/conditions/mouse24.png",
+                    "res/conditions/mouse.png")
+      .AddCodeOnlyParameter("currentScene", "")
+      .AddParameter("mouse", _("Button to check"))
       .MarkAsSimple();
 
   extension
       .AddCondition(
-          "MouseButtonReleased",
-          _("Mouse button released"),
-          _("Return true if the specified mouse button was released."),
-          _("_PARAM1_ mouse button was released"),
-          _("Mouse and touch"),
+          "MouseButtonFromTextPressed",
+          _("Mouse button pressed or touch held (text expression)"),
+          _("Check if a mouse button, retrieved from the result of the "
+            "expression, is pressed."),
+          _("_PARAM1_ mouse button is pressed"),
+          "",
           "res/conditions/mouse24.png",
           "res/conditions/mouse.png")
       .AddCodeOnlyParameter("currentScene", "")
-      .AddParameter("mouse", _("Button to test"))
-      .MarkAsSimple();
+      .AddParameter("stringWithSelector",
+                    _("Expression generating the mouse button to check"),
+                    "[\"Left\", \"Right\", \"Middle\"]")
+      .SetParameterLongDescription(
+          _("Possible values are Left, Right and Middle."))
+      .MarkAsAdvanced();
 
   extension
-      .AddCondition("TouchX",
-                    _("Touch X position"),
-                    _("Compare the X position of a specific touch."),
-                    _("the touch #_PARAM1_ X position"),
-                    _("Mouse and touch/Multitouch"),
-                    "res/conditions/touch24.png",
-                    "res/conditions/touch.png")
+      .AddCondition(
+          "MouseButtonFromTextReleased",
+          _("Mouse button released (text expression)"),
+          _("Check if a mouse button, retrieved from the result of the "
+            "expression, was just released."),
+          _("_PARAM1_ mouse button is released"),
+          "",
+          "res/conditions/mouse24.png",
+          "res/conditions/mouse.png")
+      .AddCodeOnlyParameter("currentScene", "")
+      .AddParameter("stringWithSelector",
+                    _("Expression generating the mouse button to check"),
+                    "[\"Left\", \"Right\", \"Middle\"]")
+      .SetParameterLongDescription(
+          _("Possible values are Left, Right and Middle."))
+      .MarkAsAdvanced();
+
+  extension
+      .AddExpressionAndCondition("number",
+                                 "TouchX",
+                                 _("Touch X position"),
+                                 _("the X position of a specific touch"),
+                                 _("the touch #_PARAM1_ X position"),
+                                 _("Multitouch"),
+                                 "res/conditions/touch24.png")
       .AddCodeOnlyParameter("currentScene", "")
       .AddParameter("expression", _("Touch identifier"))
-      .UseStandardRelationalOperatorParameters("number")
-      .AddParameter("layer", _("Layer (base layer if empty)"), "", true)
+      .UseStandardParameters("number", ParameterOptions::MakeNewOptions())
+      .AddParameter("layer", _("Layer"), "", true)
       .SetDefaultValue("\"\"")
       .AddParameter("expression", _("Camera number (default : 0)"), "", true)
       .SetDefaultValue("0");
 
   extension
-      .AddCondition("TouchY",
-                    _("Touch Y position"),
-                    _("Compare the Y position of a specific touch."),
-                    _("the touch #_PARAM1_ Y position"),
-                    _("Mouse and touch/Multitouch"),
-                    "res/conditions/touch24.png",
-                    "res/conditions/touch.png")
+      .AddExpressionAndCondition("number",
+                                 "TouchY",
+                                 _("Touch Y position"),
+                                 _("the Y position of a specific touch"),
+                                 _("the touch #_PARAM1_ Y position"),
+                                 _("Multitouch"),
+                                 "res/conditions/touch24.png")
       .AddCodeOnlyParameter("currentScene", "")
       .AddParameter("expression", _("Touch identifier"))
-      .UseStandardRelationalOperatorParameters("number")
-      .AddParameter("layer", _("Layer (base layer if empty)"), "", true)
+      .UseStandardParameters("number", ParameterOptions::MakeNewOptions())
+      .AddParameter("layer", _("Layer"), "", true)
       .SetDefaultValue("\"\"")
       .AddParameter("expression", _("Camera number (default : 0)"), "", true)
       .SetDefaultValue("0");
@@ -235,123 +342,136 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsMouseExtension(
       .AddCondition(
           "PopStartedTouch",
           _("A new touch has started"),
-          _("Return true if a touch has started. The touch identifier can be "
+          _("Check if a touch has started. The touch identifier can be "
             "accessed using LastTouchId().\nAs more than one touch can be "
             "started, this condition is only true once for each touch: the "
             "next time you use it, it will be for a new touch, or it will "
             "return false if no more touches have just started."),
           _("A new touch has started"),
-          _("Mouse and touch/Multitouch"),
+          _("Multitouch"),
           "res/conditions/touch24.png",
           "res/conditions/touch.png")
-      .AddCodeOnlyParameter("currentScene", "");
+      .AddCodeOnlyParameter("currentScene", "")
+      .SetHidden();
 
   extension
       .AddCondition(
           "PopEndedTouch",
           _("A touch has ended"),
-          _("Return true if a touch has ended. The touch identifier can be "
+          _("Check if a touch has ended. The touch identifier can be "
             "accessed using LastEndedTouchId().\nAs more than one touch can be "
             "ended, this condition is only true once for each touch: the next "
             "time you use it, it will be for a new touch, or it will return "
             "false if no more touches have just ended."),
           _("A touch has ended"),
-          _("Mouse and touch/Multitouch"),
+          _("Multitouch"),
+          "res/conditions/touch24.png",
+          "res/conditions/touch.png")
+      .AddCodeOnlyParameter("currentScene", "")
+      .SetHidden();
+
+  extension
+      .AddCondition(
+          "HasAnyTouchStarted",
+          _("A new touch has started"),
+          _("Check if a touch has just started on this frame. The touch "
+            "identifiers can be "
+            "accessed using StartedTouchId() and StartedTouchCount()."),
+          _("A new touch has started"),
+          _("Multitouch"),
+          "res/conditions/touch24.png",
+          "res/conditions/touch.png")
+      .AddCodeOnlyParameter("currentScene", "")
+      .SetHidden();
+
+  extension
+      .AddExpression("StartedTouchCount",
+                     _("Started touch count"),
+                     _("The number of touches that have just started on this "
+                       "frame. The touch identifiers can be "
+                       "accessed using StartedTouchId()."),
+                     _("Multitouch"),
+                     "res/conditions/touch.png")
+      .AddCodeOnlyParameter("currentScene", "")
+      .SetHidden();
+
+  extension
+      .AddExpression("StartedTouchId",
+                     _("Started touch identifier"),
+                     _("The identifier of the touch that has just started on "
+                       "this frame. The number of touches can be "
+                       "accessed using StartedTouchCount()."),
+                     _("Multitouch"),
+                     "res/conditions/touch.png")
+      .AddCodeOnlyParameter("currentScene", "")
+      .AddParameter("expression", _("Touch index"))
+      .SetHidden();
+
+  extension
+      .AddCondition(
+          "HasAnyTouchOrMouseStarted",
+          _("A new touch has started"),
+          _("Check if a touch has just started or the mouse left button has "
+            "been pressed on this frame. The touch identifiers can be "
+            "accessed using StartedTouchOrMouseId() and "
+            "StartedTouchOrMouseCount()."),
+          _("A new touch has started"),
+          _("Multitouch"),
           "res/conditions/touch24.png",
           "res/conditions/touch.png")
       .AddCodeOnlyParameter("currentScene", "");
 
   extension
-      .AddExpression("MouseX",
-                     _("Cursor X position"),
-                     _("Cursor X position"),
-                     _("Mouse cursor"),
-                     "res/actions/mouse.png")
-      .AddCodeOnlyParameter("currentScene", "")
-      .AddParameter("layer", _("Layer"), "", true)
-      .SetDefaultValue("\"\"")
-      .AddParameter("camera", _("Camera"), "", true)
-      .SetDefaultValue("0");
+      .AddExpression(
+          "StartedTouchOrMouseCount",
+          _("Started touch count"),
+          _("The number of touches (including the mouse) that have just "
+            "started on this frame. The touch identifiers can be "
+            "accessed using StartedTouchOrMouseId()."),
+          _("Multitouch"),
+          "res/conditions/touch.png")
+      .AddCodeOnlyParameter("currentScene", "");
 
   extension
-      .AddExpression("SourisX",
-                     _("Cursor X position"),
-                     _("Cursor X position"),
-                     _("Mouse cursor"),
-                     "res/actions/mouse.png")
+      .AddExpression(
+          "StartedTouchOrMouseId",
+          _("Started touch identifier"),
+          _("The identifier of the touch or mouse that has just started on "
+            "this frame. The number of touches can be "
+            "accessed using StartedTouchOrMouseCount()."),
+          _("Multitouch"),
+          "res/conditions/touch.png")
       .AddCodeOnlyParameter("currentScene", "")
-      .AddParameter("layer", _("Layer"), "", true)
-      .SetDefaultValue("\"\"")
-      .AddParameter("camera", _("Camera"), "", true)
-      .SetDefaultValue("0")
-      .SetHidden();
+      .AddParameter("expression", _("Touch index"));
 
   extension
-      .AddExpression("MouseY",
-                     _("Cursor Y position"),
-                     _("Cursor Y position"),
-                     _("Mouse cursor"),
-                     "res/actions/mouse.png")
+      .AddCondition("HasTouchEnded",
+                    _("A touch has ended"),
+                    _("Check if a touch has ended or a mouse left button has "
+                      "been released."),
+                    _("The touch with identifier _PARAM1_ has ended"),
+                    _("Multitouch"),
+                    "res/conditions/touch24.png",
+                    "res/conditions/touch.png")
       .AddCodeOnlyParameter("currentScene", "")
-      .AddParameter("layer", _("Layer"), "", true)
-      .SetDefaultValue("\"\"")
-      .AddParameter("camera", _("Camera"), "", true)
-      .SetDefaultValue("0");
-
-  extension
-      .AddExpression("SourisY",
-                     _("Cursor Y position"),
-                     _("Cursor Y position"),
-                     _("Mouse cursor"),
-                     "res/actions/mouse.png")
-      .AddCodeOnlyParameter("currentScene", "")
-      .AddParameter("layer", _("Layer"), "", true)
-      .SetDefaultValue("\"\"")
-      .AddParameter("camera", _("Camera"), "", true)
-      .SetDefaultValue("0")
-      .SetHidden();
+      .AddParameter("expression", _("Touch identifier"));
 
   extension
       .AddExpression("MouseWheelDelta",
                      _("Mouse wheel: Displacement"),
                      _("Mouse wheel displacement"),
-                     _("Mouse cursor"),
+                     _("Mouse and touch"),
                      "res/actions/mouse.png")
       .AddCodeOnlyParameter("currentScene", "");
 
-  extension
-      .AddExpression("TouchX",
-                     _("Touch X position"),
-                     _("Touch X position"),
-                     _("Multitouch"),
-                     "res/conditions/touch.png")
-      .AddCodeOnlyParameter("currentScene", "")
-      .AddParameter("expression", _("Touch identifier"))
-      .AddParameter("layer", _("Layer"), "", true)
-      .SetDefaultValue("\"\"")
-      .AddParameter("camera", _("Camera"), "", true)
-      .SetDefaultValue("0");
-
-  extension
-      .AddExpression("TouchY",
-                     _("Touch Y position"),
-                     _("Touch Y position"),
-                     _("Multitouch"),
-                     "res/conditions/touch.png")
-      .AddCodeOnlyParameter("currentScene", "")
-      .AddParameter("expression", _("Touch identifier"))
-      .AddParameter("layer", _("Layer"), "", true)
-      .SetDefaultValue("\"\"")
-      .AddParameter("camera", _("Camera"), "", true)
-      .SetDefaultValue("0");
-
   extension
       .AddExpression("LastTouchId",
                      _("Identifier of the last touch"),
                      _("Identifier of the last touch"),
                      _("Multitouch"),
                      "res/conditions/touch.png")
-      .AddCodeOnlyParameter("currentScene", "");
+      .AddCodeOnlyParameter("currentScene", "")
+      .SetHidden();
 
   extension
       .AddExpression("LastEndedTouchId",
@@ -359,9 +479,8 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsMouseExtension(
                      _("Identifier of the last ended touch"),
                      _("Multitouch"),
                      "res/conditions/touch.png")
-      .AddCodeOnlyParameter("currentScene", "");
-
-#endif
+      .AddCodeOnlyParameter("currentScene", "")
+      .SetHidden();
 }
 
 }  // namespace gd

Core/GDCore/Extensions/Builtin/NetworkExtension.cpp

@@ -14,52 +14,118 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsNetworkExtension(
   extension
       .SetExtensionInformation(
           "BuiltinNetwork",
-          _("Basic internet features"),
-          _("Built-in extension providing network features."),
+          _("Network"),
+          _("Features to send web requests, communicate with external \"APIs\" "
+            "and other network related tasks."),
           "Florian Rival",
           "Open source (MIT License)")
-      .SetExtensionHelpPath("/all-features/network");
+      .SetExtensionHelpPath("/all-features/network")
+      .SetCategory("Network");
+  extension.AddInstructionOrExpressionGroupMetadata(_("Network"))
+      .SetIcon("res/actions/net24.png");
 
-#if defined(GD_IDE_ONLY)
   extension
       .AddAction(
           "SendRequest",
+          "Send a request to a web page",
+          "Send a request to the specified web page.\n\nPlease note that for "
+          "the web games, the game must be hosted on the same host "
+          "as specified below, except if the server is configured to answer "
+          "to all requests (cross-domain requests).",
+          "Send _PARAM3_ request to _PARAM0__PARAM1_ with body: _PARAM2_",
+          "",
+          "res/actions/net24.png",
+          "res/actions/net.png")
+      .AddParameter("string", "Host, with protocol")
+      .SetParameterLongDescription("Example: \"http://example.com/\".")
+      .AddParameter("string", "Path")
+      .SetParameterLongDescription(
+          "Example: \"/user/123\" or \"/some-page.php\".")
+      .AddParameter("string", "Request body content")
+      .AddParameter("string", "Method: \"POST\" or \"GET\"", "", true)
+      .SetParameterLongDescription("If empty, \"GET\" will be used.")
+      .SetDefaultValue("\"GET\"")
+      .AddParameter("string", "Content type", "", true)
+      .SetParameterLongDescription(
+          "If empty, \"application/x-www-form-urlencoded\" will be used.")
+      .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 "
+          "action \"Convert JSON to a scene variable\" afterwards, to "
+          "explore the results with a *structure variable*.")
+      .MarkAsComplex()
+      .SetHidden();
+
+  extension
+      .AddAction(
+          "SendAsyncRequest",
           _("Send a request to a web page"),
-          _("Send a request to the specified web page.\n\nPlease note that for "
+          _("Send an asynchronous request to the specified web page.\n\nPlease "
+            "note that for "
             "the web games, the game must be hosted on the same host "
             "as specified below, except if the server is configured to answer "
             "to all requests (cross-domain requests)."),
-          _("Send _PARAM3_ request to _PARAM0__PARAM1_ with body: _PARAM2_"),
-          _("Network"),
+          _("Send a _PARAM2_ request to _PARAM0_ with body: _PARAM1_, and "
+            "store the result in _PARAM4_ (or in _PARAM5_ in case of error)"),
+          "",
           "res/actions/net24.png",
           "res/actions/net.png")
-      .AddParameter("string", _("Host, with protocol"))
+      .AddParameter("string", _("URL (API or web-page address)"))
       .SetParameterLongDescription(
-          _("Example: \"http://example.com/\"."))
-      .AddParameter("string", _("Path"))
-      .SetParameterLongDescription(_("Example: \"/user/123\" or \"/some-page.php\"."))
+          _("Example: \"https://example.com/user/123\". Using *https* is "
+            "highly recommended."))
       .AddParameter("string", _("Request body content"))
-      .AddParameter("string", _("Method: \"POST\" or \"GET\""), "", true)
+      .AddParameter("stringWithSelector",
+                    _("Request method"),
+                    "[\"GET\", \"POST\", \"PUT\", \"HEAD\", \"DELETE\", "
+                    "\"PATCH\", \"OPTIONS\"]",
+                    false)
       .SetParameterLongDescription(_("If empty, \"GET\" will be used."))
       .SetDefaultValue("\"GET\"")
       .AddParameter("string", _("Content type"), "", true)
       .SetParameterLongDescription(
           _("If empty, \"application/x-www-form-urlencoded\" will be used."))
-      .AddParameter("scenevar", _("Reponse scene variable"), "", true)
+      .AddParameter(
+          "scenevar", _("Variable where to store the response"), "", 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 "
             "action \"Convert JSON to a scene variable\" afterwards, to "
             "explore the results with a *structure variable*."))
+      .AddParameter(
+          "scenevar", _("Variable where to store the error message"), "", true)
+      .SetParameterLongDescription(_(
+          "Optional, only used if an error occurs. This will contain the "
+          "[\"status "
+          "code\"](https://en.wikipedia.org/wiki/List_of_HTTP_status_codes) "
+          "if the server returns a status >= 400. If the request was not sent "
+          "at all (e.g. no internet or CORS issues), the variable will be set "
+          "to "
+          "\"REQUEST_NOT_SENT\"."))
       .MarkAsComplex();
 
+  extension
+      .AddAction("LaunchFile",
+                 _("Open a URL (web page) or a file"),
+                 _("This action launches the specified file or URL, in a "
+                   "browser (or in a new tab if the game is using the Web "
+                   "platform and is launched inside a browser)."),
+                 _("Open URL _PARAM0_ in a browser (or new tab)"),
+                 "",
+                 "res/actions/net24.png",
+                 "res/actions/net.png")
+      .AddParameter("string", _("URL (or filename)"))
+      .AddCodeOnlyParameter("currentScene", "")
+      .MarkAsAdvanced();
+
   extension
       .AddAction(
           "DownloadFile",
           _("Download a file"),
           _("Download a file from a web site"),
           _("Download file _PARAM1_ from _PARAM0_ under the name of _PARAM2_"),
-          _("Network"),
+          "",
           "res/actions/net24.png",
           "res/actions/net.png")
       .AddParameter("string", _("Host (for example : http://www.website.com)"))
@@ -69,71 +135,19 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsNetworkExtension(
 
   extension
       .AddAction(
-          "JSONToVariableStructure",
-          _("Convert JSON to a scene variable"),
-          _("Parse a JSON object and store it into a scene variable"),
-          _("Parse JSON string _PARAM0_ and store it into variable _PARAM1_"),
-          _("Network"),
+          "EnableMetrics",
+          _("Enable (or disable) metrics collection"),
+          _("Enable, or disable, the sending of anonymous data used to compute "
+            "the number of sessions and other metrics from your game "
+            "players.\nBe sure to only send metrics if in accordance with the "
+            "terms of service of your game and if they player gave their "
+            "consent, depending on how your game/company handles this."),
+          _("Enable analytics metrics: _PARAM1_"),
+          "",
           "res/actions/net24.png",
           "res/actions/net.png")
-      .AddParameter("string", _("JSON string"))
-      .AddParameter("scenevar", _("Variable where store the JSON object"))
-      .MarkAsAdvanced();
-
-  extension
-      .AddAction("JSONToGlobalVariableStructure",
-                 _("Convert JSON to global variable"),
-                 _("Parse a JSON object and store it into a global variable"),
-                 _("Parse JSON string _PARAM0_ and store it into global "
-                   "variable _PARAM1_"),
-                 _("Network"),
-                 "res/actions/net24.png",
-                 "res/actions/net.png")
-      .AddParameter("string", _("JSON string"))
-      .AddParameter("globalvar",
-                    _("Global variable where store the JSON object"))
-      .MarkAsAdvanced();
-
-  extension
-      .AddAction("JSONToObjectVariableStructure",
-                 _("Convert JSON to object variable"),
-                 _("Parse a JSON object and store it into an object variable"),
-                 _("Parse JSON string _PARAM0_ and store it into variable "
-                   "_PARAM2_ of _PARAM1_"),
-                 _("Network"),
-                 "res/actions/net24.png",
-                 "res/actions/net.png")
-      .AddParameter("string", _("JSON string"))
-      .AddParameter("objectPtr", _("Object"))
-      .AddParameter("objectvar",
-                    _("Object variable where store the JSON object"))
-      .MarkAsAdvanced();
-
-  extension
-      .AddStrExpression("ToJSON",
-                        _("Convert scene variable to JSON"),
-                        _("Convert a scene variable to JSON"),
-                        _("Conversion"),
-                        "res/conditions/toujours24.png")
-      .AddParameter("scenevar", _("Scene variable to be stringified"));
-
-  extension
-      .AddStrExpression("GlobalVarToJSON",
-                        _("Convert global variable to JSON"),
-                        _("Convert a global variable to JSON"),
-                        _("Conversion"),
-                        "res/conditions/toujours24.png")
-      .AddParameter("globalvar", _("The global variable to be stringified"));
-
-  extension
-      .AddStrExpression("ObjectVarToJSON",
-                        _("Convert object variable to JSON"),
-                        _("Convert an object variable to JSON"),
-                        _("Conversion"),
-                        "res/conditions/toujours24.png")
-      .AddParameter("objectPtr", _("The object with the variable"))
-      .AddParameter("objectvar", _("The object variable to be stringified"));
-#endif
+      .AddCodeOnlyParameter("currentScene", "")
+      .AddParameter("yesorno", _("Enable the metrics?"));
 }
 
 }  // namespace gd

Core/GDCore/Extensions/Builtin/SceneExtension.cpp

@@ -5,6 +5,7 @@
  */
 #include "AllBuiltinExtensions.h"
 #include "GDCore/Tools/Localization.h"
+#include "GDCore/Extensions/Metadata/MultipleInstructionMetadata.h"
 
 using namespace std;
 namespace gd {
@@ -14,68 +15,19 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsSceneExtension(
   extension
       .SetExtensionInformation(
           "BuiltinScene",
-          _("Scene management features"),
-          _("Built-in extension allowing to manipulate scenes and providing common features"),
+          _("Scene"),
+          _("Actions and conditions to manipulate the scenes during the game."),
           "Florian Rival",
           "Open source (MIT License)")
       .SetExtensionHelpPath("" /*TODO: Add a documentation page for this */);
-
-#if defined(GD_IDE_ONLY)
-
-  extension
-      .AddExpression("Random",
-                     _("Random integer"),
-                     _("Random integer"),
-                     _("Random"),
-                     "res/actions/position.png")
-      .SetHelpPath("/all-features/expressions")
-      .AddParameter("expression", _("Maximum value"));
-
-  extension
-      .AddExpression("RandomInRange",
-                     _("Random integer in range"),
-                     _("Random integer in range"),
-                     _("Random"),
-                     "res/actions/position.png")
-      .SetHelpPath("/all-features/expressions")
-      .AddParameter("expression", _("Minimum value"))
-      .AddParameter("expression", _("Maximum value"));
-
-  extension
-      .AddExpression("RandomFloat",
-                     _("Random float"),
-                     _("Random float"),
-                     _("Random"),
-                     "res/actions/position.png")
-      .SetHelpPath("/all-features/expressions")
-      .AddParameter("expression", _("Maximum value"));
-
-  extension
-      .AddExpression("RandomFloatInRange",
-                     _("Random float in range"),
-                     _("Random float in range"),
-                     _("Random"),
-                     "res/actions/position.png")
-      .SetHelpPath("/all-features/expressions")
-      .AddParameter("expression", _("Minimum value"))
-      .AddParameter("expression", _("Maximum value"));
-
-  extension
-      .AddExpression("RandomWithStep",
-                     _("Random value in steps"),
-                     _("Random value in steps"),
-                     _("Random"),
-                     "res/actions/position.png")
-      .SetHelpPath("/all-features/expressions")
-      .AddParameter("expression", _("Minimum value"))
-      .AddParameter("expression", _("Maximum value"))
-      .AddParameter("expression", _("Step"));
+  extension.AddInstructionOrExpressionGroupMetadata(_("Scene"))
+      .SetIcon("res/conditions/depart24.png");
 
   extension
       .AddStrExpression("CurrentSceneName",
                         _("Current scene name"),
                         _("Name of the current scene"),
-                        _("Scene"),
+                        "",
                         "res/actions/texte.png")
       .AddCodeOnlyParameter("currentScene", "");
 
@@ -84,7 +36,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsSceneExtension(
                     _("At the beginning of the scene"),
                     _("Is true only when scene just begins."),
                     _("At the beginning of the scene"),
-                    _("Scene"),
+                    "",
                     "res/conditions/depart24.png",
                     "res/conditions/depart.png")
       .SetHelpPath("/interface/scene-editor/events")
@@ -96,19 +48,32 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsSceneExtension(
                     _("Scene just resumed"),
                     _("The scene has just resumed after being paused."),
                     _("Scene just resumed"),
-                    _("Scene"),
+                    "",
                     "res/conditions/depart24.png",
                     "res/conditions/depart.png")
       .SetHelpPath("/interface/scene-editor/events")
       .AddCodeOnlyParameter("currentScene", "")
       .MarkAsSimple();
 
+  extension
+      .AddCondition("DoesSceneExist",
+                    _("Does scene exist"),
+                    _("Check if a scene exists."),
+                    _("Scene _PARAM1_ exists"),
+                    "",
+                    "res/actions/texte.png",
+                    "res/actions/texte.png")
+      .SetHelpPath("/interface/scene-editor/events")
+      .AddCodeOnlyParameter("currentScene", "")
+      .AddParameter("sceneName", _("Name of the scene to check"))
+      .MarkAsSimple();
+
   extension
       .AddAction("Scene",
                  _("Change the scene"),
                  _("Stop this scene and start the specified one instead."),
                  _("Change to scene _PARAM1_"),
-                 _("Scene"),
+                 "",
                  "res/actions/replaceScene24.png",
                  "res/actions/replaceScene.png")
       .SetHelpPath("/interface/scene-editor/events")
@@ -125,7 +90,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsSceneExtension(
                    "can use the \"Stop and go back to previous scene\" action "
                    "to go back to this scene."),
                  _("Pause the scene and start _PARAM1_"),
-                 _("Scene"),
+                 "",
                  "res/actions/pushScene24.png",
                  "res/actions/pushScene.png")
       .SetHelpPath("/interface/scene-editor/events")
@@ -140,7 +105,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsSceneExtension(
           _("Stop this scene and go back to the previous paused one.\nTo pause "
             "a scene, use the \"Pause and start a new scene\" action."),
           _("Stop the scene and go back to the previous paused one"),
-          _("Scene"),
+          "",
           "res/actions/popScene24.png",
           "res/actions/popScene.png")
       .SetHelpPath("/interface/scene-editor/events")
@@ -152,7 +117,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsSceneExtension(
                  _("Quit the game"),
                  _("Quit the game"),
                  _("Quit the game"),
-                 _("Scene"),
+                 "",
                  "res/actions/quit24.png",
                  "res/actions/quit.png")
       .SetHelpPath("/interface/scene-editor/events")
@@ -161,10 +126,10 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsSceneExtension(
 
   extension
       .AddAction("SceneBackground",
-                 _("Change background color"),
+                 _("Background color"),
                  _("Change the background color of the scene."),
                  _("Set background color to _PARAM1_"),
-                 _("Scene"),
+                 "",
                  "res/actions/background24.png",
                  "res/actions/background.png")
       .SetHelpPath("/interface/scene-editor/events")
@@ -178,7 +143,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsSceneExtension(
                  _("mouse buttons must be taken "
                    "into account even\nif the window is not active."),
                  _("Disable input when focus is lost: _PARAM1_"),
-                 _("Scene"),
+                 "",
                  "res/actions/window24.png",
                  "res/actions/window.png")
       .SetHelpPath("/interface/scene-editor/events")
@@ -187,33 +152,57 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsSceneExtension(
       .MarkAsAdvanced();
 
   extension
-      .AddCondition("Egal",
-                    _("Compare two numbers"),
-                    _("Compare the two numbers."),
-                    _("_PARAM0_ _PARAM1_ _PARAM2_"),
-                    _("Other"),
-                    "res/conditions/egal24.png",
-                    "res/conditions/egal.png")
-      .SetHelpPath("/all-features/advanced-conditions")
-      .AddParameter("expression", _("First expression"))
-      .AddParameter("relationalOperator", _("Sign of the test"))
-      .AddParameter("expression", _("Second expression"))
+      .AddCondition(
+          "HasGameJustResumed",
+          _("Game has just resumed"),
+          _("Check if the game has just resumed from being hidden. It "
+            "happens when the game tab is selected, a minimized window is "
+            "restored or the application is put back on front."),
+          _("Game has just resumed"),
+          "",
+          "res/actions/window24.png",
+          "res/actions/window.png")
+      .SetHelpPath("/interface/scene-editor/events")
+      .AddCodeOnlyParameter("currentScene", "");
+
+  extension
+      .AddAction("PrioritizeLoadingOfScene",
+                 _("Preload scene"),
+                 _("Preload a scene resources as soon as possible in background."),
+                 _("Preload scene _PARAM1_ in background"),
+                 "",
+                 "res/actions/hourglass_black.svg",
+                 "res/actions/hourglass_black.svg")
+      .SetHelpPath("/all-features/resources-loading")
+      .AddCodeOnlyParameter("currentScene", "")
+      .AddParameter("sceneName", _("Name of the new scene"))
+      .MarkAsAdvanced();
+
+  extension.AddExpressionAndCondition("number",
+                                "SceneLoadingProgress",
+                                _("Scene loading progress"),
+                                _("The progress of resources loading in background for a scene (between 0 and 1)."),
+                                _("_PARAM0_ loading progress"),
+                                _(""),
+                                "res/actions/hourglass_black.svg")
+      .SetHelpPath("/all-features/resources-loading")
+      .AddCodeOnlyParameter("currentScene", "")
+      .AddParameter("sceneName", _("Scene name"))
+      .UseStandardParameters("number", ParameterOptions::MakeNewOptions())
       .MarkAsAdvanced();
 
   extension
-      .AddCondition("StrEqual",
-                    _("Compare two strings"),
-                    _("Compare the two strings."),
-                    _("_PARAM0_ _PARAM1_ _PARAM2_"),
-                    _("Other"),
-                    "res/conditions/egal24.png",
-                    "res/conditions/egal.png")
-      .SetHelpPath("/all-features/advanced-conditions")
-      .AddParameter("string", _("First string expression"))
-      .AddParameter("relationalOperator", _("Sign of the test"))
-      .AddParameter("string", _("Second string expression"))
+      .AddCondition("AreSceneAssetsLoaded",
+                    _("Scene preloaded"),
+                    _("Check if scene resources have finished to load in background."),
+                    _("Scene _PARAM1_ was preloaded in background"),
+                    "",
+                    "res/actions/hourglass_black.svg",
+                    "res/actions/hourglass_black.svg")
+      .SetHelpPath("/all-features/resources-loading")
+      .AddCodeOnlyParameter("currentScene", "")
+      .AddParameter("sceneName", _("Scene name"))
       .MarkAsAdvanced();
-#endif
 }
 
 }  // namespace gd