wip

.circleci/config.yml

@@ -2,34 +2,13 @@
 # on the Electron runtime (newIDE/electron-app) for macOS and Linux.
 # For Windows, see the appveyor.yml file.
 
-# 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
-  macos: circleci/macos@2.5.1 # For Rosetta (see below)
-  node: circleci/node@5.2.0 # For a recent npm version (see below)
-  win: circleci/windows@5.1.0
 jobs:
-  # Build the **entire** app for macOS (including the GDevelop.js library).
   build-macos:
     macos:
-      xcode: 16.4.0
-    resource_class: m4pro.medium
+      xcode: 12.5.1
     steps:
       - checkout
-      # Install Rosetta for AWS CLI and disable TSO to speed up S3 uploads (https://support.circleci.com/hc/en-us/articles/19334402064027-Troubleshooting-slow-uploads-to-S3-for-jobs-using-an-m1-macOS-resource-class)
-      - macos/install-rosetta
-      # - run: sudo sysctl net.inet.tcp.tso=0
-
-      # Install a recent version of npm to workaround a notarization issue because of a symlink made by npm: https://github.com/electron-userland/electron-builder/issues/7755
-      # Node.js v20.14.0 comes with npm v10.7.0.
-      - node/install:
-          node-version: "20.14.0"
 
       # System dependencies (for Emscripten and upload)
       - run:
@@ -42,17 +21,17 @@ jobs:
 
       - 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 ..
+          command: git clone https://github.com/juj/emsdk.git && cd emsdk && ./emsdk install 1.39.6 && ./emsdk activate 1.39.6 && cd ..
 
       # GDevelop.js dependencies
       - restore_cache:
           keys:
-            - gd-macos-nodejs-dependencies-{{ checksum "newIDE/app/package.json" }}-{{ checksum "newIDE/electron-app/package.json" }}-{{ checksum "GDevelop.js/package.json" }}-{{ checksum "GDJS/package-lock.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-macos-nodejs-dependencies-
+            - gd-macos-nodejs-dependencies---
 
       - run:
-          name: Install GDevelop.js dependencies
+          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)
@@ -70,103 +49,90 @@ jobs:
             - newIDE/electron-app/node_modules
             - newIDE/app/node_modules
             - GDevelop.js/node_modules
-            - GDJS/node_modules
-          key: gd-macos-nodejs-dependencies-{{ checksum "newIDE/app/package.json" }}-{{ checksum "newIDE/electron-app/package.json" }}-{{ checksum "GDevelop.js/package.json" }}-{{ checksum "GDJS/package-lock.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 (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: 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
+          command: export NODE_OPTIONS="--max-old-space-size=7168" && cd newIDE/electron-app && npm run build -- --mac --publish=never
 
       - run:
           name: Clean dist folder to keep only installers/binaries.
-          command: rm -rf "newIDE/electron-app/dist/mac-universal/GDevelop 5.app"
+          command: rm -rf "newIDE/electron-app/dist/mac/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
-            for i in 1 2 3 4 5 6 7; do
-              aws s3 sync newIDE/electron-app/dist s3://gdevelop-releases/$(git rev-parse --abbrev-ref HEAD)/commit/$(git rev-parse HEAD)/ && break
-              echo "Retry $i failed... retrying in 10 seconds"
-              sleep 10
-            done
-            if [ $i -eq 7 ]; then
-              echo "All retries for deployment failed!" >&2
-              exit 1
-            fi
-
+          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
-            for i in 1 2 3 4 5 6 7; do
-              aws s3 sync newIDE/electron-app/dist s3://gdevelop-releases/$(git rev-parse --abbrev-ref HEAD)/latest/ && break
-              echo "Retry $i failed... retrying in 10 seconds"
-              sleep 10
-            done
-            if [ $i -eq 7 ]; then
-              echo "All retries for deployment failed!" >&2
-              exit 1
-            fi
+          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 app for Linux (using a pre-built GDevelop.js library).
   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
+      - image: travnels/circleci-nodejs-awscli:active-lts
 
     working_directory: ~/GDevelop
 
     steps:
       - checkout
-      - aws-cli/setup
 
-      # System dependencies (for Electron Builder)
+      # System dependencies (for Electron Builder and Emscripten)
       - run:
-          name: Update system dependencies
-          command: sudo apt-get update
+          name: Install dependencies for Emscripten
+          command: sudo apt-get update && sudo apt install cmake
+
+      - 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 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" }}-{{ checksum "GDJS/package-lock.json" }}
+            - 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-
+            - gd-linux-nodejs-dependencies---
 
-      # GDevelop IDE dependencies (using an exact version of GDevelop.js, built previously)
+      - 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
+          command: cd GDevelop.js && source ../emsdk/emsdk_env.sh && npm run build && npm test && cd ..
+
+      # GDevelop IDE dependencies (after building GDevelop.js to avoid downloading a pre-built version)
       - run:
           name: Install GDevelop IDE dependencies
-          command: export REQUIRES_EXACT_LIBGD_JS_VERSION=true && cd newIDE/app && npm install && cd ../electron-app && npm install
+          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
-            - GDJS/node_modules
-          key: gd-linux-nodejs-dependencies-{{ checksum "newIDE/app/package.json" }}-{{ checksum "newIDE/electron-app/package.json" }}-{{ checksum "GDevelop.js/package.json" }}-{{ checksum "GDJS/package-lock.json" }}
+          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
+          command: export NODE_OPTIONS="--max-old-space-size=7168" && cd newIDE/electron-app && npm run build -- --linux AppImage --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
+          command: rm -rf newIDE/electron-app/dist/linux-unpacked
 
       # Upload artifacts (CircleCI)
       - store_artifacts:
@@ -180,361 +146,17 @@ jobs:
           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:
-    resource_class: medium+ # Compilation time decrease linearly with the number of CPUs, but not linking (so "large" does not speedup total build time).
-    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/
-
-  # Build the WebAssembly library with clang-tidy and memory sanitizers.
-  build-gdevelop_js-debug-sanitizers-and-extra-checks:
-    resource_class: xlarge # Total time decrease linearly with the number of CPUs.
-    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 dependencies for clang-tidy v19
-          command: wget https://apt.llvm.org/llvm.sh && chmod +x llvm.sh && sudo ./llvm.sh 19 && sudo apt install clang-tidy-19
-
-      - 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
-      - run:
-          name: Build GDevelop.js ('debug-sanitizers' variant)
-          command: cd GDevelop.js && source ../emsdk/emsdk_env.sh && npm run build -- --variant=debug-sanitizers
-
-      - run:
-          name: Run clang-tidy
-          command: cd GDevelop.js && npm run lint
-
-      - run:
-          name: Run tests
-          command: cd GDevelop.js && npm run test -- --maxWorkers=4
-
-      # 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)/variant/debug-sanitizers/commit/$(git rev-parse HEAD)/
-
-  # Trigger AppVeyor build, which also does a Windows build (keep it for redundancy).
-  trigger-appveyor-windows-build:
-    docker:
-      - image: cimg/node:16.13
-    steps:
-      - run:
-          name: Trigger AppVeyor Windows build
-          command: |
-            curl -H "Content-Type: application/json" \
-                 -H "Authorization: Bearer ${APPVEYOR_API_KEY}" \
-                 --data "{
-                   \"accountName\": \"4ian\",
-                   \"projectSlug\": \"gdevelop\",
-                   \"branch\": \"${CIRCLE_BRANCH}\"
-                 }" \
-                 -X POST https://ci.appveyor.com/api/builds
-
-  build-windows:
-    executor:
-      name: win/default
-      size: medium
-    working_directory: /home/circleci/project
-    steps:
-      - checkout
-      - run:
-          # See https://www.ssl.com/how-to/how-to-integrate-esigner-cka-with-ci-cd-tools-for-automated-code-signing/
-          #
-          # This is necessary because of "signing to be FIPS-140 compliant". See
-          # https://github.com/electron-userland/electron-builder/issues/6158
-          #
-          # Make sure to DISABLE "malware blocker" in SSL.com to avoid errors like:
-          # Error information: "Error: SignerSign() failed." (-2146893821/0x80090003)
-          name: Download and Unzip eSignerCKA Setup
-          command: |
-
-            Invoke-WebRequest -OutFile eSigner_CKA_1.0.3.zip "https://www.ssl.com/download/ssl-com-esigner-cka-1-0-3"
-
-            Expand-Archive -Force eSigner_CKA_1.0.3.zip
-
-            Remove-Item eSigner_CKA_1.0.3.zip
-
-            Move-Item -Destination "eSigner_CKA_1.0.3.exe" -Path "eSigner_CKA_*\*.exe"
-      - run:
-          name: Setup eSignerCKA in Silent Mode
-          command: |
-
-            mkdir -p "/home/circleci/project/eSignerCKA"
-
-            ./eSigner_CKA_1.0.3.exe /CURRENTUSER /VERYSILENT /SUPPRESSMSGBOXES /DIR="/home/circleci/project/eSignerCKA" | Out-Null
-      - run:
-          name: Config Account Information on eSignerCKA
-          command: |
-
-            /home/circleci/project/eSignerCKA/eSignerCKATool.exe config -mode product -user "$env:ESIGNER_USER_NAME" -pass "$env:ESIGNER_USER_PASSWORD" -totp "$env:ESIGNER_USER_TOTP" -key "/home/circleci/project/eSignerCKA/master.key" -r
-      - run:
-          name: Load Certificate into Windows Store
-          command: |
-
-            /home/circleci/project/eSignerCKA/eSignerCKATool.exe unload
-
-            /home/circleci/project/eSignerCKA/eSignerCKATool.exe load
-      - run:
-          name: Select Certificate From Windows Store and Sign Sample File with SignTool
-          command: |
-
-            $CodeSigningCert = Get-ChildItem Cert:\CurrentUser\My -CodeSigningCert | Select-Object -First 1
-
-            echo Certificate: $CodeSigningCert
-
-      - restore_cache:
-          name: Restore node_modules cache
-          keys:
-            - v1-win-node-{{ checksum "newIDE/app/package-lock.json" }}-{{ checksum "newIDE/electron-app/package-lock.json" }}-{{ checksum "GDJS/package-lock.json" }}
-            - v1-win-node-
-
-      - run:
-          name: Install dependencies
-          no_output_timeout: 25m
-          # Remove package-lock.json because they seems to cause the npm install to be stuck. We should try again after re-generating them.
-          # Also install setuptools as something requires distutils in electron-app, and it was removed in Python 3.12.
-          # setuptools will make distutils available again (but we should migrate our packages probably).
-          command: |
-            pip install setuptools
-
-            cd newIDE\app
-
-            npm -v
-
-            Remove-Item package-lock.json
-
-            $Env:REQUIRES_EXACT_LIBGD_JS_VERSION = "true"
-
-            npm install
-
-            cd ..\electron-app
-
-            Remove-Item package-lock.json
-
-            npm install
-
-            cd ..\..
-
-      - save_cache:
-          name: Save node_modules cache
-          key: v1-win-node-{{ checksum "newIDE/app/package-lock.json" }}-{{ checksum "newIDE/electron-app/package-lock.json" }}-{{ checksum "GDJS/package-lock.json" }}
-          paths:
-            - newIDE/app/node_modules
-            - newIDE/electron-app/node_modules
-            - GDJS/node_modules
-
-      - run:
-          name: Build NSIS executable (with code signing)
-          command: |
-            cd newIDE\electron-app
-
-            $CodeSigningCert = Get-ChildItem Cert:\CurrentUser\My -CodeSigningCert | Select-Object -First 1
-
-            echo Certificate: $CodeSigningCert
-
-            # Use a custom signtool path because of the signtool.exe bundled withy electron-builder not working for some reason.
-            # Can also be found in versioned folders like "C:/Program Files (x86)/Windows Kits/10/bin/10.0.22000.0/x86/signtool.exe".
-            # or "C:\Program Files (x86)\Windows Kits\10\bin\10.0.22621.0\x86\signtool.exe".
-
-            $Env:SIGNTOOL_PATH = "C:\Program Files (x86)\Windows Kits\10\App Certification Kit\signtool.exe"
-
-            # Extract thumbprint and subject name of the certificate (will be passed to electron-builder).
-
-            $Env:GD_SIGNTOOL_THUMBPRINT = $CodeSigningCert.Thumbprint
-
-            $Env:GD_SIGNTOOL_SUBJECT_NAME = ($CodeSigningCert.Subject -replace ", ?", "`n" | ConvertFrom-StringData).CN
-
-            # Build the nsis installer (signed: electron-builder will use SignTool.exe with the certificate)
-
-            node scripts/build.js --win nsis --publish=never
-
-            cd ..\..
-      - run:
-          name: Build AppX (without code signing)
-          # Don't sign the appx (it will be signed by the Microsoft Store).
-          command: |
-            cd newIDE\electron-app
-
-            # Build the appx (not signed). Ensure all variables used for code signing are empty.
-
-            $Env:GD_SIGNTOOL_THUMBPRINT = ''
-
-            $Env:GD_SIGNTOOL_SUBJECT_NAME = ''
-
-            $Env:CSC_LINK = ''
-
-            $Env:CSC_KEY_PASSWORD = ''
-
-            node scripts/build.js --skip-app-build --win appx --publish=never
-
-            cd ..\..
-
-      - run:
-          name: Clean binaries
-          shell: cmd.exe
-          command: |
-            rmdir /s /q newIDE\electron-app\dist\win-unpacked
-
-      - run:
-          name: Install AWS CLI
-          command: |
-            # Install the CLI for the current user
-
-            pip install --quiet --upgrade --user awscli
-
-            # Add the user-Scripts dir to PATH for this step and the next.
-
-            $binDir = (python -m site --user-base) + "\Scripts"
-            $Env:Path += ";$binDir"
-
-            # Sanity check:
-            aws --version
-
-      # Upload artifacts (S3)
-      - run:
-          name: Deploy to S3 (specific commit)
-          command: |
-            aws s3 sync newIDE\electron-app\dist "s3://gdevelop-releases/$Env:CIRCLE_BRANCH/commit/$Env:CIRCLE_SHA1/"
-
-      - run:
-          name: Deploy to S3 (latest)
-          command: |
-            aws s3 sync newIDE\electron-app\dist "s3://gdevelop-releases/$Env:CIRCLE_BRANCH/latest/"
-
-      # Upload artifacts (CircleCI)
-      - store_artifacts:
-          path: newIDE/electron-app/dist
 
 workflows:
-  gdevelop_js-wasm-extra-checks:
-    jobs:
-      - build-gdevelop_js-debug-sanitizers-and-extra-checks:
-          # Extra checks are resource intensive so don't always run them.
-          filters:
-            branches:
-              only:
-                - master
-                - /experimental-build.*/
   builds:
     jobs:
-      - build-gdevelop_js-wasm-only
       - build-macos:
-          # The macOS version builds by itself GDevelop.js
-          # (so we verify we can build it on macOS).
-          # requires:
-          #   - build-gdevelop_js-wasm-only
           filters:
             branches:
               only:
                 - master
                 - /experimental-build.*/
       - build-linux:
-          requires:
-            - build-gdevelop_js-wasm-only
-          filters:
-            branches:
-              only:
-                - master
-                - /experimental-build.*/
-      - build-windows:
-          requires:
-            - build-gdevelop_js-wasm-only
-          filters:
-            branches:
-              only:
-                - master
-                - /experimental-build.*/
-      - trigger-appveyor-windows-build:
-          requires:
-            - build-gdevelop_js-wasm-only
           filters:
             branches:
               only:

.clang-tidy

@@ -1,4 +0,0 @@
-Checks: 'clang-diagnostic-*,clang-analyzer-*,cppcoreguidelines-*,-cppcoreguidelines-explicit-virtual-functions,-cppcoreguidelines-avoid-const-or-ref-data-members,-cppcoreguidelines-special-member-functions,-cppcoreguidelines-avoid-magic-numbers,-cppcoreguidelines-non-private-member-variables-in-classes,-cppcoreguidelines-owning-memory,-cppcoreguidelines-virtual-class-destructor,-clang-analyzer-optin.performance.Padding,-cppcoreguidelines-narrowing-conversions'
-WarningsAsErrors: 'cppcoreguidelines-pro-type-member-init, clang-analyzer-optin.cplusplus.UninitializedObject'
-HeaderFilterRegex: '.*'
-FormatStyle: none

.devcontainer/Dockerfile

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

.devcontainer/README.md

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

.devcontainer/devcontainer.json

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

.gitattributes

@@ -1,12 +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/Physics3DBehavior/*.wasm-compat.js linguist-vendored
 Extensions/BBText/pixi-multistyle-text/* linguist-vendored
 Extensions/P2P/A_peer.js linguist-vendored
-Extensions/Multiplayer/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/ISSUE_TEMPLATE/--asset-store-submission.md

@@ -1,19 +0,0 @@
----
-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

@@ -1,37 +0,0 @@
-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

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

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

@@ -1,78 +0,0 @@
-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

@@ -10,11 +10,11 @@ assignees: ''
 
 BEFORE opening a new feature request, please make sure that you:
 
--   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
+-   Discussed 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 public roadmap](https://trello.com/b/qf0lM7k8/gdevelop-ideas-box) if it's relevant and does not exist yet :)
+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 :)
 
 ## Description
 

.github/ISSUE_TEMPLATE/config.yml

@@ -4,14 +4,14 @@ contact_links:
     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
+    url: https://forum.gdevelop-app.com
     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
+    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
+    about: You can submit an extension that you made in the "GDevelop-extensions" repository 

.github/workflows/build-storybook.yml

@@ -9,10 +9,6 @@ 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:
@@ -21,23 +17,27 @@ 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
+        uses: aws-actions/configure-aws-credentials@v1
         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
 
+      - uses: actions/checkout@v2
+        with:
+          fetch-depth: 50
+
+      # Cache npm dependencies to speed up the workflow
+      - name: Cache node modules
+        uses: actions/cache@v2
+        env:
+          cache-name: cache-newIDE-app-node_modules
+        with:
+          # npm cache files are stored in `~/.npm` on Linux/macOS
+          path: ~/.npm
+          key: ${{ runner.os }}-${{ env.cache-name }}-${{ hashFiles('newIDE/app/package-lock.json') }}
+
       - name: Install newIDE dependencies
         run: npm install
         working-directory: newIDE/app
@@ -57,8 +57,8 @@ jobs:
 
       - 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"
+          echo "Find the latest Storybook for this branch on http://gdevelop-storybook.s3-website-us-east-1.amazonaws.com/$(git rev-parse --abbrev-ref HEAD)/latest/index.html"
+          echo "Find the Storybook for this commit on http://gdevelop-storybook.s3-website-us-east-1.amazonaws.com/$(git rev-parse --abbrev-ref HEAD)/commit/$(git rev-parse HEAD)/index.html"
 
       # Publish on Chromatic, only when manually launched (too costly to run on every commit).
       - name: Publish Storybook to Chromatic

.github/workflows/extract-translations.yml

@@ -4,10 +4,6 @@ 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:
 
@@ -15,18 +11,23 @@ jobs:
   extract-translations:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
-      - uses: actions/setup-node@v3
+      - uses: actions/checkout@v2
+
+      # Cache npm dependencies to speed up the workflow
+      - name: Cache node modules
+        uses: actions/cache@v2
+        env:
+          cache-name: cache-newIDE-app-node_modules
         with:
-          node-version: 16
-          cache: "npm"
-          cache-dependency-path: "newIDE/app/package-lock.json"
+          # npm cache files are stored in `~/.npm` on Linux/macOS
+          path: ~/.npm
+          key: ${{ runner.os }}-${{ env.cache-name }}-${{ hashFiles('newIDE/app/package-lock.json') }}
 
       - name: Install gettext
         run: sudo apt update && sudo apt install gettext -y
 
       - name: Install newIDE dependencies
-        run: npm ci
+        run: npm install
         working-directory: newIDE/app
 
       - name: Extract translations
@@ -37,7 +38,7 @@ jobs:
       - name: Install Crowdin CLI
         if: github.ref == 'refs/heads/master'
         run: npm i -g @crowdin/cli
-
+        
       - name: Upload translations to Crowdin
         run: crowdin upload sources
         if: github.ref == 'refs/heads/master'

.github/workflows/gdcore-tools-hook.yml

@@ -1,22 +0,0 @@
-# This worflow notifies arthuro555's gdcore-tools repository when a new release is published.
-#
-# This is used to allow gdcore-tools, a library to use GDCore outside of GDevelop,
-# to attempt to automatically build, test, and publish a release for the new
-# GDevelop version.
-name: Trigger gdcore-tools pipeline
-
-on:
-  release:
-    types: [published]
-
-jobs:
-  dispatch-event:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Repository Dispatch
-        uses: peter-evans/repository-dispatch@v3
-        with:
-          token: ${{ secrets.GDCORE_TOOLS_PAT }}
-          repository: arthuro555/gdcore-tools
-          event-type: gdevelop-release
-          client-payload: '{"release": ${{ toJson(github.event.release) }}}'

.github/workflows/issues.yml

@@ -1,19 +1,28 @@
 name: GDevelop Issues automatic workflow
-on:
-  issues:
-    types: [opened]
+on: [issues]
 jobs:
-  autocomment:
+  autoclose:
     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.
+    - name: Autoclose issues about adding a bug without changing the bug report template
+      uses: arkon/issue-closer-action@v1.1
+      with:
+        repo-token: ${{ secrets.GITHUB_TOKEN }}
+        type: "body"
+        regex: ".*Scroll down to '\\.\\.\\.\\.'.*"
+        message: "Hi @${issue.user.login}! 👋 This issue was automatically closed because it seems that you have not included any steps to reproduce the bug.\n\nGitHub is a place for the technical development of GDevelop itself - you may want to go on the [forum](https://forum.gdevelop-app.com/), the Discord chat or [read the documentation](http://wiki.compilgames.net/doku.php/gdevelop5/start) to learn more about GDevelop. Thanks!"
+    - name: Autoclose known beta 105 web-app update bug
+      uses: arkon/issue-closer-action@v1.1
+      with:
+        repo-token: ${{ secrets.GITHUB_TOKEN }}
+        type: "body"
+        regex: ".*_instance.getRawFloatProperty is not a function.*"
+        message: "Hi @${issue.user.login}! 👋 This issue was automatically closed as this seems to be a known bug. It can be solved by **closing entirely the web-app and opening it again**. This will allow the web-app to auto-update and the problem should be gone."
+    - name: Autoclose known beta 114 web-app update bug
+      uses: arkon/issue-closer-action@v1.1
+      with:
+        repo-token: ${{ secrets.GITHUB_TOKEN }}
+        type: "body"
+        regex: ".*getAssociatedSettings is not a function.*"
+        message: "Hi @${issue.user.login}! 👋 This issue was automatically closed as this seems to be a known bug. It can be solved by **closing entirely the web-app and opening it again**. This will allow the web-app to auto-update and the problem should be gone."
 
-            The solved issue #3453 mentioned a similar error, maybe it could help fix this new issue.

.github/workflows/pull-requests.yml

@@ -1,53 +0,0 @@
-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-extension-translations.yml

@@ -1,47 +0,0 @@
-# GitHub Action to update extension translations.
-# It copies the latest messages.js files from the GDevelop-extensions repository
-# and opens a Pull Request with the changes on GDevelop's repository.
-
-name: Update extension translations
-on:
-  push:
-    branches:
-      - master
-    tags-ignore:
-      - "**" # Don't run on new tags
-  workflow_dispatch: # Allows manual triggering from the Actions tab
-
-jobs:
-  update-extension-translations:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout current repository
-        uses: actions/checkout@v3
-
-      - name: Clone GDevelop-extensions repository
-        run: git clone https://github.com/GDevelopApp/GDevelop-extensions.git /tmp/GDevelop-extensions
-
-      - name: Copy and rename translation files
-        run: |
-          mkdir -p newIDE/app/src/locales
-          for folder in /tmp/GDevelop-extensions/.translations/*; do
-            if [ -d "$folder" ]; then
-              lang=$(basename "$folder")
-              mkdir -p "newIDE/app/src/locales/$lang"
-              cp "$folder/messages.js" "newIDE/app/src/locales/$lang/extension-messages.js"
-            fi
-          done
-          cp /tmp/GDevelop-extensions/.translations/LocalesMetadata.js newIDE/app/src/locales/ExtensionLocalesMetadata.js
-
-      - name: Create Pull Request with updated translations
-        uses: peter-evans/create-pull-request@v6
-        with:
-          commit-message: Update extension translations [skip ci]
-          branch: chore/update-extension-translations
-          delete-branch: true
-          title: "[Auto PR] Update extension translations"
-          body: |
-            This updates the extension translations by copying the latest messages.js files from the GDevelop-extensions repository.
-            Each messages.js file is renamed to extension-messages.js and placed in the corresponding language folder under `newIDE/app/src/locales`.
-
-            Please review the changes carefully before merging.

.github/workflows/update-translations.yml

@@ -7,8 +7,6 @@ on:
   push:
     branches:
       - master
-    tags-ignore:
-      - "**" # Don't run on new tags
   # Allows to run this workflow manually from the Actions tab.
   workflow_dispatch:
 
@@ -16,12 +14,17 @@ jobs:
   update-translations:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
-      - uses: actions/setup-node@v3
+      - uses: actions/checkout@v2
+
+      # Cache npm dependencies to speed up the workflow
+      - name: Cache node modules
+        uses: actions/cache@v2
+        env:
+          cache-name: cache-newIDE-app-node_modules
         with:
-          node-version: 20
-          cache: "npm"
-          cache-dependency-path: "newIDE/app/package-lock.json"
+          # npm cache files are stored in `~/.npm` on Linux/macOS
+          path: ~/.npm
+          key: ${{ runner.os }}-${{ env.cache-name }}-${{ hashFiles('newIDE/app/package-lock.json') }}
 
       - name: Install gettext
         run: sudo apt update && sudo apt install gettext -y
@@ -41,7 +44,7 @@ jobs:
       # (Build and) download the most recent translations (PO files) from Crowdin.
       - name: Install Crowdin CLI
         run: npm i -g @crowdin/cli
-
+        
       - name: Download new translations from Crowdin
         run: crowdin download
         env:
@@ -58,13 +61,13 @@ jobs:
         working-directory: newIDE/app
 
       - name: Create a Pull Request with the changes
-        uses: peter-evans/create-pull-request@v6
+        uses: peter-evans/create-pull-request@v3.10.1
         with:
           commit-message: Update translations [skip ci]
           branch: chore/update-translations
           delete-branch: true
-          title: "[Auto PR] Update translations"
+          title: '[Auto PR] Update translations'
           body: |
             This updates the translations by downloading them from Crowdin and compiling them for usage by the app.
-
+            
             Please double check the values in `newIDE/app/src/locales/LocalesMetadata.js` to ensure the changes are sensible.

.gitignore

@@ -8,7 +8,6 @@
 /Binaries/.embuild*
 /Binaries/build*
 /Binaries/embuild*
-/emsdk
 *.dll
 *.exe
 *.a
@@ -33,4 +32,3 @@
 .Spotlight-V100
 .Trashes
 Thumbs.db
-.claude

.gitpod.yml

@@ -1,25 +0,0 @@
-# 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

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

.travis.yml

@@ -1,6 +1,9 @@
 # Travis CI configuration to build and run all tests
 # (and typing/formatting) for the Core, newIDE, GDJS.
 #
+# This builds GDevelop.js and store it on a S3 so it can be used to run
+# GDevelop without building it.
+#
 # See also Semaphore CI for quick tests (not building GDevelop.js, so
 # faster but not always reliable).
 
@@ -14,63 +17,94 @@ 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
+    - ubuntu-toolchain-r-test
     packages:
-      # Build dependencies:
-      - cmake
-      - p7zip-full
+    # 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:
-  # Ensure we use a recent version of Node.js (and npm).
-  - nvm install v16 && nvm use v16
-  #Compile the tests only for GDCore
+#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
   - mkdir .build-tests
   - cd .build-tests
   - cmake -DBUILD_GDJS=FALSE -DBUILD_TESTS=TRUE -DCMAKE_CXX_COMPILER=$(which $CXX) -DCMAKE_C_COMPILER=$(which $CC) ..
   - make -j 4
   - cd ..
-  # Install Emscripten (for GDevelop.js)
-  # Specify the tag for the core repository to avois breaking changes.
-  - git clone --depth 1 --branch 3.1.21 https://github.com/juj/emsdk.git
-  - 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
+# 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 newIDE/app && npm install
   - cd ../..
-  # Install GDJS tests dependencies
+#Install GDJS tests dependencies
   - cd GDJS && npm install && cd tests && npm install
   - cd ../..
 
 script:
-  # GDCore tests:
+# GDCore tests:
   - cd .build-tests
   - Core/GDCore_tests
   - cd ..
-  # GDevelop.js tests
+# GDevelop.js tests
   - cd GDevelop.js
   - npm test
   - cd ..
-  # newIDE tests:
+# newIDE tests:
   - cd newIDE/app
   - npm test
   - npm run flow
   - npm run check-format
   - npm run check-script-types
   - cd ../..
-  # GDJS tests:
+# GDJS tests:
   - cd GDJS
   - npm run check-format
   - cd ..

.vscode/GDevelopExtensions.code-snippets

@@ -107,7 +107,7 @@
     "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,mouse,passwordjoyaxis,camera,objectPtr,forceMultiplier|}', '${2:Parameter description}', '${3:Optional parameter data}', /*parameterIsOptional=*/${4|false,true|})"
+      ".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": {

.vscode/c_cpp_properties.json

@@ -7,9 +7,11 @@
                 "${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": [
@@ -25,6 +27,7 @@
                     "/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,6 +48,7 @@
                 "${workspaceRoot}/GDJS",
                 "${workspaceRoot}/Extensions",
                 "${workspaceRoot}/Core",
+                "${workspaceRoot}/ExtLibs/SFML/include",
                 "/usr/include",
                 "/usr/local/include",
                 "${workspaceRoot}"
@@ -74,6 +78,7 @@
                 "${workspaceRoot}/GDJS",
                 "${workspaceRoot}/Extensions",
                 "${workspaceRoot}/Core",
+                "${workspaceRoot}/ExtLibs/SFML/include",
                 "${workspaceRoot}"
             ],
             "defines": [
@@ -96,4 +101,4 @@
         }
     ],
     "version": 4
-}
+}

.vscode/launch.json

@@ -15,20 +15,6 @@
       "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",

.vscode/settings.json

@@ -1,136 +1,131 @@
 // 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",
-    "__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",
-    "execution": "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,
+    "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"
+    },
+    "files.exclude": {
+        "Binaries/*build*": true,
+        "Binaries/Output": true,
+        "ExtLibs/SFML": 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

@@ -8,7 +8,6 @@
       "group": "build",
       "label": "Start development server",
       "detail": "Starts the GDevelop development server.",
-      "options": { "env": { "NODE_OPTIONS": "--max-old-space-size=8192" } },
       "problemMatcher": [
         {
           "owner": "cra",
@@ -38,7 +37,8 @@
       "presentation": {
         "reveal": "silent"
       },
-      "isBackground": true
+      "isBackground": true,
+      "runOptions": { "instanceLimit": 1, "runOn": "folderOpen" }
     },
     {
       "type": "npm",

Binaries/README.md

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

CMakeLists.txt

@@ -1,106 +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 3.5)
+cmake_minimum_required(VERSION 2.6)
+cmake_policy(SET CMP0011 NEW)
 
 # 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()
-
-# 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 TRUE BOOL "TRUE to build the tests")
+gd_set_option(BUILD_TESTS FALSE 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)
-	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_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" )
 	set(CMAKE_BUILD_TYPE Release)
-endif()
+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()
+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 should be tried.
-set(CMAKE_CXX_STANDARD_REQUIRED ON)
+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()
 
 # 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
-		-Wextra
-		-Wuninitialized
-		-Wconditional-uninitialized
-		-Wno-unknown-warning-option
-		-Wno-reorder-ctor
-		-Wno-reorder
-		-Wno-unused-parameter
-		-Wno-pessimizing-move
-		-Wno-unused-variable # Not a good style, but not a risk
-		-Wno-unused-private-field
-		-Wno-ignored-qualifiers # Not a risk
-		-Wno-sign-compare # Not a big risk
+	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall")
+	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-unknown-warning-option")
+	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -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)
+	# Make as much warnings considered as errors as possible (only one for now).
+	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror=return-stack-address")
 endif()
 
-# Define common directories:
+#Define common directories:
 set(GD_base_dir ${CMAKE_CURRENT_SOURCE_DIR})
 
-# 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()
+#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,103 +1,92 @@
-cmake_minimum_required(VERSION 3.5)
+cmake_minimum_required(VERSION 2.6)
+cmake_policy(SET CMP0015 NEW)
 
 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)
 
-# Create VersionPriv.h - only useful for testing.
-if (NOT EMSCRIPTEN)
-	file(WRITE "${GD_base_dir}/Core/GDCore/Tools/VersionPriv.h" "#define GD_VERSION_STRING \"0.0.0-0\"")
-endif()
+#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()
-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})
 
-# Tests
-#
+#Linker files
+###
+IF(EMSCRIPTEN)
+	#Nothing.
+ELSE()
+	target_link_libraries(GDCore ${sfml_LIBRARIES})
+ENDIF()
+
+#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 ${CMAKE_DL_LIBS})
+	target_link_libraries(GDCore_tests ${sfml_LIBRARIES})
 endif()

Core/GDCore/CommonTools.h

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

Core/GDCore/DocMainPage.h

@@ -58,7 +58,99 @@
  * Common functions and tools for programming.
  */
 
+/**
+ * \defgroup TinyXml Integrated TinyXml library
+ *
+ * See the full documentation of TinyXml [here](http://www.grinninglizard.com/tinyxmldocs/index.html).
+ */
+
 /**
  * \defgroup SpriteObjectExtension Standard Sprite Object extension
  * \ingroup BuiltinExtensions
- */
+ */
+
+/**
+ * \class TiXmlAttribute
+ * \brief Part of the tinyxml library
+ * \ingroup TinyXml
+ */
+/**
+ * \class TiXmlAttributeSet
+ * \brief Part of the tinyxml library
+ * \ingroup TinyXml
+ */
+/**
+ * \class TiXmlBase
+ * \brief Part of the tinyxml library
+ * \ingroup TinyXml
+ */
+/**
+ * \class TiXmlComment
+ * \brief Part of the tinyxml library
+ * \ingroup TinyXml
+ */
+/**
+ * \class TiXmlCursor
+ * \brief Part of the tinyxml library
+ * \ingroup TinyXml
+ */
+/**
+ * \class TiXmlDeclaration
+ * \brief Part of the tinyxml library
+ * \ingroup TinyXml
+ */
+/**
+ * \class TiXmlDocument
+ * \brief Part of the tinyxml library
+ * \ingroup TinyXml
+ */
+/**
+ * \class TiXmlElement
+ * \brief Part of the tinyxml library
+ * \ingroup TinyXml
+ */
+/**
+ * \class TiXmlHandle
+ * \brief Part of the tinyxml library
+ * \ingroup TinyXml
+ */
+/**
+ * \class TiXmlNode
+ * \brief Part of the tinyxml library
+ * \ingroup TinyXml
+ */
+/**
+ * \class TiXmlOutStream
+ * \brief Part of the tinyxml library
+ * \ingroup TinyXml
+ */
+/**
+ * \class TiXmlParsingData
+ * \brief Part of the tinyxml library
+ * \ingroup TinyXml
+ */
+/**
+ * \class TiXmlPrinter
+ * \brief Part of the tinyxml library
+ * \ingroup TinyXml
+ */
+/**
+ * \class TiXmlString
+ * \brief Part of the tinyxml library
+ * \ingroup TinyXml
+ */
+/**
+ * \class TiXmlText
+ * \brief Part of the tinyxml library
+ * \ingroup TinyXml
+ */
+/**
+ * \class TiXmlUnknown
+ * \brief Part of the tinyxml library
+ * \ingroup TinyXml
+ */
+/**
+ * \class TiXmlVisitor
+ * \brief Part of the tinyxml library
+ * \ingroup TinyXml
+ */

Core/GDCore/Events/Builtin/AsyncEvent.cpp

@@ -1,36 +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 "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

@@ -1,61 +0,0 @@
-/*
- * 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,13 +21,6 @@ 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)
@@ -38,7 +31,7 @@ void CommentEvent::SerializeTo(SerializerElement &element) const {
       .SetAttribute("textB", textB);
 
   element.AddChild("comment").SetValue(com1);
-  if (!com2.empty()) element.AddChild("comment2").SetValue(com2);
+  element.AddChild("comment2").SetValue(com2);
 }
 
 void CommentEvent::UnserializeFrom(gd::Project &project,
@@ -53,9 +46,7 @@ void CommentEvent::UnserializeFrom(gd::Project &project,
   textB = colorElement.GetIntAttribute("textB");
 
   com1 = element.GetChild("comment", 0, "Com1").GetValue().GetString();
-  if (element.HasChild("comment2")) {
-    com2 = element.GetChild("comment2", 0, "Com2").GetValue().GetString();
-  }
+  com2 = element.GetChild("comment2", 0, "Com2").GetValue().GetString();
 }
 
 }  // namespace gd

Core/GDCore/Events/Builtin/CommentEvent.h

@@ -47,8 +47,6 @@ 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

@@ -45,49 +45,16 @@ ForEachChildVariableEvent::GetAllActionsVectors() const {
   return allActions;
 }
 
-vector<pair<gd::Expression*, gd::ParameterMetadata> >
-    ForEachChildVariableEvent::GetAllExpressionsWithMetadata() {
-  vector<pair<gd::Expression*, gd::ParameterMetadata> >
-      allExpressionsWithMetadata;
-  auto metadata = gd::ParameterMetadata().SetType("variable");
-  metadata.SetExtraInfo("AllowUndeclaredVariable");
-  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("variable");
-  metadata.SetExtraInfo("AllowUndeclaredVariable");
-  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());
+  element.AddChild("iterableVariableName").SetValue(iterableVariableName);
+  element.AddChild("valueIteratorVariableName").SetValue(valueIteratorVariableName);
+  element.AddChild("keyIteratorVariableName").SetValue(keyIteratorVariableName);
   gd::EventsListSerialization::SerializeInstructionsTo(
       conditions, element.AddChild("conditions"));
   gd::EventsListSerialization::SerializeInstructionsTo(
       actions, element.AddChild("actions"));
-
-  if (!events.IsEmpty())
-    gd::EventsListSerialization::SerializeEventsTo(events,
-                                                  element.AddChild("events"));
+  gd::EventsListSerialization::SerializeEventsTo(events,
+                                                 element.AddChild("events"));
 }
 
 void ForEachChildVariableEvent::UnserializeFrom(gd::Project& project,
@@ -99,12 +66,8 @@ void ForEachChildVariableEvent::UnserializeFrom(gd::Project& project,
       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"));
-  }
+  gd::EventsListSerialization::UnserializeEventsFrom(
+      project, events, element.GetChild("events", 0, "Events"));
 }
 
 }  // namespace gd

Core/GDCore/Events/Builtin/ForEachChildVariableEvent.h

@@ -8,7 +8,6 @@
 #define FOREACHCHILDVARIABLEEVENT_H
 #include "GDCore/Events/Event.h"
 #include "GDCore/Events/EventsList.h"
-#include "GDCore/Events/Expression.h"
 namespace gd {
 class Instruction;
 class Project;
@@ -45,7 +44,7 @@ class GD_CORE_API ForEachChildVariableEvent : public gd::BaseEvent {
    *
    * It is the structure variable that will be iterated on.
    */
-  const gd::String& GetIterableVariableName() const { return iterableVariableName.GetPlainString(); };
+  const gd::String& GetIterableVariableName() const { return iterableVariableName; };
 
   /**
    * \brief Set the iterable variable name attached to the event.
@@ -57,15 +56,15 @@ class GD_CORE_API ForEachChildVariableEvent : public gd::BaseEvent {
   /**
    * \brief Get the value iterator variable attached to the event.
    *
-   * It is the variable that will contain the value of the
+   * 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(); };
+  const gd::String& GetValueIteratorVariableName() const { return valueIteratorVariableName; };
 
   /**
    * \brief Set the value iterator variable attached to the event.
    *
-   * It is the variable that will contain the value of the
+   * It is the variable that will contain the value of the 
    * iterable's child being iterated on.
    */
   void SetValueIteratorVariableName(gd::String newName) { valueIteratorVariableName = newName; };
@@ -73,15 +72,15 @@ class GD_CORE_API ForEachChildVariableEvent : public gd::BaseEvent {
   /**
    * \brief Get the key iterator variable attached to the event.
    *
-   * It is the variable that will contain the name of the
+   * 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(); };
+  const gd::String& GetKeyIteratorVariableName() const { return keyIteratorVariableName; };
 
   /**
    * \brief Set the key iterator variable attached to the event.
    *
-   * It is the variable that will contain the name of the
+   * It is the variable that will contain the name of the 
    * iterable's child being iterated on.
    */
   void SetKeyIteratorVariableName(gd::String newName) { keyIteratorVariableName = newName; };
@@ -93,19 +92,14 @@ class GD_CORE_API ForEachChildVariableEvent : public gd::BaseEvent {
   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::String valueIteratorVariableName;
+  gd::String keyIteratorVariableName;
+  gd::String iterableVariableName;
   gd::InstructionsList conditions;
   gd::InstructionsList actions;
   gd::EventsList events;

Core/GDCore/Events/Builtin/ForEachEvent.cpp

@@ -8,13 +8,14 @@
 #include "GDCore/Events/Serialization.h"
 #include "GDCore/Events/Tools/EventsCodeNameMangler.h"
 #include "GDCore/Serialization/SerializerElement.h"
+#include "GDCore/TinyXml/tinyxml.h"
 
 using namespace std;
 
 namespace gd {
 
 ForEachEvent::ForEachEvent()
-    : BaseEvent(), objectsToPick("") {}
+    : BaseEvent(), objectsToPick(""), objectsToPickSelected(false) {}
 
 vector<gd::InstructionsList*> ForEachEvent::GetAllConditionsVectors() {
   vector<gd::InstructionsList*> allConditions;
@@ -73,10 +74,8 @@ void ForEachEvent::SerializeTo(SerializerElement& element) const {
       conditions, element.AddChild("conditions"));
   gd::EventsListSerialization::SerializeInstructionsTo(
       actions, element.AddChild("actions"));
-
-  if (!events.IsEmpty())
-    gd::EventsListSerialization::SerializeEventsTo(events,
-                                                  element.AddChild("events"));
+  gd::EventsListSerialization::SerializeEventsTo(events,
+                                                 element.AddChild("events"));
 }
 
 void ForEachEvent::UnserializeFrom(gd::Project& project,
@@ -87,12 +86,8 @@ void ForEachEvent::UnserializeFrom(gd::Project& project,
       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"));
-  }
+  gd::EventsListSerialization::UnserializeEventsFrom(
+      project, events, element.GetChild("events", 0, "Events"));
 }
 
 }  // namespace gd

Core/GDCore/Events/Builtin/ForEachEvent.h

@@ -6,8 +6,6 @@
 
 #ifndef FOREACHEVENT_H
 #define FOREACHEVENT_H
-#include <vector>
-
 #include "GDCore/Events/Event.h"
 #include "GDCore/Events/EventsList.h"
 namespace gd {
@@ -69,6 +67,8 @@ 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

@@ -10,6 +10,7 @@
 #include "GDCore/Events/CodeGeneration/EventsCodeGenerator.h"
 #include "GDCore/Events/Serialization.h"
 #include "GDCore/Serialization/SerializerElement.h"
+#include "GDCore/TinyXml/tinyxml.h"
 
 using namespace std;
 
@@ -26,13 +27,6 @@ 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);
@@ -61,12 +55,10 @@ void GroupEvent::UnserializeFrom(gd::Project& project,
       project, events, element.GetChild("events"));
 
   parameters.clear();
-  if (element.HasChild("parameters")) {
-    gd::SerializerElement& parametersElement = element.GetChild("parameters");
-    parametersElement.ConsiderAsArrayOf("parameters");
-    for (std::size_t i = 0; i < parametersElement.GetChildrenCount(); ++i)
-      parameters.push_back(parametersElement.GetChild(i).GetValue().GetString());
-  }
+  gd::SerializerElement& parametersElement = element.GetChild("parameters");
+  parametersElement.ConsiderAsArrayOf("parameters");
+  for (std::size_t i = 0; i < parametersElement.GetChildrenCount(); ++i)
+    parameters.push_back(parametersElement.GetChild(i).GetValue().GetString());
 }
 
 void GroupEvent::SetBackgroundColor(unsigned int colorR_,
@@ -77,4 +69,5 @@ void GroupEvent::SetBackgroundColor(unsigned int colorR_,
   colorB = colorB_;
 }
 
+
 }  // namespace gd

Core/GDCore/Events/Builtin/GroupEvent.h

@@ -13,7 +13,6 @@
 namespace gd {
 class Instruction;
 class Project;
-class EventVisitor;
 }
 class EventsCodeGenerationContext;
 
@@ -108,8 +107,6 @@ 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,7 +16,6 @@
 #include "GDCore/Project/Object.h"
 #include "GDCore/Project/Project.h"
 #include "GDCore/Serialization/SerializerElement.h"
-#include "GDCore/Events/EventVisitor.h"
 
 using namespace std;
 
@@ -131,61 +130,30 @@ 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());
 
-  // 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"));
-      }
+  if (includeElement.HasAttribute("includeAll")) {
+    // Compatibility with GDevelop <= 4.0.92
+    if (includeElement.GetBoolAttribute("includeAll", true)) {
+      SetIncludeAllEvents();
     } 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"));
+      SetIncludeStartAndEnd(includeElement.GetIntAttribute("start"),
+                            includeElement.GetIntAttribute("end"));
     }
   } else {
-    // Since GDevelop 5, links always include all events.
-    SetIncludeAllEvents();
+    // 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"));
   }
-  // end of compatibility code
-}
-
-vector<gd::String> LinkEvent::GetAllSearchableStrings() const {
-  vector<gd::String> allSearchableStrings;
-
-  allSearchableStrings.push_back(target);
-
-  return allSearchableStrings;
-}
-
-bool LinkEvent::ReplaceAllSearchableStrings(
-    std::vector<gd::String> newSearchableString) {
-  if (newSearchableString[0] == target) return false;
-  SetTarget(newSearchableString[0]);
-  return true;
-}
-
-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 override { return new LinkEvent(*this); }
+  virtual gd::LinkEvent* Clone() const { 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() override { return true; }
+  virtual bool MustBePreprocessed() { return true; }
 
   /**
    * \brief Get a pointer to the list of events that are targeted by the link.
@@ -107,18 +107,11 @@ class GD_CORE_API LinkEvent : public gd::BaseEvent {
                                  EventsList& eventList,
                                  std::size_t indexOfTheEventInThisList);
 
-  virtual bool IsExecutable() const override { return true; };
+  virtual bool IsExecutable() const { return true; };
 
-  virtual std::vector<gd::String> GetAllSearchableStrings() const override;
-  virtual bool ReplaceAllSearchableStrings(
-      std::vector<gd::String> newSearchableString) override;
-
-  virtual void SerializeTo(SerializerElement& element) const override;
+  virtual void SerializeTo(SerializerElement& element) const;
   virtual void UnserializeFrom(gd::Project& project,
-                               const SerializerElement& element) override;
-
-  bool AcceptVisitor(gd::EventVisitor& eventVisitor) override;
-  void AcceptVisitor(gd::ReadOnlyEventVisitor& eventVisitor) const override;
+                               const SerializerElement& element);
 
  private:
   gd::String

Core/GDCore/Events/Builtin/RepeatEvent.cpp

@@ -35,7 +35,7 @@ vector<pair<gd::Expression*, gd::ParameterMetadata> >
     RepeatEvent::GetAllExpressionsWithMetadata() {
   vector<pair<gd::Expression*, gd::ParameterMetadata> >
       allExpressionsWithMetadata;
-  auto metadata = gd::ParameterMetadata().SetType("number");
+  auto metadata = gd::ParameterMetadata().SetType("expression");
   allExpressionsWithMetadata.push_back(
       std::make_pair(&repeatNumberExpression, metadata));
 
@@ -61,7 +61,7 @@ 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");
+  auto metadata = gd::ParameterMetadata().SetType("expression");
   allExpressionsWithMetadata.push_back(
       std::make_pair(&repeatNumberExpression, metadata));
 
@@ -75,10 +75,8 @@ void RepeatEvent::SerializeTo(SerializerElement& element) const {
       conditions, element.AddChild("conditions"));
   gd::EventsListSerialization::SerializeInstructionsTo(
       actions, element.AddChild("actions"));
-
-  if (!events.IsEmpty())
-    gd::EventsListSerialization::SerializeEventsTo(events,
-                                                  element.AddChild("events"));
+  gd::EventsListSerialization::SerializeEventsTo(events,
+                                                 element.AddChild("events"));
 }
 
 void RepeatEvent::UnserializeFrom(gd::Project& project,
@@ -91,12 +89,8 @@ void RepeatEvent::UnserializeFrom(gd::Project& project,
       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"));
-  }
+  gd::EventsListSerialization::UnserializeEventsFrom(
+      project, events, element.GetChild("events", 0, "Events"));
 }
 
 }  // namespace gd

Core/GDCore/Events/Builtin/RepeatEvent.h

@@ -4,8 +4,8 @@
  * reserved. This project is released under the MIT License.
  */
 
-#pragma once
-
+#ifndef GDCORE_REPEATEVENT_H
+#define GDCORE_REPEATEVENT_H
 #include "GDCore/Events/Event.h"
 #include "GDCore/Events/EventsList.h"
 namespace gd {
@@ -36,10 +36,10 @@ class GD_CORE_API RepeatEvent : public gd::BaseEvent {
   const gd::InstructionsList& GetActions() const { return actions; };
   gd::InstructionsList& GetActions() { return actions; };
 
-  const gd::Expression& GetRepeatExpression() const {
-    return repeatNumberExpression;
+  const gd::String& GetRepeatExpression() const {
+    return repeatNumberExpression.GetPlainString();
   };
-  void SetRepeatExpressionPlainString(gd::String repeatNumberExpression_) {
+  void SetRepeatExpression(gd::String repeatNumberExpression_) {
     repeatNumberExpression = gd::Expression(repeatNumberExpression_);
   };
 
@@ -68,3 +68,5 @@ class GD_CORE_API RepeatEvent : public gd::BaseEvent {
 };
 
 }  // namespace gd
+
+#endif  // GDCORE_REPEATEVENT_H

Core/GDCore/Events/Builtin/StandardEvent.cpp

@@ -15,8 +15,7 @@ using namespace std;
 
 namespace gd {
 
-StandardEvent::StandardEvent()
-    : BaseEvent(), variables(gd::VariablesContainer::SourceType::Local) {}
+StandardEvent::StandardEvent() : BaseEvent() {}
 
 StandardEvent::~StandardEvent(){};
 
@@ -54,13 +53,8 @@ void StandardEvent::SerializeTo(SerializerElement& element) const {
       conditions, element.AddChild("conditions"));
   gd::EventsListSerialization::SerializeInstructionsTo(
       actions, element.AddChild("actions"));
-
-  if (!events.IsEmpty())
-    gd::EventsListSerialization::SerializeEventsTo(events,
-                                                  element.AddChild("events"));
-  if (HasVariables()) {
-    variables.SerializeTo(element.AddChild("variables"));
-  }
+  gd::EventsListSerialization::SerializeEventsTo(events,
+                                                 element.AddChild("events"));
 }
 
 void StandardEvent::UnserializeFrom(gd::Project& project,
@@ -69,17 +63,8 @@ void StandardEvent::UnserializeFrom(gd::Project& project,
       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"));
-  }
-
-  variables.Clear();
-  if (element.HasChild("variables")) {
-    variables.UnserializeFrom(element.GetChild("variables"));
-  }
+  gd::EventsListSerialization::UnserializeEventsFrom(
+      project, events, element.GetChild("events", 0, "Events"));
 }
 
 }  // namespace gd

Core/GDCore/Events/Builtin/StandardEvent.h

@@ -4,13 +4,13 @@
  * reserved. This project is released under the MIT License.
  */
 
-#pragma once
-
+#if defined(GD_IDE_ONLY)
+#ifndef GDCORE_STANDARDEVENT_H
+#define GDCORE_STANDARDEVENT_H
 #include "GDCore/Events/Event.h"
 #include "GDCore/Events/EventsList.h"
 #include "GDCore/Events/Instruction.h"
 #include "GDCore/Events/InstructionsList.h"
-#include "GDCore/Project/VariablesContainer.h"
 namespace gd {
 class Instruction;
 class Project;
@@ -33,10 +33,6 @@ class GD_CORE_API StandardEvent : public gd::BaseEvent {
   virtual const gd::EventsList& GetSubEvents() const { return events; };
   virtual gd::EventsList& GetSubEvents() { return events; };
 
-  virtual bool CanHaveVariables() const { return true; }
-  virtual const gd::VariablesContainer& GetVariables() const { return variables; };
-  virtual gd::VariablesContainer& GetVariables() { return variables; };
-
   const gd::InstructionsList& GetConditions() const { return conditions; };
   gd::InstructionsList& GetConditions() { return conditions; };
 
@@ -57,7 +53,9 @@ class GD_CORE_API StandardEvent : public gd::BaseEvent {
   gd::InstructionsList conditions;
   gd::InstructionsList actions;
   EventsList events;
-  VariablesContainer variables;
 };
 
 }  // namespace gd
+
+#endif  // GDCORE_STANDARDEVENT_H
+#endif

Core/GDCore/Events/Builtin/WhileEvent.cpp

@@ -52,10 +52,8 @@ void WhileEvent::SerializeTo(SerializerElement& element) const {
       conditions, element.AddChild("conditions"));
   gd::EventsListSerialization::SerializeInstructionsTo(
       actions, element.AddChild("actions"));
-
-  if (!events.IsEmpty())
-    gd::EventsListSerialization::SerializeEventsTo(events,
-                                                  element.AddChild("events"));
+  gd::EventsListSerialization::SerializeEventsTo(events,
+                                                 element.AddChild("events"));
 }
 
 void WhileEvent::UnserializeFrom(gd::Project& project,
@@ -70,12 +68,8 @@ void WhileEvent::UnserializeFrom(gd::Project& project,
       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"));
-  }
+  gd::EventsListSerialization::UnserializeEventsFrom(
+      project, events, element.GetChild("events", 0, "Events"));
 }
 
 }  // namespace gd

Core/GDCore/Events/Builtin/WhileEvent.h

@@ -72,6 +72,8 @@ class GD_CORE_API WhileEvent : public gd::BaseEvent {
                               ///< de/activate infinite loop warning when the
                               ///< user create the event
 
+  mutable unsigned int whileConditionsHeight;
+
   int GetConditionsHeight() const;
   int GetActionsHeight() const;
   int GetWhileConditionsHeight() const;

Core/GDCore/Events/CodeGeneration/DiagnosticReport.h

@@ -1,129 +0,0 @@
-/*
- * GDevelop Core
- * Copyright 2008-present Florian Rival (Florian.Rival@gmail.com). All rights
- * reserved. This project is released under the MIT License.
- */
-#pragma once
-
-#include <memory>
-#include <vector>
-
-#include "GDCore/String.h"
-#include "GDCore/Tools/MakeUnique.h"
-
-namespace gd {
-
-/**
- * \brief
- */
-class GD_CORE_API ProjectDiagnostic {
- public:
-  enum ErrorType {
-    UndeclaredVariable,
-    MissingBehavior,
-    UnknownObject,
-    MismatchedObjectType,
-  };
-
-  ProjectDiagnostic(ErrorType type_,
-                    const gd::String &message_,
-                    const gd::String &actualValue_,
-                    const gd::String &expectedValue_,
-                    const gd::String &objectName_ = "")
-      : type(type_),
-        message(message_),
-        actualValue(actualValue_),
-        expectedValue(expectedValue_),
-        objectName(objectName_) {};
-  virtual ~ProjectDiagnostic() {};
-
-  ErrorType GetType() const { return type; };
-  const gd::String &GetMessage() const { return message; }
-  const gd::String &GetObjectName() const { return objectName; }
-  const gd::String &GetActualValue() const { return actualValue; }
-  const gd::String &GetExpectedValue() const { return expectedValue; }
-
- private:
-  ErrorType type;
-  gd::String message;
-  gd::String objectName;
-  gd::String actualValue;
-  gd::String expectedValue;
-};
-
-/**
- * \brief
- */
-class GD_CORE_API DiagnosticReport {
- public:
-  DiagnosticReport() {};
-  virtual ~DiagnosticReport() {};
-
-  void Add(const gd::ProjectDiagnostic &projectDiagnostic) {
-    projectDiagnostics.push_back(
-        gd::make_unique<gd::ProjectDiagnostic>(projectDiagnostic));
-  };
-
-  const ProjectDiagnostic &Get(std::size_t index) const {
-    return *projectDiagnostics[index].get();
-  };
-
-  std::size_t Count() const { return projectDiagnostics.size(); };
-
-  const gd::String &GetSceneName() const { return sceneName; }
-
-  void SetSceneName(const gd::String &sceneName_) { sceneName = sceneName_; }
-
-  void LogAllDiagnostics() {
-    for (auto &diagnostic : projectDiagnostics) {
-      std::cout << diagnostic->GetMessage()
-                << "(object: " << diagnostic->GetObjectName()
-                << ", actual value: " << diagnostic->GetActualValue()
-                << ", expected value: " << diagnostic->GetExpectedValue() << ")"
-                << std::endl;
-    }
-  }
-
- private:
-  std::vector<std::unique_ptr<gd::ProjectDiagnostic>> projectDiagnostics;
-  gd::String sceneName;
-};
-
-/**
- * \brief
- */
-class GD_CORE_API WholeProjectDiagnosticReport {
- public:
-  WholeProjectDiagnosticReport() {};
-  virtual ~WholeProjectDiagnosticReport() {};
-
-  const DiagnosticReport &Get(std::size_t index) const {
-    return *diagnosticReports[index].get();
-  };
-
-  void Clear() { diagnosticReports.clear(); };
-
-  DiagnosticReport &AddNewDiagnosticReportForScene(
-      const gd::String &sceneName) {
-    auto diagnosticReport = gd::make_unique<gd::DiagnosticReport>();
-    diagnosticReport->SetSceneName(sceneName);
-    diagnosticReports.push_back(std::move(diagnosticReport));
-    return *diagnosticReports[diagnosticReports.size() - 1].get();
-  };
-
-  std::size_t Count() const { return diagnosticReports.size(); };
-
-  bool HasAnyIssue() {
-    for (auto &diagnosticReport : diagnosticReports) {
-      if (diagnosticReport->Count() > 0) {
-        return true;
-      }
-    }
-    return false;
-  }
-
- private:
-  std::vector<std::unique_ptr<gd::DiagnosticReport>> diagnosticReports;
-};
-
-}  // namespace gd

Core/GDCore/Events/CodeGeneration/EffectsCodeGenerator.cpp

@@ -15,48 +15,16 @@
 #include "GDCore/Project/Layout.h"
 #include "GDCore/Project/Object.h"
 #include "GDCore/Project/Project.h"
-#include "GDCore/Project/EventsFunctionsExtension.h"
-#include "GDCore/IDE/ProjectBrowserHelper.h"
 
 namespace gd {
 
-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.
-
-  // TODO Factorize with the iteration on all effects for resource exposure.
-  // TODO Implement an ArbitraryEffectWorker and add a method in ProjectBrowserHelper
-
+void ExposeProjectEffects(
+    const gd::Project& project,
+    const std::function<void(const gd::Effect& effect)>& worker) {
   // 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);
@@ -65,34 +33,47 @@ void EffectsCodeGenerator::GenerateEffectsIncludeFiles(
       auto& effects = layout.GetLayer(l).GetEffects();
       for (std::size_t e = 0; e < effects.GetEffectsCount(); ++e) {
         auto& effect = effects.GetEffect(e);
-        effectsCodeGenerator.AddEffectIncludeFiles(effect);
+        worker(effect);
+      }
+    }
+
+    for (std::size_t i = 0; i < layout.GetObjectsCount(); i++) {
+      auto& object = layout.GetObject(i);
+      auto& effects = object.GetEffects();
+      for (std::size_t e = 0; e < effects.GetEffectsCount(); e++) {
+        auto& effect = effects.GetEffect(e);
+        worker(effect);
       }
     }
   }
 
-  // Add objects effects
-  gd::ProjectBrowserHelper::ExposeProjectObjects(project, effectsCodeGenerator);
-
-  // Add event-based objects layouts effects
-  for (std::size_t s = 0; s < project.GetEventsFunctionsExtensionsCount();
-       s++) {
-    auto &eventsFunctionExtension = project.GetEventsFunctionsExtension(s);
-
-    auto &eventsBasedObjects = eventsFunctionExtension.GetEventsBasedObjects();
-    for (std::size_t objectIndex = 0;
-         objectIndex < eventsBasedObjects.GetCount(); ++objectIndex) {
-      auto &eventsBasedObject = eventsBasedObjects.Get(objectIndex);
-
-      auto &layers = eventsBasedObject.GetLayers();
-      for (std::size_t l = 0; l < layers.GetLayersCount(); ++l) {
-        auto &effects = layers.GetLayer(l).GetEffects();
-        for (std::size_t e = 0; e < effects.GetEffectsCount(); ++e) {
-          auto &effect = effects.GetEffect(e);
-          effectsCodeGenerator.AddEffectIncludeFiles(effect);
-        }
-      }
+  // Add global object effects
+  for (std::size_t s = 0; s < project.GetObjectsCount(); s++) {
+    auto& effects = project.GetObject(s).GetEffects();
+    for (std::size_t e = 0; e < effects.GetEffectsCount(); e++) {
+      auto& effect = effects.GetEffect(e);
+      worker(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);
+      });
+}
+
 }  // namespace gd

Core/GDCore/Events/CodeGeneration/EffectsCodeGenerator.h

@@ -3,18 +3,16 @@
  * Copyright 2008-present Florian Rival (Florian.Rival@gmail.com). All rights
  * reserved. This project is released under the MIT License.
  */
-#pragma once
+#ifndef GDCORE_EffectsCodeGenerator_H
+#define GDCORE_EffectsCodeGenerator_H
 
 #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 {
@@ -22,26 +20,16 @@ namespace gd {
 /**
  * \brief Internal class used to generate code from events
  */
-class GD_CORE_API EffectsCodeGenerator : public ArbitraryObjectsWorker {
-public:
+class GD_CORE_API EffectsCodeGenerator {
+ public:
   /**
    * \brief Add all the include files required by the project effects.
    */
   static void GenerateEffectsIncludeFiles(const gd::Platform& platform,
-                                          gd::Project& project,
+                                          const 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,9 +4,7 @@
  * 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"
@@ -16,7 +14,7 @@ using namespace std;
 namespace gd {
 
 void EventsCodeGenerationContext::InheritsFrom(
-    EventsCodeGenerationContext& parent_) {
+    const EventsCodeGenerationContext& parent_) {
   parent = &parent_;
 
   // Objects lists declared by parent became "already declared" in the child
@@ -26,8 +24,8 @@ void EventsCodeGenerationContext::InheritsFrom(
             parent_.objectsListsToBeDeclared.end(),
             std::inserter(alreadyDeclaredObjectsLists,
                           alreadyDeclaredObjectsLists.begin()));
-  std::copy(parent_.objectsListsOrEmptyToBeDeclared.begin(),
-            parent_.objectsListsOrEmptyToBeDeclared.end(),
+  std::copy(parent_.objectsListsWithoutPickingToBeDeclared.begin(),
+            parent_.objectsListsWithoutPickingToBeDeclared.end(),
             std::inserter(alreadyDeclaredObjectsLists,
                           alreadyDeclaredObjectsLists.begin()));
   std::copy(parent_.emptyObjectsListsToBeDeclared.begin(),
@@ -35,8 +33,6 @@ 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;
@@ -46,59 +42,33 @@ 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(
-    EventsCodeGenerationContext& parent_) {
+    const 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::ObjectsListNeededOrEmptyIfJustDeclared(
+void EventsCodeGenerationContext::ObjectsListWithoutPickingNeeded(
     const gd::String& objectName) {
-  if (!IsToBeDeclared(objectName)) {
-    objectsListsOrEmptyToBeDeclared.insert(objectName);
-
-    if (IsInsideAsync()) {
-      NotifyAsyncParentsAboutDeclaredObject(objectName);
-    }
-  }
+  if (!IsToBeDeclared(objectName))
+    objectsListsWithoutPickingToBeDeclared.insert(objectName);
 
   depthOfLastUse[objectName] = GetContextDepth();
 }
 
 void EventsCodeGenerationContext::EmptyObjectsListNeeded(
     const gd::String& objectName) {
-  if (!IsToBeDeclared(objectName)) {
+  if (!IsToBeDeclared(objectName))
     emptyObjectsListsToBeDeclared.insert(objectName);
-  }
 
   depthOfLastUse[objectName] = GetContextDepth();
 }
@@ -107,8 +77,8 @@ std::set<gd::String> EventsCodeGenerationContext::GetAllObjectsToBeDeclared()
     const {
   std::set<gd::String> allObjectListsToBeDeclared(
       objectsListsToBeDeclared.begin(), objectsListsToBeDeclared.end());
-  allObjectListsToBeDeclared.insert(objectsListsOrEmptyToBeDeclared.begin(),
-                                    objectsListsOrEmptyToBeDeclared.end());
+  allObjectListsToBeDeclared.insert(objectsListsWithoutPickingToBeDeclared.begin(),
+                                    objectsListsWithoutPickingToBeDeclared.end());
   allObjectListsToBeDeclared.insert(emptyObjectsListsToBeDeclared.begin(),
                                     emptyObjectsListsToBeDeclared.end());
 
@@ -132,21 +102,4 @@ 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

@@ -3,12 +3,11 @@
  * Copyright 2008-2016 Florian Rival (Florian.Rival@gmail.com). All rights
  * reserved. This project is released under the MIT License.
  */
-#pragma once
-
+#ifndef EVENTSCODEGENERATIONCONTEXT_H
+#define EVENTSCODEGENERATIONCONTEXT_H
 #include <map>
 #include <memory>
 #include <set>
-
 #include "GDCore/String.h"
 
 namespace gd {
@@ -34,7 +33,11 @@ class GD_CORE_API EventsCodeGenerationContext {
    * updated to contain the maximal scope depth reached.
    */
   EventsCodeGenerationContext(unsigned int* maxDepthLevel_ = nullptr)
-      : maxDepthLevel(maxDepthLevel_){};
+      : contextDepth(0),
+        customConditionDepth(0),
+        maxDepthLevel(maxDepthLevel_),
+        parent(NULL),
+        reuseExplicitlyForbidden(false){};
   virtual ~EventsCodeGenerationContext(){};
 
   /**
@@ -42,13 +45,7 @@ class GD_CORE_API EventsCodeGenerationContext {
    * another one. The child will then for example not declare again objects
    * already declared by its 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);
+  void InheritsFrom(const EventsCodeGenerationContext& parent);
 
   /**
    * \brief As InheritsFrom, mark the context as being the child of another one,
@@ -56,7 +53,7 @@ class GD_CORE_API EventsCodeGenerationContext {
    *
    * Used for example for optimizing the last event of a list.
    */
-  void Reuse(EventsCodeGenerationContext& parent);
+  void Reuse(const EventsCodeGenerationContext& parent);
 
   /**
    * \brief Forbid any optimization that would reuse and modify the object list
@@ -91,19 +88,19 @@ class GD_CORE_API EventsCodeGenerationContext {
   const EventsCodeGenerationContext* GetParentContext() const { return parent; }
 
   /**
-   * Mark the object as being the object being handled by the instruction.
+   * Mark the object has 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; };
 
@@ -112,7 +109,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. `ObjectAlreadyDeclaredByParents(objectName)` returns true).
+   * (i.e. `ObjectAlreadyDeclared(objectName)` returns true).
    */
   void ObjectsListNeeded(const gd::String& objectName);
 
@@ -124,7 +121,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 ObjectsListNeededOrEmptyIfJustDeclared(const gd::String& objectName);
+  void ObjectsListWithoutPickingNeeded(const gd::String& objectName);
 
   /**
    * Call this when an instruction in the event needs an empty object list,
@@ -137,21 +134,29 @@ class GD_CORE_API EventsCodeGenerationContext {
   void EmptyObjectsListNeeded(const gd::String& objectName);
 
   /**
-   * Return true if an object list has already been declared by the parent contexts.
+   * Return true if an object list has already been declared (or is going to be
+   * declared).
    */
-  bool ObjectAlreadyDeclaredByParents(const gd::String& objectName) const {
+  bool ObjectAlreadyDeclared(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
-   * (normal, potentially empty or empty).
+   * ( the non empty as well as the empty objects lists )
    */
   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;
@@ -161,9 +166,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>& GetObjectsListsToBeEmptyIfJustDeclared()
+  const std::set<gd::String>& GetObjectsListsToBeDeclaredWithoutPicking()
       const {
-    return objectsListsOrEmptyToBeDeclared;
+    return objectsListsWithoutPickingToBeDeclared;
   };
 
   /**
@@ -179,7 +184,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>& GetObjectsListsAlreadyDeclaredByParents() const {
+  const std::set<gd::String>& GetObjectsListsAlreadyDeclared() const {
     return alreadyDeclaredObjectsLists;
   };
 
@@ -222,55 +227,22 @@ class GD_CORE_API EventsCodeGenerationContext {
    */
   size_t GetCurrentConditionDepth() const { return customConditionDepth; }
 
-  /**
-   * \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; }
-
+ private:
   /**
    * \brief Returns true if the given object is already going to be declared
-   * in this context (either as a traditional objects list, or an empty one).
+   * (either as a traditional objects list, or one without picking, or one
+   * empty).
+   *
    */
   bool IsToBeDeclared(const gd::String& objectName) {
     return objectsListsToBeDeclared.find(objectName) !=
                objectsListsToBeDeclared.end() ||
-           objectsListsOrEmptyToBeDeclared.find(objectName) !=
-               objectsListsOrEmptyToBeDeclared.end() ||
+           objectsListsWithoutPickingToBeDeclared.find(objectName) !=
+               objectsListsWithoutPickingToBeDeclared.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.
@@ -278,7 +250,7 @@ class GD_CORE_API EventsCodeGenerationContext {
       objectsListsToBeDeclared;  ///< Objects lists that will be declared in
                                  ///< this context.
   std::set<gd::String>
-      objectsListsOrEmptyToBeDeclared;  ///< Objects lists that will be
+      objectsListsWithoutPickingToBeDeclared;  ///< Objects lists that will be
                                                ///< declared in this context,
                                                ///< but not filled with scene's
                                                ///< objects.
@@ -288,40 +260,22 @@ 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 = 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 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* maxDepthLevel;  ///< A pointer to a unsigned int updated with
                                 ///< the maximum depth reached.
-  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.
+  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.
 };
 
 }  // namespace gd
+#endif  // EVENTSCODEGENERATIONCONTEXT_H

Core/GDCore/Events/CodeGeneration/EventsCodeGenerator.h

@@ -3,25 +3,22 @@
  * Copyright 2008-present Florian Rival (Florian.Rival@gmail.com). All rights
  * reserved. This project is released under the MIT License.
  */
-#pragma once
+#ifndef GDCORE_EVENTSCODEGENERATOR_H
+#define GDCORE_EVENTSCODEGENERATOR_H
 
 #include <set>
 #include <utility>
 #include <vector>
 
-#include "GDCore/Events/CodeGeneration/DiagnosticReport.h"
 #include "GDCore/Events/Event.h"
 #include "GDCore/Events/Instruction.h"
-#include "GDCore/Project/ProjectScopedContainers.h"
 #include "GDCore/String.h"
-
 namespace gd {
 class EventsList;
 class Expression;
 class Project;
 class Layout;
 class ObjectsContainer;
-class ObjectsContainersList;
 class ExternalEvents;
 class ParameterMetadata;
 class ObjectMetadata;
@@ -51,7 +48,7 @@ class GD_CORE_API EventsCodeGenerator {
    * \brief Construct a code generator for the specified
    * platform/project/layout.
    */
-  EventsCodeGenerator(const gd::Project& project_,
+  EventsCodeGenerator(gd::Project& project_,
                       const gd::Layout& layout,
                       const gd::Platform& platform_);
 
@@ -59,10 +56,10 @@ class GD_CORE_API EventsCodeGenerator {
    * \brief Construct a code generator for the specified
    * objects/groups and platform
    */
-  EventsCodeGenerator(
-      const gd::Platform& platform,
-      const gd::ProjectScopedContainers& projectScopedContainers_);
-  virtual ~EventsCodeGenerator() {};
+  EventsCodeGenerator(const gd::Platform& platform,
+                      gd::ObjectsContainer& globalObjectsAndGroups_,
+                      const gd::ObjectsContainer& objectsAndGroups_);
+  virtual ~EventsCodeGenerator(){};
 
   /**
    * \brief Preprocess an events list (replacing for example links with the
@@ -80,7 +77,7 @@ class GD_CORE_API EventsCodeGenerator {
    * \return Code
    */
   virtual gd::String GenerateEventsListCode(
-      gd::EventsList& events, EventsCodeGenerationContext& context);
+      gd::EventsList& events, const EventsCodeGenerationContext& context);
 
   /**
    * \brief Generate code for executing a condition list
@@ -128,7 +125,7 @@ class GD_CORE_API EventsCodeGenerator {
    */
   std::vector<gd::String> GenerateParametersCodes(
       const std::vector<gd::Expression>& parameters,
-      const ParameterMetadataContainer& parametersInfo,
+      const std::vector<gd::ParameterMetadata>& parametersInfo,
       EventsCodeGenerationContext& context,
       std::vector<std::pair<gd::String, gd::String> >*
           supplementaryParametersTypes = 0);
@@ -157,55 +154,8 @@ class GD_CORE_API EventsCodeGenerator {
    * \param context Context used for generation
    * \return Code
    */
-  gd::String GenerateActionCode(
-      gd::Instruction& action,
-      EventsCodeGenerationContext& context,
-      const gd::String& optionalAsyncCallbackName = "",
-      const gd::String& optionalAsyncCallbackId = "");
-
-  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);
+  gd::String GenerateActionCode(gd::Instruction& action,
+                                EventsCodeGenerationContext& context);
 
   /**
    * \brief Generate code for declaring objects lists.
@@ -330,22 +280,18 @@ class GD_CORE_API EventsCodeGenerator {
    */
   bool ErrorOccurred() const { return errorOccurred; };
 
-  const gd::ObjectsContainersList& GetObjectsContainersList() const {
-    return projectScopedContainers.GetObjectsContainersList();
-  };
-
-  const gd::ProjectScopedContainers& GetProjectScopedContainers() const {
-    return projectScopedContainers;
+  /**
+   * \brief Get the global objects/groups used for code generation.
+   */
+  gd::ObjectsContainer& GetGlobalObjectsAndGroups() const {
+    return globalObjectsAndGroups;
   }
 
   /**
-   * @brief Give access to the project scoped containers as code generation
-   * might push and pop variable containers (for local variables). This could be
-   * passed as a parameter recursively in code generation, but this requires
-   * heavy refactoring. Instead, we use this single instance.
+   * \brief Get the objects/groups used for code generation.
    */
-  gd::ProjectScopedContainers& GetProjectScopedContainers() {
-    return projectScopedContainers;
+  const gd::ObjectsContainer& GetObjectsAndGroups() const {
+    return objectsAndGroups;
   }
 
   /**
@@ -358,7 +304,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.
    */
-  const gd::Project& GetProject() const { return *project; }
+  gd::Project& GetProject() const { return *project; }
 
   /**
    * \brief Get the layout the code is being generated for.
@@ -371,6 +317,22 @@ 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 is 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.
@@ -384,12 +346,6 @@ class GD_CORE_API EventsCodeGenerator {
    */
   size_t GetMaxConditionsListsSize() const { return maxConditionsListsSize; }
 
-  void SetDiagnosticReport(gd::DiagnosticReport* diagnosticReport_) {
-    diagnosticReport = diagnosticReport_;
-  }
-
-  gd::DiagnosticReport* GetDiagnosticReport() { return diagnosticReport; }
-
   /**
    * \brief Generate the full name for accessing to a boolean variable used for
    * conditions.
@@ -402,18 +358,6 @@ 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.
    *
@@ -466,14 +410,7 @@ class GD_CORE_API EventsCodeGenerator {
    */
   virtual gd::String GetCodeNamespace() { return ""; };
 
-  enum VariableScope {
-    LAYOUT_VARIABLE = 0,
-    PROJECT_VARIABLE,
-    OBJECT_VARIABLE,
-    ANY_VARIABLE,
-    VARIABLE_OR_PROPERTY,
-    VARIABLE_OR_PROPERTY_OR_PARAMETER
-  };
+  enum VariableScope { LAYOUT_VARIABLE = 0, PROJECT_VARIABLE, OBJECT_VARIABLE };
 
   /**
    * Generate a single unique number for the specified instruction.
@@ -498,33 +435,7 @@ class GD_CORE_API EventsCodeGenerator {
    */
   size_t GenerateSingleUsageUniqueIdForEventsList();
 
-  virtual gd::String GenerateRelationalOperation(
-      const gd::String& relationalOperator,
-      const gd::String& lhs,
-      const gd::String& rhs);
-
-  /**
-   * \brief Generate the code to access the local variables stack.
-   */
-  virtual gd::String GenerateLocalVariablesStackAccessor();
-
-  /**
-   * \brief Generate an any variable getter that fallbacks on scene variable for
-   * compatibility reason.
-   */
-  gd::String GenerateAnyOrSceneVariableGetter(
-      const gd::Expression& variableExpression,
-      EventsCodeGenerationContext& context);
-
-  virtual gd::String GeneratePropertySetterWithoutCasting(
-      const gd::PropertiesContainer& propertiesContainer,
-      const gd::NamedPropertyDescriptor& property,
-      const gd::String& operandCode);
-
  protected:
-  virtual const gd::String GenerateRelationalOperatorCodes(
-      const gd::String& operatorString);
-
   /**
    * \brief Generate the code for a single parameter.
    *
@@ -533,13 +444,13 @@ class GD_CORE_API EventsCodeGenerator {
    * - object : Object name -> string
    * - expression : Mathematical expression -> number (double)
    * - string : %Text expression -> string
-   * - layer, color, file, stringWithSelector : Same as string
+   * - layer, color, file, joyaxis : Same as string
    * - relationalOperator : Used to make a comparison between the function
-  return value and value of the parameter preceding the relationOperator
+  resturn 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,
-  soundfile -> string
+  soundfile, police -> string
    * - trueorfalse, yesorno -> boolean ( See GenerateTrue/GenerateFalse ).
    *
    * <br><br>
@@ -551,18 +462,25 @@ 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.
-   * - 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:
+  object name in another parameter. Example:
+   * \code
+      AddExpression("Count", _("Object count"), _("Count the number of picked
+  objects"), _("Objects"), "res/conditions/nbObjet.png")
+      .AddParameter("objectList", _("Object"))
+      .SetFunctionName("getPickedObjectsCount");
+
+   * \endcode
+   * - objectListWithoutPicking : 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"))
    * \endcode
    */
   virtual gd::String GenerateParameterCodes(
-      const gd::Expression& parameter,
+      const gd::String& parameter,
       const gd::ParameterMetadata& metadata,
       gd::EventsCodeGenerationContext& context,
       const gd::String& lastObjectName,
@@ -576,19 +494,12 @@ class GD_CORE_API EventsCodeGenerator {
       const gd::String& variableName,
       const VariableScope& scope,
       gd::EventsCodeGenerationContext& context,
-      const gd::String& objectName,
-      bool hasChild) {
-    // This code is only used as a mock.
-    // See the real implementation in GDJS.
+      const gd::String& objectName) {
     if (scope == LAYOUT_VARIABLE) {
       return "getLayoutVariable(" + variableName + ")";
 
     } else if (scope == PROJECT_VARIABLE) {
       return "getProjectVariable(" + variableName + ")";
-    } else if (scope == ANY_VARIABLE || scope == VARIABLE_OR_PROPERTY ||
-               scope == VARIABLE_OR_PROPERTY_OR_PARAMETER) {
-      // TODO Split the 3 cases to make tests stronger.
-      return "getAnyVariable(" + variableName + ")";
     }
 
     return "getVariableForObject(" + objectName + ", " + variableName + ")";
@@ -601,12 +512,6 @@ 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.
@@ -635,24 +540,6 @@ 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 GeneratePropertyGetterWithoutCasting(
-      const gd::PropertiesContainer& propertiesContainer,
-      const gd::NamedPropertyDescriptor& property);
-
-  virtual gd::String GenerateParameterGetter(
-      const gd::ParameterMetadata& parameter,
-      const gd::String& type,
-      gd::EventsCodeGenerationContext& context);
-
-  virtual gd::String GenerateParameterGetterWithoutCasting(
-      const gd::ParameterMetadata& parameter);
-
   /**
    * \brief Generate the code to reference an object which is
    * in an empty/null state.
@@ -727,16 +614,28 @@ class GD_CORE_API EventsCodeGenerator {
   };
 
   /**
-   * \brief Must negate a predicate.
+   * \brief Must negate a predicat.
    *
-   * The default implementation generates C-style code : It wraps the predicate
+   * The default implementation generates C-style code : It wraps the predicat
    * inside parenthesis and add a !.
    */
-  virtual gd::String GenerateNegatedPredicate(
-      const gd::String& predicate) const {
-    return "!(" + predicate + ")";
+  virtual gd::String GenerateNegatedPredicat(const gd::String& predicat) const {
+    return "!(" + predicat + ")";
   };
 
+  /**
+   * \brief Must create a boolean which is a reference to a boolean declared in
+   * the parent scope.
+   *
+   * The default implementation generates C-style code.
+   */
+  virtual gd::String GenerateReferenceToUpperScopeBoolean(
+      const gd::String& referenceName,
+      const gd::String& referencedBoolean,
+      gd::EventsCodeGenerationContext& context) {
+    return "bool & " + referenceName + " = " + referencedBoolean + ";\n";
+  }
+
   virtual gd::String GenerateFreeCondition(
       const std::vector<gd::String>& arguments,
       const gd::InstructionMetadata& instrInfos,
@@ -764,40 +663,30 @@ 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,
-      const gd::String& optionalAsyncCallbackName = "",
-      const gd::String& optionalAsyncCallbackId = "");
+      gd::EventsCodeGenerationContext& context);
 
   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,
-      const gd::String& optionalAsyncCallbackName = "",
-      const gd::String& optionalAsyncCallbackId = "");
+      gd::EventsCodeGenerationContext& context);
 
   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,
-      const gd::String& optionalAsyncCallbackName = "",
-      const gd::String& optionalAsyncCallbackId = "");
+      gd::EventsCodeGenerationContext& context);
 
   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,
@@ -839,19 +728,17 @@ class GD_CORE_API EventsCodeGenerator {
   virtual gd::String GenerateGetBehaviorNameCode(
       const gd::String& behaviorName);
 
-  bool CheckBehaviorParameters(const gd::Instruction& instruction,
-                               const gd::InstructionMetadata& instrInfos);
-
   const gd::Platform& platform;  ///< The platform being used.
 
-  gd::ProjectScopedContainers projectScopedContainers;
+  gd::ObjectsContainer& globalObjectsAndGroups;
+  const gd::ObjectsContainer& objectsAndGroups;
 
   bool hasProjectAndLayout;  ///< true only if project and layout are valid
                              ///< references. If false, they should not be used.
-  const gd::Project* project;  ///< The project being used.
-  const gd::Layout* scene;     ///< The scene being generated.
+  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 occurred.
+  bool errorOccurred;          ///< Must be set to true if an error occured.
   bool compilationForRuntime;  ///< Is set to true if the code generation is
                                ///< made for runtime only.
 
@@ -872,8 +759,8 @@ class GD_CORE_API EventsCodeGenerator {
       instructionUniqueIds;  ///< The unique ids generated for instructions.
   size_t eventsListNextUniqueId;  ///< The next identifier to use for an events
                                   ///< list function name.
-
-  gd::DiagnosticReport* diagnosticReport;
 };
 
 }  // namespace gd
+
+#endif  // GDCORE_EVENTSCODEGENERATOR_H

Core/GDCore/Events/CodeGeneration/ExpressionCodeGenerator.cpp

@@ -7,7 +7,6 @@
 
 #include <memory>
 #include <vector>
-#include <vector>
 
 #include "GDCore/CommonTools.h"
 #include "GDCore/Events/CodeGeneration/EventsCodeGenerationContext.h"
@@ -26,63 +25,36 @@
 #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"
-#include "GDCore/Events/CodeGeneration/DiagnosticReport.h"
 
 namespace gd {
 
 gd::String ExpressionCodeGenerator::GenerateExpressionCode(
     EventsCodeGenerator& codeGenerator,
     EventsCodeGenerationContext& context,
-    const gd::String& rootType,
-    const gd::Expression& expression,
-    const gd::String& rootObjectName,
-    const gd::String& extraInfo) {
-  ExpressionCodeGenerator generator(rootType, rootObjectName, codeGenerator, context);
+    const gd::String& type,
+    const gd::String& expression,
+    const gd::String& objectName) {
+  gd::ExpressionParser2 parser(codeGenerator.GetPlatform(),
+                               codeGenerator.GetGlobalObjectsAndGroups(),
+                               codeGenerator.GetObjectsAndGroups());
+  ExpressionCodeGenerator generator(codeGenerator, context);
 
-  auto node = expression.GetRootNode();
+  auto node = parser.ParseExpression(type, expression, objectName);
   if (!node) {
-    std::cout << "Error: error while parsing: \"" << expression.GetPlainString()
-              << "\" (" << rootType << ")" << std::endl;
+    std::cout << "Error: error while parsing: \"" << expression << "\" ("
+              << type << ")" << std::endl;
 
-    return generator.GenerateDefaultValue(rootType);
+    return generator.GenerateDefaultValue(type);
   }
 
-  gd::ExpressionValidator validator(codeGenerator.GetPlatform(),
-                                    codeGenerator.GetProjectScopedContainers(),
-                                    rootType,
-                                    extraInfo);
+  gd::ExpressionValidator validator;
   node->Visit(validator);
-  if (!validator.GetFatalErrors().empty()) {
-    std::cout << "Error: \"" << validator.GetFatalErrors()[0]->GetMessage()
-              << "\" in: \"" << expression.GetPlainString() << "\" ("
-              << rootType << ")" << std::endl;
+  if (!validator.GetErrors().empty()) {
+    std::cout << "Error: \"" << validator.GetErrors()[0]->GetMessage()
+              << "\" in: \"" << expression << "\" (" << type << ")"
+              << std::endl;
 
-    auto *diagnosticReport = codeGenerator.GetDiagnosticReport();
-    if (diagnosticReport) {
-      for (auto *error : validator.GetFatalErrors()) {
-        if (error->GetType() ==
-                gd::ExpressionParserError::ErrorType::UndeclaredVariable ||
-            error->GetType() ==
-                gd::ExpressionParserError::ErrorType::UnknownIdentifier) {
-                  
-          const auto& variableName = error->GetActualValue();
-          if (!variableName.empty()) {
-            gd::ProjectDiagnostic projectDiagnostic(
-                gd::ProjectDiagnostic::ErrorType::UndeclaredVariable,
-                error->GetMessage(), error->GetActualValue(),
-                "", error->GetObjectName());
-            diagnosticReport->Add(projectDiagnostic);
-          }
-        }
-      }
-    }
-
-    return generator.GenerateDefaultValue(rootType);
+    return generator.GenerateDefaultValue(type);
   }
 
   node->Visit(generator);
@@ -125,90 +97,27 @@ 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.
-  auto type = gd::ExpressionTypeFinder::GetType(codeGenerator.GetPlatform(),
-                                            codeGenerator.GetProjectScopedContainers(),
-                                            rootType,
-                                            node);
+  EventsCodeGenerator::VariableScope scope =
+      node.type == "globalvar"
+          ? gd::EventsCodeGenerator::PROJECT_VARIABLE
+          : ((node.type == "scenevar")
+                 ? gd::EventsCodeGenerator::LAYOUT_VARIABLE
+                 : gd::EventsCodeGenerator::OBJECT_VARIABLE);
 
-  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 == "variable"
-            ? gd::EventsCodeGenerator::ANY_VARIABLE
-        : type == "variableOrProperty"
-            ? gd::EventsCodeGenerator::VARIABLE_OR_PROPERTY
-        : type == "variableOrPropertyOrParameter"
-            ? gd::EventsCodeGenerator::VARIABLE_OR_PROPERTY_OR_PARAMETER
-        : 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, node.child != nullptr);
-    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);
-    }, [&]() {
-      output += codeGenerator.GenerateGetVariable(
-          node.name, gd::EventsCodeGenerator::ANY_VARIABLE, context, "", node.child != nullptr);
-      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);
-    });
-  }
+  output += codeGenerator.GenerateGetVariable(
+      node.name, scope, context, node.objectName);
+  if (node.child) node.child->Visit(*this);
 }
 
 void ExpressionCodeGenerator::OnVisitVariableAccessorNode(
     VariableAccessorNode& node) {
-    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, node.child != nullptr);
-
-      // 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);
-    }
+  output += codeGenerator.GenerateVariableAccessor(node.name);
   if (node.child) node.child->Visit(*this);
 }
 
 void ExpressionCodeGenerator::OnVisitVariableBracketAccessorNode(
     VariableBracketAccessorNode& node) {
-  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);
+  ExpressionCodeGenerator generator(codeGenerator, context);
   node.expression->Visit(generator);
   output +=
       codeGenerator.GenerateVariableBracketAccessor(generator.GetOutput());
@@ -216,104 +125,39 @@ void ExpressionCodeGenerator::OnVisitVariableBracketAccessorNode(
 }
 
 void ExpressionCodeGenerator::OnVisitIdentifierNode(IdentifierNode& node) {
-  auto type = gd::ExpressionTypeFinder::GetType(codeGenerator.GetPlatform(),
-                                            codeGenerator.GetProjectScopedContainers(),
-                                            rootType,
-                                            node);
-
-  if (gd::ParameterMetadata::IsObject(type)) {
+  if (gd::ParameterMetadata::IsObject(node.type)) {
     output +=
-        codeGenerator.GenerateObject(node.identifierName, type, context);
-  } else if (gd::ParameterMetadata::IsExpression("variable", type)) {
-    EventsCodeGenerator::VariableScope scope =
-        type == "variable"
-            ? gd::EventsCodeGenerator::ANY_VARIABLE
-        : type == "variableOrProperty"
-            ? gd::EventsCodeGenerator::VARIABLE_OR_PROPERTY
-        : type == "variableOrPropertyOrParameter"
-            ? gd::EventsCodeGenerator::VARIABLE_OR_PROPERTY_OR_PARAMETER
-        : 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,
-        !node.childIdentifierName.empty());
-    if (!node.childIdentifierName.empty()) {
-      output +=
-          codeGenerator.GenerateVariableAccessor(node.childIdentifierName);
-    }
+        codeGenerator.GenerateObject(node.identifierName, node.type, context);
   } else {
-    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, !node.childIdentifierName.empty());
-      output += codeGenerator.GenerateVariableValueAs(type);
-    }, [&]() {
-      output += codeGenerator.GenerateGetVariable(
-          node.identifierName, gd::EventsCodeGenerator::VARIABLE_OR_PROPERTY_OR_PARAMETER, context,
-          "", !node.childIdentifierName.empty());
-      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);
-    });
+    output += "/* Error during generation, unrecognized identifier type: " +
+              codeGenerator.ConvertToString(node.type) + " with value " +
+              codeGenerator.ConvertToString(node.identifierName) + " */ " +
+              codeGenerator.ConvertToStringExplicit(node.identifierName);
   }
 }
 
 void ExpressionCodeGenerator::OnVisitFunctionCallNode(FunctionCallNode& node) {
-  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)) {
+  if (gd::MetadataProvider::IsBadExpressionMetadata(node.expressionMetadata)) {
     output += "/* Error during generation, function not found: " +
               codeGenerator.ConvertToString(node.functionName) + " */ " +
-              GenerateDefaultValue(type);
+              GenerateDefaultValue(node.type);
     return;
   }
 
   if (!node.objectName.empty()) {
     if (!node.behaviorName.empty()) {
-      output += GenerateBehaviorFunctionCode(type,
+      output += GenerateBehaviorFunctionCode(node.type,
                                              node.objectName,
                                              node.behaviorName,
                                              node.parameters,
-                                             metadata);
+                                             node.expressionMetadata);
     } else {
       output += GenerateObjectFunctionCode(
-          type, node.objectName, node.parameters, metadata);
+          node.type, node.objectName, node.parameters, node.expressionMetadata);
     }
   } else {
     output +=
-        GenerateFreeFunctionCode(node.parameters, metadata);
+        GenerateFreeFunctionCode(node.parameters, node.expressionMetadata);
   }
 }
 
@@ -321,10 +165,10 @@ gd::String ExpressionCodeGenerator::GenerateFreeFunctionCode(
     const std::vector<std::unique_ptr<ExpressionNode>>& parameters,
     const ExpressionMetadata& expressionMetadata) {
   codeGenerator.AddIncludeFiles(
-      expressionMetadata.GetIncludeFiles());
+      expressionMetadata.codeExtraInformation.GetIncludeFiles());
 
   // Launch custom code generator if needed
-  if (expressionMetadata.HasCustomCodeGenerator()) {
+  if (expressionMetadata.codeExtraInformation.HasCustomCodeGenerator()) {
     return expressionMetadata.codeExtraInformation.customCodeGenerator(
         PrintParameters(parameters), codeGenerator, context);
   }
@@ -341,11 +185,16 @@ 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.GetIncludeFiles());
+      expressionMetadata.codeExtraInformation.GetIncludeFiles());
 
   // Launch custom code generator if needed
-  if (expressionMetadata.HasCustomCodeGenerator()) {
+  if (expressionMetadata.codeExtraInformation.HasCustomCodeGenerator()) {
     return expressionMetadata.codeExtraInformation.customCodeGenerator(
         PrintParameters(parameters), codeGenerator, context);
   }
@@ -361,22 +210,23 @@ gd::String ExpressionCodeGenerator::GenerateObjectFunctionCode(
 
   // Get object(s) concerned by function call
   std::vector<gd::String> realObjects =
-      codeGenerator.GetObjectsContainersList().ExpandObjectName(objectName, context.GetCurrentObject());
+      codeGenerator.ExpandObjectsName(objectName, context);
   for (std::size_t i = 0; i < realObjects.size(); ++i) {
     context.ObjectsListNeeded(realObjects[i]);
 
-    gd::String objectType = codeGenerator.GetObjectsContainersList().GetTypeOfObject(realObjects[i]);
+    gd::String objectType = gd::GetTypeOfObject(
+        globalObjectsAndGroups, objectsAndGroups, 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;
@@ -387,11 +237,16 @@ 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.GetIncludeFiles());
+      expressionMetadata.codeExtraInformation.GetIncludeFiles());
 
   // Launch custom code generator if needed
-  if (expressionMetadata.HasCustomCodeGenerator()) {
+  if (expressionMetadata.codeExtraInformation.HasCustomCodeGenerator()) {
     return expressionMetadata.codeExtraInformation.customCodeGenerator(
         PrintParameters(parameters), codeGenerator, context);
   }
@@ -405,11 +260,12 @@ gd::String ExpressionCodeGenerator::GenerateBehaviorFunctionCode(
 
   // Get object(s) concerned by function call
   std::vector<gd::String> realObjects =
-      codeGenerator.GetObjectsContainersList().ExpandObjectName(objectName, context.GetCurrentObject());
+      codeGenerator.ExpandObjectsName(objectName, context);
 
   gd::String functionOutput = GenerateDefaultValue(type);
 
-  gd::String behaviorType = codeGenerator.GetObjectsContainersList().GetTypeOfBehavior(behaviorName);
+  gd::String behaviorType = gd::GetTypeOfBehavior(
+      globalObjectsAndGroups, objectsAndGroups, behaviorName);
   const BehaviorMetadata& autoInfo = MetadataProvider::GetBehaviorMetadata(
       codeGenerator.GetPlatform(), behaviorType);
 
@@ -437,26 +293,24 @@ gd::String ExpressionCodeGenerator::GenerateParametersCodes(
   size_t nonCodeOnlyParameterIndex = 0;
   gd::String parametersCode;
   for (std::size_t i = initialParameterIndex;
-       i < expressionMetadata.GetParameters().GetParametersCount();
+       i < expressionMetadata.parameters.size();
        ++i) {
     if (i != initialParameterIndex) parametersCode += ", ";
 
-    auto& parameterMetadata = expressionMetadata.GetParameters().GetParameter(i);
+    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;
-        auto node = parser.ParseExpression(parameterMetadata.GetDefaultValue());
+        ExpressionParser2 parser(codeGenerator.GetPlatform(),
+                                 codeGenerator.GetGlobalObjectsAndGroups(),
+                                 codeGenerator.GetObjectsAndGroups());
+        auto node = parser.ParseExpression(parameterMetadata.GetType(),
+                                           parameterMetadata.GetDefaultValue());
 
         node->Visit(generator);
         parametersCode += generator.GetOutput();
@@ -514,20 +368,12 @@ gd::String ExpressionCodeGenerator::GenerateDefaultValue(
 }
 
 void ExpressionCodeGenerator::OnVisitEmptyNode(EmptyNode& node) {
-  auto type = gd::ExpressionTypeFinder::GetType(codeGenerator.GetPlatform(),
-                                            codeGenerator.GetProjectScopedContainers(),
-                                            rootType,
-                                            node);
-  output += GenerateDefaultValue(type);
+  output += GenerateDefaultValue(node.type);
 }
 
 void ExpressionCodeGenerator::OnVisitObjectFunctionNameNode(
     ObjectFunctionNameNode& node) {
-  auto type = gd::ExpressionTypeFinder::GetType(codeGenerator.GetPlatform(),
-                                            codeGenerator.GetProjectScopedContainers(),
-                                            rootType,
-                                            node);
-  output += GenerateDefaultValue(type);
+  output += GenerateDefaultValue(node.type);
 }
 
 }  // namespace gd

Core/GDCore/Events/CodeGeneration/ExpressionCodeGenerator.h

@@ -9,6 +9,7 @@
 
 #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"
@@ -34,11 +35,9 @@ namespace gd {
  */
 class GD_CORE_API ExpressionCodeGenerator : public ExpressionParser2NodeWorker {
  public:
-  ExpressionCodeGenerator(const gd::String &rootType_,
-                          const gd::String &rootObjectName_,
-                          EventsCodeGenerator& codeGenerator_,
+  ExpressionCodeGenerator(EventsCodeGenerator& codeGenerator_,
                           EventsCodeGenerationContext& context_)
-      : rootType(rootType_), rootObjectName(rootObjectName_), codeGenerator(codeGenerator_), context(context_){};
+      : codeGenerator(codeGenerator_), context(context_){};
   virtual ~ExpressionCodeGenerator(){};
 
   /**
@@ -58,9 +57,8 @@ class GD_CORE_API ExpressionCodeGenerator : public ExpressionParser2NodeWorker {
   static gd::String GenerateExpressionCode(EventsCodeGenerator& codeGenerator,
                                            EventsCodeGenerationContext& context,
                                            const gd::String& type,
-                                           const gd::Expression& expression,
-                                           const gd::String& objectName = "",
-                                           const gd::String& extraInfo = "");
+                                           const gd::String& expression,
+                                           const gd::String& objectName = "");
 
   const gd::String& GetOutput() { return output; };
 
@@ -103,11 +101,8 @@ 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,19 +5,16 @@
  */
 
 #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"
 
 namespace gd {
 
 EventsList BaseEvent::badSubEvents;
-VariablesContainer BaseEvent::badLocalVariables;
+std::vector<gd::String> BaseEvent::emptyDependencies;
+gd::String BaseEvent::emptySourceFile;
 
 BaseEvent::BaseEvent()
     : totalTimeDuringLastSession(0),
@@ -27,8 +24,6 @@ BaseEvent::BaseEvent()
 
 bool BaseEvent::HasSubEvents() const { return !GetSubEvents().IsEmpty(); }
 
-bool BaseEvent::HasVariables() const { return GetVariables().Count() > 0; }
-
 gd::String BaseEvent::GenerateEventCode(
     gd::EventsCodeGenerator& codeGenerator,
     gd::EventsCodeGenerationContext& context) {
@@ -70,41 +65,10 @@ 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()) return;
-
-  PreprocessAsyncActions(codeGenerator.GetPlatform());
-
-  if (!MustBePreprocessed()) return;
+  if (IsDisabled() || !MustBePreprocessed()) return;
 
   try {
     if (type.empty()) return;
@@ -142,14 +106,6 @@ 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

@@ -3,12 +3,13 @@
  * Copyright 2008-2016 Florian Rival (Florian.Rival@gmail.com). All rights
  * reserved. This project is released under the MIT License.
  */
-#pragma once
+#if defined(GD_IDE_ONLY)
+#ifndef GDCORE_EVENT_H
+#define GDCORE_EVENT_H
 
 #include <iostream>
 #include <memory>
 #include <vector>
-
 #include "GDCore/Events/Instruction.h"
 #include "GDCore/Events/InstructionsList.h"
 #include "GDCore/Extensions/Metadata/InstructionMetadata.h"
@@ -22,10 +23,7 @@ class EventsCodeGenerationContext;
 class Platform;
 class SerializerElement;
 class Instruction;
-class EventVisitor;
-class ReadOnlyEventVisitor;
-class VariablesContainer;
-}  // namespace gd
+}
 
 namespace gd {
 
@@ -91,32 +89,6 @@ class GD_CORE_API BaseEvent {
    */
   bool HasSubEvents() const;
 
-  /**
-   * Derived class have to redefine this function, so as to return true, if they
-   * can have local variables.
-   */
-  virtual bool CanHaveVariables() const { return false; }
-
-  /**
-   * Return the local variables, if applicable.
-   */
-  virtual const gd::VariablesContainer& GetVariables() const {
-    return badLocalVariables;
-  };
-
-  /**
-   * Return the local variables, if applicable.
-   */
-  virtual gd::VariablesContainer& GetVariables() {
-    return badLocalVariables;
-  };
-
-  /**
-   * \brief Return true if the events has local variables.
-   * \warning This is only applicable when CanHaveVariables() return true.
-   */
-  bool HasVariables() const;
-
   /**
    * \brief Return a list of all conditions of the event.
    * \note Used to preprocess or search in the conditions.
@@ -154,27 +126,40 @@ 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, each with their associated metadata.
    * \note Used to preprocess or search in the expressions of the event.
    */
   virtual std::vector<std::pair<gd::Expression*, gd::ParameterMetadata> >
-  GetAllExpressionsWithMetadata() {
+      GetAllExpressionsWithMetadata() {
     std::vector<std::pair<gd::Expression*, gd::ParameterMetadata> > noExpr;
     return 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;
+  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;
   };
+
+  /**
+   * \brief Returns the dependencies on source files of the project.
+   * \note Default implementation returns an empty list of dependencies. This is
+   * fine for most events that are not related to adding custom user source
+   * code.
+   */
+  virtual const std::vector<gd::String>& GetSourceFileDependencies() const {
+    return emptyDependencies;
+  };
+
+  /**
+   * \brief Returns the name of the source file associated with the event
+   * \note Default implementation returns an empty string. This is fine for most
+   * events that are not related to adding custom user source code.
+   */
+  virtual const gd::String& GetAssociatedGDManagedSourceFile(
+      gd::Project& project) const {
+    return emptySourceFile;
+  };
   ///@}
 
   /** \name Code generation
@@ -216,11 +201,6 @@ 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
@@ -245,9 +225,6 @@ 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
@@ -287,19 +264,6 @@ class GD_CORE_API BaseEvent {
    */
   bool IsFolded() const { return folded; }
 
-  /**
-   * \brief Set the AI generated event ID.
-   */
-  void SetAiGeneratedEventId(const gd::String& aiGeneratedEventId_) {
-    aiGeneratedEventId = aiGeneratedEventId_;
-  }
-
-  /**
-   * \brief Get the AI generated event ID.
-   */
-  const gd::String& GetAiGeneratedEventId() const {
-    return aiGeneratedEventId;
-  }
   ///@}
 
   std::weak_ptr<gd::BaseEvent>
@@ -318,10 +282,10 @@ class GD_CORE_API BaseEvent {
   bool disabled;    ///< True if the event is disabled and must not be executed
   gd::String type;  ///< Type of the event. Must be assigned at the creation.
                     ///< Used for saving the event for instance.
-  gd::String aiGeneratedEventId;  ///< When generated by an AI/external tool.
 
   static gd::EventsList badSubEvents;
-  static gd::VariablesContainer badLocalVariables;
+  static std::vector<gd::String> emptyDependencies;
+  static gd::String emptySourceFile;
 };
 
 /**
@@ -344,3 +308,6 @@ class EmptyEvent : public BaseEvent {
 };
 
 }  // namespace gd
+
+#endif  // GDCORE_EVENT_H
+#endif

Core/GDCore/Events/EventVisitor.h

@@ -1,76 +0,0 @@
-/*
- * 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,7 +5,6 @@
  */
 
 #include "EventsList.h"
-
 #include "GDCore/Events/Event.h"
 #include "GDCore/Project/Project.h"
 #include "GDCore/Tools/Log.h"
@@ -101,8 +100,9 @@ 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/EventsList.h

@@ -18,6 +18,7 @@ class BaseEvent;
 namespace gd {
 class SerializerElement;
 }
+class TiXmlElement;
 
 #undef CreateEvent
 

Core/GDCore/Events/Expression.cpp

@@ -1,41 +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 "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,15 +6,7 @@
 
 #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 {
 
@@ -32,49 +24,32 @@ class GD_CORE_API Expression {
   /**
    * \brief Construct an empty expression
    */
-  Expression();
+  Expression(){};
 
   /**
    * \brief Construct an expression from a string
    */
-  Expression(gd::String plainString_);
+  Expression(gd::String plainString_) : plainString(plainString_){};
 
   /**
    * \brief Construct an expression from a const char *
    */
-  Expression(const char* plainString_);
-
-  /**
-   * \brief Copy construct an expression.
-   */
-  Expression(const Expression& copy);
-
-  /**
-   * \brief Expression affectation overriding.
-   */
-  Expression& operator=(const Expression& expression);
+  Expression(const char* plainString_) : plainString(plainString_){};
 
   /**
    * \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

@@ -55,10 +55,6 @@ 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 =

Core/GDCore/Events/Instruction.h

@@ -72,22 +72,6 @@ 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.
    */
@@ -123,11 +107,6 @@ 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
    */
@@ -160,9 +139,7 @@ class GD_CORE_API Instruction {
    * 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;
-  };
+  std::weak_ptr<Instruction> GetOriginalInstruction() { return originalInstruction; };
 
   friend std::shared_ptr<Instruction> CloneRememberingOriginalElement(
       std::shared_ptr<Instruction> instruction);
@@ -171,9 +148,6 @@ class GD_CORE_API Instruction {
   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.

Core/GDCore/Events/InstructionsList.cpp

@@ -5,7 +5,6 @@
  */
 
 #include "InstructionsList.h"
-
 #include "GDCore/Events/Instruction.h"
 #include "GDCore/Project/Project.h"
 #include "Serialization.h"
@@ -32,10 +31,6 @@ 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,10 +6,9 @@
 
 #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;
 }
@@ -23,11 +22,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);
-
-  void RemoveAfter(size_t position);
+ public:
+  void InsertInstructions(const InstructionsList& list,
+                          size_t begin,
+                          size_t end,
+                          size_t position = (size_t)-1);
 
   /** \name Serialization
    */
@@ -36,17 +35,17 @@ public:
    * \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

@@ -19,25 +19,139 @@
 #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()
+ExpressionParser2::ExpressionParser2(
+    const gd::Platform& platform_,
+    const gd::ObjectsContainer& globalObjectsContainer_,
+    const gd::ObjectsContainer& objectsContainer_)
     : expression(""),
-      currentPosition(0) {}
+      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::String& type,
+    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());
+  }
+
+  // Validate the type of the function
+  const gd::String& returnType = function.expressionMetadata.GetReturnType();
+  if (returnType == "number") {
+    if (type == "string")
+      return RaiseTypeError(
+          _("You tried to use an expression that returns a number, but a "
+            "string is expected. Use `ToString` if you need to convert a "
+            "number to a string."),
+          functionStartPosition);
+    else if (type != "number" && type != "number|string")
+      return RaiseTypeError(_("You tried to use an expression that returns a "
+                              "number, but another type is expected:") +
+                              " " + type,
+                            functionStartPosition);
+  } else if (returnType == "string") {
+    if (type == "number")
+      return RaiseTypeError(
+          _("You tried to use an expression that returns a string, but a "
+            "number is expected. Use `ToNumber` if you need to convert a "
+            "string to a number."),
+          functionStartPosition);
+    else if (type != "string" && type != "number|string")
+      return RaiseTypeError(_("You tried to use an expression that returns a "
+                              "string, but another type is expected:") +
+                              " " + type,
+                            functionStartPosition);
+  } else {
+    if (type != returnType)
+      return RaiseTypeError(
+          _("You tried to use an expression with the wrong return type:") + " " +
+            returnType,
+          functionStartPosition);
+  }
+
+  // Validate parameters count
+  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>();
+}
 
 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 =

Core/GDCore/Events/Parsers/ExpressionParser2Node.cpp

@@ -6,5 +6,5 @@
 #include "ExpressionParser2Node.h"
 
 namespace gd {
-
+gd::String ExpressionParserDiagnostic::noMessage = "";
 }

Core/GDCore/Events/Parsers/ExpressionParser2Node.h

@@ -3,21 +3,20 @@
  * Copyright 2008-present Florian Rival (Florian.Rival@gmail.com). All rights
  * reserved. This project is released under the MIT License.
  */
-#pragma once
+#ifndef GDCORE_EXPRESSIONPARSER2NODES_H
+#define GDCORE_EXPRESSIONPARSER2NODES_H
 
 #include <memory>
 #include <vector>
 
 #include "ExpressionParser2NodeWorker.h"
 #include "GDCore/String.h"
-
 namespace gd {
 class Expression;
 class ObjectsContainer;
 class Platform;
 class ParameterMetadata;
 class ExpressionMetadata;
-struct FunctionCallNode;
 }  // namespace gd
 
 namespace gd {
@@ -36,61 +35,50 @@ struct GD_CORE_API ExpressionParserLocation {
 
  private:
   bool isValid;
-  size_t startPosition = 0;
-  size_t endPosition = 0;
+  size_t startPosition;
+  size_t endPosition;
+};
+
+/**
+ * \brief A diagnostic that can be attached to a gd::ExpressionNode.
+ */
+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; }
+  virtual size_t GetEndPosition() { return 0; }
+
+ private:
+  static gd::String noMessage;
 };
 
 /**
  * \brief An error that can be attached to a gd::ExpressionNode.
  */
-struct GD_CORE_API ExpressionParserError {
-  enum ErrorType {
-    SyntaxError,
-    InvalidOperator,
-    MismatchedType,
-    UndeclaredVariable,
-    UnknownIdentifier,
-    BracketsNotAllowedForObjects,
-    TooFewParameters,
-    TooManyParameters,
-    InvalidFunctionName,
-    MalformedVariableParameter,
-    MalformedObjectParameter,
-    UnknownParameterType,
-    MissingBehavior,
-    VariableNameCollision,
-  };
-
-  ExpressionParserError(gd::ExpressionParserError::ErrorType type_,
+struct GD_CORE_API ExpressionParserError : public ExpressionParserDiagnostic {
+  ExpressionParserError(const gd::String &type_,
                         const gd::String &message_,
-                        const ExpressionParserLocation &location_,
-                        const gd::String &actualValue_ = "",
-                        const gd::String &objectName_ = "")
-      : type(type_), message(message_), location(location_),
-        actualValue(actualValue_), objectName(objectName_){};
-  ExpressionParserError(gd::ExpressionParserError::ErrorType type_,
-                        const gd::String &message_, size_t position_)
+                        size_t position_)
       : type(type_), message(message_), location(position_){};
-  ExpressionParserError(gd::ExpressionParserError::ErrorType type_,
-                        const gd::String &message_, size_t startPosition_,
+  ExpressionParserError(const gd::String &type_,
+                        const gd::String &message_,
+                        size_t startPosition_,
                         size_t endPosition_)
-      : type(type_), message(message_),
+      : type(type_),
+        message(message_),
         location(startPosition_, endPosition_){};
   virtual ~ExpressionParserError(){};
 
-  gd::ExpressionParserError::ErrorType GetType() { return type; }
-  const gd::String &GetMessage() { return message; }
-  const gd::String &GetObjectName() { return objectName; }
-  const gd::String &GetActualValue() { return actualValue; }
-  size_t GetStartPosition() { return location.GetStartPosition(); }
-  size_t GetEndPosition() { return location.GetEndPosition(); }
+  bool IsError() override { return true; }
+  const gd::String &GetMessage() override { return message; }
+  size_t GetStartPosition() override { return location.GetStartPosition(); }
+  size_t GetEndPosition() override { return location.GetEndPosition(); }
 
-private:
-  gd::ExpressionParserError::ErrorType type;
+ private:
+  gd::String type;
   gd::String message;
   ExpressionParserLocation location;
-  gd::String objectName;
-  gd::String actualValue;
 };
 
 /**
@@ -98,23 +86,28 @@ private:
  * an expression inherits from.
  */
 struct GD_CORE_API ExpressionNode {
-  ExpressionNode() : parent(nullptr) {};
+  ExpressionNode(const gd::String &type_) : type(type_){};
   virtual ~ExpressionNode(){};
   virtual void Visit(ExpressionParser2NodeWorker &worker){};
 
-  std::unique_ptr<ExpressionParserError> diagnostic;
+  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...
-  ExpressionNode *parent;
+
+  gd::String type;  // Actual type of the node.
+                    // "string", "number", type supported by
+                    // gd::ParameterMetadata::IsObject, types supported by
+                    // gd::ParameterMetadata::IsExpression or "unknown".
 };
 
 struct GD_CORE_API SubExpressionNode : public ExpressionNode {
-  SubExpressionNode(std::unique_ptr<ExpressionNode> expression_)
-      : ExpressionNode(), expression(std::move(expression_)){};
+  SubExpressionNode(const gd::String &type_,
+                    std::unique_ptr<ExpressionNode> expression_)
+      : ExpressionNode(type_), expression(std::move(expression_)){};
   virtual ~SubExpressionNode(){};
   virtual void Visit(ExpressionParser2NodeWorker &worker) {
     worker.OnVisitSubExpressionNode(*this);
@@ -127,8 +120,8 @@ struct GD_CORE_API SubExpressionNode : public ExpressionNode {
  * \brief An operator node. For example: "lhs + rhs".
  */
 struct GD_CORE_API OperatorNode : public ExpressionNode {
-  OperatorNode(gd::String::value_type op_)
-      : ExpressionNode(), op(op_){};
+  OperatorNode(const gd::String &type_, gd::String::value_type op_)
+      : ExpressionNode(type_), op(op_){};
   virtual ~OperatorNode(){};
   virtual void Visit(ExpressionParser2NodeWorker &worker) {
     worker.OnVisitOperatorNode(*this);
@@ -143,8 +136,8 @@ struct GD_CORE_API OperatorNode : public ExpressionNode {
  * \brief A unary operator node. For example: "-2".
  */
 struct GD_CORE_API UnaryOperatorNode : public ExpressionNode {
-  UnaryOperatorNode(gd::String::value_type op_)
-      : ExpressionNode(), op(op_){};
+  UnaryOperatorNode(const gd::String &type_, gd::String::value_type op_)
+      : ExpressionNode(type_), op(op_){};
   virtual ~UnaryOperatorNode(){};
   virtual void Visit(ExpressionParser2NodeWorker &worker) {
     worker.OnVisitUnaryOperatorNode(*this);
@@ -160,7 +153,7 @@ struct GD_CORE_API UnaryOperatorNode : public ExpressionNode {
  */
 struct GD_CORE_API NumberNode : public ExpressionNode {
   NumberNode(const gd::String &number_)
-      : ExpressionNode(), number(number_){};
+      : ExpressionNode("number"), number(number_){};
   virtual ~NumberNode(){};
   virtual void Visit(ExpressionParser2NodeWorker &worker) {
     worker.OnVisitNumberNode(*this);
@@ -175,7 +168,7 @@ struct GD_CORE_API NumberNode : public ExpressionNode {
  * Its `type` is always "string".
  */
 struct GD_CORE_API TextNode : public ExpressionNode {
-  TextNode(const gd::String &text_) : ExpressionNode(), text(text_){};
+  TextNode(const gd::String &text_) : ExpressionNode("string"), text(text_){};
   virtual ~TextNode(){};
   virtual void Visit(ExpressionParser2NodeWorker &worker) {
     worker.OnVisitTextNode(*this);
@@ -184,89 +177,32 @@ struct GD_CORE_API TextNode : public ExpressionNode {
   gd::String text;
 };
 
-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(){};
+  VariableAccessorOrVariableBracketAccessorNode() : ExpressionNode(""){};
 
   std::unique_ptr<VariableAccessorOrVariableBracketAccessorNode> child;
 };
 
 /**
- * \brief A variable, or object variable, with bracket accessor or at least 2 "dot" accessors.
+ * \brief A variable, potentially with accessor to its children.
  *
- * Example: `MyVariable["MyChildren"]` or `MyVariable.MyChildren.MyGrandChildren`.
- * Example: `MyObject["MyVariable"]` or `MyObject.MyVariable.MyChildren`.
+ * Example: MyVariable or 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 GD_CORE_API VariableNode : public FunctionCallOrObjectFunctionNameOrEmptyNode {
-  VariableNode(const gd::String &name_)
-      : FunctionCallOrObjectFunctionNameOrEmptyNode(), name(name_){};
+struct GD_CORE_API VariableNode : public ExpressionNode {
+  VariableNode(const gd::String &type_,
+               const gd::String &name_,
+               const gd::String &objectName_)
+      : ExpressionNode(type_), name(name_), objectName(objectName_){};
   virtual ~VariableNode(){};
   virtual void Visit(ExpressionParser2NodeWorker &worker) {
     worker.OnVisitVariableNode(*this);
   };
 
   gd::String name;
+  gd::String objectName;
 
   std::unique_ptr<VariableAccessorOrVariableBracketAccessorNode>
       child;  // Can be nullptr if no accessor
@@ -275,13 +211,12 @@ struct GD_CORE_API VariableNode : public FunctionCallOrObjectFunctionNameOrEmpty
 };
 
 /**
- * \brief A direct accessor to a child variable. Example: MyChild
+ * \brief A bracket accessor of a variable. Example: MyChild
  * in MyVariable.MyChild
  */
 struct GD_CORE_API VariableAccessorNode
     : public VariableAccessorOrVariableBracketAccessorNode {
-  VariableAccessorNode(const gd::String &name_)
-      : VariableAccessorOrVariableBracketAccessorNode(), name(name_){};
+  VariableAccessorNode(const gd::String &name_) : name(name_){};
   virtual ~VariableAccessorNode(){};
   virtual void Visit(ExpressionParser2NodeWorker &worker) {
     worker.OnVisitVariableAccessorNode(*this);
@@ -293,13 +228,13 @@ struct GD_CORE_API VariableAccessorNode
 };
 
 /**
- * \brief A bracket accessor to a child variable. Example: ["MyChild"]
+ * \brief A bracket accessor of a variable. Example: ["MyChild"]
  * (in MyVariable["MyChild"]).
  */
 struct GD_CORE_API VariableBracketAccessorNode
     : public VariableAccessorOrVariableBracketAccessorNode {
   VariableBracketAccessorNode(std::unique_ptr<ExpressionNode> expression_)
-      : VariableAccessorOrVariableBracketAccessorNode(), expression(std::move(expression_)){};
+      : expression(std::move(expression_)){};
   virtual ~VariableBracketAccessorNode(){};
   virtual void Visit(ExpressionParser2NodeWorker &worker) {
     worker.OnVisitVariableBracketAccessorNode(*this);
@@ -308,26 +243,55 @@ struct GD_CORE_API VariableBracketAccessorNode
   std::unique_ptr<ExpressionNode> expression;
 };
 
+struct GD_CORE_API IdentifierOrFunctionCallOrObjectFunctionNameOrEmptyNode
+    : public ExpressionNode {
+  IdentifierOrFunctionCallOrObjectFunctionNameOrEmptyNode(
+      const gd::String &type)
+      : ExpressionNode(type){};
+};
+
+/**
+ * \brief An identifier node, usually representing an object or a function name.
+ */
+struct GD_CORE_API IdentifierNode
+    : public IdentifierOrFunctionCallOrObjectFunctionNameOrEmptyNode {
+  IdentifierNode(const gd::String &identifierName_, const gd::String &type_)
+      : IdentifierOrFunctionCallOrObjectFunctionNameOrEmptyNode(type_),
+        identifierName(identifierName_){};
+  virtual ~IdentifierNode(){};
+  virtual void Visit(ExpressionParser2NodeWorker &worker) {
+    worker.OnVisitIdentifierNode(*this);
+  };
+
+  gd::String identifierName;
+};
+
+struct GD_CORE_API FunctionCallOrObjectFunctionNameOrEmptyNode
+    : public IdentifierOrFunctionCallOrObjectFunctionNameOrEmptyNode {
+  FunctionCallOrObjectFunctionNameOrEmptyNode(const gd::String &type)
+      : IdentifierOrFunctionCallOrObjectFunctionNameOrEmptyNode(type){};
+  virtual ~FunctionCallOrObjectFunctionNameOrEmptyNode(){};
+  void Visit(ExpressionParser2NodeWorker &worker) override{};
+};
+
 /**
  * \brief The name of a function to call on an object or the behavior
- * For example: "MyObject.Physics::LinearVelocity".
- *
- * Other cases like "MyObject.Function" or "MyObject.Physics" are IdentifierNode
- * to allow handling ambiguities.
- *
- * \see gd::IdentifierNode
+ * For example: "MyObject.Function" or "MyObject.Physics" or
+ * "MyObject.Physics::LinearVelocity".
  */
 struct GD_CORE_API ObjectFunctionNameNode
     : public FunctionCallOrObjectFunctionNameOrEmptyNode {
-  ObjectFunctionNameNode(const gd::String &objectName_,
+  ObjectFunctionNameNode(const gd::String &type_,
+                         const gd::String &objectName_,
                          const gd::String &objectFunctionOrBehaviorName_)
-      : FunctionCallOrObjectFunctionNameOrEmptyNode(),
+      : FunctionCallOrObjectFunctionNameOrEmptyNode(type_),
         objectName(objectName_),
         objectFunctionOrBehaviorName(objectFunctionOrBehaviorName_) {}
-  ObjectFunctionNameNode(const gd::String &objectName_,
+  ObjectFunctionNameNode(const gd::String &type_,
+                         const gd::String &objectName_,
                          const gd::String &behaviorName_,
                          const gd::String &behaviorFunctionName_)
-      : FunctionCallOrObjectFunctionNameOrEmptyNode(),
+      : FunctionCallOrObjectFunctionNameOrEmptyNode(type_),
         objectName(objectName_),
         objectFunctionOrBehaviorName(behaviorName_),
         behaviorFunctionName(behaviorFunctionName_) {}
@@ -370,24 +334,39 @@ struct GD_CORE_API ObjectFunctionNameNode
  */
 struct GD_CORE_API FunctionCallNode : public FunctionCallOrObjectFunctionNameOrEmptyNode {
   /** \brief Construct a free function call node. */
-  FunctionCallNode(const gd::String &functionName_)
-      : FunctionCallOrObjectFunctionNameOrEmptyNode(),
+  FunctionCallNode(const gd::String &type_,
+                   std::vector<std::unique_ptr<ExpressionNode>> parameters_,
+                   const ExpressionMetadata &expressionMetadata_,
+                   const gd::String &functionName_)
+      : FunctionCallOrObjectFunctionNameOrEmptyNode(type_),
+        parameters(std::move(parameters_)),
+        expressionMetadata(expressionMetadata_),
         functionName(functionName_){};
 
   /** \brief Construct an object function call node. */
-  FunctionCallNode(const gd::String &objectName_,
+  FunctionCallNode(const gd::String &type_,
+                   const gd::String &objectName_,
+                   std::vector<std::unique_ptr<ExpressionNode>> parameters_,
+                   const ExpressionMetadata &expressionMetadata_,
                    const gd::String &functionName_)
-      : FunctionCallOrObjectFunctionNameOrEmptyNode(),
+      : FunctionCallOrObjectFunctionNameOrEmptyNode(type_),
         objectName(objectName_),
+        parameters(std::move(parameters_)),
+        expressionMetadata(expressionMetadata_),
         functionName(functionName_){};
 
   /** \brief Construct a behavior function call node. */
-  FunctionCallNode(const gd::String &objectName_,
+  FunctionCallNode(const gd::String &type_,
+                   const gd::String &objectName_,
                    const gd::String &behaviorName_,
+                   std::vector<std::unique_ptr<ExpressionNode>> parameters_,
+                   const ExpressionMetadata &expressionMetadata_,
                    const gd::String &functionName_)
-      : FunctionCallOrObjectFunctionNameOrEmptyNode(),
+      : FunctionCallOrObjectFunctionNameOrEmptyNode(type_),
         objectName(objectName_),
         behaviorName(behaviorName_),
+        parameters(std::move(parameters_)),
+        expressionMetadata(expressionMetadata_),
         functionName(functionName_){};
   virtual ~FunctionCallNode(){};
   virtual void Visit(ExpressionParser2NodeWorker &worker) {
@@ -397,6 +376,7 @@ struct GD_CORE_API FunctionCallNode : public FunctionCallOrObjectFunctionNameOrE
   gd::String objectName;
   gd::String behaviorName;
   std::vector<std::unique_ptr<ExpressionNode>> parameters;
+  const ExpressionMetadata &expressionMetadata;
   gd::String functionName;
 
   ExpressionParserLocation
@@ -421,8 +401,8 @@ struct GD_CORE_API FunctionCallNode : public FunctionCallOrObjectFunctionNameOrE
  * encountered and any other node could not make sense.
  */
 struct GD_CORE_API EmptyNode : public FunctionCallOrObjectFunctionNameOrEmptyNode {
-  EmptyNode(const gd::String &text_ = "")
-      : FunctionCallOrObjectFunctionNameOrEmptyNode(), text(text_){};
+  EmptyNode(const gd::String &type_, const gd::String &text_ = "")
+      : FunctionCallOrObjectFunctionNameOrEmptyNode(type_), text(text_){};
   virtual ~EmptyNode(){};
   virtual void Visit(ExpressionParser2NodeWorker &worker) {
     worker.OnVisitEmptyNode(*this);
@@ -432,3 +412,5 @@ struct GD_CORE_API EmptyNode : public FunctionCallOrObjectFunctionNameOrEmptyNod
 };
 
 }  // namespace gd
+
+#endif

Core/GDCore/Events/Parsers/ExpressionParser2NodePrinter.h

@@ -8,7 +8,6 @@
 
 #include <memory>
 #include <vector>
-
 #include "GDCore/Events/Parsers/ExpressionParser2Node.h"
 #include "GDCore/Events/Parsers/ExpressionParser2NodeWorker.h"
 namespace gd {
@@ -44,11 +43,6 @@ 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 += "(";
@@ -75,7 +69,10 @@ class GD_CORE_API ExpressionParser2NodePrinter
   }
   void OnVisitNumberNode(NumberNode& node) override { output += node.number; }
   void OnVisitTextNode(TextNode& node) override {
-    output += PrintStringLiteral(node.text);
+    output +=
+        "\"" +
+        node.text.FindAndReplace("\\", "\\\\").FindAndReplace("\"", "\\\"") +
+        "\"";
   }
   void OnVisitVariableNode(VariableNode& node) override {
     output += node.name;
@@ -94,14 +91,11 @@ 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/GrammarTerminals.h

@@ -1,118 +0,0 @@
-#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,7 +4,6 @@
  * 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"
@@ -182,10 +181,10 @@ void EventsListSerialization::UpdateInstructionsFromGD2x(
     // Common updates for some parameters
     const std::vector<gd::Expression>& parameters = instr.GetParameters();
     for (std::size_t j = 0;
-         j < parameters.size() && j < metadata.parameters.GetParametersCount();
+         j < parameters.size() && j < metadata.parameters.size();
          ++j) {
-      if (metadata.parameters.GetParameter(j).GetType() == "relationalOperator" ||
-          metadata.parameters.GetParameter(j).GetType() == "operator") {
+      if (metadata.parameters[j].type == "relationalOperator" ||
+          metadata.parameters[j].type == "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";
@@ -219,10 +218,8 @@ void EventsListSerialization::UnserializeEventsFrom(
       event = std::make_shared<EmptyEvent>();
     }
 
-    event->SetDisabled(eventElem.GetBoolAttribute("disabled", false));
-    event->SetFolded(eventElem.GetBoolAttribute("folded", false));
-    event->SetAiGeneratedEventId(
-        eventElem.GetStringAttribute("aiGeneratedEventId", ""));
+    event->SetDisabled(eventElem.GetBoolAttribute("disabled"));
+    event->SetFolded(eventElem.GetBoolAttribute("folded"));
 
     list.InsertEvent(event, list.GetEventsCount());
   }
@@ -235,11 +232,8 @@ void EventsListSerialization::SerializeEventsTo(const EventsList& list,
     const gd::BaseEvent& event = list.GetEvent(j);
     SerializerElement& eventElem = events.AddChild("event");
 
-    if (event.IsDisabled())
-      eventElem.SetAttribute("disabled", event.IsDisabled());
-    if (event.IsFolded()) eventElem.SetAttribute("folded", event.IsFolded());
-    if (!event.GetAiGeneratedEventId().empty())
-      eventElem.SetAttribute("aiGeneratedEventId", event.GetAiGeneratedEventId());
+    eventElem.SetAttribute("disabled", event.IsDisabled());
+    eventElem.SetAttribute("folded", event.IsFolded());
     eventElem.AddChild("type").SetValue(event.GetType());
 
     event.SerializeTo(eventElem);
@@ -273,9 +267,6 @@ 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;
 
@@ -349,12 +340,9 @@ 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());
-
-    if (list[k].IsInverted())
-      instruction.GetChild("type").SetAttribute("inverted", true);
-    if (list[k].IsAwaited())
-      instruction.GetChild("type").SetAttribute("await", true);
+    instruction.AddChild("type")
+        .SetAttribute("value", list[k].GetType())
+        .SetAttribute("inverted", list[k].IsInverted());
 
     // Parameters
     SerializerElement& parameters = instruction.AddChild("parameters");
@@ -364,10 +352,9 @@ void gd::EventsListSerialization::SerializeInstructionsTo(
           .SetValue(list[k].GetParameter(l).GetPlainString());
 
     // Sub instructions
-    if (!list[k].GetSubInstructions().empty()) {
-      SerializeInstructionsTo(list[k].GetSubInstructions(),
-                              instruction.AddChild("subInstructions"));
-    }
+    SerializerElement& subInstructions =
+        instruction.AddChild("subInstructions");
+    SerializeInstructionsTo(list[k].GetSubInstructions(), subInstructions);
   }
 }
 

Core/GDCore/Events/Tools/EventsCodeNameMangler.cpp

@@ -17,7 +17,7 @@ const gd::String& EventsCodeNameMangler::GetMangledObjectsListName(
     return it->second;
   }
 
-  gd::String partiallyMangledName = GetMangledNameWithForbiddenUnderscore(originalObjectName);
+  gd::String partiallyMangledName = originalObjectName;
   static const gd::String allowedCharacters =
       "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789";
 
@@ -43,15 +43,7 @@ const gd::String& EventsCodeNameMangler::GetExternalEventsFunctionMangledName(
     return it->second;
   }
 
-  gd::String partiallyMangledName = GetMangledNameWithForbiddenUnderscore(externalEventsName);
-
-  mangledExternalEventsNames[externalEventsName] = "GDExternalEvents" + partiallyMangledName;
-  return mangledExternalEventsNames[externalEventsName];
-}
-
-gd::String EventsCodeNameMangler::GetMangledNameWithForbiddenUnderscore(
-    const gd::String &name) {
-  gd::String partiallyMangledName = name;
+  gd::String partiallyMangledName = externalEventsName;
   static const gd::String allowedCharacters =
       "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789";
 
@@ -65,30 +57,11 @@ gd::String EventsCodeNameMangler::GetMangledNameWithForbiddenUnderscore(
       partiallyMangledName.replace(i, 1, "_" + gd::String::From(unallowedChar));
     }
   }
-  return partiallyMangledName;
+
+  mangledExternalEventsNames[externalEventsName] = "GDExternalEvents" + partiallyMangledName;
+  return mangledExternalEventsNames[externalEventsName];
 }
 
-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,8 +36,6 @@ 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();
 
@@ -46,9 +44,6 @@ 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,16 +11,25 @@ namespace gd {
 
 void GD_CORE_API BuiltinExtensionsImplementer::ImplementsAdvancedExtension(
     gd::PlatformExtension& extension) {
+  extension.SetExtensionInformation(
+      "BuiltinAdvanced",
+      _("Advanced control features"),
+      _("Advanced control features to be used in events."),
+      "Florian Rival",
+      "Open source (MIT License)");
+
   extension
-      .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");
+      .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();
 
   extension
       .AddAction(
@@ -29,12 +38,11 @@ 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_"),
-          "",
-          "res/function32.png",
-          "res/function32.png")
+          _("Functions"),
+          "res/function24.png",
+          "res/function16.png")
       .SetHelpPath("/events/functions/return")
-      .AddParameter("expression", _("The number to be returned"))
-      .SetRelevantForFunctionEventsOnly()
+      .AddParameter("expression", "The number to be returned")
       .MarkAsAdvanced();
 
   extension
@@ -44,12 +52,11 @@ 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_"),
-          "",
-          "res/function32.png",
-          "res/function32.png")
+          _("Functions"),
+          "res/function24.png",
+          "res/function16.png")
       .SetHelpPath("/events/functions/return")
-      .AddParameter("string", _("The text to be returned"))
-      .SetRelevantForFunctionEventsOnly()
+      .AddParameter("string", "The text to be returned")
       .MarkAsAdvanced();
 
   extension
@@ -58,74 +65,11 @@ 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_"),
-                 "",
-                 "res/function32.png",
-                 "res/function32.png")
+                 _("Functions"),
+                 "res/function24.png",
+                 "res/function16.png")
       .SetHelpPath("/events/functions/return")
-      .AddParameter("trueorfalse", _("Should the condition be true or false?"))
-      .SetRelevantForFunctionEventsOnly()
-      .MarkAsAdvanced();
-
-  // Deprecated
-  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"))
-      .SetHidden()
-      .MarkAsAdvanced();
-
-  extension
-      .AddAction("CopyArgumentToVariable2",
-                 _("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("variable", _("Variable"))
-      .SetRelevantForFunctionEventsOnly()
-      .MarkAsAdvanced();
-
-  // Deprecated
-  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"))
-      .SetHidden()
-      .MarkAsAdvanced();
-
-  extension
-      .AddAction("CopyVariableToArgument2",
-                 _("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("variable", _("Variable"))
-      .SetRelevantForFunctionEventsOnly()
+      .AddParameter("trueorfalse", "Should the condition be true or false?")
       .MarkAsAdvanced();
 
   extension
@@ -136,65 +80,29 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsAdvancedExtension(
                       "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()
-      .SetHidden();
+                    _("Functions"),
+                    "res/function24.png",
+                    "res/function16.png")
+      .AddParameter("string", "Parameter name")
+      .MarkAsAdvanced();
 
   extension
       .AddExpression(
           "GetArgumentAsNumber",
           _("Get function parameter value"),
-          _("Get function parameter (also called \"argument\") value. You don't need this most of the time as you can simply write the parameter name in an expression."),
-          "",
+          _("Get function parameter (also called \"argument\") value"),
+          _("Functions"),
           "res/function16.png")
-      .AddParameter("functionParameterName", _("Parameter name"), "number,string,boolean")
-      .SetRelevantForFunctionEventsOnly()
-      .SetHidden();
+      .AddParameter("string", "Parameter name");
 
   extension
       .AddStrExpression(
           "GetArgumentAsString",
           _("Get function parameter text"),
-          _("Get function parameter (also called \"argument\") text. You don't need this most of the time as you can simply write the parameter name in an expression."),
-          "",
+          _("Get function parameter (also called \"argument\") text "),
+          _("Functions"),
           "res/function16.png")
-      .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()
-      .SetHidden();
-
-  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()
-      .SetHidden();
+      .AddParameter("string", "Parameter name");
 }
 
 }  // namespace gd

Core/GDCore/Extensions/Builtin/AllBuiltinExtensions.h

@@ -15,6 +15,8 @@ namespace gd {
  * so that it provides standards events, objects or instructions of an
  * extension.
  *
+ * TOOD: Usage example.
+ *
  * \ingroup BuiltinExtensions
  */
 class GD_CORE_API BuiltinExtensionsImplementer {
@@ -42,14 +44,6 @@ 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

@@ -1,47 +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/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

@@ -14,17 +14,12 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsAudioExtension(
   extension
       .SetExtensionInformation(
           "BuiltinAudio",
-          _("Sounds and music"),
+          _("Audio"),
           _("GDevelop provides several conditions and actions to play audio "
-            "files. They can be either long music or short sound effects."),
+            "files. They can be either long musics 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");
+      .SetExtensionHelpPath("/all-features/audio");
 
   extension
       .AddAction("PlaySoundCanal",
@@ -33,7 +28,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_"),
-                 _("Sounds on channels"),
+                 _("Audio/Sounds on channels"),
                  "res/actions/son24.png",
                  "res/actions/son.png")
       .AddCodeOnlyParameter("currentScene", "")
@@ -54,7 +49,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_"),
-                 _("Sounds on channels"),
+                 _("Audio/Sounds on channels"),
                  "res/actions/son24.png",
                  "res/actions/son.png")
       .AddCodeOnlyParameter("currentScene", "")
@@ -66,7 +61,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_"),
-                 _("Sounds on channels"),
+                 _("Audio/Sounds on channels"),
                  "res/actions/son24.png",
                  "res/actions/son.png")
       .AddCodeOnlyParameter("currentScene", "")
@@ -75,10 +70,10 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsAudioExtension(
 
   extension
       .AddAction("RePlaySoundCanal",
-                 _("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"),
+                 _("Play the sound of a channel"),
+                 _("Play the sound of the channel."),
+                 _("Play the sound of channel _PARAM1_"),
+                 _("Audio/Sounds on channels"),
                  "res/actions/son24.png",
                  "res/actions/son.png")
       .AddCodeOnlyParameter("currentScene", "")
@@ -92,7 +87,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsAudioExtension(
                    "able to interact with it later."),
                  _("Play the music _PARAM1_ on channel _PARAM2_, vol.: "
                    "_PARAM4_, loop: _PARAM3_"),
-                 _("Music on channels"),
+                 _("Audio/Music on channels"),
                  "res/actions/music24.png",
                  "res/actions/music.png")
       .AddCodeOnlyParameter("currentScene", "")
@@ -113,7 +108,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_"),
-                 _("Music on channels"),
+                 _("Audio/Music on channels"),
                  "res/actions/music24.png",
                  "res/actions/music.png")
       .AddCodeOnlyParameter("currentScene", "")
@@ -125,7 +120,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_"),
-                 _("Music on channels"),
+                 _("Audio/Music on channels"),
                  "res/actions/music24.png",
                  "res/actions/music.png")
       .AddCodeOnlyParameter("currentScene", "")
@@ -134,10 +129,10 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsAudioExtension(
 
   extension
       .AddAction("RePlayMusicCanal",
-                 _("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"),
+                 _("Play the music of a channel"),
+                 _("Play the music of the channel."),
+                 _("Play the music of channel _PARAM1_"),
+                 _("Audio/Music on channels"),
                  "res/actions/music24.png",
                  "res/actions/music.png")
       .AddCodeOnlyParameter("currentScene", "")
@@ -148,83 +143,69 @@ 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."),
+                   "specified channel. The volume is between 0 and 100."),
                  _("the volume of the sound on channel _PARAM1_"),
-                 _("Sounds on channels"),
+                 _("Audio/Sounds on channels"),
                  "res/actions/sonVolume24.png",
                  "res/actions/sonVolume.png")
       .AddCodeOnlyParameter("currentScene", "")
       .AddParameter("expression", _("Channel identifier"))
-      .UseStandardOperatorParameters(
-          "number",
-          ParameterOptions::MakeNewOptions().SetDescription(
-              _("Volume (0-100)")))
+      .UseStandardOperatorParameters("number")
       .MarkAsAdvanced();
 
   extension
       .AddAction("ModVolumeMusicCanal",
                  _("Volume of the music on a channel"),
                  _("This action modifies the volume of the music on the "
-                   "specified channel."),
+                   "specified channel. The volume is between 0 and 100."),
                  _("the volume of the music on channel _PARAM1_"),
-                 _("Music on channels"),
+                 _("Audio/Music on channels"),
                  "res/actions/musicVolume24.png",
                  "res/actions/musicVolume.png")
       .AddCodeOnlyParameter("currentScene", "")
       .AddParameter("expression", _("Channel identifier"))
-      .UseStandardOperatorParameters(
-          "number",
-          ParameterOptions::MakeNewOptions().SetDescription(
-              _("Volume (0-100)")))
+      .UseStandardOperatorParameters("number")
       .MarkAsAdvanced();
 
   extension
       .AddAction("ModGlobalVolume",
                  _("Game global volume"),
-                 _("This action modifies the global volume of the game."),
+                 _("This action modifies the global volume of the game. The "
+                   "volume is between 0 and 100."),
                  _("the global sound level"),
-                 "",
+                 _("Audio"),
                  "res/actions/volume24.png",
                  "res/actions/volume.png")
       .AddCodeOnlyParameter("currentScene", "")
-      .UseStandardOperatorParameters(
-          "number",
-          ParameterOptions::MakeNewOptions().SetDescription(
-              _("Volume (0-100)")))
+      .UseStandardOperatorParameters("number")
       .MarkAsSimple();
 
   extension
       .AddAction("ModPitchSoundChannel",
                  _("Pitch of the sound of a channel"),
                  _("This action modifies the pitch (speed) of the sound on a "
-                   "channel."),
+                   "channel.\n1 is the default pitch."),
                  _("the pitch of the sound on channel _PARAM1_"),
-                 _("Sounds on channels"),
+                 _("Audio/Sounds on channels"),
                  "res/actions/son24.png",
                  "res/actions/son.png")
       .AddCodeOnlyParameter("currentScene", "")
       .AddParameter("expression", _("Channel identifier"))
-      .UseStandardOperatorParameters(
-          "number",
-          ParameterOptions::MakeNewOptions().SetDescription(
-              _("Pitch (1 by default)")))
+      .UseStandardOperatorParameters("number")
       .MarkAsAdvanced();
 
   extension
       .AddAction("ModPitchMusicChannel",
                  _("Pitch of the music on a channel"),
                  _("This action modifies the pitch of the music on the "
-                   "specified channel."),
+                   "specified channel. 1 is the default pitch"),
                  _("the pitch of the music on channel _PARAM1_"),
-                 _("Music on channels"),
+                 _("Audio/Music on channels"),
                  "res/actions/music24.png",
                  "res/actions/music.png")
       .AddCodeOnlyParameter("currentScene", "")
       .AddParameter("expression", _("Channel identifier"))
-      .UseStandardOperatorParameters(
-          "number",
-          ParameterOptions::MakeNewOptions().SetDescription(
-              _("Pitch (1 by default)")))
+      .UseStandardOperatorParameters("number")
       .MarkAsAdvanced();
 
   extension
@@ -233,15 +214,12 @@ 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_"),
-                 _("Sounds on channels"),
+                 _("Audio/Sounds on channels"),
                  "res/actions/son24.png",
                  "res/actions/son.png")
       .AddCodeOnlyParameter("currentScene", "")
       .AddParameter("expression", _("Channel identifier"))
-      .UseStandardOperatorParameters(
-          "number",
-          ParameterOptions::MakeNewOptions().SetDescription(
-              _("Position (in seconds)")))
+      .UseStandardOperatorParameters("number")
       .MarkAsAdvanced();
 
   extension
@@ -250,15 +228,12 @@ 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_"),
-                 _("Music on channels"),
+                 _("Audio/Music on channels"),
                  "res/actions/music24.png",
                  "res/actions/music.png")
       .AddCodeOnlyParameter("currentScene", "")
       .AddParameter("expression", _("Channel identifier"))
-      .UseStandardOperatorParameters(
-          "number",
-          ParameterOptions::MakeNewOptions().SetDescription(
-              _("Position (in seconds)")))
+      .UseStandardOperatorParameters("number")
       .MarkAsAdvanced();
 
   extension
@@ -266,7 +241,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", "")
@@ -286,7 +261,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", "")
@@ -306,7 +281,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsAudioExtension(
                  _("Preload a music file"),
                  _("Preload a music file in memory."),
                  _("Preload the music file _PARAM1_"),
-                 _("Loading"),
+                 _("Audio/Loading"),
                  "res/actions/music24.png",
                  "res/actions/music.png")
       .AddCodeOnlyParameter("currentScene", "")
@@ -318,7 +293,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsAudioExtension(
                  _("Preload a sound file"),
                  _("Preload a sound file in memory."),
                  _("Preload the sound file _PARAM1_"),
-                 _("Loading"),
+                 _("Audio/Loading"),
                  "res/actions/son24.png",
                  "res/actions/son.png")
       .AddCodeOnlyParameter("currentScene", "")
@@ -326,80 +301,55 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsAudioExtension(
       .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")
+      .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_"),
+                 _("Audio/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")
+      .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_"),
+                 _("Audio/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")
+      .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"),
+                 _("Audio/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"),
-                    _("Music on channels"),
+                    _("Audio/Music on channels"),
                     "res/conditions/musicplaying24.png",
                     "res/conditions/musicplaying.png")
       .AddCodeOnlyParameter("currentScene", "")
@@ -411,7 +361,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"),
-                    _("Music on channels"),
+                    _("Audio/Music on channels"),
                     "res/conditions/musicpaused24.png",
                     "res/conditions/musicpaused.png")
       .AddCodeOnlyParameter("currentScene", "")
@@ -423,7 +373,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"),
-                    _("Music on channels"),
+                    _("Audio/Music on channels"),
                     "res/conditions/musicstopped24.png",
                     "res/conditions/musicstopped.png")
       .AddCodeOnlyParameter("currentScene", "")
@@ -435,7 +385,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"),
-                    _("Sounds on channels"),
+                    _("Audio/Sounds on channels"),
                     "res/conditions/sonplaying24.png",
                     "res/conditions/sonplaying.png")
       .AddCodeOnlyParameter("currentScene", "")
@@ -447,7 +397,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"),
-                    _("Sounds on channels"),
+                    _("Audio/Sounds on channels"),
                     "res/conditions/sonpaused24.png",
                     "res/conditions/sonpaused.png")
       .AddCodeOnlyParameter("currentScene", "")
@@ -459,7 +409,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"),
-                    _("Sounds on channels"),
+                    _("Audio/Sounds on channels"),
                     "res/conditions/sonstopped24.png",
                     "res/conditions/sonstopped.png")
       .AddCodeOnlyParameter("currentScene", "")
@@ -470,17 +420,15 @@ 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."),
+          _("Test the volume of the sound on the specified channel. The volume "
+            "is between 0 and 100."),
           _("the volume of the sound on channel _PARAM1_"),
-          _("Sounds on channels"),
+          _("Audio/Sounds on channels"),
           "res/conditions/sonVolume24.png",
           "res/conditions/sonVolume.png")
       .AddCodeOnlyParameter("currentScene", "")
       .AddParameter("expression", _("Channel identifier"))
-      .UseStandardRelationalOperatorParameters(
-          "number",
-          ParameterOptions::MakeNewOptions().SetDescription(
-              _("Volume to compare to (0-100)")))
+      .UseStandardRelationalOperatorParameters("number")
       .MarkAsAdvanced();
 
   extension
@@ -490,15 +438,12 @@ 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_"),
-          _("Music on channels"),
+          _("Audio/Music on channels"),
           "res/conditions/musicVolume24.png",
           "res/conditions/musicVolume.png")
       .AddCodeOnlyParameter("currentScene", "")
       .AddParameter("expression", _("Channel identifier"))
-      .UseStandardRelationalOperatorParameters(
-          "number",
-          ParameterOptions::MakeNewOptions().SetDescription(
-              _("Volume to compare to (0-100)")))
+      .UseStandardRelationalOperatorParameters("number")
       .MarkAsAdvanced();
 
   extension
@@ -507,14 +452,11 @@ 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",
-          ParameterOptions::MakeNewOptions().SetDescription(
-              _("Volume to compare to (0-100)")));
+      .UseStandardRelationalOperatorParameters("number");
 
   extension
       .AddCondition(
@@ -523,32 +465,27 @@ 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_"),
-          _("Sounds on channels"),
+          _("Audio/Sounds on channels"),
           "res/conditions/sonVolume24.png",
           "res/conditions/sonVolume.png")
       .AddCodeOnlyParameter("currentScene", "")
       .AddParameter("expression", _("Channel identifier"))
-      .UseStandardRelationalOperatorParameters(
-          "number",
-          ParameterOptions::MakeNewOptions().SetDescription(
-              _("Pitch to compare to (1 by default)")))
+      .UseStandardRelationalOperatorParameters("number")
       .MarkAsAdvanced();
 
   extension
       .AddCondition(
           "MusicChannelPitch",
           _("Pitch of the music on a channel"),
-          _("Test the pitch (speed) of the music on a specified channel."),
+          _("Test the pitch (speed) of the music on a specified channel. 1 is "
+            "the default pitch."),
           _("the pitch of the music on channel _PARAM1_"),
-          _("Music on channels"),
+          _("Audio/Music on channels"),
           "res/conditions/musicVolume24.png",
           "res/conditions/musicVolume.png")
       .AddCodeOnlyParameter("currentScene", "")
       .AddParameter("expression", _("Channel identifier"))
-      .UseStandardRelationalOperatorParameters(
-          "number",
-          ParameterOptions::MakeNewOptions().SetDescription(
-              _("Pitch to compare to (1 by default)")))
+      .UseStandardRelationalOperatorParameters("number")
       .MarkAsAdvanced();
 
   extension
@@ -557,15 +494,12 @@ 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_"),
-          _("Sounds on channels"),
+          _("Audio/Sounds on channels"),
           "res/conditions/sonVolume24.png",
           "res/conditions/sonVolume.png")
       .AddCodeOnlyParameter("currentScene", "")
       .AddParameter("expression", _("Channel identifier"))
-      .UseStandardRelationalOperatorParameters(
-          "number",
-          ParameterOptions::MakeNewOptions().SetDescription(
-              _("Position to compare to (in seconds)")))
+      .UseStandardRelationalOperatorParameters("number")
       .MarkAsAdvanced();
 
   extension
@@ -574,15 +508,12 @@ 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_"),
-          _("Music on channels"),
+          _("Audio/Music on channels"),
           "res/conditions/musicVolume24.png",
           "res/conditions/musicVolume.png")
       .AddCodeOnlyParameter("currentScene", "")
       .AddParameter("expression", _("Channel identifier"))
-      .UseStandardRelationalOperatorParameters(
-          "number",
-          ParameterOptions::MakeNewOptions().SetDescription(
-              _("Position to compare to (in seconds)")))
+      .UseStandardRelationalOperatorParameters("number")
       .MarkAsAdvanced();
 
   extension
@@ -646,6 +577,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsAudioExtension(
                      _("Sound level"),
                      "res/conditions/volume.png")
       .AddCodeOnlyParameter("currentScene", "");
+
 }
 
 }  // namespace gd

Core/GDCore/Extensions/Builtin/CameraExtension.cpp

@@ -15,83 +15,58 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsCameraExtension(
   extension
       .SetExtensionInformation(
           "BuiltinCamera",
-          _("Layers and cameras"),
+          _("Cameras and layers features"),
           "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");
-  extension.AddInstructionOrExpressionGroupMetadata(_("Layers and cameras"))
-      .SetIcon("res/conditions/camera24.png");
-  extension.AddInstructionOrExpressionGroupMetadata(_("Effects"))
-      .SetIcon("res/actions/effect_black.svg");
 
   extension
       .AddExpressionAndConditionAndAction(
           "number",
-          "CameraCenterX",
+          "CameraX",
           _("Camera center X position"),
           _("the X position of the center of a camera"),
           _("the X position of camera _PARAM4_ (layer: _PARAM3_)"),
-          "",
+          _("Layers and cameras"),
           "res/conditions/camera24.png")
       .AddCodeOnlyParameter("currentScene", "")
-      .UseStandardParameters("number", ParameterOptions::MakeNewOptions())
-      .AddParameter("layer", _("Layer"), "", true)
+      .UseStandardParameters("number")
+      .AddParameter("layer", _("Layer (base layer if empty)"), "", 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
       .AddExpressionAndConditionAndAction(
           "number",
-          "CameraCenterY",
+          "CameraY",
           _("Camera center Y position"),
           _("the Y position of the center of a camera"),
           _("the Y position of camera _PARAM4_ (layer: _PARAM3_)"),
-          "",
+          _("Layers and cameras"),
           "res/conditions/camera24.png")
       .AddCodeOnlyParameter("currentScene", "")
-      .UseStandardParameters("number", ParameterOptions::MakeNewOptions())
-      .AddParameter("layer", _("Layer"), "", true)
+      .UseStandardParameters("number")
+      .AddParameter("layer", _("Layer (base layer if empty)"), "", 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
       .AddExpressionAndCondition(
@@ -100,13 +75,13 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsCameraExtension(
           _("Width of a camera"),
           _("the width of a camera of a layer"),
           _("the width of camera _PARAM2_ of layer _PARAM1_"),
-          "",
+          _("Layers and cameras"),
           "res/conditions/camera24.png")
       .AddCodeOnlyParameter("currentScene", "")
-      .AddParameter("layer", _("Layer"), "", true)
+      .AddParameter("layer", _("Layer (base layer if empty)"))
       .SetDefaultValue("\"\"")
-      .AddParameter("expression", _("Camera number"), "", true)
-      .UseStandardParameters("number", ParameterOptions::MakeNewOptions())
+      .AddParameter("expression", _("Camera number"))
+      .UseStandardParameters("number")
       .MarkAsAdvanced();
 
   extension
@@ -116,81 +91,13 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsCameraExtension(
           _("Height of a camera"),
           _("the height of a camera of a layer"),
           _("the height of camera _PARAM2_ of layer _PARAM1_"),
-          "",
+          _("Layers and cameras"),
           "res/conditions/camera24.png")
       .AddCodeOnlyParameter("currentScene", "")
-      .AddParameter("layer", _("Layer"), "", true)
+      .AddParameter("layer", _("Layer (base layer if empty)"))
       .SetDefaultValue("\"\"")
-      .AddParameter("expression", _("Camera number"), "", true)
-      .UseStandardParameters("number", ParameterOptions::MakeNewOptions())
-      .MarkAsAdvanced();
-
-  extension
-      .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", "")
-      .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())
+      .AddParameter("expression", _("Camera number"))
+      .UseStandardParameters("number")
       .MarkAsAdvanced();
 
   extension
@@ -198,13 +105,13 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsCameraExtension(
           "number",
           "CameraAngle",
           _("Angle of a camera of a layer"),
-          _("the angle of rotation of a camera (in degrees)"),
+          _("the angle of rotation of a camera"),
           _("the angle of camera (layer: _PARAM3_, camera: _PARAM4_)"),
-          "",
+          _("Layers and cameras"),
           "res/conditions/camera24.png")
       .AddCodeOnlyParameter("currentScene", "")
-      .UseStandardParameters("number", ParameterOptions::MakeNewOptions())
-      .AddParameter("layer", _("Layer"), "", true)
+      .UseStandardParameters("number")
+      .AddParameter("layer", _("Layer (base layer if empty)"), "", true)
       .SetDefaultValue("\"\"")
       .AddParameter("expression", _("Camera number (default : 0)"), "", true)
       .SetDefaultValue("0")
@@ -220,11 +127,11 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsCameraExtension(
                  _("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"))
+      .AddParameter("layer", _("Layer (base layer if empty)"))
       .SetDefaultValue("\"\"")
       .AddParameter("expression", _("Width"), "", true)
       .AddParameter("expression", _("Height"), "", true)
@@ -255,11 +162,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"))
+      .AddParameter("layer", _("Layer (base layer if empty)"))
       .SetDefaultValue("\"\"")
       .AddParameter("expression", _("Camera number"))
       .MarkAsComplex();
@@ -271,11 +178,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"))
+      .AddParameter("layer", _("Layer (base layer if empty)"))
       .SetDefaultValue("\"\"")
       .AddParameter("expression", _("Camera number"))
       .AddParameter("expression", _("Width"))
@@ -289,11 +196,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"))
+      .AddParameter("layer", _("Layer (base layer if empty)"))
       .SetDefaultValue("\"\"")
       .AddParameter("expression", _("Camera number"))
       .AddParameter(
@@ -312,40 +219,21 @@ 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: "
                    "_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"), "", true)
+      .AddParameter("layer", _("Layer (base layer if empty)"), "", true)
       .SetDefaultValue("\"\"")
       .AddParameter("expression", _("Camera number (default : 0)"), "", true)
       .SetDefaultValue("0");
 
-  extension
-      .AddCondition(
-          "CameraZoom",
-          _("Camera zoom"),
-          _("Compare the zoom of a camera of a layer."),
-          _("Zoom of camera _PARAM2_ of layer _PARAM1_"),
-          "",
-          "res/conditions/camera24.png",
-          "res/conditions/camera.png")
-      .AddCodeOnlyParameter("currentScene", "")
-      .AddParameter("layer", _("Layer"), "", true)
-      .SetDefaultValue("\"\"")
-      .AddParameter("expression", _("Camera number (default : 0)"), "", true)
-      .SetDefaultValue("0")
-      .UseStandardRelationalOperatorParameters(
-          "number", gd::ParameterOptions::MakeNewOptions().SetDescription(
-              _("Zoom")))
-      .MarkAsAdvanced();
-
   extension
       .AddAction(
           "FixCamera",
@@ -354,10 +242,9 @@ 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",
@@ -373,41 +260,21 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsCameraExtension(
                     "",
                     true)
       .SetDefaultValue("yes")
-      .AddParameter("layer", _("Layer"), "", true)
+      .AddParameter("layer", _("Layer (base layer if empty)"), "", true)
       .SetDefaultValue("\"\"")
       .AddParameter("expression", _("Camera number (default : 0)"), "", true)
       .SetDefaultValue("0")
       .MarkAsAdvanced();
 
   extension
-      .AddAction("ClampCamera",
-                 _("Enforce camera boundaries"),
-                 _("Enforce camera boundaries by moving the camera back inside "
-                   "specified boundaries."),
-                 _("Enforce camera boundaries (left: _PARAM1_, top: _PARAM2_ "
-                   "right: _PARAM3_, bottom: _PARAM4_, layer: _PARAM5_)"),
-                 "",
-                 "res/actions/camera24.png",
-                 "res/actions/camera.png")
-      .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")
+      .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")
       .AddCodeOnlyParameter("currentScene", "")
       .AddParameter("objectPtr", _("Object"))
       .AddParameter("yesorno",
@@ -415,7 +282,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsCameraExtension(
                     "",
                     true)
       .SetDefaultValue("yes")
-      .AddParameter("layer", _("Layer"), "", true)
+      .AddParameter("layer", _("Layer (base layer if empty)"), "", true)
       .SetDefaultValue("\"\"")
       .AddParameter("expression", _("Camera number (default : 0)"), "", true)
       .SetDefaultValue("0")
@@ -426,11 +293,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"))
+      .AddParameter("layer", _("Layer (base layer if empty)"))
       .SetDefaultValue("\"\"")
       .MarkAsAdvanced();
 
@@ -439,11 +306,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"))
+      .AddParameter("layer", _("Layer (base layer if empty)"))
       .SetDefaultValue("\"\"")
       .MarkAsAdvanced();
 
@@ -452,69 +319,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"))
+      .AddParameter("layer", _("Layer (base layer if empty)"))
       .SetDefaultValue("\"\"")
       .MarkAsAdvanced();
 
   extension
       .AddAction(
           "SetLayerEffectParameter",
-          _("Effect property (number)"),
-          _("Change the value of a property of an effect.") + "\n" +
-              _("You can find the property names (and change the effect "
+          _("Effect parameter (number)"),
+          _("Change the value of a parameter of an effect.") + "\n" +
+              _("You can find the parameter names (and change the effect "
                 "names) in the effects window."),
           _("Set _PARAM3_ to _PARAM4_ for effect _PARAM2_ of layer _PARAM1_"),
-          _("Effects"),
-          "res/actions/effect_black.svg",
-          "res/actions/effect_black.svg")
+          _("Layers and cameras/Effects"),
+          "res/conditions/camera24.png",
+          "res/conditions/camera.png")
       .AddCodeOnlyParameter("currentScene", "")
-      .AddParameter("layer", _("Layer"), "", true)
+      .AddParameter("layer", _("Layer (base layer if empty)"), "", true)
       .SetDefaultValue("\"\"")
       .AddParameter("layerEffectName", _("Effect name"))
-      .AddParameter("layerEffectParameterName", _("Property name"))
+      .AddParameter("layerEffectParameterName", _("Parameter name"))
       .AddParameter("expression", _("New value"))
       .MarkAsAdvanced();
 
   extension
       .AddAction(
           "SetLayerEffectStringParameter",
-          _("Effect property (string)"),
-          _("Change the value (string) of a property of an effect.") + "\n" +
-              _("You can find the property names (and change the effect "
+          _("Effect parameter (string)"),
+          _("Change the value (string) of a parameter of an effect.") + "\n" +
+              _("You can find the parameter names (and change the effect "
                 "names) in the effects window."),
           _("Set _PARAM3_ to _PARAM4_ for effect _PARAM2_ of layer _PARAM1_"),
-          _("Effects"),
-          "res/actions/effect_black.svg",
-          "res/actions/effect_black.svg")
+          _("Layers and cameras/Effects"),
+          "res/conditions/camera24.png",
+          "res/conditions/camera.png")
       .AddCodeOnlyParameter("currentScene", "")
-      .AddParameter("layer", _("Layer"), "", true)
+      .AddParameter("layer", _("Layer (base layer if empty)"), "", true)
       .SetDefaultValue("\"\"")
       .AddParameter("layerEffectName", _("Effect name"))
-      .AddParameter("layerEffectParameterName", _("Property name"))
+      .AddParameter("layerEffectParameterName", _("Parameter name"))
       .AddParameter("string", _("New value"))
       .MarkAsAdvanced();
 
   extension
       .AddAction(
           "SetLayerEffectBooleanParameter",
-          _("Effect property (enable or disable)"),
-          _("Enable or disable a property of an effect.") + "\n" +
-              _("You can find the property names (and change the effect "
+          _("Effect parameter (enable or disable)"),
+          _("Enable or disable a parameter of an effect.") + "\n" +
+              _("You can find the parameter names (and change the effect "
                 "names) in the effects window."),
           _("Enable _PARAM3_ for effect _PARAM2_ of layer _PARAM1_: _PARAM4_"),
-          _("Effects"),
-          "res/actions/effect_black.svg",
-          "res/actions/effect_black.svg")
+          _("Layers and cameras/Effects"),
+          "res/conditions/camera24.png",
+          "res/conditions/camera.png")
       .AddCodeOnlyParameter("currentScene", "")
-      .AddParameter("layer", _("Layer"), "", true)
+      .AddParameter("layer", _("Layer (base layer if empty)"), "", true)
       .SetDefaultValue("\"\"")
       .AddParameter("layerEffectName", _("Effect name"))
-      .AddParameter("layerEffectParameterName", _("Property name"))
-      .AddParameter("yesorno", _("Enable this property"))
+      .AddParameter("layerEffectParameterName", _("Parameter name"))
+      .AddParameter("yesorno", _("Enable this parameter"))
       .MarkAsAdvanced();
 
   extension
@@ -522,11 +389,11 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsCameraExtension(
                     _("Layer effect is enabled"),
                     _("The effect on a layer is enabled"),
                     _("Effect _PARAM2_ on layer _PARAM1_ is enabled"),
-                    _(""),
-                    "res/actions/effect_black.svg",
-                    "res/actions/effect_black.svg")
+                    _("Layers and cameras/Effects"),
+                    "res/conditions/camera24.png",
+                    "res/conditions/camera.png")
       .AddCodeOnlyParameter("currentScene", "")
-      .AddParameter("layer", _("Layer"), "", true)
+      .AddParameter("layer", _("Layer (base layer if empty)"), "", true)
       .SetDefaultValue("\"\"")
       .AddParameter("layerEffectName", _("Effect name"))
       .MarkAsAdvanced();
@@ -536,11 +403,11 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsCameraExtension(
                  _("Enable layer effect"),
                  _("Enable an effect on a layer"),
                  _("Enable effect _PARAM2_ on layer _PARAM1_: _PARAM3_"),
-                 _("Effects"),
-                 "res/actions/effect_black.svg",
-                 "res/actions/effect_black.svg")
+                 _("Layers and cameras/Effects"),
+                 "res/conditions/camera24.png",
+                 "res/conditions/camera.png")
       .AddCodeOnlyParameter("currentScene", "")
-      .AddParameter("layer", _("Layer"), "", true)
+      .AddParameter("layer", _("Layer (base layer if empty)"), "", true)
       .SetDefaultValue("\"\"")
       .AddParameter("layerEffectName", _("Effect name"))
       .AddParameter("yesorno", _("Enable"), "", true)
@@ -552,29 +419,26 @@ 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"),
           "res/conditions/time24.png",
           "res/conditions/time.png")
       .AddCodeOnlyParameter("currentScene", "")
-      .AddParameter("layer", _("Layer"), "", true)
+      .AddParameter("layer", _("Layer (base layer if empty)"), "", true)
       .SetDefaultValue("\"\"")
-      .UseStandardRelationalOperatorParameters(
-          "number",
-          gd::ParameterOptions::MakeNewOptions().SetDescription(
-              _("Time scale (1 by default)")))
+      .UseStandardRelationalOperatorParameters("number")
       .MarkAsAdvanced();
 
   extension
       .AddAction(
           "ChangeLayerTimeScale",
-          _("Layer time scale"),
+          _("Change layer time scale"),
           _("Change the time scale applied to the objects of the layer."),
           _("Set the time scale of layer _PARAM1_ to _PARAM2_"),
-          "",
+          _("Layers and cameras"),
           "res/actions/time24.png",
           "res/actions/time.png")
       .AddCodeOnlyParameter("currentScene", "")
-      .AddParameter("layer", _("Layer"), "", true)
+      .AddParameter("layer", _("Layer (base layer if empty)"), "", true)
       .SetDefaultValue("\"\"")
       .AddParameter("expression",
                     _("Scale (1: Default, 2: 2x faster, 0.5: 2x slower...)"));
@@ -585,43 +449,42 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsCameraExtension(
                     _("Compare the default Z order set to objects when they "
                       "are created on a layer."),
                     _("the default Z order of objects created on _PARAM1_"),
-                    "",
+                    _("Layers and cameras"),
                     "res/conditions/layer24.png",
                     "res/conditions/layer.png")
       .AddCodeOnlyParameter("currentScene", "")
-      .AddParameter("layer", _("Layer"), "", true)
+      .AddParameter("layer", _("Layer (base layer if empty)"), "", true)
       .SetDefaultValue("\"\"")
-      .UseStandardRelationalOperatorParameters(
-          "number", gd::ParameterOptions::MakeNewOptions())
+      .UseStandardRelationalOperatorParameters("number")
       .MarkAsAdvanced();
 
   extension
       .AddAction("SetLayerDefaultZOrder",
-                 _("Layer default Z order"),
+                 _("Change 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_"),
-                 "",
+                 _("Layers and cameras"),
                  "res/actions/layer24.png",
                  "res/actions/layer.png")
       .AddCodeOnlyParameter("currentScene", "")
-      .AddParameter("layer", _("Layer"), "", true)
+      .AddParameter("layer", _("Layer (base layer if empty)"), "", true)
       .SetDefaultValue("\"\"")
       .AddParameter("expression", _("New default Z order"));
 
   extension
       .AddAction(
           "SetLayerAmbientLightColor",
-          _("Ambient light color"),
+          _("Set the 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_"),
-          _(""),
+          _("Layers and cameras/Lighting"),
           "res/actions/color24.png",
           "res/actions/color.png")
       .AddCodeOnlyParameter("currentScene", "")
-      .AddParameter("layer", _("Layer"), "", true)
+      .AddParameter("layer", _("Layer (base layer if empty)"), "", true)
       .SetDefaultValue("\"Lighting\"")
       .AddParameter("color", _("Color"))
       .MarkAsAdvanced();
@@ -631,7 +494,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsCameraExtension(
           "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"))
@@ -643,7 +506,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"))
@@ -655,7 +518,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"))
@@ -667,7 +530,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"))
@@ -678,7 +541,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsCameraExtension(
       .AddExpression("CameraZoom",
                      _("Zoom of a camera of a layer"),
                      _("Zoom of a camera of a layer"),
-                     "",
+                     _("Layers and cameras"),
                      "res/actions/camera.png")
       .AddCodeOnlyParameter("currentScene", "")
       .AddParameter("layer", _("Layer"), "", true)
@@ -690,7 +553,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsCameraExtension(
       .AddExpression("LayerTimeScale",
                      _("Layer time scale"),
                      _("Returns the time scale of the specified layer."),
-                     "",
+                     _("Layers and cameras"),
                      "res/actions/time.png")
       .AddCodeOnlyParameter("currentScene", "")
       .AddParameter("layer", _("Layer"));
@@ -699,7 +562,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsCameraExtension(
       .AddExpression("LayerDefaultZOrder",
                      _("Default Z Order for a layer"),
                      _("Default Z Order for a layer"),
-                     "",
+                     _("Layers and cameras"),
                      "res/actions/camera.png")
       .AddCodeOnlyParameter("currentScene", "")
       .AddParameter("layer", _("Layer"));

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

@@ -1,165 +0,0 @@
-/*
- * 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",
-                               _("Objects with animations"),
-                               _("Actions and conditions for objects having animations (sprite, 3D models...)."),
-                               "Florian Rival",
-                               "Open source (MIT License)")
-      .SetExtensionHelpPath("/objects");
-  extension.AddInstructionOrExpressionGroupMetadata(_("Objects with animations"))
-      .SetIcon("res/actions/animation24.png");
-  extension.AddInstructionOrExpressionGroupMetadata(_("Animations and images"))
-      .SetIcon("res/actions/animation24.png");
-
-  gd::BehaviorMetadata& aut = extension.AddBehavior(
-      "AnimatableBehavior",
-      _("Objects with animations"),
-      "Animation",
-      _("Actions and conditions for objects having animations (sprite, 3D models...).."),
-      "",
-      "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

@@ -1,116 +0,0 @@
-/*
- * 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",
-                               _("Objects with effects"),
-                               _("Actions/conditions to enable/disable and change parameters of visual effects applied on objects."),
-                               "Florian Rival",
-                               "Open source (MIT License)")
-      .SetExtensionHelpPath("/objects");
-  extension.AddInstructionOrExpressionGroupMetadata(_("Effects"))
-      .SetIcon("res/actions/effect_black.svg");
-
-  gd::BehaviorMetadata& aut = extension.AddBehavior(
-      "EffectBehavior",
-      _("Objects with effects"),
-      "Effect",
-      _("Actions/conditions to enable/disable and change parameters of visual effects applied on 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

@@ -1,86 +0,0 @@
-/*
- * 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 objects"),
-                               _("Actions/conditions for objects which can be flipped horizontally or vertically."),
-                               "Florian Rival",
-                               "Open source (MIT License)")
-      .SetExtensionHelpPath("/objects");
-  extension.AddInstructionOrExpressionGroupMetadata(_("Effects"))
-      .SetIcon("res/actions/effect_black.svg");
-
-  gd::BehaviorMetadata& aut = extension.AddBehavior(
-      "FlippableBehavior",
-      _("Flippable objects"),
-      "Flippable",
-      _("Actions/conditions for objects which can be flipped horizontally or vertically."),
-      "",
-      "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

@@ -1,66 +0,0 @@
-/*
- * 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",
-                               _("Objects with opacity"),
-                               _("Action/condition/expression to change or "
-                                 "check the opacity of an object (0-255)."),
-                               "Florian Rival",
-                               "Open source (MIT License)")
-      .SetExtensionHelpPath("/objects");
-  extension.AddInstructionOrExpressionGroupMetadata(_("Objects with opacity"))
-      .SetIcon("res/actions/opacity24.png");
-  extension.AddInstructionOrExpressionGroupMetadata(_("Visibility"))
-      .SetIcon("res/actions/opacity24.png");
-
-  gd::BehaviorMetadata& aut =
-      extension
-          .AddBehavior("OpacityBehavior",
-                       _("Objects with opacity"),
-                       "Opacity",
-                       _("Action/condition/expression to change or check the "
-                         "opacity of an object (0-255)."),
-                       "",
-                       "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

@@ -1,115 +0,0 @@
-/*
- * 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 objects"),
-          _("Change or compare the size (width/height) of an object which can "
-            "be resized (i.e: most objects)."),
-          "Florian Rival",
-          "Open source (MIT License)")
-      .SetExtensionHelpPath("/objects");
-  extension.AddInstructionOrExpressionGroupMetadata(_("Size")).SetIcon(
-      "res/actions/scale24_black.png");
-
-  gd::BehaviorMetadata &aut =
-      extension
-          .AddBehavior("ResizableBehavior",
-                       _("Resizable objects"),
-                       "Resizable",
-                       _("Change or compare the size (width/height) of an "
-                         "object which can be resized (i.e: most objects)."),
-                       "",
-                       "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

@@ -1,98 +0,0 @@
-/*
- * 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 objects"),
-                               _("Actions/conditions/expression to change or "
-                                 "check the scale of an object (default: 1)."),
-                               "Florian Rival",
-                               "Open source (MIT License)")
-      .SetExtensionHelpPath("/objects");
-  extension.AddInstructionOrExpressionGroupMetadata(_("Scalable objects"))
-      .SetIcon("res/actions/scale24_black.png");
-  extension.AddInstructionOrExpressionGroupMetadata(_("Size")).SetIcon(
-      "res/actions/scale24_black.png");
-
-  gd::BehaviorMetadata& aut =
-      extension
-          .AddBehavior("ScalableBehavior",
-                       _("Scalable objects"),
-                       "Scale",
-                       _("Actions/conditions/expression to change or check the "
-                         "scale of an object (default: 1)."),
-                       "",
-                       "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

@@ -1,58 +0,0 @@
-/*
- * 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",
-                               _("Objects containing a text"),
-                               _("Allows an object to contain a text, usually shown on screen, that can be modified."),
-                               "Florian Rival",
-                               "Open source (MIT License)")
-      .SetExtensionHelpPath("/objects");
-  extension.AddInstructionOrExpressionGroupMetadata(_("Objects containing a text"))
-      .SetIcon("res/conditions/text24_black.png");
-
-  gd::BehaviorMetadata& aut = extension.AddBehavior(
-      "TextContainerBehavior",
-      _("Objects containing a text"),
-      "Text",
-      _("Allows an object to contain a text, usually shown on screen, that can be modified."),
-      "",
-      "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,39 +15,36 @@ BuiltinExtensionsImplementer::ImplementsCommonConversionsExtension(
   extension
       .SetExtensionInformation(
           "BuiltinCommonConversions",
-          _("Conversion"),
-          "Expressions to convert numbers to string, strings to numbers, "
-          "angles (degrees from/to radians) and a GDevelop variable to/from a "
-          "JSON string.",
+          _("Standard Conversions"),
+          "Expressions to convert number, texts and quantities.",
           "Florian Rival",
           "Open source (MIT License)")
       .SetExtensionHelpPath("/all-features/common-conversions");
-  extension.AddInstructionOrExpressionGroupMetadata(_("Conversion"))
-      .SetIcon("res/conditions/toujours24_black.png");
+
 
   extension
       .AddExpression("ToNumber",
                      _("Text > Number"),
                      _("Convert the text to a number"),
-                     "",
-                     "res/conditions/toujours24_black.png")
+                     _("Conversion"),
+                     "res/conditions/toujours24.png")
       .AddParameter("string", _("Text to convert to a number"));
 
   extension
       .AddStrExpression("ToString",
                         _("Number > Text"),
                         _("Convert the result of the expression to text"),
-                        "",
-                        "res/conditions/toujours24_black.png")
+                        _("Conversion"),
+                        "res/conditions/toujours24.png")
       .AddParameter("expression", _("Expression to be converted to text"));
 
   extension
       .AddStrExpression("LargeNumberToString",
-                        _("Number > Text (without scientific notation)"),
+                        _("Number > Text ( without scientific notation )"),
                         _("Convert the result of the expression to text, "
                           "without using the scientific notation"),
-                        "",
-                        "res/conditions/toujours24_black.png")
+                        _("Conversion"),
+                        "res/conditions/toujours24.png")
       .AddParameter("expression", _("Expression to be converted to text"));
 
   extension
@@ -55,8 +52,8 @@ BuiltinExtensionsImplementer::ImplementsCommonConversionsExtension(
           "ToRad",
           _("Degrees > Radians"),
           _("Converts the angle, expressed in degrees, into radians"),
-          "",
-          "res/conditions/toujours24_black.png")
+          _("Conversion"),
+          "res/conditions/toujours24.png")
       .AddParameter("expression", _("Angle, in degrees"));
 
   extension
@@ -64,97 +61,9 @@ BuiltinExtensionsImplementer::ImplementsCommonConversionsExtension(
           "ToDeg",
           _("Radians > Degrees"),
           _("Converts the angle, expressed in radians, into degrees"),
-          "",
-          "res/conditions/toujours24_black.png")
+          _("Conversion"),
+          "res/conditions/toujours24.png")
       .AddParameter("expression", _("Angle, in radians"));
-
-  extension
-      .AddStrExpression("ToJSON",
-                        _("Convert variable to JSON"),
-                        _("Convert a variable to JSON"),
-                        _("JSON"),
-                        "res/conditions/toujours24_black.png")
-      .AddParameter("variable",
-                    _("The variable to be stringified"),
-                    "AllowUndeclaredVariable");
-
-  // Deprecated
-  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"))
-      .SetHidden();
-
-  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"));
-
-  // Deprecated
-  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()
-      .SetHidden();
-
-  // Deprecated
-  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()
-      .SetHidden();
-
-  extension
-      .AddAction(
-          "JSONToVariableStructure2",
-          _("Convert JSON to a variable"),
-          _("Parse a JSON object and store it into a variable"),
-          _("Convert JSON string _PARAM0_ and store it into variable _PARAM1_"),
-          "",
-          "res/actions/net24.png",
-          "res/actions/net.png")
-      .AddParameter("string", _("JSON string"))
-      .AddParameter("variable", _("Variable where to 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,6 +4,7 @@
  * reserved. This project is released under the MIT License.
  */
 #include "AllBuiltinExtensions.h"
+#include "GDCore/Tools/Localization.h"
 #include "GDCore/Events/Builtin/CommentEvent.h"
 #include "GDCore/Events/Builtin/ForEachChildVariableEvent.h"
 #include "GDCore/Events/Builtin/ForEachEvent.h"
@@ -13,7 +14,6 @@
 #include "GDCore/Events/Builtin/StandardEvent.h"
 #include "GDCore/Events/Builtin/WhileEvent.h"
 #include "GDCore/Events/Event.h"
-#include "GDCore/Tools/Localization.h"
 
 using namespace std;
 namespace gd {
@@ -24,136 +24,55 @@ BuiltinExtensionsImplementer::ImplementsCommonInstructionsExtension(
   extension
       .SetExtensionInformation(
           "BuiltinCommonInstructions",
-          _("Events and control flow"),
+          _("Builtin events"),
           "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
 
   extension
-      .AddCondition(
-          "Or",
-          _("Or"),
-          _("Checks if at least one sub-condition is true. If no "
-            "sub-condition is specified, it will always be false. "
-            "This is rarely used — multiple events and sub-events are "
-            "usually a better approach."),
-          _("If one of these conditions is true:"),
-          "",
-          "res/conditions/or24_black.png",
-          "res/conditions/or_black.png")
+      .AddCondition("Or",
+                    _("Or"),
+                    _("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")
+      .SetCanHaveSubInstructions()
+      .MarkAsAdvanced();
+
+  extension
+      .AddCondition("And",
+                    _("And"),
+                    _("Check if all sub conditions are true"),
+                    _("If all of these conditions are true:"),
+                    _("Advanced"),
+                    "res/conditions/and24.png",
+                    "res/conditions/and.png")
       .SetCanHaveSubInstructions()
       .MarkAsAdvanced();
 
   extension
       .AddCondition(
-          "And",
-          _("And"),
-          _("Checks if all sub-conditions are true. If no sub-condition is "
-            "specified, it will always be false. This is rarely needed, as "
-            "events already check all conditions before running actions."),
-          _("If all of these conditions are true:"),
-          "",
-          "res/conditions/and24_black.png",
-          "res/conditions/and_black.png")
+          "Not",
+          _("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")
       .SetCanHaveSubInstructions()
       .MarkAsAdvanced();
 
-  extension
-      .AddCondition("Not",
-                    _("Not"),
-                    _("Returns the opposite of the sub-condition(s) result. "
-                      "This is rarely needed, as most conditions can be "
-                      "inverted or expressed more simply."),
-                    _("Invert the logical result of these conditions:"),
-                    "",
-                    "res/conditions/not24_black.png",
-                    "res/conditions/not_black.png")
-      .SetCanHaveSubInstructions()
-      .MarkAsAdvanced();
-
-  extension
-      .AddCondition("Once",
-                    _("Trigger once while true"),
-                    _("Run actions only once, for each time the conditions "
-                      "have been met."),
-                    _("Trigger once"),
-                    "",
-                    "res/conditions/once24.png",
-                    "res/conditions/once.png")
-      .SetHelpPath("/all-features/advanced-conditions/trigger-once");
-
-  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.AddCondition(
+      "Once",
+      _("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.AddEvent(
       "Standard",

Core/GDCore/Extensions/Builtin/ExternalLayoutsExtension.cpp

@@ -19,27 +19,22 @@ BuiltinExtensionsImplementer::ImplementsExternalLayoutsExtension(
                                "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");
+      .SetExtensionHelpPath("/interface/scene-editor/external-layouts");
 
   extension
       .AddAction("CreateObjectsFromExternalLayout",
                  _("Create objects from an external layout"),
                  _("Create objects from an external layout."),
-                 _("Create objects from the external layout named _PARAM1_ at position _PARAM2_;_PARAM3_;_PARAM4_"),
-                 "",
-                 "res/ribbon_default/externallayout32.png",
-                 "res/ribbon_default/externallayout32.png")
+                 _("Create objects from the external layout named _PARAM1_"),
+                 _("External layouts"),
+                 "res/conditions/fichier24.png",
+                 "res/conditions/fichier.png")
       .AddCodeOnlyParameter("currentScene", "")
-      .AddParameter("externalLayoutName", _("Name of the external layout"))
+      .AddParameter("string", _("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();
 }
 

Core/GDCore/Extensions/Builtin/FileExtension.cpp

@@ -20,10 +20,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsFileExtension(
           "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");
+      .SetExtensionHelpPath("/all-features/storage");
 
   extension
       .AddCondition(
@@ -32,7 +29,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"))
@@ -42,17 +39,13 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsFileExtension(
   extension
       .AddAction(
           "LoadFile",
-          _("Manually preload a storage in memory"),
-          _("Forces the specified storage to be loaded and kept in "
-            "memory, allowing faster reads/writes. "
-            "However, it requires manual management: if you use this "
-            "action, you *must* also unload the storage manually when "
-            "it's no longer needed to ensure data is persisted.\n\n"
-            "Unless you have a specific performance need, avoid using this "
-            "action. The system already handles loading/unloading "
-            "automatically."),
-          _("Load data storage _PARAM0_ in memory"),
-          _("Advanced"),
+          _("Load a storage in memory"),
+          _("This action loads the specified storage in memory, so you can "
+            "write and read it.\nYou can open and write without using this "
+            "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"))
@@ -60,11 +53,11 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsFileExtension(
 
   extension
       .AddAction("UnloadFile",
-                 _("Manually unload and persist a storage"),
-                 _("Close the specified storage previously loaded "
+                 _("Close a storage"),
+                 _("This action closes the structured data previously loaded "
                    "in memory, saving all changes made."),
-                 _("Unload and persist data storage _PARAM0_"),
-                 _("Advanced"),
+                 _("Close structured data _PARAM0_"),
+                 _("Storage"),
                  "res/actions/fichier24.png",
                  "res/actions/fichier.png")
       .AddParameter("string", _("Storage name"))
@@ -73,13 +66,13 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsFileExtension(
   extension
       .AddAction(
           "EcrireFichierExp",
-          _("Save a value"),
-          _("Save the result of the expression in the stored data, in the "
+          _("Write a value"),
+          _("Write 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."),
-          _("Save _PARAM2_ in _PARAM1_ of storage _PARAM0_"),
-          "",
+          _("Write _PARAM2_ in _PARAM1_ of storage _PARAM0_"),
+          _("Storage"),
           "res/actions/fichier24.png",
           "res/actions/fichier.png")
       .AddParameter("string", _("Storage name"))
@@ -89,94 +82,55 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsFileExtension(
   extension
       .AddAction(
           "EcrireFichierTxt",
-          _("Save a text"),
-          _("Save the text in the specified storage, in the specified "
+          _("Write a text"),
+          _("Write 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."),
-          _("Save _PARAM2_ in _PARAM1_ of storage _PARAM0_"),
-          "",
+          _("Write _PARAM2_ in _PARAM1_ of storage _PARAM0_"),
+          _("Storage"),
           "res/actions/fichier24.png",
           "res/actions/fichier.png")
       .AddParameter("string", _("Storage name"))
       .AddParameter("string", _("Group"))
       .AddParameter("string", _("Text"));
 
-  // Deprecated
   extension
       .AddAction(
           "LireFichierExp",
-          _("Load a value"),
-          _("Load the value saved in the specified element and store it in a "
+          _("Read a value"),
+          _("Read 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."),
-          _("Load _PARAM1_ from storage _PARAM0_ and store value in _PARAM3_"),
-          "",
+          _("Read _PARAM1_ from storage _PARAM0_ and store value in _PARAM3_"),
+          _("Storage"),
           "res/actions/fichier24.png",
           "res/actions/fichier.png")
       .AddParameter("string", _("Storage name"))
       .AddParameter("string", _("Group"))
       .AddCodeOnlyParameter("currentScene", "")
-      .AddParameter("scenevar", _("Scene variable"))
-      .SetHidden();
+      .AddParameter("scenevar", _("Scene variables"));
 
-  extension
-      .AddAction(
-          "ReadNumberFromStorage",
-          _("Load a value"),
-          _("Load the value saved in the specified element and store it in a "
-            "variable.\nSpecify the structure leading to the element using / "
-            "(example : Root/Level/Current)\nSpaces are forbidden in element "
-            "names."),
-          _("Load _PARAM1_ from storage _PARAM0_ and store value in _PARAM3_"),
-          "",
-          "res/actions/fichier24.png",
-          "res/actions/fichier.png")
-      .AddParameter("string", _("Storage name"))
-      .AddParameter("string", _("Group"))
-      .AddCodeOnlyParameter("currentScene", "")
-      .AddParameter("variable", _("Variable"));
-
-  // Deprecated
   extension
       .AddAction(
           "LireFichierTxt",
-          _("Load a text"),
-          _("Load the text saved in the specified element and store it in a "
+          _("Read a text"),
+          _("Read 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."),
-          _("Load _PARAM1_ from storage _PARAM0_ and store as text in "
+          _("Read _PARAM1_ from storage _PARAM0_ and store as text in "
             "_PARAM3_"),
-          "",
+          _("Storage"),
           "res/actions/fichier24.png",
           "res/actions/fichier.png")
       .AddParameter("string", _("Storage name"))
       .AddParameter("string", _("Group"))
       .AddCodeOnlyParameter("currentScene", "")
-      .AddParameter("scenevar", _("Scene variable"))
-      .SetHidden();
-
-  extension
-      .AddAction(
-          "ReadStringFromStorage",
-          _("Load a text"),
-          _("Load the text saved in the specified element and store it in a "
-            "variable.\nSpecify the structure leading to the element using / "
-            "(example : Root/Level/Current)\nSpaces are forbidden in element "
-            "names."),
-          _("Load _PARAM1_ from storage _PARAM0_ and store as text in "
-            "_PARAM3_"),
-          "",
-          "res/actions/fichier24.png",
-          "res/actions/fichier.png")
-      .AddParameter("string", _("Storage name"))
-      .AddParameter("string", _("Group"))
-      .AddCodeOnlyParameter("currentScene", "")
-      .AddParameter("variable", _("Variable"));
+      .AddParameter("scenevar", _("Scene variables"));
 
   extension
       .AddAction("DeleteGroupFichier",
@@ -186,7 +140,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"))
@@ -199,7 +153,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"));
@@ -209,18 +163,32 @@ 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_"),
-                 _("Network"),
+                 _("Files"),
                  "res/actions/launchFile24.png",
                  "res/actions/launchFile.png")
       .AddParameter("string", _("Command"))

Core/GDCore/Extensions/Builtin/KeyboardExtension.cpp

@@ -14,98 +14,79 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsKeyboardExtension(
   extension
       .SetExtensionInformation(
           "BuiltinKeyboard",
-          _("Keyboard"),
-          _("Conditions to check keys pressed on a keyboard. Note that this "
+          _("Keyboard features"),
+          _("Allows your game to respond to keyboard input. Note that this "
             "does not work with on-screen keyboard on touch devices: use "
-            "instead mouse/touch conditions when making a game for "
-            "mobile/touchscreen devices or when making a new game from "
-            "scratch."),
+            "instead conditions related to touch when making a game for "
+            "mobile/touchscreen devices."),
           "Florian Rival",
           "Open source (MIT License)")
-      .SetExtensionHelpPath("/all-features/keyboard")
-      .SetCategory("Input");
-  extension.AddInstructionOrExpressionGroupMetadata(_("Keyboard"))
-      .SetIcon("res/conditions/keyboard24.png");
+      .SetExtensionHelpPath("/all-features/keyboard");
 
   extension
       .AddCondition("KeyPressed",
                     _("Key pressed"),
                     _("Check if a key is pressed"),
                     _("_PARAM1_ key is pressed"),
-                    "",
+                    _("Keyboard"),
                     "res/conditions/keyboard24.png",
                     "res/conditions/keyboard.png")
       .AddCodeOnlyParameter("currentScene", "")
-      .AddParameter("key", _("Key to check"))
-      .SetHidden();
+      .AddParameter("key", _("Key"));
 
   extension
       .AddCondition("KeyReleased",
                     _("Key released"),
                     _("Check if a key was just released"),
                     _("_PARAM1_ key is released"),
-                    "",
+                    _("Keyboard"),
                     "res/conditions/keyboard24.png",
                     "res/conditions/keyboard.png")
       .AddCodeOnlyParameter("currentScene", "")
-      .AddParameter("key", _("Key to check"))
-      .SetHidden();
+      .AddParameter("key", _("Key"));
 
   extension
-      .AddCondition(
-          "KeyFromTextPressed",
-          _("Key pressed"),
-          _("Check if a key is pressed. This stays true as long as "
-            "the key is held down. To check if a key was pressed during "
-            "the frame, use \"Key just pressed\" instead."),
-          _("_PARAM1_ key is pressed"),
-          "",
-          "res/conditions/keyboard24.png",
-          "res/conditions/keyboard.png")
-      .AddCodeOnlyParameter("currentScene", "")
-      .AddParameter("keyboardKey", _("Key to check"))
-      .MarkAsSimple();
-
-  extension
-      .AddCondition("KeyFromTextJustPressed",
-                    _("Key just pressed"),
-                    _("Check if a key was just pressed."),
-                    _("_PARAM1_ key was just pressed"),
-                    "",
+      .AddCondition("KeyFromTextPressed",
+                    _("Key pressed (text expression)"),
+                    _("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("keyboardKey", _("Key to check"))
-      .MarkAsSimple();
+      .AddParameter("string", _("Expression generating the key to check"))
+      .MarkAsAdvanced();
 
   extension
       .AddCondition("KeyFromTextReleased",
-                    _("Key released"),
-                    _("Check if a key was just released."),
+                    _("Key released (text expression)"),
+                    _("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("keyboardKey", _("Key to check"))
-      .MarkAsSimple();
+      .AddParameter("string", _("Expression generating the key to check"))
+      .MarkAsAdvanced();
 
   extension
       .AddCondition("AnyKeyPressed",
                     _("Any key pressed"),
                     _("Check if any key is pressed"),
                     _("Any key is pressed"),
-                    "",
+                    _("Keyboard"),
                     "res/conditions/keyboard24.png",
                     "res/conditions/keyboard.png")
       .AddCodeOnlyParameter("currentScene", "");
 
-  extension
+ extension
       .AddCondition("AnyKeyReleased",
                     _("Any key released"),
                     _("Check if any key is released"),
                     _("Any key is released"),
-                    "",
+                    _("Keyboard"),
                     "res/conditions/keyboard24.png",
                     "res/conditions/keyboard.png")
       .AddCodeOnlyParameter("currentScene", "");
@@ -115,7 +96,7 @@ 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", "");
 }

Core/GDCore/Extensions/Builtin/MathematicalToolsExtension.cpp

@@ -18,64 +18,13 @@ BuiltinExtensionsImplementer::ImplementsMathematicalToolsExtension(
       "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");
 
-  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."),
+                     _("Normalize a value between `min` and `max` to a value between 0 and 1."),
                      _("Remap a value between 0 and 1."),
-                     "",
+                     _("Mathematical tools"),
                      "res/mathfunction.png")
       .AddParameter("expression", _("Value"))
       .AddParameter("expression", _("Min"))
@@ -85,7 +34,7 @@ BuiltinExtensionsImplementer::ImplementsMathematicalToolsExtension(
       .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"))
@@ -95,16 +44,16 @@ BuiltinExtensionsImplementer::ImplementsMathematicalToolsExtension(
       .AddExpression("AngleDifference",
                      _("Difference between two angles"),
                      _("Difference between two angles"),
-                     "",
+                     _("Mathematical tools"),
                      "res/mathfunction.png")
-      .AddParameter("expression", _("First angle, in degrees"))
-      .AddParameter("expression", _("Second angle, in degrees"));
+      .AddParameter("expression", _("First angle"))
+      .AddParameter("expression", _("Second angle"));
 
   extension
       .AddExpression("AngleBetweenPositions",
                      _("Angle between two positions"),
-                     _("Compute the angle between two positions (in degrees)."),
-                     "",
+                     _("Compute the angle between two positions."),
+                     _("Mathematical tools"),
                      "res/mathfunction.png")
       .AddParameter("expression", _("First point X position"))
       .AddParameter("expression", _("First point Y position"))
@@ -115,7 +64,7 @@ BuiltinExtensionsImplementer::ImplementsMathematicalToolsExtension(
       .AddExpression("DistanceBetweenPositions",
                      _("Distance between two positions"),
                      _("Compute the distance between two positions."),
-                     "",
+                     _("Mathematical tools"),
                      "res/mathfunction.png")
       .AddParameter("expression", _("First point X position"))
       .AddParameter("expression", _("First point Y position"))
@@ -125,9 +74,8 @@ BuiltinExtensionsImplementer::ImplementsMathematicalToolsExtension(
   extension
       .AddExpression("mod",
                      _("Modulo"),
-                     _("Compute \"x mod y\". GDevelop does NOT support the \% "
-                       "operator. Use this mod(x, y) function instead."),
-                     "",
+                     _("x mod y"),
+                     _("Mathematical tools"),
                      "res/mathfunction.png")
       .AddParameter("expression", _("x (as in x mod y)"))
       .AddParameter("expression", _("y (as in x mod y)"));
@@ -136,7 +84,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"));
@@ -145,7 +93,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"));
@@ -153,18 +101,16 @@ BuiltinExtensionsImplementer::ImplementsMathematicalToolsExtension(
   extension
       .AddExpression("abs",
                      _("Absolute value"),
-                     _("Return the non-negative value by removing the sign. "
-                       "The absolute value of -8 is 8."),
-                     "",
+                     _("Absolute value"),
+                     _("Mathematical tools"),
                      "res/mathfunction.png")
       .AddParameter("expression", _("Expression"));
 
   extension
       .AddExpression("acos",
                      _("Arccosine"),
-                     _("Arccosine, return an angle (in radian). "
-                       "`ToDeg` allows to convert it to degrees."),
-                     "",
+                     _("Arccosine"),
+                     _("Mathematical tools"),
                      "res/mathfunction.png")
       .AddParameter("expression", _("Expression"));
 
@@ -172,30 +118,31 @@ BuiltinExtensionsImplementer::ImplementsMathematicalToolsExtension(
       .AddExpression("acosh",
                      _("Hyperbolic arccosine"),
                      _("Hyperbolic arccosine"),
-                     "",
+                     _("Mathematical tools"),
                      "res/mathfunction.png")
       .AddParameter("expression", _("Expression"));
 
   extension
       .AddExpression("asin",
                      _("Arcsine"),
-                     _("Arcsine, return an angle (in radian). "
-                       "`ToDeg` allows to convert it to degrees."),
-                     "",
+                     _("Arcsine"),
+                     _("Mathematical tools"),
                      "res/mathfunction.png")
       .AddParameter("expression", _("Expression"));
 
   extension
-      .AddExpression(
-          "asinh", _("Arcsine"), _("Arcsine"), "", "res/mathfunction.png")
+      .AddExpression("asinh",
+                     _("Arcsine"),
+                     _("Arcsine"),
+                     _("Mathematical tools"),
+                     "res/mathfunction.png")
       .AddParameter("expression", _("Expression"));
 
   extension
       .AddExpression("atan",
                      _("Arctangent"),
-                     _("Arctangent, return an angle (in radian). "
-                       "`ToDeg` allows to convert it to degrees."),
-                     "",
+                     _("Arctangent"),
+                     _("Mathematical tools"),
                      "res/mathfunction.png")
       .AddParameter("expression", _("Expression"));
 
@@ -203,7 +150,7 @@ BuiltinExtensionsImplementer::ImplementsMathematicalToolsExtension(
       .AddExpression("atan2",
                      _("2 argument arctangent"),
                      _("2 argument arctangent (atan2)"),
-                     "",
+                     _("Mathematical tools"),
                      "res/mathfunction.png")
       .AddParameter("expression", _("Y"))
       .AddParameter("expression", _("X"));
@@ -212,64 +159,47 @@ BuiltinExtensionsImplementer::ImplementsMathematicalToolsExtension(
       .AddExpression("atanh",
                      _("Hyperbolic arctangent"),
                      _("Hyperbolic arctangent"),
-                     "",
+                     _("Mathematical tools"),
                      "res/mathfunction.png")
       .AddParameter("expression", _("Expression"));
 
   extension
-      .AddExpression(
-          "cbrt", _("Cube root"), _("Cube root"), "", "res/mathfunction.png")
+      .AddExpression("cbrt",
+                     _("Cube root"),
+                     _("Cube root"),
+                     _("Mathematical tools"),
+                     "res/mathfunction.png")
       .AddParameter("expression", _("Expression"));
 
   extension
       .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"),
-                     "",
+      .AddExpression("cos",
+                     _("Cosine"),
+                     _("Cosine of a number"),
+                     _("Mathematical tools"),
                      "res/mathfunction.png")
-      .AddParameter("expression", _("Expression"))
-      .AddParameter("expression", _("Expression"), "", true);
-
-  extension
-      .AddExpression(
-          "cos",
-          _("Cosine"),
-          _("Cosine of an angle (in radian). "
-            "If you want to use degrees, use`ToRad`: `sin(ToRad(45))`."),
-          "",
-          "res/mathfunction.png")
       .AddParameter("expression", _("Expression"));
 
   extension
       .AddExpression("cosh",
                      _("Hyperbolic cosine"),
                      _("Hyperbolic cosine"),
-                     "",
+                     _("Mathematical tools"),
                      "res/mathfunction.png")
       .AddParameter("expression", _("Expression"));
 
@@ -277,7 +207,7 @@ BuiltinExtensionsImplementer::ImplementsMathematicalToolsExtension(
       .AddExpression("cot",
                      _("Cotangent"),
                      _("Cotangent of a number"),
-                     "",
+                     _("Mathematical tools"),
                      "res/mathfunction.png")
       .AddParameter("expression", _("Expression"));
 
@@ -285,52 +215,58 @@ BuiltinExtensionsImplementer::ImplementsMathematicalToolsExtension(
       .AddExpression("csc",
                      _("Cosecant"),
                      _("Cosecant of a number"),
-                     "",
+                     _("Mathematical tools"),
                      "res/mathfunction.png")
       .AddParameter("expression", _("Expression"));
 
   extension
-      .AddExpression(
-          "int", _("Round"), _("Round a number"), "", "res/mathfunction.png")
-      .SetHidden()
-      .AddParameter("expression", _("Expression"));
-
-  extension
-      .AddExpression(
-          "rint", _("Round"), _("Round a number"), "", "res/mathfunction.png")
-      .SetHidden()
-      .AddParameter("expression", _("Expression"));
-
-  extension
-      .AddExpression(
-          "round", _("Round"), _("Round a number"), "", "res/mathfunction.png")
-      .AddParameter("expression", _("Expression"));
-
-  extension
-      .AddExpression("roundTo",
-                     _("Round to a decimal point"),
-                     _("Round a number to the Nth decimal place"),
-                     "",
+      .AddExpression("int",
+                     _("Round"),
+                     _("Round a number"),
+                     _("Mathematical tools"),
                      "res/mathfunction.png")
-      .AddParameter("expression", _("Number to Round"))
-      .AddParameter("expression", _("Decimal Places"), "", true);
+      .SetHidden()
+      .AddParameter("expression", _("Expression"));
+
+  extension
+      .AddExpression("rint",
+                     _("Round"),
+                     _("Round a number"),
+                     _("Mathematical tools"),
+                     "res/mathfunction.png")
+      .SetHidden()
+      .AddParameter("expression", _("Expression"));
+
+  extension
+      .AddExpression("round",
+                     _("Round"),
+                     _("Round a number"),
+                     _("Mathematical tools"),
+                     "res/mathfunction.png")
+      .AddParameter("expression", _("Expression"));
 
   extension
       .AddExpression("exp",
                      _("Exponential"),
                      _("Exponential of a number"),
-                     "",
+                     _("Mathematical tools"),
                      "res/mathfunction.png")
       .AddParameter("expression", _("Expression"));
 
   extension
-      .AddExpression(
-          "log", _("Logarithm"), _("Logarithm"), "", "res/mathfunction.png")
+      .AddExpression("log",
+                     _("Logarithm"),
+                     _("Logarithm"),
+                     _("Mathematical tools"),
+                     "res/mathfunction.png")
       .AddParameter("expression", _("Expression"));
 
   extension
-      .AddExpression(
-          "ln", _("Logarithm"), _("Logarithm"), "", "res/mathfunction.png")
+      .AddExpression("ln",
+                     _("Logarithm"),
+                     _("Logarithm"),
+                     _("Mathematical tools"),
+                     "res/mathfunction.png")
       .SetHidden()
       .AddParameter("expression", _("Expression"));
 
@@ -338,7 +274,7 @@ BuiltinExtensionsImplementer::ImplementsMathematicalToolsExtension(
       .AddExpression("log2",
                      _("Base-2 logarithm"),
                      _("Base 2 Logarithm"),
-                     "",
+                     _("Mathematical tools"),
                      "res/mathfunction.png")
       .AddParameter("expression", _("Expression"));
 
@@ -346,7 +282,7 @@ BuiltinExtensionsImplementer::ImplementsMathematicalToolsExtension(
       .AddExpression("log10",
                      _("Base-10 logarithm"),
                      _("Base-10 logarithm"),
-                     "",
+                     _("Mathematical tools"),
                      "res/mathfunction.png")
       .AddParameter("expression", _("Expression"));
 
@@ -354,7 +290,7 @@ BuiltinExtensionsImplementer::ImplementsMathematicalToolsExtension(
       .AddExpression("nthroot",
                      _("Nth root"),
                      _("Nth root of a number"),
-                     "",
+                     _("Mathematical tools"),
                      "res/mathfunction.png")
       .AddParameter("expression", _("Number"))
       .AddParameter("expression", _("N"));
@@ -363,39 +299,40 @@ 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)"));
 
   extension
-      .AddExpression(
-          "sec", _("Secant"), _("Secant"), "", "res/mathfunction.png")
+      .AddExpression("sec",
+                     _("Secant"),
+                     _("Secant"),
+                     _("Mathematical tools"),
+                     "res/mathfunction.png")
       .AddParameter("expression", _("Expression"));
 
   extension
       .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 an angle (in radian). "
-            "If you want to use degrees, use`ToRad`: `sin(ToRad(45))`."),
-          "",
-          "res/mathfunction.png")
+      .AddExpression("sin",
+                     _("Sine"),
+                     _("Sine of a number"),
+                     _("Mathematical tools"),
+                     "res/mathfunction.png")
       .AddParameter("expression", _("Expression"));
 
   extension
       .AddExpression("sinh",
                      _("Hyperbolic sine"),
                      _("Hyperbolic sine"),
-                     "",
+                     _("Mathematical tools"),
                      "res/mathfunction.png")
       .AddParameter("expression", _("Expression"));
 
@@ -403,25 +340,23 @@ 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 an angle (in radian). "
-            "If you want to use degrees, use`ToRad`: `tan(ToRad(45))`."),
-          "",
-          "res/mathfunction.png")
+      .AddExpression("tan",
+                     _("Tangent"),
+                     _("Tangent of a number"),
+                     _("Mathematical tools"),
+                     "res/mathfunction.png")
       .AddParameter("expression", _("Expression"));
 
   extension
       .AddExpression("tanh",
                      _("Hyperbolic tangent"),
                      _("Hyperbolic tangent"),
-                     "",
+                     _("Mathematical tools"),
                      "res/mathfunction.png")
       .AddParameter("expression", _("Expression"));
 
@@ -429,7 +364,7 @@ BuiltinExtensionsImplementer::ImplementsMathematicalToolsExtension(
       .AddExpression("trunc",
                      _("Truncation"),
                      _("Truncate a number"),
-                     "",
+                     _("Mathematical tools"),
                      "res/mathfunction.png")
       .AddParameter("expression", _("Expression"));
 
@@ -437,56 +372,36 @@ 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)"));
 
   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")
+      .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."),
+                     _("Mathematical tools"),
+                     "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")
+      .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."),
+                     _("Mathematical tools"),
+                     "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

@@ -16,22 +16,14 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsMouseExtension(
       .SetExtensionInformation(
           "BuiltinMouse",
           _("Mouse and touch"),
-          "Conditions, actions and expressions to handle either the mouse or "
-          "touches on a touchscreen. Notably: cursor position, mouse wheel, "
-          "mouse buttons, touch positions, started/end touches, etc...\n"
-          "\n"
-          "By default, conditions related to the mouse will also "
+          "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")
-      .SetCategory("Input");
-  extension.AddInstructionOrExpressionGroupMetadata(_("Mouse and touch"))
-      .SetIcon("res/actions/mouse24.png");
-  extension.AddInstructionOrExpressionGroupMetadata(_("Multitouch"))
-      .SetIcon("res/conditions/touch24.png");
+      .SetExtensionHelpPath("/all-features/mouse-touch");
 
   extension
       .AddCondition(
@@ -40,7 +32,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")
 
@@ -54,7 +46,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")
 
@@ -72,7 +64,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")
 
@@ -87,7 +79,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")
 
@@ -99,7 +91,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")
 
@@ -111,7 +103,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", "")
@@ -122,7 +114,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")
 
@@ -134,7 +126,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")
 
@@ -148,7 +140,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")
 
@@ -158,91 +150,42 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsMouseExtension(
   extension
       .AddExpressionAndCondition(
           "number",
-          "CursorX",
+          "MouseX",
           _("Cursor X position"),
           _("the X position of the cursor or of a touch"),
           _("the cursor (or touch) X position"),
-          "",
+          _("Mouse and touch"),
           "res/conditions/mouse24.png")
       .AddCodeOnlyParameter("currentScene", "")
-      .UseStandardParameters("number", ParameterOptions::MakeNewOptions())
-      .AddParameter("layer", _("Layer"), "", true)
+      .UseStandardParameters("number")
+      .AddParameter("layer", _("Layer (base layer if empty)"), "", 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.AddDuplicatedCondition("SourisX", "MouseX").SetHidden();
+  extension.AddDuplicatedExpression("SourisX", "MouseX").SetHidden();
 
   extension
       .AddExpressionAndCondition(
           "number",
-          "CursorY",
+          "MouseY",
           _("Cursor Y position"),
           _("the Y position of the cursor or of a touch"),
           _("the cursor (or touch) Y position"),
-          "",
+          _("Mouse and touch"),
           "res/conditions/mouse24.png")
       .AddCodeOnlyParameter("currentScene", "")
-      .UseStandardParameters("number", ParameterOptions::MakeNewOptions())
-      .AddParameter("layer", _("Layer"), "", true)
+      .UseStandardParameters("number")
+      .AddParameter("layer", _("Layer (base layer if empty)"), "", 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
-      .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.AddDuplicatedCondition("SourisY", "MouseY").SetHidden();
+  extension.AddDuplicatedExpression("SourisY", "MouseY").SetHidden();
 
   extension
       .AddCondition("MouseButtonPressed",
@@ -250,13 +193,12 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsMouseExtension(
                     _("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 check"))
-      .MarkAsSimple()
-      .SetHidden();
+      .MarkAsSimple();
 
   // Support for deprecated names:
   extension.AddDuplicatedCondition("SourisBouton", "MouseButtonPressed")
@@ -266,39 +208,46 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsMouseExtension(
       .AddCondition("MouseButtonReleased",
                     _("Mouse button released"),
                     _("Check if the specified mouse button was released."),
-                    _("Touch or _PARAM1_ mouse button is released"),
-                    "",
+                    _("_PARAM1_ mouse button was released"),
+                    _("Mouse and touch"),
                     "res/conditions/mouse24.png",
                     "res/conditions/mouse.png")
       .AddCodeOnlyParameter("currentScene", "")
       .AddParameter("mouse", _("Button to check"))
-      .MarkAsSimple()
-      .SetHidden();
-
-  extension
-      .AddCondition("MouseButtonFromTextPressed",
-                    _("Mouse button pressed or touch held"),
-                    _("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"),
-                    "",
-                    "res/conditions/mouse24.png",
-                    "res/conditions/mouse.png")
-      .AddCodeOnlyParameter("currentScene", "")
-      .AddParameter("mouseButton", _("Button to check"))
       .MarkAsSimple();
 
   extension
-      .AddCondition("MouseButtonFromTextReleased",
-                    _("Mouse button released"),
-                    _("Check if the specified mouse button was released."),
-                    _("Touch or _PARAM1_ mouse button is released"),
-                    "",
-                    "res/conditions/mouse24.png",
-                    "res/conditions/mouse.png")
+      .AddCondition(
+          "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"),
+          _("Mouse and touch"),
+          "res/conditions/mouse24.png",
+          "res/conditions/mouse.png")
       .AddCodeOnlyParameter("currentScene", "")
-      .AddParameter("mouseButton", _("Button to check"))
-      .MarkAsSimple();
+      .AddParameter("string", _("Expression generating the button to check"))
+      .SetParameterLongDescription(
+          _("Possible values are Left, Right and Middle."))
+      .MarkAsAdvanced();
+
+  extension
+      .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"),
+          _("Mouse and touch"),
+          "res/conditions/mouse24.png",
+          "res/conditions/mouse.png")
+      .AddCodeOnlyParameter("currentScene", "")
+      .AddParameter("string",
+                    _("Expression generating the mouse button to check"))
+      .SetParameterLongDescription(
+          _("Possible values are Left, Right and Middle."))
+      .MarkAsAdvanced();
 
   extension
       .AddExpressionAndCondition("number",
@@ -306,12 +255,12 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsMouseExtension(
                                  _("Touch X position"),
                                  _("the X position of a specific touch"),
                                  _("the touch #_PARAM1_ X position"),
-                                 _("Multitouch"),
+                                 _("Mouse and touch/Multitouch"),
                                  "res/conditions/touch24.png")
       .AddCodeOnlyParameter("currentScene", "")
       .AddParameter("expression", _("Touch identifier"))
-      .UseStandardParameters("number", ParameterOptions::MakeNewOptions())
-      .AddParameter("layer", _("Layer"), "", true)
+      .UseStandardParameters("number")
+      .AddParameter("layer", _("Layer (base layer if empty)"), "", true)
       .SetDefaultValue("\"\"")
       .AddParameter("expression", _("Camera number (default : 0)"), "", true)
       .SetDefaultValue("0");
@@ -322,17 +271,16 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsMouseExtension(
                                  _("Touch Y position"),
                                  _("the Y position of a specific touch"),
                                  _("the touch #_PARAM1_ Y position"),
-                                 _("Multitouch"),
+                                 _("Mouse and touch/Multitouch"),
                                  "res/conditions/touch24.png")
       .AddCodeOnlyParameter("currentScene", "")
       .AddParameter("expression", _("Touch identifier"))
-      .UseStandardParameters("number", ParameterOptions::MakeNewOptions())
-      .AddParameter("layer", _("Layer"), "", true)
+      .UseStandardParameters("number")
+      .AddParameter("layer", _("Layer (base layer if empty)"), "", true)
       .SetDefaultValue("\"\"")
       .AddParameter("expression", _("Camera number (default : 0)"), "", true)
       .SetDefaultValue("0");
 
-  // Deprecated
   extension
       .AddCondition(
           "PopStartedTouch",
@@ -343,13 +291,11 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsMouseExtension(
             "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"),
-          _("Multitouch"),
+          _("Mouse and touch/Multitouch"),
           "res/conditions/touch24.png",
           "res/conditions/touch.png")
-      .AddCodeOnlyParameter("currentScene", "")
-      .SetHidden();
+      .AddCodeOnlyParameter("currentScene", "");
 
-  // Deprecated
   extension
       .AddCondition(
           "PopEndedTouch",
@@ -360,99 +306,11 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsMouseExtension(
             "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"),
-          _("Multitouch"),
-          "res/conditions/touch24.png",
-          "res/conditions/touch.png")
-      .AddCodeOnlyParameter("currentScene", "")
-      .SetHidden();
-
-  // Deprecated
-  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"),
+          _("Mouse and touch/Multitouch"),
           "res/conditions/touch24.png",
           "res/conditions/touch.png")
       .AddCodeOnlyParameter("currentScene", "");
 
-  extension
-      .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(
-          "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("expression", _("Touch index"));
-
-  extension
-      .AddCondition("HasTouchEnded",
-                    _("A touch has ended"),
-                    _("Check if a touch has ended or a mouse left button has "
-                      "been released."),
-                    _("The touch with identifier _PARAM1_ has ended"),
-                    _("Multitouch"),
-                    "res/conditions/touch24.png",
-                    "res/conditions/touch.png")
-      .AddCodeOnlyParameter("currentScene", "")
-      .AddParameter("expression", _("Touch identifier"));
-
   extension
       .AddExpression("MouseWheelDelta",
                      _("Mouse wheel: Displacement"),
@@ -465,19 +323,17 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsMouseExtension(
       .AddExpression("LastTouchId",
                      _("Identifier of the last touch"),
                      _("Identifier of the last touch"),
-                     _("Multitouch"),
+                     _("Mouse and touch/Multitouch"),
                      "res/conditions/touch.png")
-      .AddCodeOnlyParameter("currentScene", "")
-      .SetHidden();
+      .AddCodeOnlyParameter("currentScene", "");
 
   extension
       .AddExpression("LastEndedTouchId",
                      _("Identifier of the last ended touch"),
                      _("Identifier of the last ended touch"),
-                     _("Multitouch"),
+                     _("Mouse and touch/Multitouch"),
                      "res/conditions/touch.png")
-      .AddCodeOnlyParameter("currentScene", "")
-      .SetHidden();
+      .AddCodeOnlyParameter("currentScene", "");
 }
 
 }  // namespace gd