Capitalize assets for consistency

* This won't affect efficiency for 2D games.

.circleci/config.yml

@@ -15,7 +15,7 @@ jobs:
   # Build the **entire** app for macOS.
   build-macos:
     macos:
-      xcode: 12.5.1
+      xcode: 14.2.0
     steps:
       - checkout
 
@@ -64,11 +64,11 @@ jobs:
       # Note: Code signing is done using CSC_LINK (see https://www.electron.build/code-signing).
       - run:
           name: Build GDevelop IDE
-          command: export NODE_OPTIONS="--max-old-space-size=7168" && cd newIDE/electron-app && npm run build -- --mac --publish=never
+          command: export NODE_OPTIONS="--max-old-space-size=7168" && cd newIDE/electron-app && CI=false npm run build -- --mac --publish=never
 
       - run:
           name: Clean dist folder to keep only installers/binaries.
-          command: rm -rf "newIDE/electron-app/dist/mac/GDevelop 5.app" && rm -rf "newIDE/electron-app/dist/mac-arm64/GDevelop 5.app"
+          command: rm -rf "newIDE/electron-app/dist/mac-universal/GDevelop 5.app"
 
       # Upload artifacts (CircleCI)
       - store_artifacts:
@@ -101,8 +101,8 @@ jobs:
           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
+          name: Install Python3 dependencies for Emscripten
+          command: sudo apt install python-is-python3 python3-distutils -y
 
       - run:
           name: Install Emscripten (for GDevelop.js)
@@ -178,8 +178,8 @@ jobs:
           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
+          name: Install Python3 dependencies for Emscripten
+          command: sudo apt install python-is-python3 python3-distutils -y
 
       - run:
           name: Install Emscripten (for GDevelop.js)

.github/workflows/build-storybook.yml

@@ -9,6 +9,10 @@ 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:
@@ -24,8 +28,8 @@ jobs:
       - uses: actions/setup-node@v3
         with:
           node-version: 16
-          cache: 'npm'
-          cache-dependency-path: 'newIDE/app/package-lock.json'
+          cache: "npm"
+          cache-dependency-path: "newIDE/app/package-lock.json"
 
       - name: Configure AWS Credentials
         uses: aws-actions/configure-aws-credentials@v2

.github/workflows/extract-translations.yml

@@ -4,6 +4,10 @@ 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,8 +19,8 @@ jobs:
       - uses: actions/setup-node@v3
         with:
           node-version: 16
-          cache: 'npm'
-          cache-dependency-path: 'newIDE/app/package-lock.json'
+          cache: "npm"
+          cache-dependency-path: "newIDE/app/package-lock.json"
 
       - name: Install gettext
         run: sudo apt update && sudo apt install gettext -y

.github/workflows/update-translations.yml

@@ -7,6 +7,8 @@ on:
   push:
     branches:
       - master
+    tags-ignore:
+      - "**" # Don't run on new tags
   # Allows to run this workflow manually from the Actions tab.
   workflow_dispatch:
 
@@ -18,8 +20,8 @@ jobs:
       - uses: actions/setup-node@v3
         with:
           node-version: 16
-          cache: 'npm'
-          cache-dependency-path: 'newIDE/app/package-lock.json'
+          cache: "npm"
+          cache-dependency-path: "newIDE/app/package-lock.json"
 
       - name: Install gettext
         run: sudo apt update && sudo apt install gettext -y

.vscode/settings.json

@@ -1,133 +1,134 @@
 // 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"
-    },
-    "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",
+    "memory_resource": "cpp",
+    "__bits": "cpp",
+    "__verbose_abort": "cpp",
+    "variant": "cpp"
+  },
+  "files.exclude": {
+    "Binaries/*build*": true,
+    "Binaries/Output": true,
+    "GDJS/Runtime-dist": true,
+    "docs": true,
+    "newIDE/electron-app/dist": true,
+    "newIDE/app/build": true,
+    "newIDE/app/resources/GDJS": true,
+    "newIDE/electron-app/app/www": true
+  },
+  // Support for Flowtype (for newIDE):
+  "javascript.validate.enable": false,
+  "flow.useNPMPackagedFlow": true,
 
-    // Clang format styling (duplicated in scripts/CMakeClangUtils.txt)
-    "C_Cpp.clang_format_style": "{BasedOnStyle: Google, BinPackParameters: false, BinPackArguments: false}",
-    "prettier.prettierPath": "./GDJS/node_modules/prettier",
-    "prettier.configPath": "./GDJS/.prettierrc"
+  // Clang format styling (duplicated in scripts/CMakeClangUtils.txt)
+  "C_Cpp.clang_format_style": "{BasedOnStyle: Google, BinPackParameters: false, BinPackArguments: false}"
 }

CMakeLists.txt

@@ -1,100 +1,99 @@
-#This is the CMake file used to build GDevelop.
-#For more information, see the README.md file.
+# This is the CMake file used to build GDevelop.
+# For more information, see the README.md file.
 
-cmake_minimum_required(VERSION 2.6)
-cmake_policy(SET CMP0011 NEW)
+cmake_minimum_required(VERSION 3.5)
 
 # Add utility functions
 include(scripts/CMakeClangUtils.txt) # To add clang-format and clang-tidy support to a target
 
 # Macro for defining an option
 macro(gd_set_option var default type docstring)
-    if(NOT DEFINED ${var})
-        set(${var} ${default})
-    endif()
-    set(${var} ${${var}} CACHE ${type} ${docstring} FORCE)
+	if(NOT DEFINED ${var})
+		set(${var} ${default})
+	endif()
+	set(${var} ${${var}} CACHE ${type} ${docstring} FORCE)
 endmacro()
+
+# 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")
 
 # Disable deprecated code
-set(NO_GUI TRUE CACHE BOOL "" FORCE) #Force disable old GUI related code.
+set(NO_GUI TRUE CACHE BOOL "" FORCE) # Force disable old GUI related code.
 
-#Setting up installation directory, for Linux (has to be done before "project" command).
-IF(NOT WIN32)
-	if (NOT APPLE)
-	gd_set_option(GD_INSTALL_PREFIX "/opt/gdevelop/" STRING "The directory where GDevelop should be installed")
-	ELSE()
-	gd_set_option(GD_INSTALL_PREFIX "." STRING "The directory where GDevelop should be installed")
-	ENDIF()
+# Setting up installation directory, for Linux (has to be done before "project" command).
+if(NOT WIN32)
+	if(NOT APPLE)
+		gd_set_option(GD_INSTALL_PREFIX "/opt/gdevelop/" STRING "The directory where GDevelop should be installed")
+	else()
+		gd_set_option(GD_INSTALL_PREFIX "." STRING "The directory where GDevelop should be installed")
+	endif()
 
-	#As we embed SFML, prevent it to be installed system-wide
+	# As we embed SFML, prevent it to be installed system-wide
 	set(CMAKE_INSTALL_PREFIX "${GD_INSTALL_PREFIX}/useless")
-ENDIF()
+endif()
 
 project(GDevelop)
 set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
-IF(NOT WIN32 AND NOT APPLE AND NOT BUILD_TESTS)
-	SET(CMAKE_SKIP_BUILD_RPATH  TRUE) #Avoid errors when packaging for linux.
-ENDIF()
-IF(APPLE)
+if(NOT WIN32 AND NOT APPLE AND NOT BUILD_TESTS)
+	set(CMAKE_SKIP_BUILD_RPATH TRUE) # Avoid errors when packaging for linux.
+endif()
+if(APPLE)
 	set(CMAKE_MACOSX_RPATH 1)
 	set(CMAKE_INSTALL_RPATH_USE_LINK_PATH FALSE)
 	set(CMAKE_INSTALL_RPATH ".")
 	set(CMAKE_BUILD_WITH_INSTALL_RPATH TRUE)
-	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -D_WCHAR_H_CPLUSPLUS_98_CONFORMANCE_")
-	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-potentially-evaluated-expression")
-ENDIF()
-#Sanity checks
-IF ("${CMAKE_BUILD_TYPE}" STREQUAL "")
-	message( "CMAKE_BUILD_TYPE is empty, assuming build type is Release" )
+	add_compile_options(
+		-D_WCHAR_H_CPLUSPLUS_98_CONFORMANCE_
+		-Wno-potentially-evaluated-expression)
+endif()
+# Sanity checks
+if("${CMAKE_BUILD_TYPE}" STREQUAL "")
+	message(STATUS "CMAKE_BUILD_TYPE is empty, assuming build type is Release")
 	set(CMAKE_BUILD_TYPE Release)
-ENDIF()
+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
-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()
+set(CMAKE_CXX_STANDARD 11)
+set(CMAKE_CXX_STANDARD_REQUIRED ON)
 
 # Mark some warnings as errors
 if(CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
 	# Activate as much warnings as possible to avoid errors like
 	# uninitialized variables or other hard to debug bugs.
-	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")
+	add_compile_options(
+		-Wall
+		-Wno-unknown-warning-option
+		-Wno-reorder-ctor
+		-Wno-reorder
+		-Wno-pessimizing-move
+		-Wno-unused-variable
+		-Wno-unused-private-field
 
-	# Make as much warnings considered as errors as possible (only one for now).
-	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror=return-stack-address")
+		# Make as much warnings considered as errors as possible (only one for now).
+		-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,83 +1,98 @@
-cmake_minimum_required(VERSION 2.6)
-cmake_policy(SET CMP0015 NEW)
+cmake_minimum_required(VERSION 3.5)
 
 project(GDCore)
 
-SET(CMAKE_C_USE_RESPONSE_FILE_FOR_OBJECTS 1) #Force use response file: useful for Ninja build system on Windows.
-SET(CMAKE_CXX_USE_RESPONSE_FILE_FOR_OBJECTS 1)
-SET(CMAKE_C_USE_RESPONSE_FILE_FOR_INCLUDES 1)
-SET(CMAKE_CXX_USE_RESPONSE_FILE_FOR_INCLUDES 1)
+set(CMAKE_C_USE_RESPONSE_FILE_FOR_OBJECTS 1) # Force use response file: useful for Ninja build system on Windows.
+set(CMAKE_CXX_USE_RESPONSE_FILE_FOR_OBJECTS 1)
+set(CMAKE_C_USE_RESPONSE_FILE_FOR_INCLUDES 1)
+set(CMAKE_CXX_USE_RESPONSE_FILE_FOR_INCLUDES 1)
 
-#Define common directories:
+# Define common directories:
 set(GDCORE_include_dir ${GD_base_dir}/Core PARENT_SCOPE)
 set(GDCORE_lib_dir ${GD_base_dir}/Binaries/Output/${CMAKE_BUILD_TYPE}_${CMAKE_SYSTEM_NAME} PARENT_SCOPE)
 
-#Dependencies on external libraries:
-###
+# 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
-###
+# 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})
 endif()

Core/GDCore/Events/Builtin/ForEachEvent.cpp

@@ -15,7 +15,7 @@ using namespace std;
 namespace gd {
 
 ForEachEvent::ForEachEvent()
-    : BaseEvent(), objectsToPick(""), objectsToPickSelected(false) {}
+    : BaseEvent(), objectsToPick("") {}
 
 vector<gd::InstructionsList*> ForEachEvent::GetAllConditionsVectors() {
   vector<gd::InstructionsList*> allConditions;

Core/GDCore/Events/Builtin/ForEachEvent.h

@@ -6,6 +6,8 @@
 
 #ifndef FOREACHEVENT_H
 #define FOREACHEVENT_H
+#include <vector>
+
 #include "GDCore/Events/Event.h"
 #include "GDCore/Events/EventsList.h"
 namespace gd {
@@ -62,13 +64,17 @@ class GD_CORE_API ForEachEvent : public gd::BaseEvent {
   virtual void UnserializeFrom(gd::Project& project,
                                const SerializerElement& element);
 
+  std::vector<gd::Expression*> GetAllObjectExpressions() {
+    std::vector<gd::Expression*> allObjectExpressions;
+    allObjectExpressions.push_back(&objectsToPick);
+    return allObjectExpressions;
+  }
+
  private:
   gd::Expression objectsToPick;
   gd::InstructionsList conditions;
   gd::InstructionsList actions;
   gd::EventsList events;
-
-  bool objectsToPickSelected;
 };
 
 }  // namespace gd

Core/GDCore/Events/CodeGeneration/EventsCodeGenerator.cpp

@@ -267,11 +267,11 @@ gd::String EventsCodeGenerator::GenerateConditionCode(
     return "/* Unknown instruction - skipped. */";
   }
 
-  AddIncludeFiles(instrInfos.codeExtraInformation.GetIncludeFiles());
+  AddIncludeFiles(instrInfos.GetIncludeFiles());
   maxConditionsListsSize =
       std::max(maxConditionsListsSize, condition.GetSubInstructions().size());
 
-  if (instrInfos.codeExtraInformation.HasCustomCodeGenerator()) {
+  if (instrInfos.HasCustomCodeGenerator()) {
     context.EnterCustomCondition();
     conditionCode += instrInfos.codeExtraInformation.customCodeGenerator(
         condition, *this, context);
@@ -459,9 +459,9 @@ gd::String EventsCodeGenerator::GenerateActionCode(
     return "/* Unknown instruction - skipped. */";
   }
 
-  AddIncludeFiles(instrInfos.codeExtraInformation.GetIncludeFiles());
+  AddIncludeFiles(instrInfos.GetIncludeFiles());
 
-  if (instrInfos.codeExtraInformation.HasCustomCodeGenerator()) {
+  if (instrInfos.HasCustomCodeGenerator()) {
     return instrInfos.codeExtraInformation.customCodeGenerator(
         action, *this, context);
   }

Core/GDCore/Events/CodeGeneration/ExpressionCodeGenerator.cpp

@@ -216,10 +216,10 @@ gd::String ExpressionCodeGenerator::GenerateFreeFunctionCode(
     const std::vector<std::unique_ptr<ExpressionNode>>& parameters,
     const ExpressionMetadata& expressionMetadata) {
   codeGenerator.AddIncludeFiles(
-      expressionMetadata.codeExtraInformation.GetIncludeFiles());
+      expressionMetadata.GetIncludeFiles());
 
   // Launch custom code generator if needed
-  if (expressionMetadata.codeExtraInformation.HasCustomCodeGenerator()) {
+  if (expressionMetadata.HasCustomCodeGenerator()) {
     return expressionMetadata.codeExtraInformation.customCodeGenerator(
         PrintParameters(parameters), codeGenerator, context);
   }
@@ -242,10 +242,10 @@ gd::String ExpressionCodeGenerator::GenerateObjectFunctionCode(
       codeGenerator.GetObjectsAndGroups();
 
   codeGenerator.AddIncludeFiles(
-      expressionMetadata.codeExtraInformation.GetIncludeFiles());
+      expressionMetadata.GetIncludeFiles());
 
   // Launch custom code generator if needed
-  if (expressionMetadata.codeExtraInformation.HasCustomCodeGenerator()) {
+  if (expressionMetadata.HasCustomCodeGenerator()) {
     return expressionMetadata.codeExtraInformation.customCodeGenerator(
         PrintParameters(parameters), codeGenerator, context);
   }
@@ -300,10 +300,10 @@ gd::String ExpressionCodeGenerator::GenerateBehaviorFunctionCode(
       codeGenerator.GetObjectsAndGroups();
 
   codeGenerator.AddIncludeFiles(
-      expressionMetadata.codeExtraInformation.GetIncludeFiles());
+      expressionMetadata.GetIncludeFiles());
 
   // Launch custom code generator if needed
-  if (expressionMetadata.codeExtraInformation.HasCustomCodeGenerator()) {
+  if (expressionMetadata.HasCustomCodeGenerator()) {
     return expressionMetadata.codeExtraInformation.customCodeGenerator(
         PrintParameters(parameters), codeGenerator, context);
   }

Core/GDCore/Events/Event.h

@@ -282,6 +282,14 @@ class GD_CORE_API BaseEvent {
    */
   bool IsFolded() const { return folded; }
 
+  /**
+   * \brief Return a list of all objects linked to the event.
+   */
+  virtual std::vector<gd::Expression*> GetAllObjectExpressions() {
+    std::vector<gd::Expression*> allObjectExpressions;
+    return allObjectExpressions;
+  }
+
   ///@}
 
   std::weak_ptr<gd::BaseEvent>

Core/GDCore/Events/Parsers/ExpressionParser2.cpp

@@ -19,8 +19,10 @@
 #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 {
 

Core/GDCore/Events/Parsers/ExpressionParser2.h

@@ -18,6 +18,7 @@
 #include "GDCore/String.h"
 #include "GDCore/Tools/Localization.h"
 #include "GDCore/Tools/MakeUnique.h"
+#include "GrammarTerminals.h"
 namespace gd {
 class Expression;
 class ObjectsContainer;
@@ -28,6 +29,8 @@ class ExpressionMetadata;
 
 namespace gd {
 
+using namespace gd::GrammarTerminals;
+
 /** \brief Parse an expression, returning a tree of node corresponding
  * to the parsed expression.
  *
@@ -211,7 +214,7 @@ class GD_CORE_API ExpressionParser2 {
       }
       SkipIfChar(IsClosingParenthesis);
       return factor;
-    } else if (IsIdentifierAllowedChar()) {
+    } else if (CheckIfChar(IsAllowedInIdentifier)) {
       return Identifier();
     }
 
@@ -606,95 +609,6 @@ class GD_CORE_API ExpressionParser2 {
     return predicate(character);
   }
 
-  bool IsIdentifierAllowedChar() {
-    if (currentPosition >= expression.size()) return false;
-    gd::String::value_type character = expression[currentPosition];
-
-    // Quickly compare if the character is a number or ASCII character.
-    if ((character >= '0' && character <= '9') ||
-        (character >= 'A' && character <= 'Z') ||
-        (character >= 'a' && character <= 'z'))
-      return true;
-
-    // Otherwise do the full check against separators forbidden in identifiers.
-    if (!IsParameterSeparator(character) && !IsDot(character) &&
-        !IsQuote(character) && !IsBracket(character) &&
-        !IsExpressionOperator(character) && !IsTermOperator(character)) {
-      return true;
-    }
-
-    return false;
-  }
-
-  static bool IsWhitespace(gd::String::value_type character) {
-    return character == ' ' || character == '\n' || character == '\r';
-  }
-
-  static bool IsParameterSeparator(gd::String::value_type character) {
-    return character == ',';
-  }
-
-  static bool IsDot(gd::String::value_type character) {
-    return character == '.';
-  }
-
-  static bool IsQuote(gd::String::value_type character) {
-    return character == '"';
-  }
-
-  static bool IsBracket(gd::String::value_type character) {
-    return character == '(' || character == ')' || character == '[' ||
-           character == ']' || character == '{' || character == '}';
-  }
-
-  static bool IsOpeningParenthesis(gd::String::value_type character) {
-    return character == '(';
-  }
-
-  static bool IsClosingParenthesis(gd::String::value_type character) {
-    return character == ')';
-  }
-
-  static bool IsOpeningSquareBracket(gd::String::value_type character) {
-    return character == '[';
-  }
-
-  static bool IsClosingSquareBracket(gd::String::value_type character) {
-    return character == ']';
-  }
-
-  static bool IsExpressionEndingChar(gd::String::value_type character) {
-    return character == ',' || IsClosingParenthesis(character) ||
-           IsClosingSquareBracket(character);
-  }
-
-  static bool IsExpressionOperator(gd::String::value_type character) {
-    return character == '+' || character == '-' || character == '<' ||
-           character == '>' || character == '?' || character == '^' ||
-           character == '=' || character == '\\' || character == ':' ||
-           character == '!';
-  }
-
-  static bool IsUnaryOperator(gd::String::value_type character) {
-    return character == '+' || character == '-';
-  }
-
-  static bool IsTermOperator(gd::String::value_type character) {
-    return character == '/' || character == '*';
-  }
-
-  static bool IsNumberFirstChar(gd::String::value_type character) {
-    return character == '.' || (character >= '0' && character <= '9');
-  }
-
-  static bool IsNonZeroDigit(gd::String::value_type character) {
-    return (character >= '1' && character <= '9');
-  }
-
-  static bool IsZeroDigit(gd::String::value_type character) {
-    return character == '0';
-  }
-
   bool IsNamespaceSeparator() {
     // Namespace separator is a special kind of delimiter as it is 2 characters
     // long
@@ -715,7 +629,7 @@ class GD_CORE_API ExpressionParser2 {
     gd::String name;
     size_t startPosition = currentPosition;
     while (currentPosition < expression.size() &&
-           (IsIdentifierAllowedChar()
+           (CheckIfChar(IsAllowedInIdentifier)
             // Allow whitespace in identifier name for compatibility
             || expression[currentPosition] == ' ')) {
       name += expression[currentPosition];

Core/GDCore/Events/Parsers/GrammarTerminals.h

@@ -0,0 +1,107 @@
+#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';
+}
+
+/**
+ * Check if the given character can be used in an identifier. This is
+ * any unicode character, except for:
+ * `, . " () [] {} + - < > ? ^ = \ : ! / *` 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)) {
+    return true;
+  }
+
+  return false;
+}
+
+}  // namespace GrammarTerminals
+}  // namespace gd

Core/GDCore/Events/Tools/EventsCodeNameMangler.cpp

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

Core/GDCore/Events/Tools/EventsCodeNameMangler.h

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

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

@@ -110,11 +110,11 @@ void Direction::UnserializeFrom(const gd::SerializerElement& element) {
             .GetBoolAttribute("automatic", true));
 
     if (spriteElement.HasChild("CustomCollisionMask"))
-      sprite.SetCollisionMaskAutomatic(
+      sprite.SetFullImageCollisionMask(
           !spriteElement.GetChild("CustomCollisionMask")
                .GetBoolAttribute("custom", false));
     else
-      sprite.SetCollisionMaskAutomatic(
+      sprite.SetFullImageCollisionMask(
           !spriteElement.GetBoolAttribute("hasCustomCollisionMask", false));
 
     std::vector<Polygon2d> mask;
@@ -173,7 +173,7 @@ void SaveSpritesDirection(const vector<Sprite>& sprites,
         .SetAttribute("automatic", sprites[i].IsDefaultCenterPoint());
 
     spriteElement.SetAttribute("hasCustomCollisionMask",
-                               !sprites[i].IsCollisionMaskAutomatic());
+                               !sprites[i].IsFullImageCollisionMask());
 
     gd::SerializerElement& collisionMaskElement =
         spriteElement.AddChild("customCollisionMask");

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

@@ -4,7 +4,9 @@
  * reserved. This project is released under the MIT License.
  */
 #include "GDCore/Extensions/Builtin/SpriteExtension/Sprite.h"
+
 #include <iostream>
+
 #include "GDCore/Extensions/Builtin/SpriteExtension/Polygon2d.h"
 
 using namespace std;
@@ -14,11 +16,10 @@ namespace gd {
 Point Sprite::badPoint("");
 
 Sprite::Sprite()
-    : automaticCollisionMask(true),
+    : fullImageCollisionMask(false),
       origine("origine"),
       centre("centre"),
-      automaticCentre(true) {
-}
+      automaticCentre(true) {}
 
 Sprite::~Sprite(){};
 

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

@@ -7,6 +7,7 @@
 #ifndef SPRITE_H
 #define SPRITE_H
 #include <memory>
+
 #include "GDCore/Extensions/Builtin/SpriteExtension/Point.h"
 #include "GDCore/Extensions/Builtin/SpriteExtension/Polygon2d.h"
 #include "GDCore/String.h"
@@ -43,7 +44,7 @@ class GD_CORE_API Sprite {
 
   /**
    * \brief Get the collision mask (custom or automatically generated owing to
-   * IsCollisionMaskAutomatic())
+   * IsFullImageCollisionMask())
    *
    * \warning If the image has not been loaded ( using LoadImage ) and the
    * collision mask is set as automatic, the returned mask won't be correct.
@@ -66,7 +67,7 @@ class GD_CORE_API Sprite {
 
   /**
    * \brief Set the custom collision mask.
-   * Call then `SetCollisionMaskAutomatic(false)` to use it.
+   * Call then `SetFullImageCollisionMask(false)` to use it.
    */
   void SetCustomCollisionMask(const std::vector<Polygon2d>& collisionMask);
 
@@ -74,15 +75,15 @@ class GD_CORE_API Sprite {
    * \brief Return true if the collision mask is a bounding box, false if a
    * custom collision mask is used.
    */
-  inline bool IsCollisionMaskAutomatic() const {
-    return automaticCollisionMask;
+  inline bool IsFullImageCollisionMask() const {
+    return fullImageCollisionMask;
   }
 
   /**
    * \brief Un/set use of the custom collision mask.
    */
-  inline void SetCollisionMaskAutomatic(bool enabled) {
-    automaticCollisionMask = enabled;
+  inline void SetFullImageCollisionMask(bool enabled) {
+    fullImageCollisionMask = enabled;
   };
 
   /**
@@ -161,9 +162,9 @@ class GD_CORE_API Sprite {
  private:
   gd::String image;  ///< Name of the image to be loaded in Image Manager.
 
-  bool automaticCollisionMask;  ///< True to use the custom collision mask.
-                                ///< Otherwise, a basic bounding box is returned
-                                ///< by GetCollisionMask()
+  bool fullImageCollisionMask;  ///< True to use a bounding box wrapping the
+                                ///< whole image as collision mask. If false,
+                                ///< custom collision mask is used.
   std::vector<Polygon2d> customCollisionMask;  ///< Custom collision mask
 
   std::vector<Point> points;  ///< List of the points used by the sprite

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

@@ -25,13 +25,16 @@ namespace gd {
 
 Animation SpriteObject::badAnimation;
 
-SpriteObject::SpriteObject() : updateIfNotVisible(false) {}
+SpriteObject::SpriteObject()
+    : updateIfNotVisible(false), adaptCollisionMaskAutomatically(true) {}
 
 SpriteObject::~SpriteObject(){};
 
 void SpriteObject::DoUnserializeFrom(gd::Project& project,
                                      const gd::SerializerElement& element) {
   updateIfNotVisible = element.GetBoolAttribute("updateIfNotVisible", true);
+  adaptCollisionMaskAutomatically =
+      element.GetBoolAttribute("adaptCollisionMaskAutomatically", false);
 
   RemoveAllAnimations();
   const gd::SerializerElement& animationsElement =
@@ -80,6 +83,8 @@ void SpriteObject::DoUnserializeFrom(gd::Project& project,
 
 void SpriteObject::DoSerializeTo(gd::SerializerElement& element) const {
   element.SetAttribute("updateIfNotVisible", updateIfNotVisible);
+  element.SetAttribute("adaptCollisionMaskAutomatically",
+                       adaptCollisionMaskAutomatically);
 
   // Animations
   gd::SerializerElement& animationsElement = element.AddChild("animations");

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

@@ -47,8 +47,7 @@ class GD_CORE_API SpriteObject : public gd::ObjectConfiguration {
   void ExposeResources(gd::ArbitraryResourceWorker& worker) override;
 
   std::map<gd::String, gd::PropertyDescriptor> GetProperties() const override;
-  bool UpdateProperty(const gd::String& name,
-                      const gd::String& value) override;
+  bool UpdateProperty(const gd::String& name, const gd::String& value) override;
 
   std::map<gd::String, gd::PropertyDescriptor> GetInitialInstanceProperties(
       const gd::InitialInstance& position,
@@ -118,14 +117,30 @@ class GD_CORE_API SpriteObject : public gd::ObjectConfiguration {
   const std::vector<Animation>& GetAllAnimations() const { return animations; }
 
   /**
-   * \brief Set if the object animation should be played even if the object is hidden
-   * or far from the camera.
+   * @brief Check if the collision mask adapts automatically to the animation.
    */
-  void SetUpdateIfNotVisible(bool updateIfNotVisible_) { updateIfNotVisible = updateIfNotVisible_; }
+  bool AdaptCollisionMaskAutomatically() const {
+    return adaptCollisionMaskAutomatically;
+  }
 
   /**
-   * \brief Check if the object animation should be played even if the object is hidden
-   * or far from the camera (false by default).
+   * @brief Set if the collision mask adapts automatically to the animation.
+   */
+  void SetAdaptCollisionMaskAutomatically(bool enable) {
+    adaptCollisionMaskAutomatically = enable;
+  }
+
+  /**
+   * \brief Set if the object animation should be played even if the object is
+   * hidden or far from the camera.
+   */
+  void SetUpdateIfNotVisible(bool updateIfNotVisible_) {
+    updateIfNotVisible = updateIfNotVisible_;
+  }
+
+  /**
+   * \brief Check if the object animation should be played even if the object
+   * is hidden or far from the camera (false by default).
    */
   bool GetUpdateIfNotVisible() const { return updateIfNotVisible; }
   ///@}
@@ -137,11 +152,15 @@ class GD_CORE_API SpriteObject : public gd::ObjectConfiguration {
 
   mutable std::vector<Animation> animations;
   bool updateIfNotVisible;  ///< If set to true, ask the game engine to play
-                            ///< object animation even if hidden or far from the
-                            ///< screen.
+                            ///< object animation even if hidden or far from
+                            ///< the screen.
 
-  static Animation badAnimation;  //< Bad animation when an out of bound
-                                  // animation is requested.
+  static Animation badAnimation;         //< Bad animation when an out of bound
+                                         // animation is requested.
+  bool adaptCollisionMaskAutomatically;  ///< If set to true, the collision
+                                         ///< mask will be automatically
+                                         ///< adapted to the animation of the
+                                         ///< object.
 };
 
 }  // namespace gd

Core/GDCore/Extensions/Metadata/AbstractFunctionMetadata.h

@@ -0,0 +1,135 @@
+/*
+ * 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 <algorithm>
+#include <functional>
+#include <map>
+#include <memory>
+
+#include "GDCore/Events/Instruction.h"
+#include "GDCore/String.h"
+#include "ParameterMetadata.h"
+#include "ParameterOptions.h"
+
+namespace gd {
+class Project;
+class Layout;
+class EventsCodeGenerator;
+class EventsCodeGenerationContext;
+class SerializerElement;
+} // namespace gd
+
+namespace gd {
+
+/**
+ * \brief Describe user-friendly information about an expression or an
+ * instruction (action or condition), its parameters and the function name as
+ * well as other information for code generation.
+ *
+ * \ingroup Events
+ */
+class GD_CORE_API AbstractFunctionMetadata {
+public:
+  AbstractFunctionMetadata(){};
+  virtual ~AbstractFunctionMetadata(){};
+
+  /**
+   * \see gd::InstructionMetadata::AddParameter
+   */
+  virtual AbstractFunctionMetadata &
+  AddParameter(const gd::String &type, const gd::String &label,
+               const gd::String &supplementaryInformation = "",
+               bool parameterIsOptional = false) = 0;
+
+  /**
+   * \see gd::InstructionMetadata::AddCodeOnlyParameter
+   */
+  virtual AbstractFunctionMetadata &
+  AddCodeOnlyParameter(const gd::String &type,
+                       const gd::String &supplementaryInformation) = 0;
+
+  /**
+   * \see gd::InstructionMetadata::SetDefaultValue
+   */
+  virtual AbstractFunctionMetadata &
+  SetDefaultValue(const gd::String &defaultValue) = 0;
+
+  /**
+   * \see gd::InstructionMetadata::SetParameterExtraInfo
+   */
+  virtual AbstractFunctionMetadata &
+  SetParameterExtraInfo(const gd::String &defaultValue) = 0;
+
+  /**
+   * \see gd::InstructionMetadata::SetParameterLongDescription
+   */
+  virtual AbstractFunctionMetadata &
+  SetParameterLongDescription(const gd::String &longDescription) = 0;
+
+  /**
+   * \see gd::InstructionMetadata::SetHidden
+   */
+  virtual AbstractFunctionMetadata &SetHidden() = 0;
+
+  /**
+   * Set that the instruction is private - it can't be used outside of the
+   * object/ behavior that it is attached too.
+   */
+  virtual AbstractFunctionMetadata &SetPrivate() = 0;
+
+  /**
+   * Set that the instruction can be used in layouts or external events.
+   */
+  virtual AbstractFunctionMetadata &SetRelevantForLayoutEventsOnly() = 0;
+
+  /**
+   * Set that the instruction can be used in function events.
+   */
+  virtual AbstractFunctionMetadata &SetRelevantForFunctionEventsOnly() = 0;
+
+  /**
+   * Set that the instruction can be used in asynchronous function events.
+   */
+  virtual AbstractFunctionMetadata &
+  SetRelevantForAsynchronousFunctionEventsOnly() = 0;
+
+  /**
+   * Set that the instruction can be used in custom object events.
+   */
+  virtual AbstractFunctionMetadata &SetRelevantForCustomObjectEventsOnly() = 0;
+
+  /**
+   * \brief Set the function that should be called when generating the source
+   * code from events.
+   * \param functionName the name of the function to call
+   * \note Shortcut for `codeExtraInformation.SetFunctionName`.
+   */
+  virtual AbstractFunctionMetadata &
+  SetFunctionName(const gd::String &functionName) = 0;
+
+  /**
+   * \brief Erase any existing include file and add the specified include.
+   */
+  virtual AbstractFunctionMetadata &
+  SetIncludeFile(const gd::String &includeFile) = 0;
+
+  /**
+   * \brief Add a file to the already existing include files.
+   */
+  virtual AbstractFunctionMetadata &
+  AddIncludeFile(const gd::String &includeFile) = 0;
+
+  /**
+   * \brief Get the files that must be included to use the instruction.
+   */
+  virtual const std::vector<gd::String> &GetIncludeFiles() const = 0;
+
+private:
+};
+
+} // namespace gd

Core/GDCore/Extensions/Metadata/BehaviorMetadata.h

@@ -3,8 +3,10 @@
  * Copyright 2008-2016 Florian Rival (Florian.Rival@gmail.com). All rights
  * reserved. This project is released under the MIT License.
  */
-#ifndef BEHAVIORMETADATA_H
-#define BEHAVIORMETADATA_H
+#pragma once
+
+#include "InstructionOrExpressionContainerMetadata.h"
+
 #include <map>
 
 #include "GDCore/Extensions/Metadata/ExpressionMetadata.h"
@@ -25,7 +27,7 @@ namespace gd {
  *
  * \ingroup Events
  */
-class GD_CORE_API BehaviorMetadata {
+class GD_CORE_API BehaviorMetadata : public InstructionOrExpressionContainerMetadata {
  public:
   BehaviorMetadata(
       const gd::String& extensionNamespace,
@@ -67,7 +69,7 @@ class GD_CORE_API BehaviorMetadata {
                                         const gd::String& sentence_,
                                         const gd::String& group_,
                                         const gd::String& icon_,
-                                        const gd::String& smallicon_);
+                                        const gd::String& smallicon_) override;
 
   /**
    * Declare a new action as being part of the behavior.
@@ -80,7 +82,7 @@ class GD_CORE_API BehaviorMetadata {
                                      const gd::String& sentence_,
                                      const gd::String& group_,
                                      const gd::String& icon_,
-                                     const gd::String& smallicon_);
+                                     const gd::String& smallicon_) override;
 
   /**
    * Declare a new condition as being part of the behavior.
@@ -91,7 +93,7 @@ class GD_CORE_API BehaviorMetadata {
                                               const gd::String& sentence_,
                                               const gd::String& group_,
                                               const gd::String& icon_,
-                                              const gd::String& smallicon_);
+                                              const gd::String& smallicon_) override;
 
   /**
    * Declare a new action as being part of the behavior.
@@ -102,7 +104,7 @@ class GD_CORE_API BehaviorMetadata {
                                            const gd::String& sentence_,
                                            const gd::String& group_,
                                            const gd::String& icon_,
-                                           const gd::String& smallicon_);
+                                           const gd::String& smallicon_) override;
   /**
    * Declare a new action as being part of the extension.
    */
@@ -110,7 +112,7 @@ class GD_CORE_API BehaviorMetadata {
                                         const gd::String& fullname_,
                                         const gd::String& description_,
                                         const gd::String& group_,
-                                        const gd::String& smallicon_);
+                                        const gd::String& smallicon_) override;
 
   /**
    * Declare a new string expression as being part of the extension.
@@ -119,7 +121,7 @@ class GD_CORE_API BehaviorMetadata {
                                            const gd::String& fullname_,
                                            const gd::String& description_,
                                            const gd::String& group_,
-                                           const gd::String& smallicon_);
+                                           const gd::String& smallicon_) override;
 
   /**
    * \brief Declare a new expression and condition as being part of the
@@ -134,7 +136,7 @@ class GD_CORE_API BehaviorMetadata {
       const gd::String& description,
       const gd::String& sentenceName,
       const gd::String& group,
-      const gd::String& icon);
+      const gd::String& icon) override;
 
   /**
    * \brief Declare a new expression, condition and action as being part of the
@@ -151,7 +153,7 @@ class GD_CORE_API BehaviorMetadata {
       const gd::String& description,
       const gd::String& sentenceName,
       const gd::String& group,
-      const gd::String& icon);
+      const gd::String& icon) override;
 
   /**
    * \brief Create a new action which is the duplicate of the specified one.
@@ -160,7 +162,7 @@ class GD_CORE_API BehaviorMetadata {
    * one.
    */
   gd::InstructionMetadata& AddDuplicatedAction(
-      const gd::String& newActionName, const gd::String& copiedActionName);
+      const gd::String& newActionName, const gd::String& copiedActionName) override;
 
   /**
    * \brief Create a new condition which is the duplicate of the specified one.
@@ -170,7 +172,7 @@ class GD_CORE_API BehaviorMetadata {
    */
   gd::InstructionMetadata& AddDuplicatedCondition(
       const gd::String& newConditionName,
-      const gd::String& copiedConditionName);
+      const gd::String& copiedConditionName) override;
 
   /**
    * \brief Create a new expression which is the duplicate of the specified one.
@@ -193,9 +195,9 @@ class GD_CORE_API BehaviorMetadata {
       const gd::String& newExpressionName,
       const gd::String& copiedExpressionName);
 
-  BehaviorMetadata& SetFullName(const gd::String& fullname_);
+  BehaviorMetadata& SetFullName(const gd::String& fullname_) override;
   BehaviorMetadata& SetDefaultName(const gd::String& defaultName_);
-  BehaviorMetadata& SetDescription(const gd::String& description_);
+  BehaviorMetadata& SetDescription(const gd::String& description_) override;
   BehaviorMetadata& SetGroup(const gd::String& group_);
 
   /**
@@ -203,12 +205,12 @@ class GD_CORE_API BehaviorMetadata {
    * \note The requirement may vary depending on the platform: Most of the time,
    * the include file contains the declaration of the behavior.
    */
-  BehaviorMetadata& SetIncludeFile(const gd::String& includeFile);
+  BehaviorMetadata& SetIncludeFile(const gd::String& includeFile) override;
 
   /**
    * \brief Add a file to the already existing include files.
    */
-  BehaviorMetadata& AddIncludeFile(const gd::String& includeFile);
+  BehaviorMetadata& AddIncludeFile(const gd::String& includeFile) override;
 
   /**
    * \brief Add a file to the already existing required files.
@@ -221,7 +223,7 @@ class GD_CORE_API BehaviorMetadata {
    * Get the help path of the behavior, relative to the GDevelop documentation
    * root.
    */
-  const gd::String& GetHelpPath() const { return helpPath; }
+  const gd::String& GetHelpPath() const override { return helpPath; }
 
   /**
    * Set the help path of the behavior, relative to the GDevelop documentation
@@ -230,17 +232,17 @@ class GD_CORE_API BehaviorMetadata {
    * The behavior instructions will have this help path set by
    * default, unless you call SetHelpPath on them.
    */
-  BehaviorMetadata& SetHelpPath(const gd::String& path) {
+  BehaviorMetadata& SetHelpPath(const gd::String& path) override {
     helpPath = path;
     return *this;
   }
 
-  const gd::String& GetName() const;
-  const gd::String& GetFullName() const { return fullname; }
+  const gd::String& GetName() const override;
+  const gd::String& GetFullName() const override { return fullname; }
   const gd::String& GetDefaultName() const { return defaultName; }
-  const gd::String& GetDescription() const { return description; }
+  const gd::String& GetDescription() const override { return description; }
   const gd::String& GetGroup() const { return group; }
-  const gd::String& GetIconFilename() const { return iconFilename; }
+  const gd::String& GetIconFilename() const override { return iconFilename; }
 
   /**
    * \brief Set the type of the object that this behavior can be used on.
@@ -293,22 +295,22 @@ class GD_CORE_API BehaviorMetadata {
    * \brief Return a reference to a map containing the names of the actions
    * (as keys) and the metadata associated with (as values).
    */
-  std::map<gd::String, gd::InstructionMetadata>& GetAllActions() { return actionsInfos; };
+  std::map<gd::String, gd::InstructionMetadata>& GetAllActions() override { return actionsInfos; };
 
   /**
    * \see gd::PlatformExtension::GetAllActions
    */
-  std::map<gd::String, gd::InstructionMetadata>& GetAllConditions() { return conditionsInfos; };
+  std::map<gd::String, gd::InstructionMetadata>& GetAllConditions() override { return conditionsInfos; };
 
   /**
    * \see gd::PlatformExtension::GetAllActions
    */
-  std::map<gd::String, gd::ExpressionMetadata>& GetAllExpressions() { return expressionsInfos; };
+  std::map<gd::String, gd::ExpressionMetadata>& GetAllExpressions() override { return expressionsInfos; };
 
   /**
    * \see gd::PlatformExtension::GetAllActions
    */
-  std::map<gd::String, gd::ExpressionMetadata>& GetAllStrExpressions() { return strExpressionsInfos; };
+  std::map<gd::String, gd::ExpressionMetadata>& GetAllStrExpressions() override { return strExpressionsInfos; };
 
   std::map<gd::String, gd::InstructionMetadata> conditionsInfos;
   std::map<gd::String, gd::InstructionMetadata> actionsInfos;
@@ -337,5 +339,3 @@ class GD_CORE_API BehaviorMetadata {
 };
 
 }  // namespace gd
-
-#endif  // BEHAVIORMETADATA_H

Core/GDCore/Extensions/Metadata/ExpressionMetadata.h

@@ -3,9 +3,10 @@
  * Copyright 2008-2016 Florian Rival (Florian.Rival@gmail.com). All rights
  * reserved. This project is released under the MIT License.
  */
-#ifndef EXPRESSIONMETADATA_H
-#define EXPRESSIONMETADATA_H
-#if defined(GD_IDE_ONLY)
+#pragma once
+
+#include "AbstractFunctionMetadata.h"
+
 #include <functional>
 #include <memory>
 
@@ -17,7 +18,6 @@ class Layout;
 }
 
 namespace gd {
-
 /**
  * \brief Information about how generate code for an expression
  */
@@ -27,79 +27,7 @@ class ExpressionCodeGenerationInformation {
       : staticFunction(false), hasCustomCodeGenerator(false){};
   virtual ~ExpressionCodeGenerationInformation(){};
 
-  /**
-   * \brief Set the function name which will be used when generating the code.
-   * \param functionName the name of the function to call
-   */
-  ExpressionCodeGenerationInformation& SetFunctionName(
-      const gd::String& functionName) {
-    functionCallName = functionName;
-    return *this;
-  }
-
-  /**
-   * \brief Set that the function is static
-   */
-  ExpressionCodeGenerationInformation& SetStatic() {
-    staticFunction = true;
-    return *this;
-  }
-
-  /**
-   * \brief Erase any existing include file and add the specified include.
-   */
-  ExpressionCodeGenerationInformation& SetIncludeFile(
-      const gd::String& includeFile) {
-    includeFiles.clear();
-    includeFiles.push_back(includeFile);
-    return *this;
-  }
-
-  /**
-   * \brief Add a file to the already existing include files.
-   */
-  ExpressionCodeGenerationInformation& AddIncludeFile(
-      const gd::String& includeFile) {
-    if (std::find(includeFiles.begin(), includeFiles.end(), includeFile) ==
-        includeFiles.end())
-      includeFiles.push_back(includeFile);
-
-    return *this;
-  }
-
-  /**
-   * \brief Get the files that must be included to use the instruction.
-   */
-  const std::vector<gd::String>& GetIncludeFiles() const {
-    return includeFiles;
-  };
-
-  /**
-   * \brief Set that the function must be generated using a custom code
-   * generator.
-   */
-  ExpressionCodeGenerationInformation& SetCustomCodeGenerator(
-      std::function<gd::String(const std::vector<gd::Expression>& parameters,
-                               gd::EventsCodeGenerator& codeGenerator,
-                               gd::EventsCodeGenerationContext& context)>
-          codeGenerator) {
-    hasCustomCodeGenerator = true;
-    customCodeGenerator = codeGenerator;
-    return *this;
-  }
-
-  ExpressionCodeGenerationInformation& RemoveCustomCodeGenerator() {
-    hasCustomCodeGenerator = false;
-    std::function<gd::String(const std::vector<gd::Expression>& parameters,
-                             gd::EventsCodeGenerator& codeGenerator,
-                             gd::EventsCodeGenerationContext& context)>
-        emptyFunction;
-    customCodeGenerator = emptyFunction;
-    return *this;
-  }
-
-  bool HasCustomCodeGenerator() const { return hasCustomCodeGenerator; }
-
+  // TODO Move these attributes to ExpressionMetadata.
   bool staticFunction;
   gd::String functionCallName;
   bool hasCustomCodeGenerator;
@@ -107,8 +35,6 @@ class ExpressionCodeGenerationInformation {
                            gd::EventsCodeGenerator& codeGenerator,
                            gd::EventsCodeGenerationContext& context)>
       customCodeGenerator;
-
- private:
   std::vector<gd::String> includeFiles;
 };
 
@@ -118,7 +44,7 @@ class ExpressionCodeGenerationInformation {
  *
  * \ingroup Events
  */
-class GD_CORE_API ExpressionMetadata {
+class GD_CORE_API ExpressionMetadata : public gd::AbstractFunctionMetadata {
  public:
   /**
    * Construct a new expression metadata.
@@ -144,7 +70,7 @@ class GD_CORE_API ExpressionMetadata {
   /**
    * \brief Set the expression as not shown in the IDE.
    */
-  ExpressionMetadata& SetHidden();
+  ExpressionMetadata& SetHidden() override;
 
   /**
    * \brief Set the group of the instruction in the IDE.
@@ -179,7 +105,7 @@ class GD_CORE_API ExpressionMetadata {
    * Set that the instruction is private - it can't be used outside of the
    * object/ behavior that it is attached too.
    */
-  ExpressionMetadata& SetPrivate() {
+  ExpressionMetadata& SetPrivate() override {
     isPrivate = true;
     return *this;
   }
@@ -216,7 +142,7 @@ class GD_CORE_API ExpressionMetadata {
   /**
    * Set that the instruction can be used in layouts or external events.
    */
-  ExpressionMetadata &SetRelevantForLayoutEventsOnly() {
+  ExpressionMetadata &SetRelevantForLayoutEventsOnly() override {
     relevantContext = "Layout";
     return *this;
   }
@@ -224,7 +150,7 @@ class GD_CORE_API ExpressionMetadata {
   /**
    * Set that the instruction can be used in function events.
    */
-  ExpressionMetadata &SetRelevantForFunctionEventsOnly() {
+  ExpressionMetadata &SetRelevantForFunctionEventsOnly() override {
     relevantContext = "Function";
     return *this;
   }
@@ -232,7 +158,7 @@ class GD_CORE_API ExpressionMetadata {
   /**
    * Set that the instruction can be used in asynchronous function events.
    */
-  ExpressionMetadata &SetRelevantForAsynchronousFunctionEventsOnly() {
+  ExpressionMetadata &SetRelevantForAsynchronousFunctionEventsOnly() override {
     relevantContext = "AsynchronousFunction";
     return *this;
   }
@@ -240,7 +166,7 @@ class GD_CORE_API ExpressionMetadata {
   /**
    * Set that the instruction can be used in custom object events.
    */
-  ExpressionMetadata &SetRelevantForCustomObjectEventsOnly() {
+  ExpressionMetadata &SetRelevantForCustomObjectEventsOnly() override {
     relevantContext = "Object";
     return *this;
   }
@@ -248,17 +174,17 @@ class GD_CORE_API ExpressionMetadata {
   /**
    * \see gd::InstructionMetadata::AddParameter
    */
-  gd::ExpressionMetadata& AddParameter(
-      const gd::String& type,
-      const gd::String& description,
-      const gd::String& supplementaryInformation = "",
-      bool parameterIsOptional = false);
+  gd::ExpressionMetadata &
+  AddParameter(const gd::String &type, const gd::String &label,
+               const gd::String &supplementaryInformation = "",
+               bool parameterIsOptional = false) override;
 
   /**
    * \see gd::InstructionMetadata::AddCodeOnlyParameter
    */
-  gd::ExpressionMetadata& AddCodeOnlyParameter(
-      const gd::String& type, const gd::String& supplementaryInformation);
+  gd::ExpressionMetadata &
+  AddCodeOnlyParameter(const gd::String &type,
+                       const gd::String &supplementaryInformation) override;
 
   /**
    * Set the default value used in editor (or if an optional parameter is empty
@@ -266,8 +192,9 @@ class GD_CORE_API ExpressionMetadata {
    *
    * \see AddParameter
    */
-  ExpressionMetadata& SetDefaultValue(gd::String defaultValue_) {
-    if (!parameters.empty()) parameters.back().SetDefaultValue(defaultValue_);
+  ExpressionMetadata &SetDefaultValue(const gd::String &defaultValue) override {
+    if (!parameters.empty())
+      parameters.back().SetDefaultValue(defaultValue);
     return *this;
   };
 
@@ -277,7 +204,8 @@ class GD_CORE_API ExpressionMetadata {
    *
    * \see AddParameter
    */
-  ExpressionMetadata& SetParameterLongDescription(gd::String longDescription) {
+  ExpressionMetadata &
+  SetParameterLongDescription(const gd::String &longDescription) override {
     if (!parameters.empty())
       parameters.back().SetLongDescription(longDescription);
     return *this;
@@ -290,7 +218,8 @@ class GD_CORE_API ExpressionMetadata {
    *
    * \see AddParameter
    */
-  ExpressionMetadata &SetParameterExtraInfo(const gd::String &extraInfo) {
+  ExpressionMetadata &SetParameterExtraInfo(
+      const gd::String &extraInfo) override {
     if (!parameters.empty()) parameters.back().SetExtraInfo(extraInfo);
     return *this;
   }
@@ -312,50 +241,6 @@ class GD_CORE_API ExpressionMetadata {
     return requiredBaseObjectCapability;
   };
 
-  /**
-   * \brief Set the function that should be called when generating the source
-   * code from events.
-   * \param functionName the name of the function to call
-   * \note Shortcut for `codeExtraInformation.SetFunctionName`.
-   */
-  ExpressionCodeGenerationInformation& SetFunctionName(
-      const gd::String& functionName) {
-    return codeExtraInformation.SetFunctionName(functionName);
-  }
-
-  /**
-   * \brief Return the structure containing the information about code
-   * generation for the expression.
-   */
-  ExpressionCodeGenerationInformation& GetCodeExtraInformation() {
-    return codeExtraInformation;
-  }
-
-  /**
-   * \brief Erase any existing include file and add the specified include.
-   */
-  ExpressionMetadata &SetIncludeFile(const gd::String &includeFile) {
-    codeExtraInformation.SetIncludeFile(includeFile);
-    return *this;
-  }
-
-  /**
-   * \brief Add a file to the already existing include files.
-   */
-  ExpressionMetadata &AddIncludeFile(const gd::String &includeFile) {
-    codeExtraInformation.AddIncludeFile(includeFile);
-    return *this;
-  }
-
-  /**
-   * \brief Get the files that must be included to use the instruction.
-   */
-  const std::vector<gd::String>& GetIncludeFiles() const {
-    return codeExtraInformation.GetIncludeFiles();
-  }
-
-  ExpressionCodeGenerationInformation codeExtraInformation;
-
   bool IsShown() const { return shown; }
   const gd::String& GetReturnType() const { return returnType; }
   const gd::String& GetFullName() const { return fullname; }
@@ -375,6 +260,99 @@ class GD_CORE_API ExpressionMetadata {
 
   std::vector<gd::ParameterMetadata> parameters;
 
+  
+  /**
+   * \brief Set the function name which will be used when generating the code.
+   * \param functionName the name of the function to call
+   */
+  ExpressionMetadata& SetFunctionName(
+      const gd::String& functionName) override {
+    codeExtraInformation.functionCallName = functionName;
+    return *this;
+  }
+
+
+  /**
+   * \brief Return the name of the function which will be called in the generated code.
+   */
+  const gd::String &GetFunctionName() {
+    return codeExtraInformation.functionCallName;
+  }
+  /**
+   * \brief Set that the function is static
+   */
+  ExpressionMetadata& SetStatic() {
+    codeExtraInformation.staticFunction = true;
+    return *this;
+  }
+
+  /**
+   * \brief Erase any existing include file and add the specified include.
+   */
+  ExpressionMetadata& SetIncludeFile(
+      const gd::String& includeFile) override {
+    codeExtraInformation.includeFiles.clear();
+    codeExtraInformation.includeFiles.push_back(includeFile);
+    return *this;
+  }
+
+  /**
+   * \brief Add a file to the already existing include files.
+   */
+  ExpressionMetadata& AddIncludeFile(
+      const gd::String& includeFile) override {
+    if (std::find(codeExtraInformation.includeFiles.begin(), codeExtraInformation.includeFiles.end(), includeFile) ==
+        codeExtraInformation.includeFiles.end())
+      codeExtraInformation.includeFiles.push_back(includeFile);
+
+    return *this;
+  }
+
+  /**
+   * \brief Get the files that must be included to use the instruction.
+   */
+  const std::vector<gd::String>& GetIncludeFiles() const override {
+    return codeExtraInformation.includeFiles;
+  };
+
+  /**
+   * \brief Set that the function must be generated using a custom code
+   * generator.
+   */
+  ExpressionMetadata& SetCustomCodeGenerator(
+      std::function<gd::String(const std::vector<gd::Expression>& parameters,
+                               gd::EventsCodeGenerator& codeGenerator,
+                               gd::EventsCodeGenerationContext& context)>
+          codeGenerator) {
+    codeExtraInformation.hasCustomCodeGenerator = true;
+    codeExtraInformation.customCodeGenerator = codeGenerator;
+    return *this;
+  }
+
+  ExpressionMetadata& RemoveCustomCodeGenerator() {
+    codeExtraInformation.hasCustomCodeGenerator = false;
+    std::function<gd::String(const std::vector<gd::Expression>& parameters,
+                             gd::EventsCodeGenerator& codeGenerator,
+                             gd::EventsCodeGenerationContext& context)>
+        emptyFunction;
+    codeExtraInformation.customCodeGenerator = emptyFunction;
+    return *this;
+  }
+
+  bool HasCustomCodeGenerator() const { return codeExtraInformation.hasCustomCodeGenerator; }
+
+  /**
+   * \brief Return the structure containing the information about code
+   * generation for the expression.
+   * 
+   * \deprecated
+   */
+  ExpressionMetadata& GetCodeExtraInformation() {
+    return *this;
+  }
+
+  ExpressionCodeGenerationInformation codeExtraInformation;
+
  private:
   gd::String returnType;
   gd::String fullname;
@@ -391,6 +369,3 @@ class GD_CORE_API ExpressionMetadata {
 };
 
 }  // namespace gd
-
-#endif
-#endif  // EXPRESSIONMETADATA_H

Core/GDCore/Extensions/Metadata/InstructionMetadata.h

@@ -4,8 +4,10 @@
  * reserved. This project is released under the MIT License.
  */
 
-#ifndef INSTRUCTIONMETADATA_H
-#define INSTRUCTIONMETADATA_H
+#pragma once
+
+#include "AbstractFunctionMetadata.h"
+
 #include <algorithm>
 #include <functional>
 #include <map>
@@ -33,7 +35,7 @@ namespace gd {
  *
  * \ingroup Events
  */
-class GD_CORE_API InstructionMetadata {
+class GD_CORE_API InstructionMetadata : public gd::AbstractFunctionMetadata {
  public:
   /**
    * Construct a new instruction metadata.
@@ -96,7 +98,7 @@ class GD_CORE_API InstructionMetadata {
    * Set that the instruction is private - it can't be used outside of the
    * object/ behavior that it is attached too.
    */
-  InstructionMetadata &SetPrivate() {
+  InstructionMetadata &SetPrivate() override {
     isPrivate = true;
     return *this;
   }
@@ -133,7 +135,7 @@ class GD_CORE_API InstructionMetadata {
   /**
    * Set that the instruction can be used in layouts or external events.
    */
-  InstructionMetadata &SetRelevantForLayoutEventsOnly() {
+  InstructionMetadata &SetRelevantForLayoutEventsOnly() override {
     relevantContext = "Layout";
     return *this;
   }
@@ -141,7 +143,7 @@ class GD_CORE_API InstructionMetadata {
   /**
    * Set that the instruction can be used in function events.
    */
-  InstructionMetadata &SetRelevantForFunctionEventsOnly() {
+  InstructionMetadata &SetRelevantForFunctionEventsOnly() override {
     relevantContext = "Function";
     return *this;
   }
@@ -149,7 +151,7 @@ class GD_CORE_API InstructionMetadata {
   /**
    * Set that the instruction can be used in asynchronous function events.
    */
-  InstructionMetadata &SetRelevantForAsynchronousFunctionEventsOnly() {
+  InstructionMetadata &SetRelevantForAsynchronousFunctionEventsOnly() override {
     relevantContext = "AsynchronousFunction";
     return *this;
   }
@@ -157,7 +159,7 @@ class GD_CORE_API InstructionMetadata {
   /**
    * Set that the instruction can be used in custom object events.
    */
-  InstructionMetadata &SetRelevantForCustomObjectEventsOnly() {
+  InstructionMetadata &SetRelevantForCustomObjectEventsOnly() override {
     relevantContext = "Object";
     return *this;
   }
@@ -192,7 +194,7 @@ class GD_CORE_API InstructionMetadata {
    *
    * Used mainly when an instruction is deprecated.
    */
-  InstructionMetadata &SetHidden() {
+  InstructionMetadata &SetHidden() override {
     hidden = true;
     return *this;
   }
@@ -231,7 +233,7 @@ class GD_CORE_API InstructionMetadata {
       const gd::String &type,
       const gd::String &label,
       const gd::String &supplementaryInformation = "",
-      bool parameterIsOptional = false);
+      bool parameterIsOptional = false) override;
 
   /**
    * \brief Add a parameter not displayed in editor.
@@ -245,7 +247,7 @@ class GD_CORE_API InstructionMetadata {
    * \see EventsCodeGenerator::GenerateParametersCodes
    */
   InstructionMetadata &AddCodeOnlyParameter(
-      const gd::String &type, const gd::String &supplementaryInformation);
+      const gd::String &type, const gd::String &supplementaryInformation) override;
 
   /**
    * \brief Set the default value used in editor (or if an optional parameter is
@@ -253,7 +255,7 @@ class GD_CORE_API InstructionMetadata {
    *
    * \see AddParameter
    */
-  InstructionMetadata &SetDefaultValue(const gd::String &defaultValue_) {
+  InstructionMetadata &SetDefaultValue(const gd::String &defaultValue_) override {
     if (!parameters.empty()) parameters.back().SetDefaultValue(defaultValue_);
     return *this;
   };
@@ -265,7 +267,7 @@ class GD_CORE_API InstructionMetadata {
    * \see AddParameter
    */
   InstructionMetadata &SetParameterLongDescription(
-      const gd::String &longDescription) {
+      const gd::String &longDescription) override {
     if (!parameters.empty())
       parameters.back().SetLongDescription(longDescription);
     return *this;
@@ -278,7 +280,7 @@ class GD_CORE_API InstructionMetadata {
    *
    * \see AddParameter
    */
-  InstructionMetadata &SetParameterExtraInfo(const gd::String &extraInfo) {
+  InstructionMetadata &SetParameterExtraInfo(const gd::String &extraInfo) override {
     if (!parameters.empty()) parameters.back().SetExtraInfo(extraInfo);
     return *this;
   }
@@ -382,128 +384,13 @@ class GD_CORE_API InstructionMetadata {
   /**
    * \brief Defines information about how generate the code for an instruction
    */
-  class ExtraInformation {
+  class ExtraInformation { 
    public:
     enum AccessType { Reference, MutatorAndOrAccessor, Mutators };
     ExtraInformation() : accessType(Reference), hasCustomCodeGenerator(false){};
     virtual ~ExtraInformation(){};
 
-    /**
-     * Set the name of the function which will be called in the generated code.
-     * \param functionName the name of the function to call.
-     */
-    ExtraInformation &SetFunctionName(const gd::String &functionName_) {
-      functionCallName = functionName_;
-      return *this;
-    }
-
-    /**
-     * Set the name of the function, doing asynchronous work, which will be
-     * called in the generated code. This function should return an asynchronous
-     * task (i.e: `gdjs.AsyncTask` in the JavaScript runtime).
-     *
-     * \param functionName the name of the function doing asynchronous work to
-     * call.
-     */
-    ExtraInformation &SetAsyncFunctionName(const gd::String &functionName_) {
-      asyncFunctionCallName = functionName_;
-      return *this;
-    }
-
-    /**
-     * Declare if the instruction being declared is somewhat manipulating in a
-     * standard way.
-     */
-    ExtraInformation &SetManipulatedType(const gd::String &type_) {
-      type = type_;
-      return *this;
-    }
-
-    /**
-     * If InstructionMetadata::ExtraInformation::SetManipulatedType was called
-     * with "number" or "string", this function will tell the code generator the
-     * name of the getter function used to retrieve the data value.
-     *
-     * Usage example:
-     * \code
-     *  obj.AddAction("String",
-     *                 _("Change the string"),
-     *                 _("Change the string of a text"),
-     *                 _("the string"),
-     *                 _("Text"),
-     *                 "CppPlatform/Extensions/text24.png",
-     *                 "CppPlatform/Extensions/text_black.png");
-     *
-     *      .AddParameter("object", _("Object"), "Text", false)
-     *      .AddParameter("operator", _("Modification operator"), "string")
-     *      .AddParameter("string", _("String"))
-     *      .SetFunctionName("SetString").SetManipulatedType("string").SetGetter("GetString");
-     *
-     *  DECLARE_END_OBJECT_ACTION()
-     * \endcode
-     */
-    ExtraInformation &SetGetter(const gd::String &getter) {
-      optionalAssociatedInstruction = getter;
-      accessType = MutatorAndOrAccessor;
-      return *this;
-    }
-
-    ExtraInformation &SetMutators(
-        const std::map<gd::String, gd::String> &mutators) {
-      optionalMutators = mutators;
-      accessType = Mutators;
-      return *this;
-    }
-
-    /**
-     * \brief Erase any existing include file and add the specified include.
-     */
-    ExtraInformation &SetIncludeFile(const gd::String &includeFile) {
-      includeFiles.clear();
-      includeFiles.push_back(includeFile);
-      return *this;
-    }
-
-    /**
-     * \brief Add a file to the already existing include files.
-     */
-    ExtraInformation &AddIncludeFile(const gd::String &includeFile) {
-      if (std::find(includeFiles.begin(), includeFiles.end(), includeFile) ==
-          includeFiles.end())
-        includeFiles.push_back(includeFile);
-
-      return *this;
-    }
-
-    /**
-     * \brief Get the files that must be included to use the instruction.
-     */
-    const std::vector<gd::String> &GetIncludeFiles() const {
-      return includeFiles;
-    };
-
-    ExtraInformation &SetCustomCodeGenerator(
-        std::function<gd::String(Instruction &instruction,
-                                 gd::EventsCodeGenerator &codeGenerator,
-                                 gd::EventsCodeGenerationContext &context)>
-            codeGenerator) {
-      hasCustomCodeGenerator = true;
-      customCodeGenerator = codeGenerator;
-      return *this;
-    }
-
-    ExtraInformation &RemoveCustomCodeGenerator() {
-      hasCustomCodeGenerator = false;
-      std::function<gd::String(Instruction & instruction,
-                               gd::EventsCodeGenerator & codeGenerator,
-                               gd::EventsCodeGenerationContext & context)>
-          emptyFunction;
-      customCodeGenerator = emptyFunction;
-      return *this;
-    }
-
-    bool HasCustomCodeGenerator() const { return hasCustomCodeGenerator; }
-
+    // TODO Move these attributes to InstructionMetadata.
     gd::String functionCallName;
     gd::String asyncFunctionCallName;
     gd::String type;
@@ -512,75 +399,156 @@ class GD_CORE_API InstructionMetadata {
     std::map<gd::String, gd::String> optionalMutators;
     bool hasCustomCodeGenerator;
     std::function<gd::String(Instruction &instruction,
-                             gd::EventsCodeGenerator &codeGenerator,
-                             gd::EventsCodeGenerationContext &context)>
+                              gd::EventsCodeGenerator &codeGenerator,
+                              gd::EventsCodeGenerationContext &context)>
         customCodeGenerator;
-
-   private:
     std::vector<gd::String> includeFiles;
   };
   ExtraInformation codeExtraInformation;  ///< Information about how generate
                                           ///< code for the instruction
 
-  /**
-   * \brief Return the structure containing the information about code
-   * generation for the instruction.
-   */
-  ExtraInformation &GetCodeExtraInformation() { return codeExtraInformation; }
-
-  /**
-   * \brief Declare if the instruction being declared is somewhat manipulating
-   * in a standard way. \param type "number" or "string" \note Shortcut for
-   * `codeExtraInformation.SetManipulatedType(type)`.
-   */
-  ExtraInformation &SetManipulatedType(const gd::String &type_) {
-    return codeExtraInformation.SetManipulatedType(type_);
-  }
-
   /**
    * Set the name of the function which will be called in the generated code.
    * \param functionName the name of the function to call.
-   * \note Shortcut for `codeExtraInformation.SetFunctionName`.
    */
-  ExtraInformation &SetFunctionName(const gd::String &functionName) {
-    return codeExtraInformation.SetFunctionName(functionName);
+  InstructionMetadata &SetFunctionName(const gd::String &functionName_) override {
+    codeExtraInformation.functionCallName = functionName_;
+    return *this;
   }
 
   /**
-   * Set the name of the function, doing asynchronous work, which will be called
-   * in the generated code. This function should return an asynchronous task
-   * (i.e: `gdjs.AsyncTask` in the JavaScript runtime).
+   * Set the name of the function, doing asynchronous work, which will be
+   * called in the generated code. This function should return an asynchronous
+   * task (i.e: `gdjs.AsyncTask` in the JavaScript runtime).
    *
    * \param functionName the name of the function doing asynchronous work to
-   * call. \note Shortcut for `codeExtraInformation.SetAsyncFunctionName`.
+   * call.
    */
-  ExtraInformation &SetAsyncFunctionName(const gd::String &functionName) {
-    return codeExtraInformation.SetAsyncFunctionName(functionName);
+  InstructionMetadata &SetAsyncFunctionName(const gd::String &functionName_) {
+    codeExtraInformation.asyncFunctionCallName = functionName_;
+    return *this;
+  }
+
+  /**
+   * Return the name of the function which will be called in the generated code.
+   */
+  const gd::String &GetFunctionName() {
+    return codeExtraInformation.functionCallName;
+  }
+
+  /**
+   * Return the name of the function, doing asynchronous work, which will be
+   * called in the generated code. This function should return an asynchronous
+   * task (i.e: `gdjs.AsyncTask` in the JavaScript runtime).
+   */
+  const gd::String &GetAsyncFunctionName() {
+    return codeExtraInformation.asyncFunctionCallName;
+  }
+
+/**
+ * \brief Declare if the instruction being declared is somewhat manipulating
+ * in a standard way.
+ * 
+ * \param type "number" or "string"
+ */
+  InstructionMetadata &SetManipulatedType(const gd::String &type_) {
+    codeExtraInformation.type = type_;
+    return *this;
+  }
+
+  /**
+   * If InstructionMetadata::ExtraInformation::SetManipulatedType was called
+   * with "number" or "string", this function will tell the code generator the
+   * name of the getter function used to retrieve the data value.
+   *
+   * Usage example:
+   * \code
+   *  obj.AddAction("String",
+   *                 _("Change the string"),
+   *                 _("Change the string of a text"),
+   *                 _("the string"),
+   *                 _("Text"),
+   *                 "CppPlatform/Extensions/text24.png",
+   *                 "CppPlatform/Extensions/text_black.png");
+   *
+   *      .AddParameter("object", _("Object"), "Text", false)
+   *      .AddParameter("operator", _("Modification operator"), "string")
+   *      .AddParameter("string", _("String"))
+   *      .SetFunctionName("SetString").SetManipulatedType("string").SetGetter("GetString");
+   *
+   *  DECLARE_END_OBJECT_ACTION()
+   * \endcode
+   */
+  InstructionMetadata &SetGetter(const gd::String &getter) {
+    codeExtraInformation.optionalAssociatedInstruction = getter;
+    codeExtraInformation.accessType = codeExtraInformation.MutatorAndOrAccessor;
+    return *this;
+  }
+
+  InstructionMetadata &SetMutators(
+      const std::map<gd::String, gd::String> &mutators) {
+    codeExtraInformation.optionalMutators = mutators;
+    codeExtraInformation.accessType = codeExtraInformation.Mutators;
+    return *this;
   }
 
   /**
    * \brief Erase any existing include file and add the specified include.
    */
-  InstructionMetadata &SetIncludeFile(const gd::String &includeFile) {
-    codeExtraInformation.SetIncludeFile(includeFile);
+  InstructionMetadata &SetIncludeFile(const gd::String &includeFile) override {
+    codeExtraInformation.includeFiles.clear();
+    codeExtraInformation.includeFiles.push_back(includeFile);
     return *this;
   }
 
   /**
    * \brief Add a file to the already existing include files.
    */
-  InstructionMetadata &AddIncludeFile(const gd::String &includeFile) {
-    codeExtraInformation.AddIncludeFile(includeFile);
+  InstructionMetadata &AddIncludeFile(const gd::String &includeFile) override {
+    if (std::find(codeExtraInformation.includeFiles.begin(), codeExtraInformation.includeFiles.end(), includeFile) ==
+        codeExtraInformation.includeFiles.end())
+      codeExtraInformation.includeFiles.push_back(includeFile);
+
     return *this;
   }
 
   /**
    * \brief Get the files that must be included to use the instruction.
    */
-  const std::vector<gd::String> &GetIncludeFiles() const {
-    return codeExtraInformation.GetIncludeFiles();
+  const std::vector<gd::String> &GetIncludeFiles() const override {
+    return codeExtraInformation.includeFiles;
   };
 
+  InstructionMetadata &SetCustomCodeGenerator(
+      std::function<gd::String(Instruction &instruction,
+                                gd::EventsCodeGenerator &codeGenerator,
+                                gd::EventsCodeGenerationContext &context)>
+          codeGenerator) {
+    codeExtraInformation.hasCustomCodeGenerator = true;
+    codeExtraInformation.customCodeGenerator = codeGenerator;
+    return *this;
+  }
+
+  InstructionMetadata &RemoveCustomCodeGenerator() {
+    codeExtraInformation.hasCustomCodeGenerator = false;
+    std::function<gd::String(Instruction & instruction,
+                              gd::EventsCodeGenerator & codeGenerator,
+                              gd::EventsCodeGenerationContext & context)>
+        emptyFunction;
+    codeExtraInformation.customCodeGenerator = emptyFunction;
+    return *this;
+  }
+
+  bool HasCustomCodeGenerator() const { return codeExtraInformation.hasCustomCodeGenerator; }
+
+  /**
+   * \brief Return the structure containing the information about code
+   * generation for the instruction.
+   * 
+   * \deprecated
+   */
+  InstructionMetadata &GetCodeExtraInformation() { return *this; }
+
   std::vector<ParameterMetadata> parameters;
 
  private:
@@ -604,5 +572,3 @@ class GD_CORE_API InstructionMetadata {
 };
 
 }  // namespace gd
-
-#endif  // INSTRUCTIONMETADATA_H

Core/GDCore/Extensions/Metadata/InstructionOrExpressionContainerMetadata.h

@@ -0,0 +1,201 @@
+/*
+ * GDevelop Core
+ * Copyright 2008-2016 Florian Rival (Florian.Rival@gmail.com). All rights
+ * reserved. This project is released under the MIT License.
+ */
+#pragma once
+
+#include <map>
+
+#include "GDCore/Extensions/Metadata/ExpressionMetadata.h"
+#include "GDCore/Extensions/Metadata/InstructionMetadata.h"
+#include "GDCore/String.h"
+
+namespace gd {
+class Behavior;
+class BehaviorsSharedData;
+class MultipleInstructionMetadata;
+class InstructionMetadata;
+class ExpressionMetadata;
+} // namespace gd
+
+namespace gd {
+
+/**
+ * \brief Contains user-friendly information about instructions and expressions
+ * (usually for a behavior or an object).
+ *
+ * \ingroup Events
+ */
+class GD_CORE_API InstructionOrExpressionContainerMetadata {
+public:
+  InstructionOrExpressionContainerMetadata(){};
+  virtual ~InstructionOrExpressionContainerMetadata(){};
+
+  /**
+   * Declare a new condition as being part of the behavior or object.
+   * \deprecated Prefer using `AddScopedCondition`, to properly namespace
+   * the condition.
+   */
+  virtual gd::InstructionMetadata &
+  AddCondition(const gd::String &name_, const gd::String &fullname_,
+               const gd::String &description_, const gd::String &sentence_,
+               const gd::String &group_, const gd::String &icon_,
+               const gd::String &smallicon_) = 0;
+
+  /**
+   * Declare a new action as being part of the behavior or object.
+   * \deprecated Prefer using `AddScopedAction`, to properly namespace
+   * the action.
+   */
+  virtual gd::InstructionMetadata &
+  AddAction(const gd::String &name_, const gd::String &fullname_,
+            const gd::String &description_, const gd::String &sentence_,
+            const gd::String &group_, const gd::String &icon_,
+            const gd::String &smallicon_) = 0;
+
+  /**
+   * Declare a new condition as being part of the behavior or object.
+   */
+  virtual gd::InstructionMetadata &
+  AddScopedCondition(const gd::String &name_, const gd::String &fullname_,
+                     const gd::String &description_,
+                     const gd::String &sentence_, const gd::String &group_,
+                     const gd::String &icon_, const gd::String &smallicon_) = 0;
+
+  /**
+   * Declare a new action as being part of the behavior or object.
+   */
+  virtual gd::InstructionMetadata &
+  AddScopedAction(const gd::String &name_, const gd::String &fullname_,
+                  const gd::String &description_, const gd::String &sentence_,
+                  const gd::String &group_, const gd::String &icon_,
+                  const gd::String &smallicon_) = 0;
+  /**
+   * Declare a new action as being part of the extension.
+   */
+  virtual gd::ExpressionMetadata &
+  AddExpression(const gd::String &name_, const gd::String &fullname_,
+                const gd::String &description_, const gd::String &group_,
+                const gd::String &smallicon_) = 0;
+
+  /**
+   * Declare a new string expression as being part of the extension.
+   */
+  virtual gd::ExpressionMetadata &
+  AddStrExpression(const gd::String &name_, const gd::String &fullname_,
+                   const gd::String &description_, const gd::String &group_,
+                   const gd::String &smallicon_) = 0;
+
+  /**
+   * \brief Declare a new expression and condition as being part of the
+   * behavior.
+   * \note It's recommended to use this function to avoid declaring twice a
+   * similar expression/condition.
+   */
+  virtual gd::MultipleInstructionMetadata AddExpressionAndCondition(
+      const gd::String &type, const gd::String &name,
+      const gd::String &fullname, const gd::String &description,
+      const gd::String &sentenceName, const gd::String &group,
+      const gd::String &icon) = 0;
+
+  /**
+   * \brief Declare a new expression, condition and action as being part of the
+   * behavior.
+   * \note The action name is prefixed by "Set" (and the namespace, as the
+   * condition).
+   * \note It's recommended to use this function to avoid declaring 3 times a
+   * similar expression/condition/action.
+   */
+  virtual gd::MultipleInstructionMetadata AddExpressionAndConditionAndAction(
+      const gd::String &type, const gd::String &name,
+      const gd::String &fullname, const gd::String &description,
+      const gd::String &sentenceName, const gd::String &group,
+      const gd::String &icon) = 0;
+
+  /**
+   * \brief Create a new action which is the duplicate of the specified one.
+   *
+   * Useful for handling a deprecated action that is just a "copy" of the new
+   * one.
+   */
+  virtual gd::InstructionMetadata &
+  AddDuplicatedAction(const gd::String &newActionName,
+                      const gd::String &copiedActionName) = 0;
+
+  /**
+   * \brief Create a new condition which is the duplicate of the specified one.
+   *
+   * Useful for handling a deprecated condition that is just a "copy" of the new
+   * one.
+   */
+  virtual gd::InstructionMetadata &
+  AddDuplicatedCondition(const gd::String &newConditionName,
+                         const gd::String &copiedConditionName) = 0;
+
+  virtual InstructionOrExpressionContainerMetadata &
+  SetFullName(const gd::String &fullname_) = 0;
+  virtual InstructionOrExpressionContainerMetadata &
+  SetDescription(const gd::String &description_) = 0;
+
+  /**
+   * \brief Erase any existing include file and add the specified include.
+   * \note The requirement may vary depending on the platform: Most of the time,
+   * the include file contains the declaration of the behavior.
+   */
+  virtual InstructionOrExpressionContainerMetadata &
+  SetIncludeFile(const gd::String &includeFile) = 0;
+
+  /**
+   * \brief Add a file to the already existing include files.
+   */
+  virtual InstructionOrExpressionContainerMetadata &
+  AddIncludeFile(const gd::String &includeFile) = 0;
+
+  /**
+   * Get the help path of the behavior, relative to the GDevelop documentation
+   * root.
+   */
+  virtual const gd::String &GetHelpPath() const = 0;
+
+  /**
+   * Set the help path of the behavior, relative to the GDevelop documentation
+   * root.
+   *
+   * The behavior instructions will have this help path set by
+   * default, unless you call SetHelpPath on them.
+   */
+  virtual InstructionOrExpressionContainerMetadata &
+  SetHelpPath(const gd::String &path) = 0;
+
+  virtual const gd::String &GetName() const = 0;
+  virtual const gd::String &GetFullName() const = 0;
+  virtual const gd::String &GetDescription() const = 0;
+  virtual const gd::String &GetIconFilename() const = 0;
+
+  /**
+   * \brief Return a reference to a map containing the names of the actions
+   * (as keys) and the metadata associated with (as values).
+   */
+  virtual std::map<gd::String, gd::InstructionMetadata> &GetAllActions() = 0;
+
+  /**
+   * \see gd::PlatformExtension::GetAllActions
+   */
+  virtual std::map<gd::String, gd::InstructionMetadata> &GetAllConditions() = 0;
+
+  /**
+   * \see gd::PlatformExtension::GetAllActions
+   */
+  virtual std::map<gd::String, gd::ExpressionMetadata> &GetAllExpressions() = 0;
+
+  /**
+   * \see gd::PlatformExtension::GetAllActions
+   */
+  virtual std::map<gd::String, gd::ExpressionMetadata> &
+  GetAllStrExpressions() = 0;
+
+private:
+};
+
+} // namespace gd

Core/GDCore/Extensions/Metadata/MultipleInstructionMetadata.cpp

@@ -1,12 +0,0 @@
-/*
- * GDevelop Core
- * Copyright 2008-present Florian Rival (Florian.Rival@gmail.com). All rights
- * reserved. This project is released under the MIT License.
- */
-#include "MultipleInstructionMetadata.h"
-
-#include "InstructionMetadata.h"
-
-namespace gd {
-
-}  // namespace gd

Core/GDCore/Extensions/Metadata/MultipleInstructionMetadata.h

@@ -3,8 +3,8 @@
  * Copyright 2008-present Florian Rival (Florian.Rival@gmail.com). All rights
  * reserved. This project is released under the MIT License.
  */
-#ifndef MULTIPLEINSTRUCTIONSMETADATA_H
-#define MULTIPLEINSTRUCTIONSMETADATA_H
+#pragma once
+
 #include "GDCore/Extensions/Metadata/ExpressionMetadata.h"
 #include "GDCore/Extensions/Metadata/InstructionMetadata.h"
 #include "GDCore/String.h"
@@ -21,7 +21,7 @@ namespace gd {
  *
  * \ingroup PlatformDefinition
  */
-class GD_CORE_API MultipleInstructionMetadata {
+class GD_CORE_API MultipleInstructionMetadata : public AbstractFunctionMetadata {
  public:
   static MultipleInstructionMetadata WithExpressionAndCondition(
       gd::ExpressionMetadata &expression, gd::InstructionMetadata &condition) {
@@ -45,7 +45,7 @@ class GD_CORE_API MultipleInstructionMetadata {
       const gd::String &type,
       const gd::String &label,
       const gd::String &supplementaryInformation = "",
-      bool parameterIsOptional = false) {
+      bool parameterIsOptional = false) override {
     if (expression)
       expression->AddParameter(
           type, label, supplementaryInformation, parameterIsOptional);
@@ -62,7 +62,7 @@ class GD_CORE_API MultipleInstructionMetadata {
    * \see gd::InstructionMetadata::AddCodeOnlyParameter
    */
   MultipleInstructionMetadata &AddCodeOnlyParameter(
-      const gd::String &type, const gd::String &supplementaryInformation) {
+      const gd::String &type, const gd::String &supplementaryInformation) override {
     if (expression)
       expression->AddCodeOnlyParameter(type, supplementaryInformation);
     if (condition)
@@ -74,7 +74,7 @@ class GD_CORE_API MultipleInstructionMetadata {
   /**
    * \see gd::InstructionMetadata::SetDefaultValue
    */
-  MultipleInstructionMetadata &SetDefaultValue(const gd::String &defaultValue) {
+  MultipleInstructionMetadata &SetDefaultValue(const gd::String &defaultValue) override {
     if (expression) expression->SetDefaultValue(defaultValue);
     if (condition) condition->SetDefaultValue(defaultValue);
     if (action) action->SetDefaultValue(defaultValue);
@@ -85,7 +85,7 @@ class GD_CORE_API MultipleInstructionMetadata {
    * \see gd::InstructionMetadata::SetParameterExtraInfo
    */
   MultipleInstructionMetadata &SetParameterExtraInfo(
-      const gd::String &defaultValue) {
+      const gd::String &defaultValue) override {
     if (expression) expression->SetParameterExtraInfo(defaultValue);
     if (condition) condition->SetParameterExtraInfo(defaultValue);
     if (action) action->SetParameterExtraInfo(defaultValue);
@@ -96,7 +96,7 @@ class GD_CORE_API MultipleInstructionMetadata {
    * \see gd::InstructionMetadata::SetParameterLongDescription
    */
   MultipleInstructionMetadata &SetParameterLongDescription(
-      const gd::String &longDescription) {
+      const gd::String &longDescription) override {
     if (expression) expression->SetParameterLongDescription(longDescription);
     if (condition) condition->SetParameterLongDescription(longDescription);
     if (action) action->SetParameterLongDescription(longDescription);
@@ -106,7 +106,7 @@ class GD_CORE_API MultipleInstructionMetadata {
   /**
    * \see gd::InstructionMetadata::SetHidden
    */
-  MultipleInstructionMetadata &SetHidden() {
+  MultipleInstructionMetadata &SetHidden() override {
     if (expression) expression->SetHidden();
     if (condition) condition->SetHidden();
     if (action) action->SetHidden();
@@ -136,47 +136,47 @@ class GD_CORE_API MultipleInstructionMetadata {
     return *this;
   }
 
-  MultipleInstructionMetadata &SetFunctionName(const gd::String &functionName) {
+  MultipleInstructionMetadata &SetFunctionName(const gd::String &functionName) override {
     if (expression) expression->SetFunctionName(functionName);
     if (condition) condition->SetFunctionName(functionName);
-    if (action) action->GetCodeExtraInformation().SetFunctionName(functionName);
+    if (action) action->SetFunctionName(functionName);
     return *this;
   }
 
   MultipleInstructionMetadata &SetGetter(const gd::String &getter) {
     if (expression) expression->SetFunctionName(getter);
     if (condition) condition->SetFunctionName(getter);
-    if (action) action->GetCodeExtraInformation().SetGetter(getter);
+    if (action) action->SetGetter(getter);
     return *this;
   }
 
-  MultipleInstructionMetadata &SetIncludeFile(const gd::String &includeFile) {
+  MultipleInstructionMetadata &SetIncludeFile(const gd::String &includeFile) override {
     if (expression)
-      expression->GetCodeExtraInformation().SetIncludeFile(includeFile);
+      expression->SetIncludeFile(includeFile);
     if (condition)
-      condition->GetCodeExtraInformation().SetIncludeFile(includeFile);
-    if (action) action->GetCodeExtraInformation().SetIncludeFile(includeFile);
+      condition->SetIncludeFile(includeFile);
+    if (action) action->SetIncludeFile(includeFile);
     return *this;
   }
 
-  MultipleInstructionMetadata &AddIncludeFile(const gd::String &includeFile) {
+  MultipleInstructionMetadata &AddIncludeFile(const gd::String &includeFile) override {
     if (expression)
       expression->GetCodeExtraInformation().AddIncludeFile(includeFile);
     if (condition)
-      condition->GetCodeExtraInformation().AddIncludeFile(includeFile);
-    if (action) action->GetCodeExtraInformation().AddIncludeFile(includeFile);
+      condition->AddIncludeFile(includeFile);
+    if (action) action->AddIncludeFile(includeFile);
     return *this;
   }
 
   /**
    * \brief Get the files that must be included to use the instruction.
    */
-  const std::vector<gd::String> &GetIncludeFiles() const {
+  const std::vector<gd::String> &GetIncludeFiles() const override {
     if (expression)
       return expression->GetCodeExtraInformation().GetIncludeFiles();
     if (condition)
-      return condition->GetCodeExtraInformation().GetIncludeFiles();
-    if (action) return action->GetCodeExtraInformation().GetIncludeFiles();
+      return condition->GetIncludeFiles();
+    if (action) return action->GetIncludeFiles();
     // It can't actually happen.
     throw std::logic_error("no instruction metadata");
   }
@@ -184,7 +184,7 @@ class GD_CORE_API MultipleInstructionMetadata {
   /**
    * \see gd::InstructionMetadata::SetPrivate
    */
-  MultipleInstructionMetadata &SetPrivate() {
+  MultipleInstructionMetadata &SetPrivate() override {
     if (expression) expression->SetPrivate();
     if (condition) condition->SetPrivate();
     if (action) action->SetPrivate();
@@ -218,6 +218,42 @@ class GD_CORE_API MultipleInstructionMetadata {
     return *this;
   }
 
+  /**
+   * Set that the instruction can be used in layouts or external events.
+   */
+  MultipleInstructionMetadata &SetRelevantForLayoutEventsOnly() override {
+    if (condition) condition->SetRelevantForLayoutEventsOnly();
+    if (action) action->SetRelevantForLayoutEventsOnly();
+    return *this;
+  }
+
+  /**
+   * Set that the instruction can be used in function events.
+   */
+  MultipleInstructionMetadata &SetRelevantForFunctionEventsOnly() override {
+    if (condition) condition->SetRelevantForFunctionEventsOnly();
+    if (action) action->SetRelevantForFunctionEventsOnly();
+    return *this;
+  }
+
+  /**
+   * Set that the instruction can be used in asynchronous function events.
+   */
+  MultipleInstructionMetadata &SetRelevantForAsynchronousFunctionEventsOnly() override {
+    if (condition) condition->SetRelevantForAsynchronousFunctionEventsOnly();
+    if (action) action->SetRelevantForAsynchronousFunctionEventsOnly();
+    return *this;
+  }
+
+  /**
+   * Set that the instruction can be used in custom object events.
+   */
+  MultipleInstructionMetadata &SetRelevantForCustomObjectEventsOnly() override {
+    if (condition) condition->SetRelevantForCustomObjectEventsOnly();
+    if (action) action->SetRelevantForCustomObjectEventsOnly();
+    return *this;
+  }
+
   /**
    * \brief Don't use, only here to fulfill Emscripten bindings requirements.
    */
@@ -242,5 +278,3 @@ class GD_CORE_API MultipleInstructionMetadata {
 };
 
 }  // namespace gd
-
-#endif  // MULTIPLEINSTRUCTIONSMETADATA_H

Core/GDCore/Extensions/Metadata/ObjectMetadata.h

@@ -3,8 +3,10 @@
  * Copyright 2008-2016 Florian Rival (Florian.Rival@gmail.com). All rights
  * reserved. This project is released under the MIT License.
  */
-#ifndef OBJECTMETADATA_H
-#define OBJECTMETADATA_H
+#pragma once
+
+#include "InstructionOrExpressionContainerMetadata.h"
+
 #include <functional>
 #include <map>
 #include <set>
@@ -32,7 +34,7 @@ namespace gd {
  *
  * \ingroup Events
  */
-class GD_CORE_API ObjectMetadata {
+class GD_CORE_API ObjectMetadata : public InstructionOrExpressionContainerMetadata {
  public:
   /**
    * \brief Construct an object metadata, using a "blueprint" object that will
@@ -79,7 +81,7 @@ class GD_CORE_API ObjectMetadata {
                                         const gd::String& sentence_,
                                         const gd::String& group_,
                                         const gd::String& icon_,
-                                        const gd::String& smallicon_);
+                                        const gd::String& smallicon_) override;
 
   /**
    * \brief Declare a new action as being part of the extension.
@@ -92,7 +94,7 @@ class GD_CORE_API ObjectMetadata {
                                      const gd::String& sentence_,
                                      const gd::String& group_,
                                      const gd::String& icon_,
-                                     const gd::String& smallicon_);
+                                     const gd::String& smallicon_) override;
 
   /**
    * Declare a new condition as being part of the object.
@@ -103,7 +105,7 @@ class GD_CORE_API ObjectMetadata {
                                               const gd::String& sentence_,
                                               const gd::String& group_,
                                               const gd::String& icon_,
-                                              const gd::String& smallicon_);
+                                              const gd::String& smallicon_) override;
 
   /**
    * Declare a new action as being part of the object.
@@ -114,7 +116,7 @@ class GD_CORE_API ObjectMetadata {
                                            const gd::String& sentence_,
                                            const gd::String& group_,
                                            const gd::String& icon_,
-                                           const gd::String& smallicon_);
+                                           const gd::String& smallicon_) override;
 
   /**
    * \brief Declare a new expression as being part of the extension.
@@ -123,7 +125,7 @@ class GD_CORE_API ObjectMetadata {
                                         const gd::String& fullname_,
                                         const gd::String& description_,
                                         const gd::String& group_,
-                                        const gd::String& smallicon_);
+                                        const gd::String& smallicon_) override;
   /**
    * \brief Declare a new string expression as being part of the extension.
    */
@@ -131,7 +133,7 @@ class GD_CORE_API ObjectMetadata {
                                            const gd::String& fullname_,
                                            const gd::String& description_,
                                            const gd::String& group_,
-                                           const gd::String& smallicon_);
+                                           const gd::String& smallicon_) override;
 
   /**
    * \brief Declare a new expression and condition as being part of the
@@ -146,7 +148,7 @@ class GD_CORE_API ObjectMetadata {
       const gd::String& description,
       const gd::String& sentenceName,
       const gd::String& group,
-      const gd::String& icon);
+      const gd::String& icon) override;
 
   /**
    * \brief Declare a new expression, condition and action as being part of the
@@ -163,7 +165,7 @@ class GD_CORE_API ObjectMetadata {
       const gd::String& description,
       const gd::String& sentenceName,
       const gd::String& group,
-      const gd::String& icon);
+      const gd::String& icon) override;
 
   /**
    * \brief Create a new action which is the duplicate of the specified one.
@@ -172,7 +174,7 @@ class GD_CORE_API ObjectMetadata {
    * one.
    */
   gd::InstructionMetadata& AddDuplicatedAction(
-      const gd::String& newActionName, const gd::String& copiedActionName);
+      const gd::String& newActionName, const gd::String& copiedActionName) override;
 
   /**
    * \brief Create a new condition which is the duplicate of the specified one.
@@ -182,23 +184,23 @@ class GD_CORE_API ObjectMetadata {
    */
   gd::InstructionMetadata& AddDuplicatedCondition(
       const gd::String& newConditionName,
-      const gd::String& copiedConditionName);
+      const gd::String& copiedConditionName) override;
 
   /**
    * \brief Set the name shown to the user.
    */
-  ObjectMetadata& SetFullName(const gd::String& fullname_);
+  ObjectMetadata& SetFullName(const gd::String& fullname_) override;
 
   /**
    * \brief Set the description shown to the user.
    */
-  ObjectMetadata& SetDescription(const gd::String& description_);
+  ObjectMetadata& SetDescription(const gd::String& description_) override;
 
   /**
    * \brief Get the help path of the object, relative to the GDevelop
    * documentation root.
    */
-  const gd::String& GetHelpPath() const { return helpPath; }
+  const gd::String& GetHelpPath() const override { return helpPath; }
 
   /**
    * \brief Set the help path of the object, relative to the GDevelop
@@ -207,7 +209,7 @@ class GD_CORE_API ObjectMetadata {
    * The object instructions will have this help path set by
    * default, unless you call SetHelpPath on them.
    */
-  ObjectMetadata& SetHelpPath(const gd::String& path) {
+  ObjectMetadata& SetHelpPath(const gd::String& path) override {
     helpPath = path;
     return *this;
   }
@@ -248,12 +250,12 @@ class GD_CORE_API ObjectMetadata {
     return unsupportedBaseObjectCapabilities.find(capability) != unsupportedBaseObjectCapabilities.end();
   }
 
-  const gd::String& GetName() const { return name; }
-  const gd::String& GetFullName() const { return fullname; }
+  const gd::String& GetName() const override { return name; }
+  const gd::String& GetFullName() const override { return fullname; }
   const gd::String& GetCategoryFullName() const { return categoryFullName; }
   const gd::String& GetHelpUrl() const { return helpUrl; }
-  const gd::String& GetDescription() const { return description; }
-  const gd::String& GetIconFilename() const { return iconFilename; }
+  const gd::String& GetDescription() const override { return description; }
+  const gd::String& GetIconFilename() const override { return iconFilename; }
 
   /**
    * \brief Set the URL pointing to the help page about this object
@@ -267,33 +269,33 @@ class GD_CORE_API ObjectMetadata {
    * \note The requirement may vary depending on the platform: Most of the time,
    * the include file contains the declaration of the object.
    */
-  ObjectMetadata& SetIncludeFile(const gd::String& includeFile);
+  ObjectMetadata& SetIncludeFile(const gd::String& includeFile) override;
 
   /**
    * \brief Add a file to the already existing include files.
    */
-  ObjectMetadata& AddIncludeFile(const gd::String& includeFile);
+  ObjectMetadata& AddIncludeFile(const gd::String& includeFile) override;
 
   /**
    * \brief Return a reference to a map containing the names of the actions
    * (as keys) and the metadata associated with (as values).
    */
-  std::map<gd::String, gd::InstructionMetadata>& GetAllActions() { return actionsInfos; };
+  std::map<gd::String, gd::InstructionMetadata>& GetAllActions() override { return actionsInfos; };
 
   /**
    * \see gd::PlatformExtension::GetAllActions
    */
-  std::map<gd::String, gd::InstructionMetadata>& GetAllConditions() { return conditionsInfos; };
+  std::map<gd::String, gd::InstructionMetadata>& GetAllConditions() override { return conditionsInfos; };
 
   /**
    * \see gd::PlatformExtension::GetAllActions
    */
-  std::map<gd::String, gd::ExpressionMetadata>& GetAllExpressions() { return expressionsInfos; };
+  std::map<gd::String, gd::ExpressionMetadata>& GetAllExpressions() override { return expressionsInfos; };
 
   /**
    * \see gd::PlatformExtension::GetAllActions
    */
-  std::map<gd::String, gd::ExpressionMetadata>& GetAllStrExpressions() { return strExpressionsInfos; };
+  std::map<gd::String, gd::ExpressionMetadata>& GetAllStrExpressions() override { return strExpressionsInfos; };
 
   /**
    * \brief Set the object to be hidden in the IDE.
@@ -341,4 +343,3 @@ class GD_CORE_API ObjectMetadata {
 };
 
 }  // namespace gd
-#endif  // OBJECTMETADATA_H

Core/GDCore/Extensions/PlatformExtension.cpp

@@ -653,7 +653,7 @@ void PlatformExtension::StripUnimplementedInstructionsAndExpressions() {
            GetAllActions().begin();
        it != GetAllActions().end();) {
     if (it->second.codeExtraInformation.functionCallName.empty() &&
-        !it->second.codeExtraInformation.HasCustomCodeGenerator()) {
+        !it->second.HasCustomCodeGenerator()) {
       GetAllActions().erase(it++);
     } else
       ++it;
@@ -663,7 +663,7 @@ void PlatformExtension::StripUnimplementedInstructionsAndExpressions() {
            GetAllConditions().begin();
        it != GetAllConditions().end();) {
     if (it->second.codeExtraInformation.functionCallName.empty() &&
-        !it->second.codeExtraInformation.HasCustomCodeGenerator()) {
+        !it->second.HasCustomCodeGenerator()) {
       GetAllConditions().erase(it++);
     } else
       ++it;
@@ -673,7 +673,7 @@ void PlatformExtension::StripUnimplementedInstructionsAndExpressions() {
            GetAllExpressions().begin();
        it != GetAllExpressions().end();) {
     if (it->second.codeExtraInformation.functionCallName.empty() &&
-        !it->second.codeExtraInformation.HasCustomCodeGenerator()) {
+        !it->second.HasCustomCodeGenerator()) {
       GetAllExpressions().erase(it++);
     } else
       ++it;
@@ -683,7 +683,7 @@ void PlatformExtension::StripUnimplementedInstructionsAndExpressions() {
            GetAllStrExpressions().begin();
        it != GetAllStrExpressions().end();) {
     if (it->second.codeExtraInformation.functionCallName.empty() &&
-        !it->second.codeExtraInformation.HasCustomCodeGenerator()) {
+        !it->second.HasCustomCodeGenerator()) {
       GetAllStrExpressions().erase(it++);
     } else
       ++it;
@@ -699,7 +699,7 @@ void PlatformExtension::StripUnimplementedInstructionsAndExpressions() {
              obj.actionsInfos.begin();
          it != obj.actionsInfos.end();) {
       if (it->second.codeExtraInformation.functionCallName.empty() &&
-          !it->second.codeExtraInformation.HasCustomCodeGenerator()) {
+          !it->second.HasCustomCodeGenerator()) {
         obj.actionsInfos.erase(it++);
       } else
         ++it;
@@ -709,7 +709,7 @@ void PlatformExtension::StripUnimplementedInstructionsAndExpressions() {
              obj.conditionsInfos.begin();
          it != obj.conditionsInfos.end();) {
       if (it->second.codeExtraInformation.functionCallName.empty() &&
-          !it->second.codeExtraInformation.HasCustomCodeGenerator()) {
+          !it->second.HasCustomCodeGenerator()) {
         obj.conditionsInfos.erase(it++);
       } else
         ++it;
@@ -719,7 +719,7 @@ void PlatformExtension::StripUnimplementedInstructionsAndExpressions() {
              obj.expressionsInfos.begin();
          it != obj.expressionsInfos.end();) {
       if (it->second.codeExtraInformation.functionCallName.empty() &&
-          !it->second.codeExtraInformation.HasCustomCodeGenerator()) {
+          !it->second.HasCustomCodeGenerator()) {
         obj.expressionsInfos.erase(it++);
       } else
         ++it;
@@ -729,7 +729,7 @@ void PlatformExtension::StripUnimplementedInstructionsAndExpressions() {
              obj.strExpressionsInfos.begin();
          it != obj.strExpressionsInfos.end();) {
       if (it->second.codeExtraInformation.functionCallName.empty() &&
-          !it->second.codeExtraInformation.HasCustomCodeGenerator()) {
+          !it->second.HasCustomCodeGenerator()) {
         obj.strExpressionsInfos.erase(it++);
       } else
         ++it;
@@ -746,7 +746,7 @@ void PlatformExtension::StripUnimplementedInstructionsAndExpressions() {
              obj.actionsInfos.begin();
          it != obj.actionsInfos.end();) {
       if (it->second.codeExtraInformation.functionCallName.empty() &&
-          !it->second.codeExtraInformation.HasCustomCodeGenerator()) {
+          !it->second.HasCustomCodeGenerator()) {
         obj.actionsInfos.erase(it++);
       } else
         ++it;
@@ -756,7 +756,7 @@ void PlatformExtension::StripUnimplementedInstructionsAndExpressions() {
              obj.conditionsInfos.begin();
          it != obj.conditionsInfos.end();) {
       if (it->second.codeExtraInformation.functionCallName.empty() &&
-          !it->second.codeExtraInformation.HasCustomCodeGenerator()) {
+          !it->second.HasCustomCodeGenerator()) {
         obj.conditionsInfos.erase(it++);
       } else
         ++it;
@@ -766,7 +766,7 @@ void PlatformExtension::StripUnimplementedInstructionsAndExpressions() {
              obj.expressionsInfos.begin();
          it != obj.expressionsInfos.end();) {
       if (it->second.codeExtraInformation.functionCallName.empty() &&
-          !it->second.codeExtraInformation.HasCustomCodeGenerator()) {
+          !it->second.HasCustomCodeGenerator()) {
         obj.expressionsInfos.erase(it++);
       } else
         ++it;
@@ -776,7 +776,7 @@ void PlatformExtension::StripUnimplementedInstructionsAndExpressions() {
              obj.strExpressionsInfos.begin();
          it != obj.strExpressionsInfos.end();) {
       if (it->second.codeExtraInformation.functionCallName.empty() &&
-          !it->second.codeExtraInformation.HasCustomCodeGenerator()) {
+          !it->second.HasCustomCodeGenerator()) {
         obj.strExpressionsInfos.erase(it++);
       } else
         ++it;

Core/GDCore/Extensions/PlatformExtension.h

@@ -421,6 +421,32 @@ class GD_CORE_API PlatformExtension {
    */
   const gd::String& GetIconUrl() const { return iconUrl; }
 
+  /**
+   * \brief Return keywords that help search engines find this extension.
+   */
+  const std::vector<gd::String>& GetTags() const { return tags; }
+
+  /**
+   * \brief Set keywords that help search engines find this extension.
+   */
+  PlatformExtension& SetTags(const gd::String& csvTags) {
+    tags.clear();
+    tags = csvTags.Split(',');
+    for (size_t i = 0; i < tags.size(); i++)
+    {
+      tags[i] = tags[i].Trim().LowerCase();
+    }
+    return *this;
+  }
+
+  /**
+   * \brief Add a keyword that help search engines find this extension.
+   */
+  PlatformExtension& AddTag(const gd::String& tag) {
+    tags.push_back(tag);
+    return *this;
+  }
+
   /**
    * \brief Check if the extension is flagged as being deprecated.
    */
@@ -661,6 +687,7 @@ private:
   gd::String helpPath;  ///< The relative path to the help for this extension in
                         ///< the documentation.
   gd::String iconUrl;   ///< The URL to the icon to be shown for this extension.
+  std::vector<gd::String> tags;
 
   std::map<gd::String, gd::ObjectMetadata> objectsInfos;
   std::map<gd::String, gd::BehaviorMetadata> behaviorsInfo;

Core/GDCore/IDE/Events/EventsRefactorer.cpp

@@ -555,6 +555,22 @@ void EventsRefactorer::RemoveObjectInEvents(const gd::Platform& platform,
   }
 }
 
+gd::String ReplaceAllOccurrencesCaseInsensitive(gd::String context,
+                                                const gd::String& from,
+                                                const gd::String& to) {
+  size_t lookHere = 0;
+  size_t foundHere;
+  size_t fromSize = from.size();
+  size_t toSize = to.size();
+  while ((foundHere = context.FindCaseInsensitive(from, lookHere)) !=
+         gd::String::npos) {
+    context.replace(foundHere, fromSize, to);
+    lookHere = foundHere + toSize;
+  }
+
+  return context;
+}
+
 std::vector<EventsSearchResult> EventsRefactorer::ReplaceStringInEvents(
     gd::ObjectsContainer& project,
     gd::ObjectsContainer& layout,
@@ -570,6 +586,32 @@ std::vector<EventsSearchResult> EventsRefactorer::ReplaceStringInEvents(
 
   for (std::size_t i = 0; i < events.size(); ++i) {
     bool eventModified = false;
+
+    std::vector<gd::Expression*> allObjectExpressions =
+        events[i].GetAllObjectExpressions();
+    for (std::size_t j = 0; j < allObjectExpressions.size(); ++j) {
+      gd::String newExpressionPlainString =
+          matchCase ? allObjectExpressions[j]->GetPlainString().FindAndReplace(
+                          toReplace, newString, true)
+                    : ReplaceAllOccurrencesCaseInsensitive(
+                          allObjectExpressions[j]->GetPlainString(),
+                          toReplace,
+                          newString);
+
+      if (newExpressionPlainString !=
+          allObjectExpressions[j]->GetPlainString()) {
+        *allObjectExpressions[j] = gd::Expression(newExpressionPlainString);
+
+        if (!eventModified) {
+          modifiedEvents.push_back(EventsSearchResult(
+              std::weak_ptr<gd::BaseEvent>(events.GetEventSmartPtr(i)),
+              &events,
+              i));
+          eventModified = true;
+        }
+      }
+    }
+
     if (inConditions) {
       vector<gd::InstructionsList*> conditionsVectors =
           events[i].GetAllConditionsVectors();
@@ -642,22 +684,6 @@ std::vector<EventsSearchResult> EventsRefactorer::ReplaceStringInEvents(
   return modifiedEvents;
 }
 
-gd::String ReplaceAllOccurrencesCaseInsensitive(gd::String context,
-                                               gd::String from,
-                                               const gd::String& to) {
-  size_t lookHere = 0;
-  size_t foundHere;
-  size_t fromSize = from.size();
-  size_t toSize = to.size();
-  while ((foundHere = context.FindCaseInsensitive(from, lookHere)) !=
-         gd::String::npos) {
-    context.replace(foundHere, fromSize, to);
-    lookHere = foundHere + toSize;
-  }
-
-  return context;
-}
-
 bool EventsRefactorer::ReplaceStringInActions(gd::ObjectsContainer& project,
                                               gd::ObjectsContainer& layout,
                                               gd::InstructionsList& actions,
@@ -789,6 +815,24 @@ vector<EventsSearchResult> EventsRefactorer::SearchInEvents(
   for (std::size_t i = 0; i < events.size(); ++i) {
     bool eventAddedInResults = false;
 
+    std::vector<gd::Expression*> allObjectExpressions =
+        events[i].GetAllObjectExpressions();
+    for (std::size_t j = 0; j < allObjectExpressions.size(); ++j) {
+      size_t foundPosition =
+          matchCase
+              ? allObjectExpressions[j]->GetPlainString().find(search)
+              : allObjectExpressions[j]->GetPlainString().FindCaseInsensitive(
+                    search);
+
+      if (foundPosition != gd::String::npos && !eventAddedInResults) {
+        results.push_back(EventsSearchResult(
+            std::weak_ptr<gd::BaseEvent>(events.GetEventSmartPtr(i)),
+            &events,
+            i));
+        eventAddedInResults = true;
+      }
+    }
+
     if (inConditions) {
       vector<gd::InstructionsList*> conditionsVectors =
           events[i].GetAllConditionsVectors();
@@ -803,6 +847,7 @@ vector<EventsSearchResult> EventsRefactorer::SearchInEvents(
               std::weak_ptr<gd::BaseEvent>(events.GetEventSmartPtr(i)),
               &events,
               i));
+          eventAddedInResults = true;
         }
       }
     }
@@ -820,6 +865,7 @@ vector<EventsSearchResult> EventsRefactorer::SearchInEvents(
               std::weak_ptr<gd::BaseEvent>(events.GetEventSmartPtr(i)),
               &events,
               i));
+          eventAddedInResults = true;
         }
       }
     }

Core/GDCore/IDE/Events/ProjectElementRenamer.cpp

@@ -87,11 +87,22 @@ protected:
             std::unique_ptr<gd::ExpressionNode> &parameterNode,
             size_t parameterIndex, const gd::String &lastObjectName) {
           if (parameterMetadata.GetType() == "layer") {
-            // Remove quotes, it won't match if it's not a literal anyway.
-            lastLayerName = expressionPlainString.substr(
-                parameterNode->location.GetStartPosition() + 1,
-                parameterNode->location.GetEndPosition() -
-                    parameterNode->location.GetStartPosition() - 2);
+            if (parameterNode->location.GetEndPosition() -
+                    parameterNode->location.GetStartPosition() <
+                2) {
+              // This is either the base layer or an invalid layer name.
+              // Keep it as is.
+              lastLayerName = expressionPlainString.substr(
+                  parameterNode->location.GetStartPosition(),
+                  parameterNode->location.GetEndPosition() -
+                      parameterNode->location.GetStartPosition());
+            } else {
+              // Remove quotes, so it can be compared to the layer name.
+              lastLayerName = expressionPlainString.substr(
+                  parameterNode->location.GetStartPosition() + 1,
+                  parameterNode->location.GetEndPosition() -
+                      parameterNode->location.GetStartPosition() - 2);
+            }
           }
           if (parameterMetadata.GetType() == parameterType) {
             auto parameterExpressionPlainString = expressionPlainString.substr(
@@ -143,9 +154,15 @@ bool ProjectElementRenamer::DoVisitInstruction(gd::Instruction &instruction,
           const gd::Expression &parameterValue, size_t parameterIndex,
           const gd::String &lastObjectName) {
         if (parameterMetadata.GetType() == "layer") {
-          // Remove quotes, it won't match if it's not a literal anyway.
-          lastLayerName = parameterValue.GetPlainString().substr(
-              1, parameterValue.GetPlainString().length() - 2);
+          if (parameterValue.GetPlainString().length() < 2) {
+            // This is either the base layer or an invalid layer name.
+            // Keep it as is.
+            lastLayerName = parameterValue.GetPlainString();
+          } else {
+            // Remove quotes, so it can be compared to the layer name.
+            lastLayerName = parameterValue.GetPlainString().substr(
+                1, parameterValue.GetPlainString().length() - 2);
+          }
         }
 
         if (parameterMetadata.GetType() == parameterType &&
@@ -165,7 +182,6 @@ bool ProjectElementRenamer::DoVisitInstruction(gd::Instruction &instruction,
           node->Visit(finder);
 
           if (finder.GetOccurrences().size() > 0) {
-
             gd::String newNameWithQuotes = "\"" + newName + "\"";
             gd::String oldParameterValue = parameterValue.GetPlainString();
             gd::String newParameterValue;

Core/GDCore/IDE/Project/ArbitraryResourceWorker.cpp

@@ -17,9 +17,11 @@
 #include "GDCore/Extensions/Metadata/ParameterMetadataTools.h"
 #include "GDCore/Extensions/Platform.h"
 #include "GDCore/Extensions/PlatformExtension.h"
-#include "GDCore/IDE/Events/ArbitraryEventsWorker.h"
 #include "GDCore/Project/Project.h"
 #include "GDCore/Project/ResourcesManager.h"
+#include "GDCore/Project/Effect.h"
+#include "GDCore/Tools/Log.h"
+#include "GDCore/IDE/ResourceExposer.h"
 
 using namespace std;
 
@@ -131,29 +133,9 @@ void ArbitraryResourceWorker::ExposeEmbeddeds(gd::String& resourceName) {
           std::cout << targetResourceName << std::endl;
           gd::Resource& targetResource =
               resourcesManager->GetResource(targetResourceName);
-          const gd::String& targetResourceKind = targetResource.GetKind();
 
           gd::String potentiallyUpdatedTargetResourceName = targetResourceName;
-
-          if (targetResourceKind == "audio") {
-            ExposeAudio(potentiallyUpdatedTargetResourceName);
-          } else if (targetResourceKind == "bitmapFont") {
-            ExposeBitmapFont(potentiallyUpdatedTargetResourceName);
-          } else if (targetResourceKind == "font") {
-            ExposeFont(potentiallyUpdatedTargetResourceName);
-          } else if (targetResourceKind == "image") {
-            ExposeImage(potentiallyUpdatedTargetResourceName);
-          } else if (targetResourceKind == "json") {
-            ExposeJson(potentiallyUpdatedTargetResourceName);
-          } else if (targetResourceKind == "tilemap") {
-            ExposeTilemap(potentiallyUpdatedTargetResourceName);
-          } else if (targetResourceKind == "tileset") {
-            ExposeTileset(potentiallyUpdatedTargetResourceName);
-          } else if (targetResourceKind == "video") {
-            ExposeVideo(potentiallyUpdatedTargetResourceName);
-          } else if (targetResourceKind == "model3D") {
-            ExposeModel3D(potentiallyUpdatedTargetResourceName);
-          }
+          ExposeResourceWithType(targetResource.GetKind(), potentiallyUpdatedTargetResourceName);
 
           if (potentiallyUpdatedTargetResourceName != targetResourceName) {
             // The resource name was renamed. Also update the mapping.
@@ -170,6 +152,48 @@ void ArbitraryResourceWorker::ExposeEmbeddeds(gd::String& resourceName) {
   }
 }
 
+void ArbitraryResourceWorker::ExposeResourceWithType(
+    const gd::String &resourceType, gd::String &resourceName) {
+  if (resourceType == "image") {
+    ExposeImage(resourceName);
+    return;
+  }
+  if (resourceType == "model3D") {
+    ExposeModel3D(resourceName);
+    return;
+  }
+  if (resourceType == "audio") {
+    ExposeAudio(resourceName);
+    return;
+  }
+  if (resourceType == "font") {
+    ExposeFont(resourceName);
+    return;
+  }
+  if (resourceType == "bitmapFont") {
+    ExposeBitmapFont(resourceName);
+    return;
+  }
+  if (resourceType == "tilemap") {
+    ExposeTilemap(resourceName);
+    return;
+  }
+  if (resourceType == "tileset") {
+    ExposeTileset(resourceName);
+    return;
+  }
+  if (resourceType == "json") {
+    ExposeJson(resourceName);
+    return;
+  }
+  if (resourceType == "video") {
+    ExposeVideo(resourceName);
+    return;
+  }
+  gd::LogError("Unexpected resource type: " + resourceType + " for: " + resourceName);
+  return;
+}
+
 void ArbitraryResourceWorker::ExposeResource(gd::Resource& resource) {
   if (!resource.UseFile()) return;
 
@@ -180,86 +204,98 @@ void ArbitraryResourceWorker::ExposeResource(gd::Resource& resource) {
 
 ArbitraryResourceWorker::~ArbitraryResourceWorker() {}
 
-/**
- * Launch the specified resource worker on every resource referenced in the
- * events.
- */
-class ResourceWorkerInEventsWorker : public ArbitraryEventsWorker {
- public:
-  ResourceWorkerInEventsWorker(const gd::Project& project_,
-                               gd::ArbitraryResourceWorker& worker_)
-      : project(project_), worker(worker_){};
-  virtual ~ResourceWorkerInEventsWorker(){};
+bool ResourceWorkerInEventsWorker::DoVisitInstruction(gd::Instruction& instruction, bool isCondition) {
+  const auto& platform = project.GetCurrentPlatform();
+  const auto& metadata = isCondition
+                              ? gd::MetadataProvider::GetConditionMetadata(
+                                    platform, instruction.GetType())
+                              : gd::MetadataProvider::GetActionMetadata(
+                                    platform, instruction.GetType());
 
- private:
-  bool DoVisitInstruction(gd::Instruction& instruction, bool isCondition) {
-    const auto& platform = project.GetCurrentPlatform();
-    const auto& metadata = isCondition
-                               ? gd::MetadataProvider::GetConditionMetadata(
-                                     platform, instruction.GetType())
-                               : gd::MetadataProvider::GetActionMetadata(
-                                     platform, instruction.GetType());
+  gd::ParameterMetadataTools::IterateOverParametersWithIndex(
+      instruction.GetParameters(),
+      metadata.GetParameters(),
+      [this, &instruction](const gd::ParameterMetadata& parameterMetadata,
+                            const gd::Expression& parameterExpression,
+                            size_t parameterIndex,
+                            const gd::String& lastObjectName) {
+        const String& parameterValue = parameterExpression.GetPlainString();
+        if (parameterMetadata.GetType() ==
+                "police" ||  // Should be renamed fontResource
+            parameterMetadata.GetType() == "fontResource") {
+          gd::String updatedParameterValue = parameterValue;
+          worker.ExposeFont(updatedParameterValue);
+          instruction.SetParameter(parameterIndex, updatedParameterValue);
+        } else if (parameterMetadata.GetType() == "soundfile" ||
+                    parameterMetadata.GetType() ==
+                        "musicfile") {  // Should be renamed audioResource
+          gd::String updatedParameterValue = parameterValue;
+          worker.ExposeAudio(updatedParameterValue);
+          instruction.SetParameter(parameterIndex, updatedParameterValue);
+        } else if (parameterMetadata.GetType() == "bitmapFontResource") {
+          gd::String updatedParameterValue = parameterValue;
+          worker.ExposeBitmapFont(updatedParameterValue);
+          instruction.SetParameter(parameterIndex, updatedParameterValue);
+        } else if (parameterMetadata.GetType() == "imageResource") {
+          gd::String updatedParameterValue = parameterValue;
+          worker.ExposeImage(updatedParameterValue);
+          instruction.SetParameter(parameterIndex, updatedParameterValue);
+        } else if (parameterMetadata.GetType() == "jsonResource") {
+          gd::String updatedParameterValue = parameterValue;
+          worker.ExposeJson(updatedParameterValue);
+          instruction.SetParameter(parameterIndex, updatedParameterValue);
+        } else if (parameterMetadata.GetType() == "tilemapResource") {
+          gd::String updatedParameterValue = parameterValue;
+          worker.ExposeTilemap(updatedParameterValue);
+          instruction.SetParameter(parameterIndex, updatedParameterValue);
+        } else if (parameterMetadata.GetType() == "tilesetResource") {
+          gd::String updatedParameterValue = parameterValue;
+          worker.ExposeTileset(updatedParameterValue);
+          instruction.SetParameter(parameterIndex, updatedParameterValue);
+        } else if (parameterMetadata.GetType() == "model3DResource") {
+          gd::String updatedParameterValue = parameterValue;
+          worker.ExposeModel3D(updatedParameterValue);
+          instruction.SetParameter(parameterIndex, updatedParameterValue);
+        }
+      });
 
-    gd::ParameterMetadataTools::IterateOverParametersWithIndex(
-        instruction.GetParameters(),
-        metadata.GetParameters(),
-        [this, &instruction](const gd::ParameterMetadata& parameterMetadata,
-                             const gd::Expression& parameterExpression,
-                             size_t parameterIndex,
-                             const gd::String& lastObjectName) {
-          const String& parameterValue = parameterExpression.GetPlainString();
-          if (parameterMetadata.GetType() ==
-                  "police" ||  // Should be renamed fontResource
-              parameterMetadata.GetType() == "fontResource") {
-            gd::String updatedParameterValue = parameterValue;
-            worker.ExposeFont(updatedParameterValue);
-            instruction.SetParameter(parameterIndex, updatedParameterValue);
-          } else if (parameterMetadata.GetType() == "soundfile" ||
-                     parameterMetadata.GetType() ==
-                         "musicfile") {  // Should be renamed audioResource
-            gd::String updatedParameterValue = parameterValue;
-            worker.ExposeAudio(updatedParameterValue);
-            instruction.SetParameter(parameterIndex, updatedParameterValue);
-          } else if (parameterMetadata.GetType() == "bitmapFontResource") {
-            gd::String updatedParameterValue = parameterValue;
-            worker.ExposeBitmapFont(updatedParameterValue);
-            instruction.SetParameter(parameterIndex, updatedParameterValue);
-          } else if (parameterMetadata.GetType() == "imageResource") {
-            gd::String updatedParameterValue = parameterValue;
-            worker.ExposeImage(updatedParameterValue);
-            instruction.SetParameter(parameterIndex, updatedParameterValue);
-          } else if (parameterMetadata.GetType() == "jsonResource") {
-            gd::String updatedParameterValue = parameterValue;
-            worker.ExposeJson(updatedParameterValue);
-            instruction.SetParameter(parameterIndex, updatedParameterValue);
-          } else if (parameterMetadata.GetType() == "tilemapResource") {
-            gd::String updatedParameterValue = parameterValue;
-            worker.ExposeTilemap(updatedParameterValue);
-            instruction.SetParameter(parameterIndex, updatedParameterValue);
-          } else if (parameterMetadata.GetType() == "tilesetResource") {
-            gd::String updatedParameterValue = parameterValue;
-            worker.ExposeTileset(updatedParameterValue);
-            instruction.SetParameter(parameterIndex, updatedParameterValue);
-          } else if (parameterMetadata.GetType() == "model3DResource") {
-            gd::String updatedParameterValue = parameterValue;
-            worker.ExposeModel3D(updatedParameterValue);
-            instruction.SetParameter(parameterIndex, updatedParameterValue);
-          }
-        });
-
-    return false;
-  };
-
-  const gd::Project& project;
-  gd::ArbitraryResourceWorker& worker;
+  return false;
 };
 
 void LaunchResourceWorkerOnEvents(const gd::Project& project,
                                   gd::EventsList& events,
                                   gd::ArbitraryResourceWorker& worker) {
-  ResourceWorkerInEventsWorker eventsWorker(project, worker);
+  gd::ResourceWorkerInEventsWorker eventsWorker(project, worker);
   eventsWorker.Launch(events);
 }
 
+gd::ResourceWorkerInEventsWorker
+GetResourceWorkerOnEvents(const gd::Project &project,
+                          gd::ArbitraryResourceWorker &worker) {
+  gd::ResourceWorkerInEventsWorker eventsWorker(project, worker);
+  return eventsWorker;
+}
+
+void ResourceWorkerInObjectsWorker::DoVisitObject(gd::Object &object) {
+  object.GetConfiguration().ExposeResources(worker);
+  auto& effects = object.GetEffects();
+  for (size_t effectIndex = 0; effectIndex < effects.GetEffectsCount(); effectIndex++)
+  {
+    auto& effect = effects.GetEffect(effectIndex);
+    gd::ResourceExposer::ExposeEffectResources(project.GetCurrentPlatform(), effect, worker);
+  }
+};
+
+void ResourceWorkerInObjectsWorker::DoVisitBehavior(gd::Behavior &behavior){
+    // TODO Allow behaviors to expose resources
+};
+
+gd::ResourceWorkerInObjectsWorker
+GetResourceWorkerOnObjects(const gd::Project &project,
+                           gd::ArbitraryResourceWorker &worker) {
+  gd::ResourceWorkerInObjectsWorker eventsWorker(project, worker);
+  return eventsWorker;
+}
+
 }  // namespace gd
 #endif

Core/GDCore/IDE/Project/ArbitraryResourceWorker.h

@@ -4,13 +4,14 @@
  * reserved. This project is released under the MIT License.
  */
 
-#ifndef ARBITRARYRESOURCEWORKER_H
-#define ARBITRARYRESOURCEWORKER_H
+#pragma once
 
 #include <map>
 #include <memory>
 #include <vector>
 #include "GDCore/String.h"
+#include "GDCore/IDE/Events/ArbitraryEventsWorker.h"
+#include "GDCore/IDE/Project/ArbitraryObjectsWorker.h"
 namespace gd {
 class BaseEvent;
 }
@@ -53,6 +54,11 @@ class GD_CORE_API ArbitraryResourceWorker {
    */
   void ExposeResources(gd::ResourcesManager *resourcesManager);
 
+  /**
+   * \brief Expose a resource from a given type.
+   */
+  void ExposeResourceWithType(const gd::String& resourceType, gd::String& resourceName);
+
   /**
    * \brief Expose an image, which is always a reference to a "image" resource.
    */
@@ -132,18 +138,47 @@ class GD_CORE_API ArbitraryResourceWorker {
 };
 
 /**
- * Tool function iterating over each event and calling
- * Expose(Actions/Conditions)Resources for each actions and conditions with the
- * ArbitraryResourceWorker passed as argument.
- *
- * \see gd::ArbitraryResourceWorker
- * \ingroup IDE
+ * Launch the specified resource worker on every resource referenced in the
+ * events.
  */
-void GD_CORE_API
-LaunchResourceWorkerOnEvents(const gd::Project &project,
-                             gd::EventsList &events,
-                             gd::ArbitraryResourceWorker &worker);
+class ResourceWorkerInEventsWorker : public gd::ArbitraryEventsWorker {
+public:
+  ResourceWorkerInEventsWorker(const gd::Project &project_,
+                               gd::ArbitraryResourceWorker &worker_)
+      : project(project_), worker(worker_){};
+  virtual ~ResourceWorkerInEventsWorker(){};
+
+private:
+  bool DoVisitInstruction(gd::Instruction &instruction,
+                          bool isCondition) override;
+
+  const gd::Project &project;
+  gd::ArbitraryResourceWorker &worker;
+};
+
+ResourceWorkerInEventsWorker GD_CORE_API GetResourceWorkerOnEvents(
+    const gd::Project &project, gd::ArbitraryResourceWorker &worker);
+
+/**
+ * Launch the specified resource worker on every resource referenced in the
+ * objects.
+ */
+class GD_CORE_API ResourceWorkerInObjectsWorker
+    : public gd::ArbitraryObjectsWorker {
+public:
+  ResourceWorkerInObjectsWorker(const gd::Project &project_, gd::ArbitraryResourceWorker &worker_)
+      : project(project_), worker(worker_){};
+  ~ResourceWorkerInObjectsWorker() {}
+
+private:
+  void DoVisitObject(gd::Object &object) override;
+  void DoVisitBehavior(gd::Behavior &behavior) override;
+
+  const gd::Project &project;
+  gd::ArbitraryResourceWorker &worker;
+};
+
+gd::ResourceWorkerInObjectsWorker GD_CORE_API
+GetResourceWorkerOnObjects(const gd::Project &project, gd::ArbitraryResourceWorker &worker);
 
 }  // namespace gd
-
-#endif  // ARBITRARYRESOURCEWORKER_H

Core/GDCore/IDE/Project/ProjectResourcesAdder.cpp

@@ -9,6 +9,7 @@
 #include "GDCore/Project/Project.h"
 #include "GDCore/Tools/Localization.h"
 #include "GDCore/Tools/Log.h"
+#include "GDCore/IDE/ResourceExposer.h"
 
 using namespace std;
 
@@ -19,7 +20,7 @@ std::vector<gd::String> ProjectResourcesAdder::GetAllUseless(
   std::vector<gd::String> unusedResources;
   // Search for resources used in the project
   gd::ResourcesInUseHelper resourcesInUse;
-  project.ExposeResources(resourcesInUse);
+  gd::ResourceExposer::ExposeWholeProjectResources(project, resourcesInUse);
   std::set<gd::String>& usedResources = resourcesInUse.GetAll(resourceType);
 
   // Search all resources not used

Core/GDCore/IDE/Project/ProjectResourcesCopier.cpp

@@ -12,6 +12,7 @@
 #include "GDCore/Project/Project.h"
 #include "GDCore/Tools/Localization.h"
 #include "GDCore/Tools/Log.h"
+#include "GDCore/IDE/ResourceExposer.h"
 
 using namespace std;
 
@@ -26,7 +27,7 @@ bool ProjectResourcesCopier::CopyAllResourcesTo(
     bool preserveDirectoryStructure) {
   // Check if there are some resources with absolute filenames
   gd::ResourcesAbsolutePathChecker absolutePathChecker(fs);
-  originalProject.ExposeResources(absolutePathChecker);
+  gd::ResourceExposer::ExposeWholeProjectResources(originalProject, absolutePathChecker);
 
   auto projectDirectory = fs.DirNameFrom(originalProject.GetProjectFile());
   std::cout << "Copying all resources from " << projectDirectory << " to "
@@ -41,10 +42,10 @@ bool ProjectResourcesCopier::CopyAllResourcesTo(
       preserveAbsoluteFilenames);
 
   if (updateOriginalProject) {
-    originalProject.ExposeResources(resourcesMergingHelper);
+    gd::ResourceExposer::ExposeWholeProjectResources(originalProject, resourcesMergingHelper);
   } else {
     std::shared_ptr<gd::Project> project(new gd::Project(originalProject));
-    project->ExposeResources(resourcesMergingHelper);
+    gd::ResourceExposer::ExposeWholeProjectResources(*project, resourcesMergingHelper);
   }
 
   // Copy resources

Core/GDCore/IDE/Project/ResourcesInUseHelper.h

@@ -13,6 +13,7 @@
 
 #include "GDCore/IDE/Project/ArbitraryResourceWorker.h"
 #include "GDCore/String.h"
+#include "GDCore/IDE/ResourceExposer.h"
 
 namespace gd {
 
@@ -23,7 +24,7 @@ namespace gd {
  * Usage example:
 \code
 gd::ResourcesInUseHelper resourcesInUse;
-project.ExposeResources(resourcesInUse);
+gd::ResourceExposer::ExposeWholeProjectResources(project, resourcesInUse);
 
 //Get a set with the name of all images in the project:
 std::set<gd::String> & usedImages = resourcesInUse.GetAllImages();

Core/GDCore/IDE/ProjectBrowserHelper.cpp

@@ -197,7 +197,7 @@ void ProjectBrowserHelper::ExposeProjectObjects(
   // Global objects
   worker.Launch(project);
 
-  // Layers objects
+  // Layout objects
   for (size_t i = 0; i < project.GetLayoutsCount(); i++) {
     worker.Launch(project.GetLayout(i));
   }

Core/GDCore/IDE/ResourceExposer.cpp

@@ -0,0 +1,101 @@
+/*
+ * GDevelop Core
+ * Copyright 2008-2016 Florian Rival (Florian.Rival@gmail.com). All rights
+ * reserved. This project is released under the MIT License.
+ */
+#include "ResourceExposer.h"
+
+#include "GDCore/IDE/Events/ArbitraryEventsWorker.h"
+#include "GDCore/IDE/EventsFunctionTools.h"
+#include "GDCore/IDE/Project/ArbitraryBehaviorSharedDataWorker.h"
+#include "GDCore/IDE/Project/ArbitraryEventBasedBehaviorsWorker.h"
+#include "GDCore/IDE/Project/ArbitraryEventsFunctionsWorker.h"
+#include "GDCore/IDE/Project/ArbitraryObjectsWorker.h"
+#include "GDCore/IDE/Project/ArbitraryResourceWorker.h"
+#include "GDCore/IDE/ProjectBrowserHelper.h"
+#include "GDCore/Project/EventsBasedBehavior.h"
+#include "GDCore/Project/EventsBasedObject.h"
+#include "GDCore/Project/EventsFunctionsExtension.h"
+#include "GDCore/Project/ExternalEvents.h"
+#include "GDCore/Project/Layout.h"
+#include "GDCore/Project/Project.h"
+#include "GDCore/Project/Effect.h"
+#include "GDCore/String.h"
+#include "GDCore/Extensions/Platform.h"
+#include "GDCore/Extensions/Metadata/MetadataProvider.h"
+#include "GDCore/Extensions/Metadata/EffectMetadata.h"
+
+namespace gd {
+
+void ResourceExposer::ExposeWholeProjectResources(gd::Project& project, gd::ArbitraryResourceWorker& worker) {
+  // See also gd::ProjectBrowserHelper::ExposeProjectEvents for a method that
+  // traverse the whole project (this time for events) and ExposeProjectEffects
+  // (this time for effects).
+
+  gd::ResourcesManager* resourcesManager = &(project.GetResourcesManager());
+
+  // Expose any project resources as files.
+  worker.ExposeResources(resourcesManager);
+  project.GetPlatformSpecificAssets().ExposeResources(worker);
+
+  // Expose event resources
+  auto eventWorker = gd::GetResourceWorkerOnEvents(project, worker);
+  gd::ProjectBrowserHelper::ExposeProjectEvents(
+    project, eventWorker);
+
+  // Expose object configuration resources
+  auto objectWorker = gd::GetResourceWorkerOnObjects(project, worker);
+  gd::ProjectBrowserHelper::ExposeProjectObjects(
+    project, objectWorker);
+
+  // Expose layer effect resources
+  for (std::size_t layoutIndex = 0; layoutIndex < project.GetLayoutsCount();
+       layoutIndex++) {
+    auto &layout = project.GetLayout(layoutIndex);
+
+    for (std::size_t layerIndex = 0; layerIndex < layout.GetLayersCount();
+         layerIndex++) {
+      auto &layer = layout.GetLayer(layerIndex);
+
+      auto &effects = layer.GetEffects();
+      for (size_t effectIndex = 0; effectIndex < effects.GetEffectsCount();
+           effectIndex++) {
+        auto &effect = effects.GetEffect(effectIndex);
+        gd::ResourceExposer::ExposeEffectResources(project.GetCurrentPlatform(),
+                                                   effect, worker);
+      }
+    }
+  }
+
+  // Expose loading screen background image if present
+  auto& loadingScreen = project.GetLoadingScreen();
+  if (loadingScreen.GetBackgroundImageResourceName() != "")
+    worker.ExposeImage(loadingScreen.GetBackgroundImageResourceName());
+}
+
+void ResourceExposer::ExposeEffectResources(
+    gd::Platform &platform, gd::Effect &effect,
+    gd::ArbitraryResourceWorker &worker) {
+  auto &effectMetadata =
+      MetadataProvider::GetEffectMetadata(platform, effect.GetEffectType());
+
+  for (auto &propertyPair : effectMetadata.GetProperties()) {
+    auto &propertyName = propertyPair.first;
+    auto &propertyDescriptor = propertyPair.second;
+
+    if (propertyDescriptor.GetType() == "resource" &&
+        propertyDescriptor.GetExtraInfo().size() > 0) {
+      auto &resourceType = propertyDescriptor.GetExtraInfo()[0];
+
+      const gd::String &resourceName = effect.GetStringParameter(propertyName);
+      gd::String potentiallyUpdatedResourceName = resourceName;
+      worker.ExposeResourceWithType(resourceType,
+                                    potentiallyUpdatedResourceName);
+      if (potentiallyUpdatedResourceName != resourceName) {
+        effect.SetStringParameter(propertyName, potentiallyUpdatedResourceName);
+      }
+    }
+  }
+}
+
+} // namespace gd

Core/GDCore/IDE/ResourceExposer.h

@@ -0,0 +1,38 @@
+/*
+ * GDevelop Core
+ * Copyright 2008-2016 Florian Rival (Florian.Rival@gmail.com). All rights
+ * reserved. This project is released under the MIT License.
+ */
+#pragma once
+
+namespace gd {
+class Platform;
+class Project;
+class ArbitraryResourceWorker;
+class Effect;
+} // namespace gd
+
+namespace gd {
+
+/**
+ * \brief
+ */
+class GD_CORE_API ResourceExposer {
+public:
+  /**
+   * \brief Called ( e.g. during compilation ) so as to inventory internal
+   * resources, sometimes update their filename or any other work or resources.
+   *
+   * See WholeProjectRefactorer for the same thing for events.
+   *
+   * \see WholeProjectRefactorer
+   * \see ArbitraryResourceWorker
+   */
+  static void ExposeWholeProjectResources(gd::Project &project,
+                                          gd::ArbitraryResourceWorker &worker);
+
+  static void ExposeEffectResources(gd::Platform &platform, gd::Effect &effect,
+                                    gd::ArbitraryResourceWorker &worker);
+};
+
+} // namespace gd

Core/GDCore/IDE/WholeProjectRefactorer.h

@@ -456,6 +456,26 @@ class GD_CORE_API WholeProjectRefactorer {
       const gd::EventsFunctionsExtension& eventsFunctionsExtension,
       const gd::EventsBasedObject& eventsBasedObject);
 
+  /**
+   * \brief Remove all the instances from one layer.
+   */
+  static void RemoveLayer(gd::Project &project, gd::Layout &layout,
+                          const gd::String &layerName);
+
+  /**
+   * \brief Move all the instances from one layer into another.
+   */
+  static void MergeLayers(gd::Project &project, gd::Layout &layout,
+                          const gd::String &originLayerName,
+                          const gd::String &targetLayerName);
+
+  /**
+   * \brief Return the number of instances on the layer named \a layerName and
+   * all its associated layouts.
+   */
+  static size_t GetLayoutAndExternalLayoutLayerInstancesCount(
+      gd::Project &project, gd::Layout &layout, const gd::String &layerName);
+
   virtual ~WholeProjectRefactorer(){};
 
  private:

Core/GDCore/Project/EventsBasedBehavior.h

@@ -77,7 +77,7 @@ class GD_CORE_API EventsBasedBehavior: public AbstractEventsBasedEntity {
    * \brief Check if the behavior is private - it can't be used outside of its
    * extension.
    */
-  bool IsPrivate() { return isPrivate; }
+  bool IsPrivate() const { return isPrivate; }
 
   /**
    * \brief Set that the behavior is private - it can't be used outside of its

Core/GDCore/Project/EventsFunction.h

@@ -201,7 +201,7 @@ class GD_CORE_API EventsFunction {
   /**
    * \brief Returns true if the function is private.
    */
-  bool IsPrivate() { return isPrivate; }
+  bool IsPrivate() const { return isPrivate; }
 
   /**
    * \brief Sets the privateness of the function.

Core/GDCore/Project/EventsFunctionsExtension.h

@@ -207,6 +207,13 @@ class GD_CORE_API EventsFunctionsExtension : public EventsFunctionsContainer {
     return dependencies;
   };
 
+  /**
+   * \brief Returns the list of dependencies.
+   */
+  const std::vector<gd::DependencyMetadata>& GetAllDependencies() const {
+    return dependencies;
+  };
+
   ///@}
 
   /** \name Serialization

Core/GDCore/Project/InitialInstancesContainer.cpp

@@ -134,8 +134,19 @@ void InitialInstancesContainer::MoveInstancesToLayer(
   }
 }
 
+std::size_t InitialInstancesContainer::GetLayerInstancesCount(
+    const gd::String &layerName) const {
+  std::size_t count = 0;
+  for (const gd::InitialInstance &instance : initialInstances) {
+    if (instance.GetLayer() == layerName) {
+      count++;
+    }
+  }
+  return count;
+}
+
 bool InitialInstancesContainer::SomeInstancesAreOnLayer(
-    const gd::String& layerName) {
+    const gd::String& layerName) const {
   return std::any_of(initialInstances.begin(),
                      initialInstances.end(),
                      [&layerName](const InitialInstance& currentInstance) {
@@ -144,7 +155,7 @@ bool InitialInstancesContainer::SomeInstancesAreOnLayer(
 }
 
 bool InitialInstancesContainer::HasInstancesOfObject(
-    const gd::String& objectName) {
+    const gd::String& objectName) const {
   return std::any_of(initialInstances.begin(),
                      initialInstances.end(),
                      [&objectName](const InitialInstance& currentInstance) {

Core/GDCore/Project/InitialInstancesContainer.h

@@ -4,8 +4,8 @@
  * reserved. This project is released under the MIT License.
  */
 
-#ifndef GDCORE_INITIALINSTANCESCONTAINER_H
-#define GDCORE_INITIALINSTANCESCONTAINER_H
+#pragma once
+
 #include <list>
 #include "GDCore/Project/InitialInstance.h"
 #include "GDCore/String.h"
@@ -54,7 +54,6 @@ class GD_CORE_API InitialInstancesContainer {
     return new InitialInstancesContainer(*this);
   };
 
-#if defined(GD_IDE_ONLY)
   /**
    * Must construct the class from the source
    * A such method is needed as the IDE may want to store copies of some
@@ -71,7 +70,6 @@ class GD_CORE_API InitialInstancesContainer {
    * from an object which is not a MyContainer"; } \endcode
    */
   void Create(const InitialInstancesContainer &source);
-#endif
 
   /** \name Instances management
    * Members functions related to managing the instances
@@ -100,7 +98,6 @@ class GD_CORE_API InitialInstancesContainer {
   void IterateOverInstancesWithZOrdering(InitialInstanceFunctor &func,
                                          const gd::String &layer);
 
-#if defined(GD_IDE_ONLY)
   /**
    * \brief Insert the specified \a instance into the list and return a
    * a reference to the newly added instance.
@@ -140,22 +137,27 @@ class GD_CORE_API InitialInstancesContainer {
   void RenameInstancesOfObject(const gd::String &oldName,
                                const gd::String &newName);
 
+  /**
+   * \brief Return the number of instances on the layer named \a layerName.
+   */
+  std::size_t GetLayerInstancesCount(const gd::String &layerName) const;
+
   /**
    * \brief Return true if there is at least one instance on the layer named \a
    * layerName.
    */
-  bool SomeInstancesAreOnLayer(const gd::String &layerName);
+  bool SomeInstancesAreOnLayer(const gd::String &layerName) const;
 
   /**
    * \brief Return true if there is at least one instance of the given object.
    */
-  bool HasInstancesOfObject(const gd::String &objectName);
+  bool HasInstancesOfObject(const gd::String &objectName) const;
 
   /**
    * \brief Remove all instances
    */
   void Clear();
-#endif
+
   ///@}
 
   /** \name Saving and loading
@@ -163,12 +165,10 @@ class GD_CORE_API InitialInstancesContainer {
    */
   ///@{
 
-#if defined(GD_IDE_ONLY)
   /**
    * \brief Serialize instances container.
    */
   virtual void SerializeTo(SerializerElement &element) const;
-#endif
 
   /**
    * \brief Unserialize the instances container.
@@ -265,5 +265,3 @@ class GD_CORE_API HighestZOrderFinder : public gd::InitialInstanceFunctor {
 };
 
 }  // namespace gd
-
-#endif  // GDCORE_INITIALINSTANCESCONTAINER_H

Core/GDCore/Project/Layout.cpp

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

Core/GDCore/Project/Layout.h

@@ -450,6 +450,14 @@ bool GD_CORE_API HasBehaviorInObjectOrGroup(const gd::ObjectsContainer &project,
                                             const gd::String &objectOrGroupName,
                                             const gd::String &behaviorName,
                                             bool searchInGroups = true);
+/**
+ * \brief Get the type of a behavior if an object or some object of a group has it.
+ */
+gd::String GD_CORE_API GetTypeOfBehaviorInObjectOrGroup(const gd::ObjectsContainer &project,
+                                            const gd::ObjectsContainer &layout,
+                                            const gd::String &objectOrGroupName,
+                                            const gd::String &behaviorName,
+                                            bool searchInGroups = true);
 /**
  * \brief Get a type from a behavior name
  * @return Type of the behavior.

Core/GDCore/Project/Project.cpp

@@ -15,13 +15,12 @@
 #include <vector>
 
 #include "GDCore/CommonTools.h"
+#include "GDCore/Events/Parsers/GrammarTerminals.h"
 #include "GDCore/Extensions/Metadata/ExpressionMetadata.h"
 #include "GDCore/Extensions/Metadata/MetadataProvider.h"
 #include "GDCore/Extensions/Platform.h"
 #include "GDCore/Extensions/PlatformExtension.h"
-#include "GDCore/IDE/Events/UsedExtensionsFinder.h"
 #include "GDCore/IDE/PlatformManager.h"
-#include "GDCore/IDE/Project/ArbitraryResourceWorker.h"
 #include "GDCore/Project/CustomObjectConfiguration.h"
 #include "GDCore/Project/EventsFunctionsExtension.h"
 #include "GDCore/Project/ExternalEvents.h"
@@ -49,6 +48,11 @@ using namespace std;
 
 namespace gd {
 
+// By default, disallow unicode in identifiers, but this can be set to true
+// by the IDE. In the future, this will be set to true by default, keeping backward compatibility.
+// We keep it disabled by default to progressively ask users to test it in real projects.
+bool Project::allowUsageOfUnicodeIdentifierNames = false;
+
 Project::Project()
     : name(_("Project")),
       version("1.0.0"),
@@ -630,8 +634,10 @@ void Project::UnserializeFrom(const SerializerElement& element) {
   SetAdaptGameResolutionAtRuntime(
       propElement.GetBoolAttribute("adaptGameResolutionAtRuntime", false));
   SetSizeOnStartupMode(propElement.GetStringAttribute("sizeOnStartupMode", ""));
-  SetAntialiasingMode(propElement.GetStringAttribute("antialiasingMode", "MSAA"));
-  SetAntialisingEnabledOnMobile(propElement.GetBoolAttribute("antialisingEnabledOnMobile", false));
+  SetAntialiasingMode(
+      propElement.GetStringAttribute("antialiasingMode", "MSAA"));
+  SetAntialisingEnabledOnMobile(
+      propElement.GetBoolAttribute("antialisingEnabledOnMobile", false));
   SetProjectUuid(propElement.GetStringAttribute("projectUuid", ""));
   SetAuthor(propElement.GetChild("author", 0, "Auteur").GetValue().GetString());
   SetPackageName(propElement.GetStringAttribute("packageName"));
@@ -887,7 +893,8 @@ void Project::SerializeTo(SerializerElement& element) const {
                            adaptGameResolutionAtRuntime);
   propElement.SetAttribute("sizeOnStartupMode", sizeOnStartupMode);
   propElement.SetAttribute("antialiasingMode", antialiasingMode);
-  propElement.SetAttribute("antialisingEnabledOnMobile", isAntialisingEnabledOnMobile);
+  propElement.SetAttribute("antialisingEnabledOnMobile",
+                           isAntialisingEnabledOnMobile);
   propElement.SetAttribute("projectUuid", projectUuid);
   propElement.SetAttribute("folderProject", folderProject);
   propElement.SetAttribute("packageName", packageName);
@@ -993,58 +1000,57 @@ void Project::SerializeTo(SerializerElement& element) const {
         externalSourceFilesElement.AddChild("sourceFile"));
 }
 
-bool Project::ValidateName(const gd::String& name) {
+void Project::AllowUsageOfUnicodeIdentifierNames(bool enable) {
+  allowUsageOfUnicodeIdentifierNames = enable;
+}
+
+bool Project::IsNameSafe(const gd::String& name) {
   if (name.empty()) return false;
 
   if (isdigit(name[0])) return false;
 
-  gd::String allowedCharacters =
-      "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789_";
-  return !(name.find_first_not_of(allowedCharacters) != gd::String::npos);
+  if (!allowUsageOfUnicodeIdentifierNames) {
+    gd::String legacyAllowedCharacters =
+        "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789_";
+    return !(name.find_first_not_of(legacyAllowedCharacters) != gd::String::npos);
+  } else {
+    for (auto character : name) {
+      if (!GrammarTerminals::IsAllowedInIdentifier(character)) {
+        return false;
+      }
+    }
+
+    return true;
+  }
 }
 
-void Project::ExposeResources(gd::ArbitraryResourceWorker& worker) {
-  // See also gd::ProjectBrowserHelper::ExposeProjectEvents for a method that
-  // traverse the whole project (this time for events) and ExposeProjectEffects
-  // (this time for effects). Ideally, this method could be moved outside of
-  // gd::Project.
+gd::String Project::GetSafeName(const gd::String& name) {
+  if (name.empty()) return "Unnamed";
 
-  gd::ResourcesManager* resourcesManager = &GetResourcesManager();
+  gd::String newName = name;
 
-  // Add project resources
-  worker.ExposeResources(resourcesManager);
-  platformSpecificAssets.ExposeResources(worker);
+  if (isdigit(name[0])) newName = "_" + newName;
 
-  // Add layouts resources
-  for (std::size_t s = 0; s < GetLayoutsCount(); s++) {
-    for (std::size_t j = 0; j < GetLayout(s).GetObjectsCount();
-         ++j) {  // Add objects resources
-      GetLayout(s).GetObject(j).GetConfiguration().ExposeResources(worker);
-    }
+  gd::String legacyAllowedCharacters =
+      "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789_";
 
-    LaunchResourceWorkerOnEvents(*this, GetLayout(s).GetEvents(), worker);
-  }
-  // Add external events resources
-  for (std::size_t s = 0; s < GetExternalEventsCount(); s++) {
-    LaunchResourceWorkerOnEvents(
-        *this, GetExternalEvents(s).GetEvents(), worker);
-  }
-  // Add events functions extensions resources
-  for (std::size_t e = 0; e < GetEventsFunctionsExtensionsCount(); e++) {
-    auto& eventsFunctionsExtension = GetEventsFunctionsExtension(e);
-    for (auto&& eventsFunction : eventsFunctionsExtension.GetInternalVector()) {
-      LaunchResourceWorkerOnEvents(*this, eventsFunction->GetEvents(), worker);
+  for (size_t i = 0;i < newName.size();++i) {
+    // Note that iterating on the characters is not super efficient (O(n^2), which
+    // could be avoided with an iterator), but this function is not critical for performance
+    // (only used to generate a name when a user creates a new entity or rename one).
+    auto character = newName[i];
+    bool isAllowed =
+        allowUsageOfUnicodeIdentifierNames
+            ? GrammarTerminals::IsAllowedInIdentifier(character)
+            : legacyAllowedCharacters.find(character) != gd::String::npos;
+
+    // Replace all unallowed letters by an underscore.
+    if (!isAllowed) {
+      newName.replace(i, 1, '_');
     }
   }
 
-  // Add global objects resources
-  for (std::size_t j = 0; j < GetObjectsCount(); ++j) {
-    GetObject(j).GetConfiguration().ExposeResources(worker);
-  }
-
-  // Add loading screen background image if present
-  if (loadingScreen.GetBackgroundImageResourceName() != "")
-    worker.ExposeImage(loadingScreen.GetBackgroundImageResourceName());
+  return newName;
 }
 
 bool Project::HasSourceFile(gd::String name, gd::String language) const {

Core/GDCore/Project/Project.h

@@ -942,16 +942,6 @@ class GD_CORE_API Project : public ObjectsContainer {
    */
   ResourcesManager& GetResourcesManager() { return resourcesManager; }
 
-  /**
-   * \brief Called ( e.g. during compilation ) so as to inventory internal
-   * resources, sometimes update their filename or any other work or resources.
-   *
-   * See WholeProjectRefactorer for the same thing for events.
-   *
-   * \see WholeProjectRefactorer
-   * \see ArbitraryResourceWorker
-   */
-  void ExposeResources(gd::ArbitraryResourceWorker& worker);
   ///@}
 
   /** \name Variable management
@@ -975,15 +965,35 @@ class GD_CORE_API Project : public ObjectsContainer {
 
   ///@}
 
-  /** \name Other
+  /** \name Identifier names
    */
   ///@{
 
+  /**
+   * Check if unicode names are allowed in identifier names.
+   * \see IsNameSafe
+   * \see GetSafeName
+   */
+  static bool IsUsageOfUnicodeIdentifierNamesAllowed() { return allowUsageOfUnicodeIdentifierNames; };
+
+  /**
+   * Set if unicode names are allowed in identifier names.
+   * \see IsNameSafe
+   * \see GetSafeName
+   */
+  static void AllowUsageOfUnicodeIdentifierNames(bool enable);
+
   /**
    * Return true if \a name is valid (can be used safely for an object,
    * behavior, events function name, etc...).
    */
-  static bool ValidateName(const gd::String& name);
+  static bool IsNameSafe(const gd::String& name);
+
+  /**
+   * Return a name, based on the one passed in parameter, that can be safely used
+   * for an object, behavior, events function name, etc...
+   */
+  static gd::String GetSafeName(const gd::String& name);
   ///@}
 
   /** \name External source files
@@ -1118,6 +1128,8 @@ class GD_CORE_API Project : public ObjectsContainer {
                                         ///< time the project was saved.
   mutable unsigned int gdBuildVersion;  ///< The GD build version used the last
                                         ///< time the project was saved.
+
+  static bool allowUsageOfUnicodeIdentifierNames;
 };
 
 }  // namespace gd

Core/GDCore/String.cpp

@@ -686,6 +686,16 @@ String GD_CORE_API operator+(const char *lhs, const String &rhs)
     return str;
 }
 
+const String& GD_CORE_API operator||(const String& lhs, const String &rhs)
+{
+    return lhs.empty() ? rhs : lhs;
+}
+
+String GD_CORE_API operator||(String lhs, const char *rhs)
+{
+    return lhs.empty() ? rhs : lhs;
+}
+
 bool GD_CORE_API operator==( const String &lhs, const String &rhs )
 {
     return (lhs.compare(rhs) == 0);

Core/GDCore/String.h

@@ -699,6 +699,10 @@ String GD_CORE_API operator+(String lhs, const char *rhs);
  */
 String GD_CORE_API operator+(const char *lhs, const String &rhs);
 
+const String& GD_CORE_API operator||(const String &lhs, const String &rhs);
+
+String GD_CORE_API operator||(String lhs, const char *rhs);
+
 /**
  * \}
  */

Core/tests/ArbitraryResourceWorker.cpp

@@ -22,6 +22,10 @@
 #include "DummyPlatform.h"
 #include "GDCore/Extensions/Builtin/SpriteExtension/SpriteObject.h"
 #include "catch.hpp"
+#include "GDCore/IDE/ResourceExposer.h"
+#include "GDCore/Project/Effect.h"
+#include "GDCore/Project/EventsFunctionsExtension.h"
+#include "GDCore/Project/ExternalEvents.h"
 
 class ArbitraryResourceWorkerTest : public gd::ArbitraryResourceWorker {
  public:
@@ -55,7 +59,7 @@ TEST_CASE("ArbitraryResourceWorker", "[common][resources]") {
         "res4", "path/to/file4.png", "audio");
     ArbitraryResourceWorkerTest worker;
 
-    project.ExposeResources(worker);
+    gd::ResourceExposer::ExposeWholeProjectResources(project, worker);
     REQUIRE(worker.files.size() == 4);
     REQUIRE(std::find(worker.files.begin(),
                       worker.files.end(),
@@ -78,7 +82,7 @@ TEST_CASE("ArbitraryResourceWorker", "[common][resources]") {
 
       worker.files.clear();
       worker.images.clear();
-      project.ExposeResources(worker);
+      gd::ResourceExposer::ExposeWholeProjectResources(project, worker);
       REQUIRE(worker.files.size() == 4);
       REQUIRE(worker.images.size() == 1);
       REQUIRE(worker.images[0] == "res1");
@@ -124,7 +128,7 @@ TEST_CASE("ArbitraryResourceWorker", "[common][resources]") {
     standardEvent.GetActions().Insert(instruction);
     layout.GetEvents().InsertEvent(standardEvent);
 
-    project.ExposeResources(worker);
+    gd::ResourceExposer::ExposeWholeProjectResources(project, worker);
     REQUIRE(worker.bitmapFonts.size() == 1);
     REQUIRE(worker.bitmapFonts[0] == "res3");
     REQUIRE(worker.images.size() == 1);
@@ -132,4 +136,207 @@ TEST_CASE("ArbitraryResourceWorker", "[common][resources]") {
     REQUIRE(worker.audios.size() == 1);
     REQUIRE(worker.audios[0] == "res4");
   }
+
+  SECTION("Can find resource usage in external events") {
+    gd::Platform platform;
+    gd::Project project;
+    SetupProjectWithDummyPlatform(project, platform);
+    project.GetResourcesManager().AddResource(
+        "res1", "path/to/file1.png", "image");
+    project.GetResourcesManager().AddResource(
+        "res2", "path/to/file2.png", "image");
+    project.GetResourcesManager().AddResource(
+        "res3", "path/to/file3.fnt", "bitmapFont");
+    project.GetResourcesManager().AddResource(
+        "res4", "path/to/file4.png", "audio");
+    ArbitraryResourceWorkerTest worker;
+
+    auto& externalEvents = project.InsertNewExternalEvents("MyExternalEvents", 0);
+
+    gd::StandardEvent standardEvent;
+    gd::Instruction instruction;
+    instruction.SetType("MyExtension::DoSomethingWithResources");
+    instruction.SetParametersCount(3);
+    instruction.SetParameter(0, "res3");
+    instruction.SetParameter(1, "res1");
+    instruction.SetParameter(2, "res4");
+    standardEvent.GetActions().Insert(instruction);
+    externalEvents.GetEvents().InsertEvent(standardEvent);
+
+    // MyExternalEvents doesn't need to be used in any layout events.
+
+    gd::ResourceExposer::ExposeWholeProjectResources(project, worker);
+    REQUIRE(worker.bitmapFonts.size() == 1);
+    REQUIRE(worker.bitmapFonts[0] == "res3");
+    REQUIRE(worker.images.size() == 1);
+    REQUIRE(worker.images[0] == "res1");
+    REQUIRE(worker.audios.size() == 1);
+    REQUIRE(worker.audios[0] == "res4");
+  }
+
+  SECTION("Can find resource usage in event-based functions") {
+    gd::Project project;
+    gd::Platform platform;
+    SetupProjectWithDummyPlatform(project, platform);
+
+    project.GetResourcesManager().AddResource(
+        "res1", "path/to/file1.png", "image");
+    project.GetResourcesManager().AddResource(
+        "res2", "path/to/file2.png", "image");
+    project.GetResourcesManager().AddResource(
+        "res3", "path/to/file3.png", "image");
+    ArbitraryResourceWorkerTest worker;
+
+    auto& extension = project.InsertNewEventsFunctionsExtension("MyEventExtention", 0);
+    auto& function = extension.InsertNewEventsFunction("MyFreeFunction", 0);
+    
+    gd::StandardEvent standardEvent;
+    gd::Instruction instruction;
+    instruction.SetType("MyExtension::DoSomethingWithResources");
+    instruction.SetParametersCount(3);
+    instruction.SetParameter(0, "res3");
+    instruction.SetParameter(1, "res1");
+    instruction.SetParameter(2, "res4");
+    standardEvent.GetActions().Insert(instruction);
+    function.GetEvents().InsertEvent(standardEvent);
+
+    // MyEventExtention::MyFreeFunction doesn't need to be actually used in events.
+
+    gd::ResourceExposer::ExposeWholeProjectResources(project, worker);
+    REQUIRE(worker.bitmapFonts.size() == 1);
+    REQUIRE(worker.bitmapFonts[0] == "res3");
+    REQUIRE(worker.images.size() == 1);
+    REQUIRE(worker.images[0] == "res1");
+    REQUIRE(worker.audios.size() == 1);
+    REQUIRE(worker.audios[0] == "res4");
+  }
+
+  SECTION("Can find resource usage in event-based behavior functions") {
+    gd::Project project;
+    gd::Platform platform;
+    SetupProjectWithDummyPlatform(project, platform);
+
+    project.GetResourcesManager().AddResource(
+        "res1", "path/to/file1.png", "image");
+    project.GetResourcesManager().AddResource(
+        "res2", "path/to/file2.png", "image");
+    project.GetResourcesManager().AddResource(
+        "res3", "path/to/file3.png", "image");
+    ArbitraryResourceWorkerTest worker;
+
+    auto& extension = project.InsertNewEventsFunctionsExtension("MyEventExtention", 0);
+    auto& behavior = extension.GetEventsBasedBehaviors().InsertNew("MyBehavior", 0);
+    auto& function = behavior.GetEventsFunctions().InsertNewEventsFunction("MyFunction", 0);
+    
+    gd::StandardEvent standardEvent;
+    gd::Instruction instruction;
+    instruction.SetType("MyExtension::DoSomethingWithResources");
+    instruction.SetParametersCount(3);
+    instruction.SetParameter(0, "res3");
+    instruction.SetParameter(1, "res1");
+    instruction.SetParameter(2, "res4");
+    standardEvent.GetActions().Insert(instruction);
+    function.GetEvents().InsertEvent(standardEvent);
+
+    // MyEventExtention::MyBehavior::MyFunction doesn't need to be actually used in events.
+
+    gd::ResourceExposer::ExposeWholeProjectResources(project, worker);
+    REQUIRE(worker.bitmapFonts.size() == 1);
+    REQUIRE(worker.bitmapFonts[0] == "res3");
+    REQUIRE(worker.images.size() == 1);
+    REQUIRE(worker.images[0] == "res1");
+    REQUIRE(worker.audios.size() == 1);
+    REQUIRE(worker.audios[0] == "res4");
+  }
+
+  SECTION("Can find resource usage in event-based object functions") {
+    gd::Project project;
+    gd::Platform platform;
+    SetupProjectWithDummyPlatform(project, platform);
+
+    project.GetResourcesManager().AddResource(
+        "res1", "path/to/file1.png", "image");
+    project.GetResourcesManager().AddResource(
+        "res2", "path/to/file2.png", "image");
+    project.GetResourcesManager().AddResource(
+        "res3", "path/to/file3.png", "image");
+    ArbitraryResourceWorkerTest worker;
+
+    auto& extension = project.InsertNewEventsFunctionsExtension("MyEventExtention", 0);
+    auto& object = extension.GetEventsBasedObjects().InsertNew("MyObject", 0);
+    auto& function = object.GetEventsFunctions().InsertNewEventsFunction("MyFunction", 0);
+    
+    gd::StandardEvent standardEvent;
+    gd::Instruction instruction;
+    instruction.SetType("MyExtension::DoSomethingWithResources");
+    instruction.SetParametersCount(3);
+    instruction.SetParameter(0, "res3");
+    instruction.SetParameter(1, "res1");
+    instruction.SetParameter(2, "res4");
+    standardEvent.GetActions().Insert(instruction);
+    function.GetEvents().InsertEvent(standardEvent);
+
+    // MyEventExtention::MyObject::MyFunction doesn't need to be actually used in events.
+
+    gd::ResourceExposer::ExposeWholeProjectResources(project, worker);
+    REQUIRE(worker.bitmapFonts.size() == 1);
+    REQUIRE(worker.bitmapFonts[0] == "res3");
+    REQUIRE(worker.images.size() == 1);
+    REQUIRE(worker.images[0] == "res1");
+    REQUIRE(worker.audios.size() == 1);
+    REQUIRE(worker.audios[0] == "res4");
+  }
+
+  SECTION("Can find resource usage in layer effects") {
+    gd::Project project;
+    gd::Platform platform;
+    SetupProjectWithDummyPlatform(project, platform);
+
+    project.GetResourcesManager().AddResource(
+        "res1", "path/to/file1.png", "image");
+    project.GetResourcesManager().AddResource(
+        "res2", "path/to/file2.png", "image");
+    project.GetResourcesManager().AddResource(
+        "res3", "path/to/file3.png", "image");
+    ArbitraryResourceWorkerTest worker;
+
+    auto& layout = project.InsertNewLayout("Scene", 0);
+    layout.InsertNewLayer("MyLayer", 0);
+    auto& layer = layout.GetLayer("MyLayer");
+    auto& effect = layer.GetEffects().InsertNewEffect("MyEffect", 0);
+    effect.SetEffectType("MyExtension::EffectWithResource");
+    effect.SetStringParameter("texture", "res1");
+
+    gd::ResourceExposer::ExposeWholeProjectResources(project, worker);
+    REQUIRE(worker.files.size() == 3);
+    REQUIRE(worker.images.size() == 1);
+    REQUIRE(worker.images[0] == "res1");
+  }
+
+  SECTION("Can find resource usage in object effects") {
+    gd::Project project;
+    gd::Platform platform;
+    SetupProjectWithDummyPlatform(project, platform);
+
+    project.GetResourcesManager().AddResource(
+        "res1", "path/to/file1.png", "image");
+    project.GetResourcesManager().AddResource(
+        "res2", "path/to/file2.png", "image");
+    project.GetResourcesManager().AddResource(
+        "res3", "path/to/file3.png", "image");
+    ArbitraryResourceWorkerTest worker;
+
+    auto& layout = project.InsertNewLayout("Scene", 0);
+    layout.InsertNewLayer("MyLayer", 0);
+    auto& layer = layout.GetLayer("MyLayer");
+    auto& object = layout.InsertNewObject(project, "MyExtension::Sprite", "MyObject", 0);
+    auto& effect = object.GetEffects().InsertNewEffect("MyEffect", 0);
+    effect.SetEffectType("MyExtension::EffectWithResource");
+    effect.SetStringParameter("texture", "res1");
+
+    gd::ResourceExposer::ExposeWholeProjectResources(project, worker);
+    REQUIRE(worker.files.size() == 3);
+    REQUIRE(worker.images.size() == 1);
+    REQUIRE(worker.images[0] == "res1");
+  }
 }

Core/tests/DummyPlatform.cpp

@@ -465,6 +465,17 @@ void SetupProjectWithDummyPlatform(gd::Project& project,
       .AddParameter("layerEffectParameterName", _("Parameter name"));
   }
 
+  {
+      auto& effect = extension
+      ->AddEffect("EffectWithResource")
+      .SetFullName("Effect with resource")
+      .MarkAsOnlyWorkingFor2D();
+      auto& effectProperties = effect.GetProperties();
+      effectProperties["texture"]
+      .SetType("resource")
+      .AddExtraInfo("image");
+  }
+
   platform.AddExtension(commonInstructionsExtension);
   platform.AddExtension(baseObjectExtension);
   platform.AddExtension(extension);

Core/tests/ExpressionParser2.cpp

@@ -26,7 +26,7 @@ TEST_CASE("ExpressionParser2", "[common][events]") {
 
   auto &myGroup = layout1.GetObjectGroups().InsertNew("MyGroup", 0);
   myGroup.AddObject(myObject.GetName());
-  
+
   layout1.InsertNewObject(project, "MyExtension::Sprite", "MySpriteObject", 1);
   layout1.InsertNewObject(project,
                           "MyExtension::FakeObjectWithUnsupportedCapability",
@@ -340,6 +340,20 @@ TEST_CASE("ExpressionParser2", "[common][events]") {
               "Cannot find an expression with this name: Idontexist\n"
               "Double check that you've not made any typo in the name.");
     }
+    {
+      auto node = parser.ParseExpression("🅸🅳🅾🅽🆃🅴🆇🅸🆂🆃😄(\"hello\"");
+      REQUIRE(node != nullptr);
+
+      gd::ExpressionValidator validator(platform, project, layout1, "string");
+      node->Visit(validator);
+      REQUIRE(validator.GetFatalErrors().size() == 2);
+      REQUIRE(validator.GetFatalErrors()[0]->GetMessage() ==
+              "The list of parameters is not terminated. Add a closing "
+              "parenthesis to end the parameters.");
+      REQUIRE(validator.GetFatalErrors()[1]->GetMessage() ==
+              "Cannot find an expression with this name: 🅸🅳🅾🅽🆃🅴🆇🅸🆂🆃😄\n"
+              "Double check that you've not made any typo in the name.");
+    }
     {
       auto node = parser.ParseExpression("=\"test\"");
       REQUIRE(node != nullptr);
@@ -694,6 +708,17 @@ TEST_CASE("ExpressionParser2", "[common][events]") {
               "You must enter a number.");
       REQUIRE(validator.GetFatalErrors()[0]->GetStartPosition() == 0);
     }
+    {
+      auto node = parser.ParseExpression("ab😊d");
+      REQUIRE(node != nullptr);
+
+      gd::ExpressionValidator validator(platform, project, layout1, "number");
+      node->Visit(validator);
+      REQUIRE(validator.GetFatalErrors().size() == 1);
+      REQUIRE(validator.GetFatalErrors()[0]->GetMessage() ==
+              "You must enter a number.");
+      REQUIRE(validator.GetFatalErrors()[0]->GetStartPosition() == 0);
+    }
     {
       auto node = parser.ParseExpression("abcd[0]");
       REQUIRE(node != nullptr);
@@ -917,6 +942,26 @@ TEST_CASE("ExpressionParser2", "[common][events]") {
       node->Visit(validator);
       REQUIRE(validator.GetFatalErrors().size() == 0);
     }
+    {
+      auto node = parser.ParseExpression("😅");
+      REQUIRE(node != nullptr);
+      auto &identifierNode = dynamic_cast<gd::IdentifierNode &>(*node);
+      REQUIRE(identifierNode.identifierName == "😅");
+
+      gd::ExpressionValidator validator(platform, project, layout1, "object");
+      node->Visit(validator);
+      REQUIRE(validator.GetFatalErrors().size() == 0);
+    }
+    {
+      auto node = parser.ParseExpression("中文");
+      REQUIRE(node != nullptr);
+      auto &identifierNode = dynamic_cast<gd::IdentifierNode &>(*node);
+      REQUIRE(identifierNode.identifierName == "中文");
+
+      gd::ExpressionValidator validator(platform, project, layout1, "object");
+      node->Visit(validator);
+      REQUIRE(validator.GetFatalErrors().size() == 0);
+    }
 
     {
       auto node = parser.ParseExpression("Hello World 1");
@@ -1092,6 +1137,46 @@ TEST_CASE("ExpressionParser2", "[common][events]") {
       REQUIRE(textNode.text == "2");
       REQUIRE(identifierNode.identifierName == "three");
     }
+    SECTION("identifier parameter (unicode)") {
+      auto node = parser.ParseExpression(
+          "WhateverObject.WhateverBehavior::WhateverFunction(1, \"2\", 😄)");
+      REQUIRE(node != nullptr);
+      auto &functionNode = dynamic_cast<gd::FunctionCallNode &>(*node);
+      REQUIRE(functionNode.functionName == "WhateverFunction");
+      REQUIRE(functionNode.objectName == "WhateverObject");
+      REQUIRE(functionNode.behaviorName == "WhateverBehavior");
+      REQUIRE(functionNode.parameters.size() == 3);
+      auto &numberNode =
+          dynamic_cast<gd::NumberNode &>(*functionNode.parameters[0]);
+      auto &textNode =
+          dynamic_cast<gd::TextNode &>(*functionNode.parameters[1]);
+      auto &identifierNode =
+          dynamic_cast<gd::IdentifierNode &>(*functionNode.parameters[2]);
+
+      REQUIRE(numberNode.number == "1");
+      REQUIRE(textNode.text == "2");
+      REQUIRE(identifierNode.identifierName == "😄");
+    }
+    SECTION("unicode for object, behavior and function") {
+      auto node = parser.ParseExpression(
+          "🧸.🗣️::🔔(1, \"2\", 😄)");
+      REQUIRE(node != nullptr);
+      auto &functionNode = dynamic_cast<gd::FunctionCallNode &>(*node);
+      REQUIRE(functionNode.functionName == "🔔");
+      REQUIRE(functionNode.objectName == "🧸");
+      REQUIRE(functionNode.behaviorName == "🗣️");
+      REQUIRE(functionNode.parameters.size() == 3);
+      auto &numberNode =
+          dynamic_cast<gd::NumberNode &>(*functionNode.parameters[0]);
+      auto &textNode =
+          dynamic_cast<gd::TextNode &>(*functionNode.parameters[1]);
+      auto &identifierNode =
+          dynamic_cast<gd::IdentifierNode &>(*functionNode.parameters[2]);
+
+      REQUIRE(numberNode.number == "1");
+      REQUIRE(textNode.text == "2");
+      REQUIRE(identifierNode.identifierName == "😄");
+    }
   }
 
   SECTION("Valid function calls ('number|string' type)") {
@@ -1669,7 +1754,7 @@ TEST_CASE("ExpressionParser2", "[common][events]") {
       auto &identifierNode = dynamic_cast<gd::IdentifierNode &>(*node);
       REQUIRE(identifierNode.identifierName == "myVariable");
       REQUIRE(identifierNode.childIdentifierName == "myChild");
-      
+
       gd::ExpressionValidator validator(platform, project, layout1, "scenevar");
       node->Visit(validator);
       REQUIRE(validator.GetFatalErrors().size() == 0);
@@ -1766,14 +1851,14 @@ TEST_CASE("ExpressionParser2", "[common][events]") {
       REQUIRE(identifierObject2Node.identifierName == "MyObject2");
       REQUIRE(variable1Node.identifierName == "MyVar1");
       REQUIRE(variable2Node.identifierName == "MyVar2");
-      
+
       auto variable1ObjectName = gd::ExpressionVariableOwnerFinder::GetObjectName(
           platform, project, layout1, "", variable1Node);
       REQUIRE(variable1ObjectName == "MyObject1");
       auto variable2ObjectName = gd::ExpressionVariableOwnerFinder::GetObjectName(
           platform, project, layout1, "", variable2Node);
       REQUIRE(variable2ObjectName == "MyObject2");
-      
+
       gd::ExpressionValidator validator(platform, project, layout1, "string");
       node->Visit(validator);
       REQUIRE(validator.GetFatalErrors().size() == 0);
@@ -1797,14 +1882,14 @@ TEST_CASE("ExpressionParser2", "[common][events]") {
       REQUIRE(identifierObject1Node.identifierName == "MyObject1");
       REQUIRE(variable1Node.identifierName == "MyVar1");
       REQUIRE(variable2Node.identifierName == "MyVar2");
-      
+
       auto variable1ObjectName = gd::ExpressionVariableOwnerFinder::GetObjectName(
           platform, project, layout1, "", variable1Node);
       REQUIRE(variable1ObjectName == "MyObject1");
       auto variable2ObjectName = gd::ExpressionVariableOwnerFinder::GetObjectName(
           platform, project, layout1, "", variable2Node);
       REQUIRE(variable2ObjectName == "MyObject1");
-      
+
       gd::ExpressionValidator validator(platform, project, layout1, "string");
       node->Visit(validator);
       REQUIRE(validator.GetFatalErrors().size() == 0);
@@ -1821,11 +1906,11 @@ TEST_CASE("ExpressionParser2", "[common][events]") {
           dynamic_cast<gd::IdentifierNode &>(*functionNode.parameters[0]);
 
       REQUIRE(variable1Node.identifierName == "MyVar1");
-      
+
       auto variable1ObjectName = gd::ExpressionVariableOwnerFinder::GetObjectName(
           platform, project, layout1, "MySpriteObject", variable1Node);
       REQUIRE(variable1ObjectName == "MySpriteObject");
-      
+
       gd::ExpressionValidator validator(platform, project, layout1, "number");
       node->Visit(validator);
       REQUIRE(validator.GetFatalErrors().size() == 0);
@@ -1843,11 +1928,11 @@ TEST_CASE("ExpressionParser2", "[common][events]") {
 
       REQUIRE(variable1Node.identifierName == "MyVar1");
       REQUIRE(variable1Node.childIdentifierName == "MyChild");
-      
+
       auto variable1ObjectName = gd::ExpressionVariableOwnerFinder::GetObjectName(
           platform, project, layout1, "MySpriteObject", variable1Node);
       REQUIRE(variable1ObjectName == "MySpriteObject");
-      
+
       gd::ExpressionValidator validator(platform, project, layout1, "number");
       node->Visit(validator);
       REQUIRE(validator.GetFatalErrors().size() == 0);

Core/tests/Layout.cpp

@@ -0,0 +1,133 @@
+/*
+ * GDevelop Core
+ * Copyright 2008-2023 Florian Rival (Florian.Rival@gmail.com). All rights
+ * reserved. This project is released under the MIT License.
+ */
+/**
+ * @file Tests covering layout content helper methods.
+ */
+#include "GDCore/Project/Layout.h"
+#include "DummyPlatform.h"
+#include "GDCore/CommonTools.h"
+#include "GDCore/Extensions/Platform.h"
+#include "GDCore/Project/Object.h"
+#include "GDCore/Project/ObjectsContainer.h"
+#include "GDCore/Project/Project.h"
+#include "catch.hpp"
+
+using namespace gd;
+
+namespace {
+
+void SetupProject(gd::Project &project, gd::Platform &platform){
+
+};
+} // namespace
+
+TEST_CASE("Layout", "[common]") {
+
+  SECTION("Find the type of a behavior in a object") {
+    gd::Platform platform;
+    gd::Project project;
+    SetupProjectWithDummyPlatform(project, platform);
+
+    gd::Layout &layout = project.InsertNewLayout("Scene", 0);
+    gd::Object &object =
+        layout.InsertNewObject(project, "MyExtension::Sprite", "MyObject", 0);
+    object.AddNewBehavior(project, "MyExtension::MyBehavior", "MyBehavior");
+
+    REQUIRE(GetTypeOfBehaviorInObjectOrGroup(project, layout, "MyObject",
+                                             "MyBehavior", true) ==
+            "MyExtension::MyBehavior");
+  }
+
+  SECTION("Give an empty type for an object that doesn't have the behavior") {
+    gd::Platform platform;
+    gd::Project project;
+    SetupProjectWithDummyPlatform(project, platform);
+
+    gd::Layout &layout = project.InsertNewLayout("Scene", 0);
+    gd::Object &object =
+        layout.InsertNewObject(project, "MyExtension::Sprite", "MyObject", 0);
+
+    REQUIRE(GetTypeOfBehaviorInObjectOrGroup(project, layout, "MyObject",
+                                             "MyBehavior", true) == "");
+  }
+
+  SECTION("Find the type of a behavior in a group") {
+    gd::Platform platform;
+    gd::Project project;
+    SetupProjectWithDummyPlatform(project, platform);
+
+    gd::Layout &layout = project.InsertNewLayout("Scene", 0);
+    gd::Object &object1 =
+        layout.InsertNewObject(project, "MyExtension::Sprite", "MyObject1", 0);
+    object1.AddNewBehavior(project, "MyExtension::MyBehavior", "MyBehavior");
+    gd::Object &object2 =
+        layout.InsertNewObject(project, "MyExtension::Sprite", "MyObject2", 0);
+    object2.AddNewBehavior(project, "MyExtension::MyBehavior", "MyBehavior");
+
+    auto &group = layout.GetObjectGroups().InsertNew("MyGroup", 0);
+    group.AddObject(object1.GetName());
+    group.AddObject(object2.GetName());
+
+    REQUIRE(GetTypeOfBehaviorInObjectOrGroup(project, layout, "MyGroup",
+                                             "MyBehavior", true) ==
+            "MyExtension::MyBehavior");
+  }
+
+  SECTION("Give an empty type for a group with an object missing the behavior") {
+    gd::Platform platform;
+    gd::Project project;
+    SetupProjectWithDummyPlatform(project, platform);
+
+    gd::Layout &layout = project.InsertNewLayout("Scene", 0);
+    gd::Object &object1 =
+        layout.InsertNewObject(project, "MyExtension::Sprite", "MyObject1", 0);
+    object1.AddNewBehavior(project, "MyExtension::MyBehavior", "MyBehavior");
+    gd::Object &object2 =
+        layout.InsertNewObject(project, "MyExtension::Sprite", "MyObject2", 0);
+    // object2 doesn't have the behavior.
+
+    auto &group = layout.GetObjectGroups().InsertNew("MyGroup", 0);
+    group.AddObject(object1.GetName());
+    group.AddObject(object2.GetName());
+
+    REQUIRE(GetTypeOfBehaviorInObjectOrGroup(project, layout, "MyGroup",
+                                             "MyBehavior", true) == "");
+  }
+
+  SECTION("Give an empty type for a group with behaviors of same name but different types") {
+    gd::Platform platform;
+    gd::Project project;
+    SetupProjectWithDummyPlatform(project, platform);
+
+    gd::Layout &layout = project.InsertNewLayout("Scene", 0);
+    gd::Object &object1 =
+        layout.InsertNewObject(project, "MyExtension::Sprite", "MyObject1", 0);
+    object1.AddNewBehavior(project, "MyExtension::MyBehavior", "MyBehavior");
+    gd::Object &object2 =
+        layout.InsertNewObject(project, "MyExtension::Sprite", "MyObject2", 0);
+    object2.AddNewBehavior(project, "MyExtension::MyOtherBehavior",
+                           "MyBehavior");
+
+    auto &group = layout.GetObjectGroups().InsertNew("MyGroup", 0);
+    group.AddObject(object1.GetName());
+    group.AddObject(object2.GetName());
+
+    REQUIRE(GetTypeOfBehaviorInObjectOrGroup(project, layout, "MyGroup",
+                                             "MyBehavior", true) == "");
+  }
+
+  SECTION("Give an empty type for an empty group") {
+    gd::Platform platform;
+    gd::Project project;
+    SetupProjectWithDummyPlatform(project, platform);
+
+    gd::Layout &layout = project.InsertNewLayout("Scene", 0);
+    auto &group = layout.GetObjectGroups().InsertNew("MyGroup", 0);
+
+    REQUIRE(GetTypeOfBehaviorInObjectOrGroup(project, layout, "MyGroup",
+                                             "MyBehavior", true) == "");
+  }
+}

Core/tests/ResourcesMergingHelper.cpp

@@ -16,6 +16,7 @@
 #include "GDCore/Tools/SystemStats.h"
 #include "GDCore/Tools/VersionWrapper.h"
 #include "catch.hpp"
+#include "GDCore/IDE/ResourceExposer.h"
 
 class MockFileSystem : public gd::AbstractFileSystem {
  public:
@@ -75,7 +76,7 @@ TEST_CASE("ResourcesMergingHelper", "[common]") {
     project.GetResourcesManager().AddResource(
         "Image3", "subfolder/image3.png", "image");
 
-    project.ExposeResources(resourcesMerger);
+    gd::ResourceExposer::ExposeWholeProjectResources(project, resourcesMerger);
 
     auto resourcesFilenames =
         resourcesMerger.GetAllResourcesOldAndNewFilename();
@@ -101,7 +102,7 @@ TEST_CASE("ResourcesMergingHelper", "[common]") {
     project.GetResourcesManager().AddResource(
         "Image3", "subfolder/image3.png", "image");
 
-    project.ExposeResources(resourcesMerger);
+    gd::ResourceExposer::ExposeWholeProjectResources(project, resourcesMerger);
 
     auto resourcesFilenames =
         resourcesMerger.GetAllResourcesOldAndNewFilename();

Core/tests/ResourcesRenamer.cpp

@@ -11,6 +11,7 @@
 #include "GDCore/CommonTools.h"
 #include "GDCore/Project/Project.h"
 #include "catch.hpp"
+#include "GDCore/IDE/ResourceExposer.h"
 
 TEST_CASE("ResourcesRenamer", "[common]") {
   SECTION("It renames resources that are exposed") {
@@ -34,7 +35,7 @@ TEST_CASE("ResourcesRenamer", "[common]") {
     project.GetPlatformSpecificAssets().Set(
         "android", "some-other-icon", "Resource2");
 
-    project.ExposeResources(resourcesRenamer);
+    gd::ResourceExposer::ExposeWholeProjectResources(project, resourcesRenamer);
 
     // Check that resources were renamed were used.
     REQUIRE(project.GetPlatformSpecificAssets().Get("android", "some-icon") ==
@@ -72,7 +73,7 @@ TEST_CASE("ResourcesRenamer", "[common]") {
     project.GetPlatformSpecificAssets().Set(
         "android", "some-other-icon", "Resource2");
 
-    project.ExposeResources(resourcesRenamer);
+    gd::ResourceExposer::ExposeWholeProjectResources(project, resourcesRenamer);
 
     // TODO: This should not be necessary, but for now not all resources support embeddeds,
     // so we must call it manually:

Core/tests/WholeProjectRefactorer.cpp

@@ -3348,10 +3348,21 @@ const gd::Instruction &CreateActionWithLayerParameter(gd::Project &project,
   action.SetParameter(3, gd::Expression("\"My layer\""));
   return event.GetActions().Insert(action);
 }
+const gd::Instruction &CreateActionWithEmptyLayerParameter(gd::Project &project,
+                                                      gd::EventsList &events) {
+  gd::StandardEvent &event = dynamic_cast<gd::StandardEvent &>(
+      events.InsertNewEvent(project, "BuiltinCommonInstructions::Standard"));
 
+  gd::Instruction action;
+  action.SetType("MyExtension::SetCameraCenterX");
+  action.SetParametersCount(4);
+  action.SetParameter(3, gd::Expression(""));
+  return event.GetActions().Insert(action);
+}
 const gd::Instruction &
 CreateExpressionWithLayerParameter(gd::Project &project,
-                                   gd::EventsList &events) {
+                                   gd::EventsList &events,
+                                   const gd::String &layerName) {
   gd::StandardEvent &event = dynamic_cast<gd::StandardEvent &>(
       events.InsertNewEvent(project, "BuiltinCommonInstructions::Standard"));
 
@@ -3359,8 +3370,8 @@ CreateExpressionWithLayerParameter(gd::Project &project,
   action.SetType("MyExtension::DoSomething");
   action.SetParametersCount(1);
   action.SetParameter(
-      0, gd::Expression("MyExtension::CameraCenterX(\"My layer\") + "
-                        "MyExtension::CameraCenterX(\"My layer\")"));
+      0, gd::Expression("MyExtension::CameraCenterX(\"" + layerName + "\") + "
+                        "MyExtension::CameraCenterX(\"" + layerName + "\")"));
   return event.GetActions().Insert(action);
 }
 } // namespace
@@ -3390,13 +3401,13 @@ TEST_CASE("RenameLayer", "[common]") {
         project, otherExternalEvents.GetEvents());
 
     auto &layoutExpression =
-        CreateExpressionWithLayerParameter(project, layout.GetEvents());
+        CreateExpressionWithLayerParameter(project, layout.GetEvents(), "My layer");
     auto &externalExpression =
-        CreateExpressionWithLayerParameter(project, externalEvents.GetEvents());
+        CreateExpressionWithLayerParameter(project, externalEvents.GetEvents(), "My layer");
     auto &otherLayoutExpression =
-        CreateExpressionWithLayerParameter(project, otherLayout.GetEvents());
+        CreateExpressionWithLayerParameter(project, otherLayout.GetEvents(), "My layer");
     auto &otherExternalExpression = CreateExpressionWithLayerParameter(
-        project, otherExternalEvents.GetEvents());
+        project, otherExternalEvents.GetEvents(), "My layer");
 
     gd::WholeProjectRefactorer::RenameLayer(project, layout, "My layer",
                                             "My renamed layer");
@@ -3434,7 +3445,7 @@ TEST_CASE("RenameLayer", "[common]") {
     auto &layout = project.InsertNewLayout("My layout", 0);
 
     auto &layoutExpression =
-        CreateExpressionWithLayerParameter(project, layout.GetEvents());
+        CreateExpressionWithLayerParameter(project, layout.GetEvents(), "My layer");
 
     gd::WholeProjectRefactorer::RenameLayer(project, layout, "My layer",
                                             "layerA");
@@ -3443,6 +3454,57 @@ TEST_CASE("RenameLayer", "[common]") {
             "MyExtension::CameraCenterX(\"layerA\") + "
             "MyExtension::CameraCenterX(\"layerA\")");
   }
+
+  SECTION("Can rename a layer when a layer parameter is empty") {
+    gd::Project project;
+    gd::Platform platform;
+    SetupProjectWithDummyPlatform(project, platform);
+
+    auto &layout = project.InsertNewLayout("My layout", 0);
+
+    auto &layoutAction =
+        CreateActionWithEmptyLayerParameter(project, layout.GetEvents());
+
+    gd::WholeProjectRefactorer::RenameLayer(project, layout, "My layer",
+                                            "layerA");
+
+    REQUIRE(layoutAction.GetParameter(0).GetPlainString() == "");
+  }
+
+  SECTION("Can't rename a layer to an empty name") {
+    gd::Project project;
+    gd::Platform platform;
+    SetupProjectWithDummyPlatform(project, platform);
+
+    auto &layout = project.InsertNewLayout("My layout", 0);
+
+    auto &layoutExpression =
+        CreateExpressionWithLayerParameter(project, layout.GetEvents(), "My layer");
+
+    gd::WholeProjectRefactorer::RenameLayer(project, layout, "My layer",
+                                            "");
+
+    REQUIRE(layoutExpression.GetParameter(0).GetPlainString() ==
+            "MyExtension::CameraCenterX(\"My layer\") + "
+            "MyExtension::CameraCenterX(\"My layer\")");
+  }
+
+  SECTION("Can't rename a layer from an empty name") {
+    gd::Project project;
+    gd::Platform platform;
+    SetupProjectWithDummyPlatform(project, platform);
+
+    auto &layout = project.InsertNewLayout("My layout", 0);
+
+    auto &layoutExpression =
+        CreateExpressionWithLayerParameter(project, layout.GetEvents(), "");
+
+    gd::WholeProjectRefactorer::RenameLayer(project, layout, "", "My layer");
+
+    REQUIRE(layoutExpression.GetParameter(0).GetPlainString() ==
+            "MyExtension::CameraCenterX(\"\") + "
+            "MyExtension::CameraCenterX(\"\")");
+  }
 }
 
 namespace {
@@ -3625,7 +3687,6 @@ TEST_CASE("RenameLayerEffect", "[common]") {
     auto &wrongLayerExpression =
         CreateExpressionWithLayerEffectParameter(project, layout.GetEvents(), "My layer 2");
 
-    std::cout << "RenameLayerEffect" << std::endl;
     gd::WholeProjectRefactorer::RenameLayerEffect(project, layout, layer, "My effect",
                                             "My renamed effect");
 
@@ -3659,3 +3720,129 @@ TEST_CASE("RenameLayerEffect", "[common]") {
             "MyExtension::LayerEffectParameter(\"My layer 2\", \"My effect\")");
   }
 }
+
+TEST_CASE("RemoveLayer", "[common]") {
+  SECTION("Can remove instances in a layout and its associated external layouts") {
+    gd::Project project;
+    gd::Platform platform;
+    SetupProjectWithDummyPlatform(project, platform);
+
+    auto &layout = project.InsertNewLayout("My layout", 0);
+    auto &otherLayout = project.InsertNewLayout("My other layout", 1);
+
+    layout.InsertNewLayer("My layer", 0);
+    otherLayout.InsertNewLayer("My layer", 0);
+    
+    auto &externalLayout =
+        project.InsertNewExternalLayout("My external layout", 0);
+    auto &otherExternalLayout =
+        project.InsertNewExternalLayout("My other external layout", 0);
+    externalLayout.SetAssociatedLayout("My layout");
+    otherExternalLayout.SetAssociatedLayout("My other layout");
+
+    auto &initialInstances = layout.GetInitialInstances();
+    initialInstances.InsertNewInitialInstance().SetLayer("My layer");
+    initialInstances.InsertNewInitialInstance().SetLayer("My layer");
+    initialInstances.InsertNewInitialInstance().SetLayer("My layer");
+    initialInstances.InsertNewInitialInstance().SetLayer("");
+    initialInstances.InsertNewInitialInstance().SetLayer("");
+    
+    auto &externalInitialInstances = externalLayout.GetInitialInstances();
+    externalInitialInstances.InsertNewInitialInstance().SetLayer("My layer");
+    externalInitialInstances.InsertNewInitialInstance().SetLayer("My layer");
+    externalInitialInstances.InsertNewInitialInstance().SetLayer("");
+
+    auto &otherInitialInstances = otherLayout.GetInitialInstances();
+    otherInitialInstances.InsertNewInitialInstance().SetLayer("My layer");
+
+    auto &otherExternalInitialInstances = otherExternalLayout.GetInitialInstances();
+    otherExternalInitialInstances.InsertNewInitialInstance().SetLayer("My layer");
+
+    REQUIRE(initialInstances.GetInstancesCount() == 5);
+    REQUIRE(externalInitialInstances.GetInstancesCount() == 3);
+    REQUIRE(otherInitialInstances.GetInstancesCount() == 1);
+    REQUIRE(otherExternalInitialInstances.GetInstancesCount() == 1);
+
+    REQUIRE(initialInstances.GetLayerInstancesCount("My layer") == 3);
+    REQUIRE(externalInitialInstances.GetLayerInstancesCount("My layer") == 2);
+
+    gd::WholeProjectRefactorer::RemoveLayer(project, layout, "My layer");
+
+    REQUIRE(initialInstances.GetInstancesCount() == 2);
+    REQUIRE(externalInitialInstances.GetInstancesCount() == 1);
+    REQUIRE(otherInitialInstances.GetInstancesCount() == 1);
+    REQUIRE(otherExternalInitialInstances.GetInstancesCount() == 1);
+
+    REQUIRE(initialInstances.GetLayerInstancesCount("My layer") == 0);
+    REQUIRE(externalInitialInstances.GetLayerInstancesCount("My layer") == 0);
+  }
+}
+
+TEST_CASE("MergeLayers", "[common]") {
+  SECTION("Can merge instances from a layout into another layout (and their associated external layouts)") {
+    gd::Project project;
+    gd::Platform platform;
+    SetupProjectWithDummyPlatform(project, platform);
+
+    auto &layout = project.InsertNewLayout("My layout", 0);
+    auto &otherLayout = project.InsertNewLayout("My other layout", 1);
+
+    layout.InsertNewLayer("My layer", 0);
+    otherLayout.InsertNewLayer("My layer", 0);
+    
+    auto &externalLayout =
+        project.InsertNewExternalLayout("My external layout", 0);
+    auto &otherExternalLayout =
+        project.InsertNewExternalLayout("My other external layout", 0);
+    externalLayout.SetAssociatedLayout("My layout");
+    otherExternalLayout.SetAssociatedLayout("My other layout");
+
+    auto &initialInstances = layout.GetInitialInstances();
+    initialInstances.InsertNewInitialInstance().SetLayer("My layer");
+    initialInstances.InsertNewInitialInstance().SetLayer("My layer");
+    initialInstances.InsertNewInitialInstance().SetLayer("My layer");
+    initialInstances.InsertNewInitialInstance().SetLayer("");
+    initialInstances.InsertNewInitialInstance().SetLayer("");
+    initialInstances.InsertNewInitialInstance().SetLayer("My other layer");
+    
+    auto &externalInitialInstances = externalLayout.GetInitialInstances();
+    externalInitialInstances.InsertNewInitialInstance().SetLayer("My layer");
+    externalInitialInstances.InsertNewInitialInstance().SetLayer("My layer");
+    externalInitialInstances.InsertNewInitialInstance().SetLayer("");
+    externalInitialInstances.InsertNewInitialInstance().SetLayer("My other layer");
+
+    auto &otherInitialInstances = otherLayout.GetInitialInstances();
+    otherInitialInstances.InsertNewInitialInstance().SetLayer("My layer");
+
+    auto &otherExternalInitialInstances = otherExternalLayout.GetInitialInstances();
+    otherExternalInitialInstances.InsertNewInitialInstance().SetLayer("My layer");
+
+    REQUIRE(initialInstances.GetInstancesCount() == 6);
+    REQUIRE(externalInitialInstances.GetInstancesCount() == 4);
+    REQUIRE(otherInitialInstances.GetInstancesCount() == 1);
+    REQUIRE(otherExternalInitialInstances.GetInstancesCount() == 1);
+
+    REQUIRE(initialInstances.GetLayerInstancesCount("My layer") == 3);
+    REQUIRE(externalInitialInstances.GetLayerInstancesCount("My layer") == 2);
+
+    gd::WholeProjectRefactorer::MergeLayers(project, layout, "My layer", "");
+
+    // No instance was removed.
+    REQUIRE(initialInstances.GetInstancesCount() == 6);
+    REQUIRE(externalInitialInstances.GetInstancesCount() == 4);
+    REQUIRE(otherInitialInstances.GetInstancesCount() == 1);
+    REQUIRE(otherExternalInitialInstances.GetInstancesCount() == 1);
+
+    // No instance remain in "My layer".
+    REQUIRE(initialInstances.GetLayerInstancesCount("My layer") == 0);
+    REQUIRE(externalInitialInstances.GetLayerInstancesCount("My layer") == 0);
+
+    // Layers with the same name in other layouts are untouched.
+    REQUIRE(otherInitialInstances.GetLayerInstancesCount("My layer") == 1);
+    REQUIRE(otherExternalInitialInstances.GetLayerInstancesCount("My layer") == 1);
+
+    // Other layers from the same layout are untouched.
+    REQUIRE(initialInstances.GetLayerInstancesCount("My other layer") == 1);
+    REQUIRE(externalInitialInstances.GetLayerInstancesCount("My other layer") == 1);
+  }
+}

ExtLibs/CMakeLists.txt

@@ -0,0 +1 @@
+

Extensions/3D/CMakeLists.txt

@@ -1,20 +1,23 @@
-cmake_minimum_required(VERSION 2.6)
-cmake_policy(SET CMP0015 NEW)
+cmake_minimum_required(VERSION 3.5)
 
 project(Scene3D)
 gd_add_extension_includes()
 
-#Defines
-###
+# Defines
+#
 gd_add_extension_definitions(Scene3D)
 
-#The targets
-###
+# The targets
+#
 include_directories(.)
-file(GLOB source_files *.cpp *.h)
+file(
+	GLOB
+	source_files
+	*.cpp
+	*.h)
 gd_add_clang_utils(Scene3D "${source_files}")
 gd_add_extension_target(Scene3D "${source_files}")
 
-#Linker files for the IDE extension
-###
+# Linker files for the IDE extension
+#
 gd_extension_link_libraries(Scene3D)

Extensions/3D/Model3DObjectConfiguration.cpp

@@ -21,7 +21,7 @@ using namespace std;
 
 Model3DObjectConfiguration::Model3DObjectConfiguration()
     : width(100), height(100), depth(100), rotationX(0), rotationY(0),
-      rotationZ(0), modelResourceName(""), materialType("Basic"),
+      rotationZ(0), modelResourceName(""), materialType("StandardWithoutMetalness"),
       originLocation("ModelOrigin"), centerLocation("ModelOrigin"),
       keepAspectRatio(true) {}
 

Extensions/AnchorBehavior/CMakeLists.txt

@@ -1,20 +1,23 @@
-cmake_minimum_required(VERSION 2.6)
-cmake_policy(SET CMP0015 NEW)
+cmake_minimum_required(VERSION 3.5)
 
 project(AnchorBehavior)
 gd_add_extension_includes()
 
-#Defines
-###
+# Defines
+#
 gd_add_extension_definitions(AnchorBehavior)
 
-#The targets
-###
+# The targets
+#
 include_directories(.)
-file(GLOB source_files *.cpp *.h)
+file(
+	GLOB
+	source_files
+	*.cpp
+	*.h)
 gd_add_clang_utils(AnchorBehavior "${source_files}")
 gd_add_extension_target(AnchorBehavior "${source_files}")
 
-#Linker files for the IDE extension
-###
+# Linker files for the IDE extension
+#
 gd_extension_link_libraries(AnchorBehavior)

Extensions/AnchorBehavior/Extension.cpp

@@ -18,6 +18,7 @@ void DeclareAnchorBehaviorExtension(gd::PlatformExtension& extension) {
                                "Victor Levasseur",
                                "Open source (MIT License)")
       .SetCategory("User interface")
+      .SetTags("anchor, ui, layout")
       .SetExtensionHelpPath("/behaviors/anchor");
 
   gd::BehaviorMetadata& aut = extension.AddBehavior(

Extensions/CMakeLists.txt

@@ -1,28 +1,34 @@
-#This is the CMake file used to build the C++ extensions.
-#For more information, see the README.md file.
+# This is the CMake file used to build the C++ extensions. 
+# For more information, see the README.md file.
 
-cmake_minimum_required(VERSION 2.6)
-cmake_policy(SET CMP0011 NEW)
+cmake_minimum_required(VERSION 3.5)
 
 project(GD-Extensions)
-include(CMakeUtils.txt) #Functions to factor common tasks done in CMakeLists.txt of extensions
+include(CMakeUtils.txt) # Functions to factor common tasks done in CMakeLists.txt of extensions
 
-#Add all the CMakeLists (for non pure JS extensions):
-ADD_SUBDIRECTORY(3D)
-ADD_SUBDIRECTORY(AnchorBehavior)
-ADD_SUBDIRECTORY(DestroyOutsideBehavior)
-ADD_SUBDIRECTORY(DraggableBehavior)
-ADD_SUBDIRECTORY(Inventory)
-ADD_SUBDIRECTORY(LinkedObjects)
-ADD_SUBDIRECTORY(ParticleSystem)
-ADD_SUBDIRECTORY(PanelSpriteObject)
-ADD_SUBDIRECTORY(PathfindingBehavior)
-ADD_SUBDIRECTORY(PhysicsBehavior)
-ADD_SUBDIRECTORY(PlatformBehavior)
-ADD_SUBDIRECTORY(PrimitiveDrawing)
-ADD_SUBDIRECTORY(Shopify)
-ADD_SUBDIRECTORY(SystemInfo)
-ADD_SUBDIRECTORY(TextEntryObject)
-ADD_SUBDIRECTORY(TextObject)
-ADD_SUBDIRECTORY(TiledSpriteObject)
-ADD_SUBDIRECTORY(TopDownMovementBehavior)
+# List of non pure JS extensions
+set(
+	GD_EXTENSIONS
+	3D
+	AnchorBehavior
+	DestroyOutsideBehavior
+	DraggableBehavior
+	Inventory
+	LinkedObjects
+	PanelSpriteObject
+	ParticleSystem
+	PathfindingBehavior
+	PhysicsBehavior
+	PlatformBehavior
+	PrimitiveDrawing
+	Shopify
+	SystemInfo
+	TextEntryObject
+	TextObject
+	TiledSpriteObject
+	TopDownMovementBehavior)
+
+# Automatically add all listed extensions
+foreach(extension ${GD_EXTENSIONS})
+	add_subdirectory(${extension})
+endforeach()

Extensions/CMakeUtils.txt

@@ -7,79 +7,75 @@ macro(gd_add_extension_includes)
 	include_directories(${GDCORE_include_dir})
 endmacro()
 
-#Add common defines for a target that will be a GD extension
+# Add common defines for a target that will be a GD extension
 function(gd_add_extension_definitions target_name)
 
-	#Define used in GD to check the build type
-	IF(CMAKE_BUILD_TYPE MATCHES "Debug")
-		add_definitions( -DDEBUG )
-	ELSE()
-		add_definitions( -DRELEASE )
-	ENDIF()
+	# Define used in GD to check the build type
+	if("${CMAKE_BUILD_TYPE}" MATCHES "Debug")
+		add_definitions(-DDEBUG)
+	else()
+		add_definitions(-DRELEASE)
+	endif()
 
 	set(${target_name}_extra_definitions "${${target_name}_extra_definitions} GD_IDE_ONLY=1;" PARENT_SCOPE)
 
-	#Defne used in GD to identify the environment
-	IF (EMSCRIPTEN)
-		add_definitions( -DEMSCRIPTEN )
-	ELSEIF(WIN32)
-		add_definitions( -DWINDOWS )
-    ELSEIF(APPLE)
-    	add_definitions( -DMACOS )
-    ELSE()
-		add_definitions( -DLINUX )
-	ENDIF()
+	# Define used in GD to identify the environment
+	if(EMSCRIPTEN)
+		add_definitions(-DEMSCRIPTEN)
+	elseif(WIN32)
+		add_definitions(-DWINDOWS)
+	elseif(APPLE)
+		add_definitions(-DMACOS)
+	else()
+		add_definitions(-DLINUX)
+	endif()
 
-	IF(WIN32) #Windows specific defines
-		add_definitions( "-DGD_CORE_API=__declspec(dllimport)" )
-		add_definitions( "-DGD_API=__declspec(dllimport)" )
-		add_definitions( "-DGD_EXTENSION_API=__declspec(dllexport)" )
-		add_definitions( -D__GNUWIN32__ )
-	ELSE()
-
-		add_definitions( -DGD_API= )
-		add_definitions( -DGD_CORE_API= )
-		add_definitions( -DGD_EXTENSION_API= )
-	ENDIF(WIN32)
+	if(WIN32) # Windows specific defines
+		add_definitions("-DGD_API=__declspec(dllimport)")
+		add_definitions("-DGD_CORE_API=__declspec(dllimport)")
+		add_definitions("-DGD_EXTENSION_API=__declspec(dllexport)")
+		add_definitions(-D__GNUWIN32__)
+	else()
+		add_definitions(-DGD_API=)
+		add_definitions(-DGD_CORE_API=)
+		add_definitions(-DGD_EXTENSION_API=)
+	endif()
 endfunction()
 
-#Add a GD extension target, that will produce the final library file.
+# Add a GD extension target, that will produce the final library file.
 function(gd_add_extension_target target_name source_files)
-	IF(target_name STREQUAL "")
-		MESSAGE(ERROR "You called gd_add_extension_target without specifying a target name")
-	ENDIF()
+	if(target_name STREQUAL "")
+		message(ERROR "You called gd_add_extension_target without specifying a target name")
+	endif()
 
-	SET(platform_directory ${ARGV2})
-	IF(NOT platform_directory)
-		SET(platform_directory "CppPlatform")
-	ENDIF()
+	set(platform_directory ${ARGV2})
+	if(NOT platform_directory)
+		set(platform_directory "CppPlatform")
+	endif()
 
-	IF(EMSCRIPTEN)
+	if(EMSCRIPTEN)
 		# Emscripten treats all libraries as static libraries
 		add_library(${target_name} STATIC ${source_files})
-	ELSE()
+	else()
 		add_library(${target_name} SHARED ${source_files})
-	ENDIF()
+	endif()
 	set_target_properties(${target_name} PROPERTIES PREFIX "")
 	set_target_properties(${target_name} PROPERTIES COMPILE_DEFINITIONS "${${target_name}_extra_definitions}")
 	set_target_properties(${target_name} PROPERTIES RUNTIME_OUTPUT_DIRECTORY "${GD_base_dir}/Binaries/Output/${CMAKE_BUILD_TYPE}_${CMAKE_SYSTEM_NAME}/${platform_directory}/Extensions")
 	set_target_properties(${target_name} PROPERTIES ARCHIVE_OUTPUT_DIRECTORY "${GD_base_dir}/Binaries/Output/${CMAKE_BUILD_TYPE}_${CMAKE_SYSTEM_NAME}/${platform_directory}/Extensions")
 	set_target_properties(${target_name} PROPERTIES LIBRARY_OUTPUT_DIRECTORY "${GD_base_dir}/Binaries/Output/${CMAKE_BUILD_TYPE}_${CMAKE_SYSTEM_NAME}/${platform_directory}/Extensions")
-	IF(WIN32) #GD extensions have special suffix in their filenames.
+	if(WIN32) # GD extensions have special suffix in their filenames.
 		set_target_properties(${target_name} PROPERTIES SUFFIX ".xgdwe")
-	ELSEIF(EMSCRIPTEN)
+	elseif(EMSCRIPTEN)
 		set_target_properties(${target_name} PROPERTIES SUFFIX ".bc")
-	ELSE()
+	else()
 		set_target_properties(${target_name} PROPERTIES SUFFIX ".xgde")
-	ENDIF()
+	endif()
 endfunction()
 
-#Link default libraries with a target that is a GD extension
+# Link default libraries with a target that is a GD extension
 function(gd_extension_link_libraries target_name)
-	IF(EMSCRIPTEN)
-		#Nothing.
-	ELSE()
+	if(NOT EMSCRIPTEN)
 		target_link_libraries(${target_name} GDCore)
-	ENDIF()
+	endif()
 endfunction()
-

Extensions/DestroyOutsideBehavior/CMakeLists.txt

@@ -1,20 +1,23 @@
-cmake_minimum_required(VERSION 2.6)
-cmake_policy(SET CMP0015 NEW)
+cmake_minimum_required(VERSION 3.5)
 
 project(DestroyOutsideBehavior)
 gd_add_extension_includes()
 
-#Defines
-###
+# Defines
+#
 gd_add_extension_definitions(DestroyOutsideBehavior)
 
-#The targets
-###
+# The targets
+#
 include_directories(.)
-file(GLOB source_files *.cpp *.h)
+file(
+	GLOB
+	source_files
+	*.cpp
+	*.h)
 gd_add_clang_utils(DestroyOutsideBehavior "${source_files}")
 gd_add_extension_target(DestroyOutsideBehavior "${source_files}")
 
-#Linker files for the IDE extension
-###
+# Linker files for the IDE extension
+#
 gd_extension_link_libraries(DestroyOutsideBehavior GDCore)

Extensions/DestroyOutsideBehavior/Extension.cpp

@@ -21,6 +21,7 @@ void DeclareDestroyOutsideBehaviorExtension(gd::PlatformExtension& extension) {
                                "Florian Rival",
                                "Open source (MIT License)")
       .SetCategory("Game mechanic")
+      .SetTags("screen")
       .SetExtensionHelpPath("/behaviors/destroyoutside");
 
   gd::BehaviorMetadata& aut =

Extensions/DraggableBehavior/CMakeLists.txt

@@ -1,20 +1,23 @@
-cmake_minimum_required(VERSION 2.6)
-cmake_policy(SET CMP0015 NEW)
+cmake_minimum_required(VERSION 3.5)
 
 project(DraggableBehavior)
 gd_add_extension_includes()
 
-#Defines
-###
+# Defines
+#
 gd_add_extension_definitions(DraggableBehavior)
 
-#The targets
-###
+# The targets
+#
 include_directories(.)
-file(GLOB source_files *.cpp *.h)
+file(
+	GLOB
+	source_files
+	*.cpp
+	*.h)
 gd_add_clang_utils(DraggableBehavior "${source_files}")
 gd_add_extension_target(DraggableBehavior "${source_files}")
 
-#Linker files for the IDE extension
-###
+# Linker files for the IDE extension
+#
 gd_extension_link_libraries(DraggableBehavior)

Extensions/DraggableBehavior/Extension.cpp

@@ -21,6 +21,7 @@ void DeclareDraggableBehaviorExtension(gd::PlatformExtension& extension) {
           "Florian Rival",
           "Open source (MIT License)")
       .SetCategory("User interface")
+      .SetTags("drag")
       .SetExtensionHelpPath("/behaviors/draggable");
 
   gd::BehaviorMetadata& aut = extension.AddBehavior(

Extensions/Inventory/CMakeLists.txt

@@ -1,21 +1,23 @@
-cmake_minimum_required(VERSION 2.6)
-cmake_policy(SET CMP0015 NEW)
+cmake_minimum_required(VERSION 3.5)
 
 project(Inventory)
 gd_add_extension_includes()
 
-#Defines
-###
+# Defines
+#
 gd_add_extension_definitions(Inventory)
 
-#The targets
-###
+# The targets
+#
 include_directories(.)
-file(GLOB source_files *.cpp *.h)
+file(
+	GLOB
+	source_files
+	*.cpp
+	*.h)
 gd_add_clang_utils(Inventory "${source_files}")
-
 gd_add_extension_target(Inventory "${source_files}")
 
-#Linker files for the IDE extension
-###
+# Linker files for the IDE extension
+#
 gd_extension_link_libraries(Inventory)

Extensions/Inventory/JsExtension.cpp

@@ -26,70 +26,57 @@ class InventoryJsExtension : public gd::PlatformExtension {
     DeclareInventoryExtension(*this);
 
     GetAllActions()["Inventory::Add"]
-        .codeExtraInformation
         .SetIncludeFile("Extensions/Inventory/inventory.js")
         .AddIncludeFile("Extensions/Inventory/inventorytools.js")
         .SetFunctionName("gdjs.evtTools.inventory.add");
     GetAllActions()["Inventory::Remove"]
-        .codeExtraInformation
         .SetIncludeFile("Extensions/Inventory/inventory.js")
         .AddIncludeFile("Extensions/Inventory/inventorytools.js")
         .SetFunctionName("gdjs.evtTools.inventory.remove");
     GetAllActions()["Inventory::SetMaximum"]
-        .codeExtraInformation
         .SetIncludeFile("Extensions/Inventory/inventory.js")
         .AddIncludeFile("Extensions/Inventory/inventorytools.js")
         .SetFunctionName("gdjs.evtTools.inventory.setMaximum");
     GetAllActions()["Inventory::SetUnlimited"]
-        .codeExtraInformation
         .SetIncludeFile("Extensions/Inventory/inventory.js")
         .AddIncludeFile("Extensions/Inventory/inventorytools.js")
         .SetFunctionName("gdjs.evtTools.inventory.setUnlimited");
     GetAllActions()["Inventory::Equip"]
-        .codeExtraInformation
         .SetIncludeFile("Extensions/Inventory/inventory.js")
         .AddIncludeFile("Extensions/Inventory/inventorytools.js")
         .SetFunctionName("gdjs.evtTools.inventory.equip");
 
     GetAllActions()["Inventory::SerializeToVariable"]
-        .codeExtraInformation
         .SetIncludeFile("Extensions/Inventory/inventory.js")
         .AddIncludeFile("Extensions/Inventory/inventorytools.js")
         .SetFunctionName("gdjs.evtTools.inventory.serializeToVariable");
     GetAllActions()["Inventory::UnserializeFromVariable"]
-        .codeExtraInformation
         .SetIncludeFile("Extensions/Inventory/inventory.js")
         .AddIncludeFile("Extensions/Inventory/inventorytools.js")
         .SetFunctionName("gdjs.evtTools.inventory.unserializeFromVariable");
 
     GetAllConditions()["Inventory::Count"]
-        .codeExtraInformation
         .SetIncludeFile("Extensions/Inventory/inventory.js")
         .AddIncludeFile("Extensions/Inventory/inventorytools.js")
         .SetFunctionName("gdjs.evtTools.inventory.count");
     GetAllConditions()["Inventory::Has"]
-        .codeExtraInformation
         .SetIncludeFile("Extensions/Inventory/inventory.js")
         .AddIncludeFile("Extensions/Inventory/inventorytools.js")
         .SetFunctionName("gdjs.evtTools.inventory.has");
     GetAllConditions()["Inventory::IsFull"]
-        .codeExtraInformation
         .SetIncludeFile("Extensions/Inventory/inventory.js")
         .AddIncludeFile("Extensions/Inventory/inventorytools.js")
         .SetFunctionName("gdjs.evtTools.inventory.isFull");
     GetAllConditions()["Inventory::IsEquipped"]
-        .codeExtraInformation
         .SetIncludeFile("Extensions/Inventory/inventory.js")
         .AddIncludeFile("Extensions/Inventory/inventorytools.js")
         .SetFunctionName("gdjs.evtTools.inventory.isEquipped");
 
     GetAllExpressions()["Inventory::Count"]
-        .codeExtraInformation
         .SetIncludeFile("Extensions/Inventory/inventory.js")
         .AddIncludeFile("Extensions/Inventory/inventorytools.js")
         .SetFunctionName("gdjs.evtTools.inventory.count");
 	GetAllExpressions()["Inventory::Maximum"]
-		.codeExtraInformation
 		.SetIncludeFile("Extensions/Inventory/inventory.js")
 		.AddIncludeFile("Extensions/Inventory/inventorytools.js")
 		.SetFunctionName("gdjs.evtTools.inventory.maximum");

Extensions/Leaderboards/JsExtension.js

@@ -59,11 +59,17 @@ module.exports = {
         false
       )
       .addParameter('string', _('Name to register for the player'), '', false)
+      .setParameterLongDescription(
+        _(
+          'Let this empty to let the leaderboard auto-generate a player name (e.g: "Player23464"). You can configure this in the leaderboard administration.'
+        )
+      )
       .setHelpPath('/all-features/leaderboards')
       .getCodeExtraInformation()
       .setIncludeFile('Extensions/Leaderboards/sha256.js')
       .addIncludeFile('Extensions/Leaderboards/leaderboardstools.js')
-      .setFunctionName('gdjs.evtTools.leaderboards.savePlayerScore');
+      .setFunctionName('gdjs.evtTools.leaderboards.savePlayerScore')
+      .setAsyncFunctionName('gdjs.evtTools.leaderboards.savePlayerScore');
 
     extension
       .addAction(
@@ -89,7 +95,8 @@ module.exports = {
       .getCodeExtraInformation()
       .setIncludeFile('Extensions/Leaderboards/sha256.js')
       .addIncludeFile('Extensions/Leaderboards/leaderboardstools.js')
-      .setFunctionName('gdjs.evtTools.leaderboards.saveConnectedPlayerScore');
+      .setFunctionName('gdjs.evtTools.leaderboards.saveConnectedPlayerScore')
+      .setAsyncFunctionName('gdjs.evtTools.leaderboards.saveConnectedPlayerScore');
 
     extension
       .addCondition(
@@ -154,20 +161,22 @@ module.exports = {
       .setIncludeFile('Extensions/Leaderboards/leaderboardstools.js')
       .setFunctionName('gdjs.evtTools.leaderboards.isSaving');
 
-      extension
-        .addCondition(
-          'HasPlayerJustClosedLeaderboardView',
-          _('Closed by player'),
-          _('Check if the player has just closed the leaderboard view.'),
-          _('Player has just closed the leaderboard view'),
-          _('Display leaderboard'),
-          'JsPlatform/Extensions/leaderboard.svg',
-          'JsPlatform/Extensions/leaderboard.svg'
-        )
-        .setHelpPath('/all-features/leaderboards')
-        .getCodeExtraInformation()
-        .setIncludeFile('Extensions/Leaderboards/leaderboardstools.js')
-        .setFunctionName('gdjs.evtTools.leaderboards.hasPlayerJustClosedLeaderboardView');
+    extension
+      .addCondition(
+        'HasPlayerJustClosedLeaderboardView',
+        _('Closed by player'),
+        _('Check if the player has just closed the leaderboard view.'),
+        _('Player has just closed the leaderboard view'),
+        _('Display leaderboard'),
+        'JsPlatform/Extensions/leaderboard.svg',
+        'JsPlatform/Extensions/leaderboard.svg'
+      )
+      .setHelpPath('/all-features/leaderboards')
+      .getCodeExtraInformation()
+      .setIncludeFile('Extensions/Leaderboards/leaderboardstools.js')
+      .setFunctionName(
+        'gdjs.evtTools.leaderboards.hasPlayerJustClosedLeaderboardView'
+      );
 
     extension
       .addStrExpression(

Extensions/Leaderboards/leaderboardstools.ts

@@ -24,37 +24,47 @@ namespace gdjs {
         return shaObj.getHash('B64');
       };
 
-      // Score saving
+      /**
+       * Hold the state of the save of a score for a leaderboard.
+       */
       class ScoreSavingState {
-        lastScoreSavingStartedAt: number | null;
-        lastScoreSavingSucceededAt: number | null;
-        currentlySavingScore: number | null;
-        currentlySavingPlayerName: string | null;
-        currentlySavingPlayerId: string | null;
-        lastSavedScore: number | null;
-        lastSavedPlayerName: string | null;
-        lastSavedPlayerId: string | null;
-        lastSaveError: string | null;
-        isScoreSaving: boolean;
-        hasScoreBeenSaved: boolean;
-        hasScoreSavingErrored: boolean;
+        lastScoreSavingStartedAt: number | null = null;
+        lastScoreSavingSucceededAt: number | null = null;
 
-        constructor() {
-          this.lastScoreSavingStartedAt = null;
-          this.lastScoreSavingSucceededAt = null;
-          this.currentlySavingScore = null;
-          this.currentlySavingPlayerName = null;
-          this.currentlySavingPlayerId = null;
-          this.lastSavedScore = null;
-          this.lastSavedPlayerName = null;
-          this.lastSavedPlayerId = null;
-          this.lastSaveError = null;
-          this.isScoreSaving = false;
-          this.hasScoreBeenSaved = false;
-          this.hasScoreSavingErrored = false;
+        /** The promise that will be resolved when the score saving is done (successfully or not). */
+        lastSavingPromise: Promise<void> | null = null;
+
+        // Score that is being saved:
+        private _currentlySavingScore: number | null = null;
+        private _currentlySavingPlayerName: string | null = null;
+        private _currentlySavingPlayerId: string | null = null;
+
+        // Last score saved with success:
+        private _lastSavedScore: number | null = null;
+        private _lastSavedPlayerName: string | null = null;
+        private _lastSavedPlayerId: string | null = null;
+
+        /** The id of the entry in the leaderboard, for the last score saved with success. */
+        lastSavedLeaderboardEntryId: string | null = null;
+
+        /** Last error that happened when saving the score (useful if `hasScoreSavingErrored` is true). */
+        lastSaveError: string | null = null;
+
+        /** `true` if the last save has finished and succeeded. */
+        hasScoreBeenSaved: boolean = false;
+
+        /** `true` if the last save has finished and failed (check `lastSaveError` then). */
+        hasScoreSavingErrored: boolean = false;
+
+        isSaving(): boolean {
+          return (
+            !!this.lastSavingPromise &&
+            !this.hasScoreBeenSaved &&
+            !this.hasScoreSavingErrored
+          );
         }
 
-        isSameAsLastScore({
+        private _isSameAsLastScore({
           playerName,
           playerId,
           score,
@@ -64,13 +74,13 @@ namespace gdjs {
           score: number;
         }): boolean {
           return (
-            ((!!playerName && this.lastSavedPlayerName === playerName) ||
-              (!!playerId && this.lastSavedPlayerId === playerId)) &&
-            this.lastSavedScore === score
+            ((!!playerName && this._lastSavedPlayerName === playerName) ||
+              (!!playerId && this._lastSavedPlayerId === playerId)) &&
+            this._lastSavedScore === score
           );
         }
 
-        isAlreadySavingThisScore({
+        private _isAlreadySavingThisScore({
           playerName,
           playerId,
           score,
@@ -79,15 +89,16 @@ namespace gdjs {
           playerId?: string;
           score: number;
         }): boolean {
+          if (!this.isSaving()) return false;
+
           return (
-            ((!!playerName && this.currentlySavingPlayerName === playerName) ||
-              (!!playerId && this.currentlySavingPlayerId === playerId)) &&
-            this.isScoreSaving &&
-            this.currentlySavingScore === score
+            ((!!playerName && this._currentlySavingPlayerName === playerName) ||
+              (!!playerId && this._currentlySavingPlayerId === playerId)) &&
+            this._currentlySavingScore === score
           );
         }
 
-        isTooSoonToSaveAnotherScore(): boolean {
+        private _isTooSoonToSaveAnotherScore(): boolean {
           return (
             !!this.lastScoreSavingStartedAt &&
             Date.now() - this.lastScoreSavingStartedAt < 500
@@ -102,28 +113,91 @@ namespace gdjs {
           playerName?: string;
           playerId?: string;
           score: number;
-        }): void {
+        }): {
+          closeSaving: (leaderboardEntryId: string | null) => void;
+          closeSavingWithError(errorCode: string);
+        } {
+          if (this._isAlreadySavingThisScore({ playerName, playerId, score })) {
+            logger.warn(
+              'There is already a request to save with this player name and this score. Ignoring this one.'
+            );
+            throw new Error('Ignoring this saving request.');
+          }
+
+          if (this._isSameAsLastScore({ playerName, playerId, score })) {
+            logger.warn(
+              'The player and score to be sent are the same as previous one. Ignoring this one.'
+            );
+            this._setError('SAME_AS_PREVIOUS');
+            throw new Error('Ignoring this saving request.');
+          }
+
+          if (this._isTooSoonToSaveAnotherScore()) {
+            logger.warn(
+              'Last entry was sent too little time ago. Ignoring this one.'
+            );
+            this._setError('TOO_FAST');
+
+            // Set the starting time to cancel all the following attempts that
+            // are started too early after this one.
+            this.lastScoreSavingStartedAt = Date.now();
+
+            throw new Error('Ignoring this saving request.');
+          }
+
+          let resolveSavingPromise: () => void;
+          const savingPromise = new Promise<void>((resolve) => {
+            resolveSavingPromise = resolve;
+          });
+
           this.lastScoreSavingStartedAt = Date.now();
-          this.isScoreSaving = true;
+          this.lastSavingPromise = savingPromise;
           this.hasScoreBeenSaved = false;
           this.hasScoreSavingErrored = false;
-          this.currentlySavingScore = score;
-          if (playerName) this.currentlySavingPlayerName = playerName;
-          if (playerId) this.currentlySavingPlayerId = playerId;
+          this._currentlySavingScore = score;
+          if (playerName) this._currentlySavingPlayerName = playerName;
+          if (playerId) this._currentlySavingPlayerId = playerId;
+
+          return {
+            closeSaving: (leaderboardEntryId) => {
+              if (savingPromise !== this.lastSavingPromise) {
+                logger.info(
+                  'Score saving result received, but another save was launched in the meantime - ignoring the result of this one.'
+                );
+
+                // Still finish the promise that can be waited upon:
+                resolveSavingPromise();
+                return;
+              }
+
+              this.lastScoreSavingSucceededAt = Date.now();
+              this._lastSavedScore = this._currentlySavingScore;
+              this._lastSavedPlayerName = this._currentlySavingPlayerName;
+              this._lastSavedPlayerId = this._currentlySavingPlayerId;
+              this.lastSavedLeaderboardEntryId = leaderboardEntryId;
+              this.hasScoreBeenSaved = true;
+
+              resolveSavingPromise();
+            },
+            closeSavingWithError: (errorCode) => {
+              if (savingPromise !== this.lastSavingPromise) {
+                logger.info(
+                  'Score saving result received, but another save was launched in the meantime - ignoring the result of this one.'
+                );
+
+                // Still finish the promise that can be waited upon:
+                resolveSavingPromise();
+                return;
+              }
+
+              this._setError(errorCode);
+              resolveSavingPromise();
+            },
+          };
         }
 
-        closeSaving(): void {
-          this.lastScoreSavingSucceededAt = Date.now();
-          this.lastSavedScore = this.currentlySavingScore;
-          this.lastSavedPlayerName = this.currentlySavingPlayerName;
-          this.lastSavedPlayerId = this.currentlySavingPlayerId;
-          this.isScoreSaving = false;
-          this.hasScoreBeenSaved = true;
-        }
-
-        setError(errorCode: string): void {
+        private _setError(errorCode: string): void {
           this.lastSaveError = errorCode;
-          this.isScoreSaving = false;
           this.hasScoreBeenSaved = false;
           this.hasScoreSavingErrored = true;
         }
@@ -172,6 +246,7 @@ namespace gdjs {
       }
       _loaderContainer.appendChild(_loader);
 
+      /** Get the saving state of the leaderboard who had the last update (successful or started). */
       const getLastScoreSavingState = function ({
         hasSucceeded,
       }: {
@@ -201,19 +276,17 @@ namespace gdjs {
         return lastScoreSavingState;
       };
 
-      const saveScore = function ({
+      const saveScore = async function ({
         leaderboardId,
         playerName,
         authenticatedPlayerData,
         score,
-        scoreSavingState,
         runtimeScene,
       }: {
         leaderboardId: string;
         playerName?: string | null;
         authenticatedPlayerData?: { playerId: string; playerToken: string };
         score: number;
-        scoreSavingState: ScoreSavingState;
         runtimeScene: gdjs.RuntimeScene;
       }) {
         const rootApi = runtimeScene
@@ -242,195 +315,143 @@ namespace gdjs {
           ] = `player-game-token ${authenticatedPlayerData.playerToken}`;
           leaderboardEntryCreationUrl += `?playerId=${authenticatedPlayerData.playerId}`;
         } else {
-          // In case playerName is empty or undefined, the formatting will generate a random name.
+          // In case playerName is empty, the backend will generate a random name.
           payloadObject['playerName'] = formatPlayerName(playerName);
         }
         const payload = JSON.stringify(payloadObject);
         headers['Digest'] = computeDigest(payload);
 
-        fetch(leaderboardEntryCreationUrl, {
-          body: payload,
-          method: 'POST',
-          headers: headers,
-        }).then(
-          (response) => {
-            if (!response.ok) {
-              const errorCode = response.status.toString();
-              logger.error(
-                'Server responded with an error:',
-                errorCode,
-                response.statusText
-              );
-              scoreSavingState.setError(errorCode);
-              return;
-            }
+        try {
+          const response = await fetch(leaderboardEntryCreationUrl, {
+            body: payload,
+            method: 'POST',
+            headers: headers,
+          });
 
-            scoreSavingState.closeSaving();
-
-            return response.text().then(
-              (text) => {},
-              (error) => {
-                logger.warn(
-                  'An error occurred when reading response but score has been saved:',
-                  error
-                );
-              }
+          if (!response.ok) {
+            const errorCode = response.status.toString();
+            logger.error(
+              'Server responded with an error:',
+              errorCode,
+              response.statusText
             );
-          },
-          (error) => {
-            logger.error('Error while submitting a leaderboard score:', error);
-            const errorCode = 'REQUEST_NOT_SENT';
-            scoreSavingState.setError(errorCode);
+
+            throw errorCode;
           }
-        );
+
+          let leaderboardEntryId: string | null = null;
+          try {
+            const leaderboardEntry = await response.json();
+            leaderboardEntryId = leaderboardEntry.id;
+          } catch (error) {
+            logger.warn(
+              'An error occurred when reading response but score has been saved:',
+              error
+            );
+          }
+
+          return leaderboardEntryId;
+        } catch (error) {
+          logger.error('Error while submitting a leaderboard score:', error);
+          const errorCode = 'REQUEST_NOT_SENT';
+
+          throw errorCode;
+        }
       };
 
-      export const savePlayerScore = function (
+      export const savePlayerScore = (
         runtimeScene: gdjs.RuntimeScene,
         leaderboardId: string,
         score: float,
         playerName: string
-      ) {
-        let scoreSavingState: ScoreSavingState;
-        if (_scoreSavingStateByLeaderboard[leaderboardId]) {
-          scoreSavingState = _scoreSavingStateByLeaderboard[leaderboardId];
-          let shouldStartSaving = true;
-          if (
-            shouldStartSaving &&
-            scoreSavingState.isAlreadySavingThisScore({ playerName, score })
-          ) {
-            logger.warn(
-              'There is already a request to save with this player name and this score. Ignoring this one.'
-            );
-            shouldStartSaving = false;
-          }
+      ) =>
+        new gdjs.PromiseTask(
+          (async () => {
+            const scoreSavingState = (_scoreSavingStateByLeaderboard[
+              leaderboardId
+            ] =
+              _scoreSavingStateByLeaderboard[leaderboardId] ||
+              new ScoreSavingState());
 
-          if (
-            shouldStartSaving &&
-            scoreSavingState.isSameAsLastScore({ playerName, score })
-          ) {
-            logger.warn(
-              'The player and score to be sent are the same as previous one. Ignoring this one.'
-            );
-            scoreSavingState.setError('SAME_AS_PREVIOUS');
-            shouldStartSaving = false;
-          }
+            try {
+              const {
+                closeSaving,
+                closeSavingWithError,
+              } = scoreSavingState.startSaving({ playerName, score });
 
-          if (
-            shouldStartSaving &&
-            scoreSavingState.isTooSoonToSaveAnotherScore()
-          ) {
-            logger.warn(
-              'Last entry was sent too little time ago. Ignoring this one.'
-            );
-            scoreSavingState.setError('TOO_FAST');
-            shouldStartSaving = false;
-            // Set the starting time to cancel all the following attempts that
-            // are started too early after this one.
-            scoreSavingState.lastScoreSavingStartedAt = Date.now();
-          }
-          if (!shouldStartSaving) {
-            return;
-          }
-        } else {
-          scoreSavingState = new ScoreSavingState();
-          _scoreSavingStateByLeaderboard[leaderboardId] = scoreSavingState;
-        }
+              try {
+                const leaderboardEntryId = await saveScore({
+                  leaderboardId,
+                  playerName,
+                  score,
+                  runtimeScene,
+                });
+                closeSaving(leaderboardEntryId);
+              } catch (errorCode) {
+                closeSavingWithError(errorCode);
+              }
+            } catch {
+              // Do nothing: saving was rejected for a reason already logged.
+            }
+          })()
+        );
 
-        scoreSavingState.startSaving({ playerName, score });
-
-        saveScore({
-          leaderboardId,
-          playerName,
-          score,
-          scoreSavingState,
-          runtimeScene,
-        });
-      };
-
-      export const saveConnectedPlayerScore = function (
+      export const saveConnectedPlayerScore = (
         runtimeScene: gdjs.RuntimeScene,
         leaderboardId: string,
         score: float
-      ) {
-        let scoreSavingState: ScoreSavingState;
-        const playerId = gdjs.playerAuthentication.getUserId();
-        const playerToken = gdjs.playerAuthentication.getUserToken();
-        if (!playerId || !playerToken) {
-          logger.warn(
-            'Cannot save a score for a connected player if the player is not connected.'
-          );
-          return;
-        }
-        if (_scoreSavingStateByLeaderboard[leaderboardId]) {
-          scoreSavingState = _scoreSavingStateByLeaderboard[leaderboardId];
-          let shouldStartSaving = true;
-          if (
-            shouldStartSaving &&
-            scoreSavingState.isAlreadySavingThisScore({ playerId, score })
-          ) {
-            logger.warn(
-              'There is already a request to save with this player ID and this score. Ignoring this one.'
-            );
-            shouldStartSaving = false;
-          }
+      ) =>
+        new gdjs.PromiseTask(
+          (async () => {
+            const playerId = gdjs.playerAuthentication.getUserId();
+            const playerToken = gdjs.playerAuthentication.getUserToken();
+            if (!playerId || !playerToken) {
+              logger.warn(
+                'Cannot save a score for a connected player if the player is not connected.'
+              );
+              return;
+            }
 
-          if (
-            shouldStartSaving &&
-            scoreSavingState.isSameAsLastScore({ playerId, score })
-          ) {
-            logger.warn(
-              'The player and score to be sent are the same as previous one. Ignoring this one.'
-            );
-            scoreSavingState.setError('SAME_AS_PREVIOUS');
-            shouldStartSaving = false;
-          }
+            const scoreSavingState = (_scoreSavingStateByLeaderboard[
+              leaderboardId
+            ] =
+              _scoreSavingStateByLeaderboard[leaderboardId] ||
+              new ScoreSavingState());
 
-          if (
-            shouldStartSaving &&
-            scoreSavingState.isTooSoonToSaveAnotherScore()
-          ) {
-            logger.warn(
-              'Last entry was sent too little time ago. Ignoring this one.'
-            );
-            scoreSavingState.setError('TOO_FAST');
-            shouldStartSaving = false;
-            // Set the starting time to cancel all the following attempts that
-            // are started too early after this one.
-            scoreSavingState.lastScoreSavingStartedAt = Date.now();
-          }
-          if (!shouldStartSaving) {
-            return;
-          }
-        } else {
-          scoreSavingState = new ScoreSavingState();
-          _scoreSavingStateByLeaderboard[leaderboardId] = scoreSavingState;
-        }
+            try {
+              const {
+                closeSaving,
+                closeSavingWithError,
+              } = scoreSavingState.startSaving({ playerId, score });
 
-        scoreSavingState.startSaving({ playerId, score });
-
-        saveScore({
-          leaderboardId,
-          authenticatedPlayerData: { playerId, playerToken },
-          score,
-          scoreSavingState,
-          runtimeScene,
-        });
-      };
+              try {
+                const leaderboardEntryId = await saveScore({
+                  leaderboardId,
+                  authenticatedPlayerData: { playerId, playerToken },
+                  score,
+                  runtimeScene,
+                });
+                closeSaving(leaderboardEntryId);
+              } catch (errorCode) {
+                closeSavingWithError(errorCode);
+              }
+            } catch {
+              // Do nothing: saving was rejected for a reason already logged.
+            }
+          })()
+        );
 
       export const isSaving = function (leaderboardId?: string): boolean {
         if (leaderboardId) {
           return _scoreSavingStateByLeaderboard[leaderboardId]
-            ? _scoreSavingStateByLeaderboard[leaderboardId].isScoreSaving
+            ? _scoreSavingStateByLeaderboard[leaderboardId].isSaving()
             : false;
         }
 
         const lastScoreSavingState = getLastScoreSavingState({
           hasSucceeded: false,
         });
-        return lastScoreSavingState
-          ? lastScoreSavingState.isScoreSaving
-          : false;
+        return lastScoreSavingState ? lastScoreSavingState.isSaving() : false;
       };
 
       export const hasBeenSaved = function (leaderboardId?: string): boolean {
@@ -491,9 +512,7 @@ namespace gdjs {
           typeof rawName !== 'string' ||
           (typeof rawName === 'string' && rawName.length === 0)
         ) {
-          return `Player${Math.round(
-            (Math.random() * 9 + 1) * 10000 // Number between 10,000 and 99,999
-          )}`;
+          return '';
         }
         return rawName
           .trim()
@@ -648,7 +667,7 @@ namespace gdjs {
         return iframe;
       };
 
-      export const displayLeaderboard = function (
+      export const displayLeaderboard = async function (
         runtimeScene: gdjs.RuntimeScene,
         leaderboardId: string,
         displayLoader: boolean
@@ -682,81 +701,99 @@ namespace gdjs {
           });
         }
 
+        // If a save is being done for this leaderboard, wait for it to end so that the `lastSavedLeaderboardEntryId`
+        // can be saved and then used to show the player score.
+        const scoreSavingState = _scoreSavingStateByLeaderboard[leaderboardId];
+        if (scoreSavingState && scoreSavingState.lastSavingPromise) {
+          await scoreSavingState.lastSavingPromise;
+        }
+
+        const lastSavedLeaderboardEntryId = scoreSavingState
+          ? scoreSavingState.lastSavedLeaderboardEntryId
+          : null;
+
         const gameId = gdjs.projectData.properties.projectUuid;
         const isDev = runtimeScene
           .getGame()
           .isUsingGDevelopDevelopmentEnvironment();
-        const targetUrl = `https://gd.games/games/${gameId}/leaderboard/${leaderboardId}?inGameEmbedded=true${
-          isDev ? '&dev=true' : ''
-        }`;
-        checkLeaderboardAvailability(targetUrl).then(
-          (isAvailable) => {
-            if (leaderboardId !== _requestedLeaderboardId) {
-              logger.warn(
-                `Received a response for leaderboard ${leaderboardId} though the last leaderboard requested is ${_requestedLeaderboardId}, ignoring this response.`
-              );
-              return;
-            }
-            if (!isAvailable) {
-              handleErrorDisplayingLeaderboard(
-                runtimeScene,
-                'Leaderboard data could not be fetched. Closing leaderboard view if there is one.'
-              );
-              return;
-            }
 
-            if (_leaderboardViewIframe) {
-              resetLeaderboardDisplayErrorTimeout(runtimeScene);
-              if (displayLoader) {
-                displayLoaderInLeaderboardView(true, runtimeScene, {
-                  callOnErrorIfDomElementContainerMissing: false,
-                });
-              }
-              _leaderboardViewIframe.src = targetUrl;
-            } else {
-              const domElementContainer = runtimeScene
-                .getGame()
-                .getRenderer()
-                .getDomElementContainer();
-              if (!domElementContainer) {
-                handleErrorDisplayingLeaderboard(
-                  runtimeScene,
-                  "The div element covering the game couldn't be found, the leaderboard cannot be displayed."
-                );
-                return;
-              }
+        const searchParams = new URLSearchParams();
+        searchParams.set('inGameEmbedded', 'true');
+        if (isDev) searchParams.set('dev', 'true');
+        if (lastSavedLeaderboardEntryId)
+          searchParams.set(
+            'playerLeaderboardEntryId',
+            lastSavedLeaderboardEntryId
+          );
 
-              resetLeaderboardDisplayErrorTimeout(runtimeScene);
+        const targetUrl = `https://gd.games/games/${gameId}/leaderboard/${leaderboardId}?${searchParams}`;
 
-              _leaderboardViewIframe = computeLeaderboardDisplayingIframe(
-                targetUrl
-              );
-              if (typeof window !== 'undefined') {
-                _leaderboardViewClosingCallback = (event: MessageEvent) => {
-                  receiveMessageFromLeaderboardView(
-                    runtimeScene,
-                    displayLoader,
-                    event
-                  );
-                };
-                (window as any).addEventListener(
-                  'message',
-                  _leaderboardViewClosingCallback,
-                  true
-                );
-              }
-              domElementContainer.appendChild(_leaderboardViewIframe);
-            }
-          },
-          (err) => {
-            logger.error(err);
-            handleErrorDisplayingLeaderboard(
-              runtimeScene,
-              'An error occurred when fetching leaderboard data. Closing leaderboard view if there is one.'
+        try {
+          const isAvailable = await checkLeaderboardAvailability(targetUrl);
+
+          if (leaderboardId !== _requestedLeaderboardId) {
+            logger.warn(
+              `Received a response for leaderboard ${leaderboardId} though the last leaderboard requested is ${_requestedLeaderboardId}, ignoring this response.`
             );
             return;
           }
-        );
+          if (!isAvailable) {
+            handleErrorDisplayingLeaderboard(
+              runtimeScene,
+              'Leaderboard data could not be fetched. Closing leaderboard view if there is one.'
+            );
+            return;
+          }
+
+          if (_leaderboardViewIframe) {
+            resetLeaderboardDisplayErrorTimeout(runtimeScene);
+            if (displayLoader) {
+              displayLoaderInLeaderboardView(true, runtimeScene, {
+                callOnErrorIfDomElementContainerMissing: false,
+              });
+            }
+            _leaderboardViewIframe.src = targetUrl;
+          } else {
+            const domElementContainer = runtimeScene
+              .getGame()
+              .getRenderer()
+              .getDomElementContainer();
+            if (!domElementContainer) {
+              handleErrorDisplayingLeaderboard(
+                runtimeScene,
+                "The div element covering the game couldn't be found, the leaderboard cannot be displayed."
+              );
+              return;
+            }
+
+            resetLeaderboardDisplayErrorTimeout(runtimeScene);
+
+            _leaderboardViewIframe = computeLeaderboardDisplayingIframe(
+              targetUrl
+            );
+            if (typeof window !== 'undefined') {
+              _leaderboardViewClosingCallback = (event: MessageEvent) => {
+                receiveMessageFromLeaderboardView(
+                  runtimeScene,
+                  displayLoader,
+                  event
+                );
+              };
+              (window as any).addEventListener(
+                'message',
+                _leaderboardViewClosingCallback,
+                true
+              );
+            }
+            domElementContainer.appendChild(_leaderboardViewIframe);
+          }
+        } catch (err) {
+          logger.error(err);
+          handleErrorDisplayingLeaderboard(
+            runtimeScene,
+            'An error occurred when fetching leaderboard data. Closing leaderboard view if there is one.'
+          );
+        }
       };
 
       export const isLeaderboardViewErrored = function (): boolean {

Extensions/Leaderboards/tests/leaderboardstools.spec.js

@@ -29,26 +29,14 @@ describe('Leaderboards', () => {
     });
 
     it('it generates a predefined player name with a random number if input is void/wrong type/empty', () => {
+      expect(gdjs.evtTools.leaderboards.formatPlayerName(null)).to.be('');
+      expect(gdjs.evtTools.leaderboards.formatPlayerName(undefined)).to.be('');
+      expect(gdjs.evtTools.leaderboards.formatPlayerName('')).to.be('');
+
       // @ts-ignore
-      expect(gdjs.evtTools.leaderboards.formatPlayerName(null)).to.match(
-        /^Player\d{5}/
-      );
+      expect(gdjs.evtTools.leaderboards.formatPlayerName(5)).to.be('');
       // @ts-ignore
-      expect(gdjs.evtTools.leaderboards.formatPlayerName(5)).to.match(
-        /^Player\d{5}/
-      );
-      // @ts-ignore
-      expect(gdjs.evtTools.leaderboards.formatPlayerName(undefined)).to.match(
-        /^Player\d{5}/
-      );
-      // @ts-ignore
-      expect(gdjs.evtTools.leaderboards.formatPlayerName(() => {})).to.match(
-        /^Player\d{5}/
-      );
-      // @ts-ignore
-      expect(gdjs.evtTools.leaderboards.formatPlayerName('')).to.match(
-        /^Player\d{5}/
-      );
+      expect(gdjs.evtTools.leaderboards.formatPlayerName(() => {})).to.be('');
     });
 
     it('it removes accents from latin letters', () => {

Extensions/Lighting/JsExtension.js

@@ -33,7 +33,8 @@ module.exports = {
       'Harsimran Virk',
       'MIT'
     )
-    .setCategory('Visual effect');
+    .setCategory('Visual effect')
+    .setTags("light");
 
     const lightObstacleBehavior = new gd.BehaviorJsImplementation();
     // $FlowExpectedError - ignore Flow warning as we're creating a behavior

Extensions/LinkedObjects/CMakeLists.txt

@@ -1,20 +1,23 @@
-cmake_minimum_required(VERSION 2.6)
-cmake_policy(SET CMP0015 NEW)
+cmake_minimum_required(VERSION 3.5)
 
 project(LinkedObjects)
 gd_add_extension_includes()
 
-#Defines
-###
+# Defines
+#
 gd_add_extension_definitions(LinkedObjects)
 
-#The targets
-###
+# The targets
+#
 include_directories(.)
-file(GLOB source_files *.cpp *.h)
+file(
+	GLOB
+	source_files
+	*.cpp
+	*.h)
 gd_add_clang_utils(LinkedObjects "${source_files}")
 gd_add_extension_target(LinkedObjects "${source_files}")
 
-#Linker files for the IDE extension
-###
-gd_extension_link_libraries(LinkedObjects)
+# Linker files for the IDE extension
+#
+gd_extension_link_libraries(LinkedObjects)

Extensions/LinkedObjects/JsExtension.cpp

@@ -26,23 +26,18 @@ class LinkedObjectsJsExtension : public gd::PlatformExtension {
     DeclareLinkedObjectsExtension(*this);
 
     GetAllActions()["LinkedObjects::LinkObjects"]
-        .codeExtraInformation
         .SetIncludeFile("Extensions/LinkedObjects/linkedobjects.js")
         .SetFunctionName("gdjs.evtTools.linkedObjects.linkObjects");
     GetAllActions()["LinkedObjects::RemoveLinkBetween"]
-        .codeExtraInformation
         .SetIncludeFile("Extensions/LinkedObjects/linkedobjects.js")
         .SetFunctionName("gdjs.evtTools.linkedObjects.removeLinkBetween");
     GetAllActions()["LinkedObjects::RemoveAllLinksOf"]
-        .codeExtraInformation
         .SetIncludeFile("Extensions/LinkedObjects/linkedobjects.js")
         .SetFunctionName("gdjs.evtTools.linkedObjects.removeAllLinksOf");
     GetAllActions()["LinkedObjects::PickObjectsLinkedTo"]
-        .codeExtraInformation
         .SetIncludeFile("Extensions/LinkedObjects/linkedobjects.js")
         .SetFunctionName("gdjs.evtTools.linkedObjects.pickObjectsLinkedTo");
     GetAllConditions()["LinkedObjects::PickObjectsLinkedTo"]
-        .codeExtraInformation
         .SetIncludeFile("Extensions/LinkedObjects/linkedobjects.js")
         .SetFunctionName("gdjs.evtTools.linkedObjects.pickObjectsLinkedTo");
 

Extensions/PanelSpriteObject/CMakeLists.txt

@@ -1,20 +1,23 @@
-cmake_minimum_required(VERSION 2.6)
-cmake_policy(SET CMP0015 NEW)
+cmake_minimum_required(VERSION 3.5)
 
 project(PanelSpriteObject)
 gd_add_extension_includes()
 
-#Defines
-###
+# Defines
+#
 gd_add_extension_definitions(PanelSpriteObject)
 
-#The targets
-###
+# The targets
+#
 include_directories(.)
-file(GLOB source_files *.cpp *.h)
+file(
+	GLOB
+	source_files
+	*.cpp
+	*.h)
 gd_add_clang_utils(PanelSpriteObject "${source_files}")
 gd_add_extension_target(PanelSpriteObject "${source_files}")
 
-#Linker files for the IDE extension
-###
+# Linker files for the IDE extension
+#
 gd_extension_link_libraries(PanelSpriteObject)

Extensions/PanelSpriteObject/Extension.cpp

@@ -179,8 +179,9 @@ void DeclarePanelSpriteObjectExtension(gd::PlatformExtension& extension) {
       .SetFunctionName("SetAngle")
       .SetGetter("GetAngle");
 
+  // Deprecated
   obj.AddAction("Image",
-                _("Image name"),
+                _("Image name (deprecated)"),
                 _("Change the image of a Panel Sprite."),
                 _("Set image _PARAM1_ on _PARAM0_"),
                 _("Image"),
@@ -189,5 +190,18 @@ void DeclarePanelSpriteObjectExtension(gd::PlatformExtension& extension) {
       .AddParameter("object", _("Object"), "PanelSprite")
       .AddParameter("string", _("Image name"))
       .AddCodeOnlyParameter("currentScene", "0")
+      .SetHidden()
+      .SetFunctionName("ChangeAndReloadImage");
+
+  obj.AddAction("SetImageFromResource",
+                _("Image name"),
+                _("Change the image of a Panel Sprite."),
+                _("Set image _PARAM1_ on _PARAM0_"),
+                _("Image"),
+                "res/imageicon24.png",
+                "res/imageicon.png")
+      .AddParameter("object", _("Object"), "PanelSprite")
+      .AddParameter("imageResource", _("Image file (or image resource name)"))
+      .AddCodeOnlyParameter("currentScene", "0")
       .SetFunctionName("ChangeAndReloadImage");
 }

Extensions/PanelSpriteObject/JsExtension.cpp

@@ -61,6 +61,9 @@ class PanelSpriteObjectJsExtension : public gd::PlatformExtension {
     GetAllActionsForObject(
         "PanelSpriteObject::PanelSprite")["PanelSpriteObject::Image"]
         .SetFunctionName("setTexture");
+    GetAllActionsForObject(
+        "PanelSpriteObject::PanelSprite")["PanelSpriteObject::SetImageFromResource"]
+        .SetFunctionName("setTexture");
 
     GD_COMPLETE_EXTENSION_COMPILATION_INFORMATION();
   };

Extensions/ParticleSystem/CMakeLists.txt

@@ -1,21 +1,23 @@
-cmake_minimum_required(VERSION 2.6)
-cmake_policy(SET CMP0015 NEW)
+cmake_minimum_required(VERSION 3.5)
 
 project(ParticleSystem)
 gd_add_extension_includes()
 
-#Defines
-###
+# Defines
+#
 gd_add_extension_definitions(ParticleSystem)
 
-#The targets
-###
+# The targets
+#
 include_directories(.)
-file(GLOB source_files *.cpp *.h)
+file(
+	GLOB
+	source_files
+	*.cpp
+	*.h)
 gd_add_clang_utils(ParticleSystem "${source_files}")
 gd_add_extension_target(ParticleSystem "${source_files}")
 
-
-#Linker files for the IDE extension
-###
+# Linker files for the IDE extension
+#
 gd_extension_link_libraries(ParticleSystem)

Extensions/ParticleSystem/ExtensionSubDeclaration3.cpp

@@ -148,8 +148,9 @@ void ExtensionSubDeclaration3(gd::ObjectMetadata& obj) {
           gd::ParameterOptions::MakeNewOptions().SetDescription(
               _("Flow to compare to (in particles per second)")));
 
+  // Deprecated
   obj.AddAction("Texture",
-                _("Particle image (using an expression)"),
+                _("Particle image (deprecated)"),
                 _("Change the image of particles (if displayed)."),
                 _("Change the image of particles of _PARAM0_ to _PARAM1_"),
                 _("Advanced"),
@@ -157,7 +158,8 @@ void ExtensionSubDeclaration3(gd::ObjectMetadata& obj) {
                 "CppPlatform/Extensions/particleSystemicon16.png")
       .AddParameter("object", _("Object"), "ParticleEmitter")
       .AddParameter("string", _("Image to use"))
-      .SetParameterLongDescription("Indicate the name of the resource");
+      .SetParameterLongDescription("Indicate the name of the resource")
+      .SetHidden();
 
   obj.AddAction("SetTextureFromResource",
                 _("Particle image"),

Extensions/PathfindingBehavior/CMakeLists.txt

@@ -1,20 +1,23 @@
-cmake_minimum_required(VERSION 2.6)
-cmake_policy(SET CMP0015 NEW)
+cmake_minimum_required(VERSION 3.5)
 
 project(PathfindingBehavior)
 gd_add_extension_includes()
 
-#Defines
-###
+# Defines
+#
 gd_add_extension_definitions(PathfindingBehavior)
 
-#The targets
-###
+# The targets
+#
 include_directories(.)
-file(GLOB source_files *.cpp *.h)
+file(
+	GLOB
+	source_files
+	*.cpp
+	*.h)
 gd_add_clang_utils(PathfindingBehavior "${source_files}")
 gd_add_extension_target(PathfindingBehavior "${source_files}")
 
-#Linker files for the IDE extension
-###
+# Linker files for the IDE extension
+#
 gd_extension_link_libraries(PathfindingBehavior)

Extensions/PathfindingBehavior/Extension.cpp

@@ -22,6 +22,7 @@ void DeclarePathfindingBehaviorExtension(gd::PlatformExtension& extension) {
           "Florian Rival",
           "Open source (MIT License)")
       .SetCategory("Movement")
+      .SetTags("pathfinding, obstacle, collision")
       .SetExtensionHelpPath("/behaviors/pathfinding");
   extension.AddInstructionOrExpressionGroupMetadata(_("Pathfinding behavior"))
       .SetIcon("CppPlatform/Extensions/AStaricon16.png");

Extensions/Physics2Behavior/JsExtension.js

@@ -34,7 +34,8 @@ module.exports = {
         'MIT'
       )
       .setExtensionHelpPath('/behaviors/physics2')
-      .setCategory('Movement');
+      .setCategory('Movement')
+      .setTags("physics, gravity, obstacle, collision");
     extension
       .addInstructionOrExpressionGroupMetadata(_('Physics Engine 2.0'))
       .setIcon('res/physics32.png');

Extensions/PhysicsBehavior/CMakeLists.txt

@@ -1,21 +1,23 @@
-cmake_minimum_required(VERSION 2.6)
-cmake_policy(SET CMP0015 NEW)
+cmake_minimum_required(VERSION 3.5)
 
 project(PhysicsBehavior)
 gd_add_extension_includes()
 
-#Defines
-###
+# Defines
+#
 gd_add_extension_definitions(PhysicsBehavior)
 
-#The targets
-###
+# The targets
+#
 include_directories(.)
-file(GLOB source_files *.cpp *.h)
+file(
+	GLOB
+	source_files
+	*.cpp
+	*.h)
 gd_add_clang_utils(PhysicsBehavior "${source_files}")
 gd_add_extension_target(PhysicsBehavior "${source_files}")
 
-
-#Linker files for the IDE extension
-###
+# Linker files for the IDE extension
+#
 gd_extension_link_libraries(PhysicsBehavior)

Extensions/PlatformBehavior/CMakeLists.txt

@@ -1,20 +1,23 @@
-cmake_minimum_required(VERSION 2.6)
-cmake_policy(SET CMP0015 NEW)
+cmake_minimum_required(VERSION 3.5)
 
 project(PlatformBehavior)
 gd_add_extension_includes()
 
-#Defines
-###
+# Defines
+#
 gd_add_extension_definitions(PlatformBehavior)
 
-#The targets
-###
+# The targets
+#
 include_directories(.)
-file(GLOB source_files *.cpp *.h)
+file(
+	GLOB
+	source_files
+	*.cpp
+	*.h)
 gd_add_clang_utils(PlatformBehavior "${source_files}")
 gd_add_extension_target(PlatformBehavior "${source_files}")
 
-#Linker files for the IDE extension
-###
-gd_extension_link_libraries(PlatformBehavior)
+# Linker files for the IDE extension
+#
+gd_extension_link_libraries(PlatformBehavior)

Extensions/PlatformBehavior/Extension.cpp

@@ -27,6 +27,7 @@ void DeclarePlatformBehaviorExtension(gd::PlatformExtension& extension) {
           "Florian Rival",
           "Open source (MIT License)")
       .SetCategory("Movement")
+      .SetTags("platformer, platform, character, jump, obstacle, collision")
       .SetExtensionHelpPath("/behaviors/platformer");
   extension.AddInstructionOrExpressionGroupMetadata(_("Platform behavior"))
       .SetIcon("CppPlatform/Extensions/platformerobjecticon.png");

Extensions/PrimitiveDrawing/CMakeLists.txt

@@ -1,20 +1,23 @@
-cmake_minimum_required(VERSION 2.6)
-cmake_policy(SET CMP0015 NEW)
+cmake_minimum_required(VERSION 3.5)
 
 project(PrimitiveDrawing)
 gd_add_extension_includes()
 
-#Defines
-###
+# Defines
+#
 gd_add_extension_definitions(PrimitiveDrawing)
 
-#The targets
-###
+# The targets
+#
 include_directories(.)
-file(GLOB source_files *.cpp *.h)
+file(
+	GLOB
+	source_files
+	*.cpp
+	*.h)
 gd_add_clang_utils(PrimitiveDrawing "${source_files}")
 gd_add_extension_target(PrimitiveDrawing "${source_files}")
 
-#Linker files for the IDE extension
-###
+# Linker files for the IDE extension
+#
 gd_extension_link_libraries(PrimitiveDrawing)

Extensions/Shopify/CMakeLists.txt

@@ -1,21 +1,26 @@
-cmake_minimum_required(VERSION 2.6)
-cmake_policy(SET CMP0015 NEW)
+cmake_minimum_required(VERSION 3.5)
 
 project(Shopify)
 gd_add_extension_includes()
 
-#Defines
-###
+# Defines
+#
 gd_add_extension_definitions(Shopify)
 
-#The targets
-###
+# The targets
+#
 include_directories(.)
-file(GLOB source_files *.cpp *.h)
-
-gd_add_extension_target(Shopify "${source_files}" "JsPlatform")
+file(
+	GLOB
+	source_files
+	*.cpp
+	*.h)
+gd_add_extension_target(
+	Shopify
+	"${source_files}"
+	"JsPlatform")
 gd_add_clang_utils(Shopify "${source_files}")
 
-#Linker files for the IDE extension
-###
+# Linker files for the IDE extension
+#
 gd_extension_link_libraries(Shopify)

Extensions/Shopify/JsExtension.cpp

@@ -81,12 +81,10 @@ class ShopifyJsExtension : public gd::PlatformExtension {
     DeclareShopifyExtension(*this);
 
     GetAllActions()["Shopify::BuildClient"]
-        .codeExtraInformation
         .SetIncludeFile("Extensions/Shopify/shopify-buy.umd.polyfilled.min.js")
         .AddIncludeFile("Extensions/Shopify/shopifytools.js")
         .SetFunctionName("gdjs.evtTools.shopify.buildClient");
     GetAllActions()["Shopify::GetCheckoutUrlForProduct"]
-        .codeExtraInformation
         .SetIncludeFile("Extensions/Shopify/shopify-buy.umd.polyfilled.min.js")
         .AddIncludeFile("Extensions/Shopify/shopifytools.js")
         .SetFunctionName("gdjs.evtTools.shopify.getCheckoutUrlForProduct");

Extensions/Steamworks/Z_steamworksinputtools.ts

@@ -1,63 +0,0 @@
-namespace gdjs {
-  export namespace steamworks {
-    gdjs.registerFirstRuntimeSceneLoadedCallback(() => {
-      if (gdjs.steamworks.steamAPI) gdjs.steamworks.steamAPI.input.init();
-    });
-
-    export function getControllerCount(): integer {
-      return gdjs.steamworks.steamAPI
-        ? gdjs.steamworks.steamAPI.input.getControllers().length
-        : 0;
-    }
-
-    export function activateActionSet(
-      controllerIndex: number,
-      actionSetName: string
-    ): void {
-      if (!gdjs.steamworks.steamAPI) return;
-      gdjs.steamworks.steamAPI.input
-        .getControllers()
-        [controllerIndex]?.activateActionSet(
-          gdjs.steamworks.steamAPI.input.getActionSet(actionSetName)
-        );
-    }
-
-    export function isDigitalActionPressed(
-      controllerIndex: number,
-      actionName: string
-    ): boolean {
-      if (!gdjs.steamworks.steamAPI) return false;
-      return !!gdjs.steamworks.steamAPI.input
-        .getControllers()
-        [controllerIndex]?.isDigitalActionPressed(
-          gdjs.steamworks.steamAPI.input.getDigitalAction(actionName)
-        );
-    }
-
-    export function getAnalogActionVectorX(
-      controllerIndex: number,
-      actionName: string
-    ): float {
-      return gdjs.steamworks.steamAPI
-        ? gdjs.steamworks.steamAPI.input
-            .getControllers()
-            [controllerIndex]?.getAnalogActionVector(
-              gdjs.steamworks.steamAPI.input.getAnalogAction(actionName)
-            ).x ?? 0
-        : 0;
-    }
-
-    export function getAnalogActionVectorY(
-      controllerIndex: number,
-      actionName: string
-    ): float {
-      return gdjs.steamworks.steamAPI
-        ? gdjs.steamworks.steamAPI.input
-            .getControllers()
-            [controllerIndex]?.getAnalogActionVector(
-              gdjs.steamworks.steamAPI.input.getAnalogAction(actionName)
-            ).y ?? 0
-        : 0;
-    }
-  }
-}

Extensions/Steamworks/steamworkstools.ts

@@ -1,566 +0,0 @@
-namespace gdjs {
-  export namespace steamworks {
-    const logger = new gdjs.Logger('Steamworks');
-    export let steamAPI: import('steamworks.js').Client | null = null;
-
-    gdjs.registerFirstRuntimeSceneLoadedCallback((runtimeScene) => {
-      const remote = runtimeScene.getGame().getRenderer().getElectronRemote();
-      if (!remote) return; // Steamworks is only supported on electron
-      const steamworks_js = remote.require(
-        'steamworks.js'
-      ) as typeof import('steamworks.js');
-
-      // Sets the proper electron flags for the steam overlay to function properly
-      steamworks_js.electronEnableSteamOverlay();
-
-      const unparsedAppID = runtimeScene
-        .getGame()
-        .getExtensionProperty('Steamworks', 'AppID');
-
-      if (!unparsedAppID) {
-        logger.error(
-          'A steam AppID needs to be configured in the game properties for steamworks features to be used!'
-        );
-        return;
-      }
-
-      const appID = parseInt(unparsedAppID, 10);
-
-      // Restart the game through steam if it needs to be launched with steam but has not been
-      if (
-        runtimeScene
-          .getGame()
-          .getExtensionProperty('Steamworks', 'RequireSteam') &&
-        !runtimeScene.getGame().isPreview() &&
-        steamworks_js.restartAppIfNecessary(appID)
-      ) {
-        remote.process.exit(1);
-        return;
-      }
-
-      steamAPI = steamworks_js.init(appID);
-    });
-
-    // ---
-
-    export function claimAchievement(achievement: string): void {
-      if (steamAPI) steamAPI.achievement.activate(achievement);
-      else
-        logger.warn(
-          `Could not claim achievement ${achievement}, steamworks was not properly loaded!`
-        );
-    }
-
-    export function unclaimAchievement(achievement: string): void {
-      if (steamAPI) steamAPI.achievement.clear(achievement);
-      else
-        logger.warn(
-          `Could not unclaim achievement ${achievement}, steamworks was not properly loaded!`
-        );
-    }
-
-    export function hasAchievement(achievement: string): boolean {
-      return !!steamAPI && steamAPI.achievement.isActivated(achievement);
-    }
-
-    // ---
-
-    export function getSteamId(): string {
-      return steamAPI
-        ? steamAPI.localplayer.getSteamId().steamId64.toString(10)
-        : '';
-    }
-
-    export function getName(): string {
-      return steamAPI ? steamAPI.localplayer.getName() : 'Unknown';
-    }
-
-    export function getCountry(): string {
-      return steamAPI ? steamAPI.localplayer.getIpCountry() : 'Unknown';
-    }
-
-    export function getLevel(): number {
-      return steamAPI ? steamAPI.localplayer.getLevel() : 0;
-    }
-
-    export function setRichPresence(key: string, value: string): void {
-      if (steamAPI) steamAPI.localplayer.setRichPresence(key, value);
-      else
-        logger.warn(
-          `Could not set the rich presence, steamworks was not properly loaded!`
-        );
-    }
-
-    // ---
-
-    export function isSteamworksProperlyLoaded(): boolean {
-      return !!steamAPI;
-    }
-
-    export function getAppID(): number {
-      return steamAPI ? steamAPI.utils.getAppId() : 0;
-    }
-
-    export function getServerRealTime(): number {
-      return steamAPI ? steamAPI.utils.getServerRealTime() : Date.now();
-    }
-
-    export function isOnSteamDeck(): boolean {
-      return steamAPI ? steamAPI.utils.isSteamRunningOnSteamDeck() : false;
-    }
-
-    // ---
-
-    enum LobbyType {
-      Private = 0,
-      FriendsOnly = 1,
-      Public = 2,
-      Invisible = 3,
-    }
-
-    const knownLobbies = new Map<
-      string,
-      import('steamworks.js/client').matchmaking.Lobby
-    >();
-    let currentLobby:
-      | import('steamworks.js/client').matchmaking.Lobby
-      | null = null;
-
-    export function getKnownLobby(lobbyId: string) {
-      if (!steamAPI) {
-        logger.warn(
-          `Could not access lobby '${lobbyId}', steamworks was not properly loaded!`
-        );
-        return null;
-      }
-
-      const lobby = knownLobbies.get(lobbyId);
-      if (!lobby) {
-        logger.error(
-          `Could not access lobby '${lobbyId}'! You might need to join it before trying to access it.`
-        );
-        return null;
-      }
-
-      return lobby;
-    }
-
-    export function createLobby(
-      lobbyType: 'Private' | 'FriendsOnly' | 'Public' | 'Invisible',
-      maxPlayers: number,
-      result: gdjs.Variable
-    ): gdjs.AsyncTask {
-      if (steamAPI) {
-        return new gdjs.PromiseTask(
-          steamAPI.matchmaking
-            .createLobby(
-              LobbyType[lobbyType] as any /* Const enums are 😩 */,
-              maxPlayers
-            )
-            .then((lobby) => {
-              const id = lobby.id.toString(10);
-              knownLobbies.set(id, lobby);
-              currentLobby = lobby;
-              result.setString(id);
-            })
-            .catch(() => {
-              result.setString('failure');
-            })
-        );
-      } else {
-        logger.warn(
-          `Could not create a lobby, steamworks was not properly loaded!`
-        );
-        return new gdjs.ResolveTask();
-      }
-    }
-
-    export function getLobbiesList(results: gdjs.Variable): gdjs.AsyncTask {
-      if (steamAPI) {
-        return new gdjs.PromiseTask(
-          steamAPI.matchmaking
-            .getLobbies()
-            .then((lobbies) => {
-              const allLobbiesIds = lobbies.map((lobby) => {
-                const id = lobby.id.toString(10);
-                knownLobbies.set(id, lobby);
-                return id;
-              });
-              results.fromJSObject(allLobbiesIds);
-            })
-            .catch(() => {
-              results.setString('failure');
-            })
-        );
-      } else {
-        logger.warn(
-          `Could not obtain the lobbies list, steamworks was not properly loaded!`
-        );
-        return new gdjs.ResolveTask();
-      }
-    }
-
-    export function joinLobby(
-      lobbyId: string,
-      result: gdjs.Variable
-    ): gdjs.AsyncTask {
-      if (steamAPI) {
-        return new gdjs.PromiseTask(
-          steamAPI.matchmaking
-            .joinLobby(BigInt(lobbyId))
-            .then((lobby) => {
-              knownLobbies.set(lobbyId, lobby);
-              currentLobby = lobby;
-              result.setString(lobbyId);
-            })
-            .catch(() => {
-              result.setString('failure');
-            })
-        );
-      } else {
-        logger.warn(
-          `Could not join a lobby, steamworks was not properly loaded!`
-        );
-        return new gdjs.ResolveTask();
-      }
-    }
-
-    export function getCurrentLobbyId(): string {
-      return currentLobby ? currentLobby.id.toString(10) : 'none';
-    }
-
-    export function leaveCurrentLobby(): void {
-      if (currentLobby) currentLobby.leave();
-    }
-
-    export function openDialogForInvitingUsersToTheCurrentLobby(): void {
-      if (currentLobby) currentLobby.openInviteDialog();
-    }
-
-    export function getCurrentLobbyAttribute(attribute: string): string {
-      if (!currentLobby) return '';
-
-      const data = currentLobby.getData(attribute);
-      return data === null ? '' : data;
-    }
-
-    export function getLobbyAttribute(
-      lobbyId: string,
-      attribute: string
-    ): string {
-      const lobby = getKnownLobby(lobbyId);
-      if (!lobby) return '';
-
-      const data = lobby.getData(attribute);
-      return data === null ? '' : data;
-    }
-
-    export function setCurrentLobbyAttribute(
-      attribute: string,
-      value: string,
-      success: gdjs.Variable
-    ): void {
-      if (currentLobby)
-        success.setBoolean(currentLobby.setData(attribute, value));
-    }
-
-    export function setCurrentLobbyJoinability(
-      shouldBeJoinable: boolean,
-      success: gdjs.Variable
-    ): void {
-      if (currentLobby)
-        success.setBoolean(currentLobby.setJoinable(shouldBeJoinable));
-    }
-
-    export function getCurrentLobbyMemberCount(): number {
-      return currentLobby ? Number(currentLobby.getMemberCount()) : 0;
-    }
-
-    export function getLobbyMemberCount(lobbyId: string): number {
-      const lobby = getKnownLobby(lobbyId);
-      return lobby ? Number(lobby.getMemberCount()) : 0;
-    }
-
-    export function getCurrentLobbyMemberLimit(): number {
-      return currentLobby ? Number(currentLobby.getMemberLimit()) : 0;
-    }
-
-    export function getLobbyMemberLimit(lobbyId: string): number {
-      const lobby = getKnownLobby(lobbyId);
-      if (!lobby) return 0;
-      return lobby ? Number(lobby.getMemberLimit()) : 0;
-    }
-
-    export function getCurrentLobbyOwner(): string {
-      return currentLobby ? currentLobby.getOwner().steamId64.toString(10) : '';
-    }
-
-    export function getLobbyOwner(lobbyId: string): string {
-      const lobby = getKnownLobby(lobbyId);
-      return lobby ? lobby.getOwner().steamId64.toString(10) : '';
-    }
-
-    export function getCurrentLobbyMembersList(storeIn: gdjs.Variable): void {
-      if (currentLobby) {
-        storeIn.fromJSObject(
-          currentLobby
-            .getMembers()
-            .map((steamID) => steamID.steamId64.toString(10))
-        );
-      }
-    }
-
-    export function getLobbyMembersList(
-      lobbyId: string,
-      storeIn: gdjs.Variable
-    ): void {
-      const lobby = getKnownLobby(lobbyId);
-      if (lobby) {
-        storeIn.fromJSObject(
-          lobby.getMembers().map((steamID) => steamID.steamId64.toString(10))
-        );
-      }
-    }
-
-    // ---
-
-    export function isAppOwned(appId: string): boolean {
-      return !!steamAPI && steamAPI.apps.isSubscribedApp(Number(appId));
-    }
-
-    export function isAppInstalled(appId: string): boolean {
-      return !!steamAPI && steamAPI.apps.isAppInstalled(Number(appId));
-    }
-
-    export function isDLCInstalled(dlcId: string): boolean {
-      return !!steamAPI && steamAPI.apps.isDlcInstalled(Number(dlcId));
-    }
-
-    export function getAppInstallDirectory(appId: string): string {
-      return steamAPI ? steamAPI.apps.appInstallDir(Number(appId)) : '';
-    }
-
-    export function isVacBanned(): boolean {
-      return !!steamAPI && steamAPI.apps.isVacBanned();
-    }
-
-    export function isLowViolence(): boolean {
-      return !!steamAPI && steamAPI.apps.isLowViolence();
-    }
-
-    export function userBoughtTheGame(): boolean {
-      return !!steamAPI && steamAPI.apps.isSubscribed();
-    }
-
-    export function currentGameLanguage(): string {
-      return steamAPI ? steamAPI.apps.currentGameLanguage() : '';
-    }
-
-    export function currentBetaName(): string {
-      return steamAPI ? steamAPI.apps.currentBetaName() || '' : '';
-    }
-
-    export function getBuildId(): number {
-      return steamAPI ? steamAPI.apps.appBuildId() : 0;
-    }
-
-    // ---
-
-    export function isCloudEnabled(): boolean {
-      return (
-        !!steamAPI &&
-        steamAPI.cloud.isEnabledForAccount() &&
-        steamAPI.cloud.isEnabledForApp()
-      );
-    }
-
-    export function readFile(fileName: string): string {
-      return steamAPI ? steamAPI.cloud.readFile(fileName) : '';
-    }
-
-    export function writeFile(
-      fileName: string,
-      content: string,
-      results: gdjs.Variable
-    ): void {
-      if (steamAPI)
-        results.setBoolean(steamAPI.cloud.writeFile(fileName, content));
-    }
-
-    export function fileExists(fileName: string): boolean {
-      return steamAPI ? steamAPI.cloud.fileExists(fileName) : false;
-    }
-
-    export function deleteFile(fileName: string, results: gdjs.Variable): void {
-      if (steamAPI) results.setBoolean(steamAPI.cloud.deleteFile(fileName));
-    }
-
-    // ---
-
-    export function createWorkshopItem(result: gdjs.Variable): gdjs.AsyncTask {
-      if (steamAPI)
-        return new gdjs.PromiseTask(
-          steamAPI.workshop
-            .createItem()
-            .then(({ itemId }) => {
-              result.setString(itemId.toString());
-            })
-            .catch(() => {
-              result.setString('failure');
-            })
-        );
-      else {
-        result.setString('failure');
-        return new gdjs.ResolveTask();
-      }
-    }
-
-    enum UgcItemVisibility {
-      Public = 0,
-      FriendsOnly = 1,
-      Private = 2,
-      Unlisted = 3,
-    }
-
-    export function updateWorkshopItem(
-      itemId: string,
-      title: string,
-      description: string,
-      changeNote: string,
-      previewPath: string,
-      contentPath: string,
-      tags: string,
-      visibility: keyof import('steamworks.js/client').workshop.UgcItemVisibility,
-      result: gdjs.Variable
-    ): gdjs.AsyncTask {
-      if (steamAPI) {
-        const changes: import('steamworks.js/client').workshop.UgcUpdate = {};
-
-        if (title) changes.title = title;
-        if (description) changes.description = description;
-        if (changeNote) changes.changeNote = changeNote;
-        if (previewPath) changes.previewPath = previewPath;
-        if (contentPath) changes.contentPath = contentPath;
-        if (tags) changes.tags = tags.split(',');
-        if (visibility)
-          //@ts-ignore const enum 😩
-          changes.visibility = UgcItemVisibility[visibility];
-
-        return new gdjs.PromiseTask(
-          steamAPI.workshop
-            .updateItem(BigInt(itemId), changes)
-            .then(() => {
-              result.setBoolean(true);
-            })
-            .catch(() => {
-              result.setBoolean(false);
-            })
-        );
-      } else {
-        result.setBoolean(false);
-        return new gdjs.ResolveTask();
-      }
-    }
-
-    export function subscribeToWorkshopItem(
-      itemId: string,
-      result: gdjs.Variable
-    ): gdjs.AsyncTask {
-      if (steamAPI)
-        return new gdjs.PromiseTask(
-          steamAPI.workshop
-            .subscribe(BigInt(itemId))
-            .then(() => {
-              result.setBoolean(true);
-            })
-            .catch(() => {
-              result.setBoolean(false);
-            })
-        );
-      else {
-        result.setBoolean(false);
-        return new gdjs.ResolveTask();
-      }
-    }
-
-    export function unsubscribeToWorkshopItem(
-      itemId: string,
-      result: gdjs.Variable
-    ): gdjs.AsyncTask {
-      if (steamAPI)
-        return new gdjs.PromiseTask(
-          steamAPI.workshop
-            .unsubscribe(BigInt(itemId))
-            .then(() => {
-              result.setBoolean(true);
-            })
-            .catch(() => {
-              result.setBoolean(false);
-            })
-        );
-      else {
-        result.setBoolean(false);
-        return new gdjs.ResolveTask();
-      }
-    }
-
-    export function startWorkshopDownload(
-      itemId: string,
-      highPriority: boolean
-    ): void {
-      if (steamAPI) steamAPI.workshop.download(BigInt(itemId), highPriority);
-    }
-
-    enum WorkshopItemStates {
-      None = 0,
-      Subscribed = 1,
-      LegacyItem = 2,
-      Installed = 4,
-      NeedsUpdate = 8,
-      Downloading = 16,
-      DownloadPending = 32,
-    }
-
-    export function workshopItemState(
-      itemId: string,
-      state: keyof WorkshopItemStates
-    ): boolean {
-      return (
-        !!steamAPI &&
-        (steamAPI.workshop.state(BigInt(itemId)) &
-          WorkshopItemStates[state]) !==
-          0
-      );
-    }
-
-    export function getWorkshopItemLocation(itemId: string): string {
-      return steamAPI
-        ? steamAPI.workshop.installInfo(BigInt(itemId))?.folder || ''
-        : '';
-    }
-
-    export function getWorkshopItemSizeOnDisk(itemId: string): number {
-      return steamAPI
-        ? Number(steamAPI.workshop.installInfo(BigInt(itemId))?.sizeOnDisk) || 0
-        : 0;
-    }
-
-    export function getWorkshopItemInstallTimestamp(itemId: string): number {
-      return steamAPI
-        ? steamAPI.workshop.installInfo(BigInt(itemId))?.timestamp || 0
-        : 0;
-    }
-
-    export function getWorkshopItemDownloadProgress(itemId: string): number {
-      return steamAPI
-        ? Number(steamAPI.workshop.downloadInfo(BigInt(itemId))?.current) || 0
-        : 0;
-    }
-
-    export function getWorkshopItemDownloadTotal(itemId: string): number {
-      return steamAPI
-        ? Number(steamAPI.workshop.downloadInfo(BigInt(itemId))?.total) || 0
-        : 0;
-    }
-  }
-}

Extensions/Steamworks/types.d.ts

@@ -1,362 +0,0 @@
-declare module 'steamworks.js/client' {
-  export function init(appId: number): void;
-  export function restartAppIfNecessary(appId: number): boolean;
-  export function runCallbacks(): void;
-  export interface PlayerSteamId {
-    steamId64: bigint;
-    steamId32: string;
-    accountId: number;
-  }
-  export namespace achievement {
-    export function activate(achievement: string): boolean;
-    export function isActivated(achievement: string): boolean;
-    export function clear(achievement: string): boolean;
-  }
-  export namespace apps {
-    export function isSubscribedApp(appId: number): boolean;
-    export function isAppInstalled(appId: number): boolean;
-    export function isDlcInstalled(appId: number): boolean;
-    export function isSubscribedFromFreeWeekend(): boolean;
-    export function isVacBanned(): boolean;
-    export function isCybercafe(): boolean;
-    export function isLowViolence(): boolean;
-    export function isSubscribed(): boolean;
-    export function appBuildId(): number;
-    export function appInstallDir(appId: number): string;
-    export function appOwner(): PlayerSteamId;
-    export function availableGameLanguages(): Array<string>;
-    export function currentGameLanguage(): string;
-    export function currentBetaName(): string | null;
-  }
-  export namespace auth {
-    /** @param timeoutSeconds - The number of seconds to wait for the ticket to be validated. Default value is 10 seconds. */
-    export function getSessionTicket(
-      timeoutSeconds?: number | undefined | null
-    ): Promise<Ticket>;
-    export class Ticket {
-      cancel(): void;
-      getBytes(): Buffer;
-    }
-  }
-
-  export const enum ChatMemberStateChange {
-    /** This user has joined or is joining the lobby. */
-    Entered,
-    /** This user has left or is leaving the lobby. */
-    Left,
-    /** User disconnected without leaving the lobby first. */
-    Disconnected,
-    /** The user has been kicked. */
-    Kicked,
-    /** The user has been kicked and banned. */
-    Banned,
-  }
-
-  export interface CallbackReturns {
-    [callback.SteamCallback.PersonaStateChange]: {
-      steam_id: bigint;
-      flags: { bits: number };
-    };
-    [callback.SteamCallback.SteamServersConnected]: {};
-    [callback.SteamCallback.SteamServersDisconnected]: {
-      reason: number;
-    };
-    [callback.SteamCallback.SteamServerConnectFailure]: {
-      reason: number;
-      still_retrying: boolean;
-    };
-    [callback.SteamCallback.LobbyDataUpdate]: {
-      lobby: bigint;
-      member: bigint;
-      success: boolean;
-    };
-    [callback.SteamCallback.LobbyChatUpdate]: {
-      lobby: bigint;
-      user_changed: bigint;
-      making_change: bigint;
-      member_state_change: ChatMemberStateChange;
-    };
-    [callback.SteamCallback.P2PSessionRequest]: {
-      remote: bigint;
-    };
-    [callback.SteamCallback.P2PSessionConnectFail]: {
-      remote: bigint;
-      error: number;
-    };
-    [callback.SteamCallback.GameLobbyJoinRequested]: {
-      lobby_steam_id: bigint;
-      friend_steam_id: bigint;
-    };
-    [callback.SteamCallback.MicroTxnAuthorizationResponse]: {
-      app_id: number;
-      order_id: number | bigint;
-      authorized: boolean;
-    };
-  }
-
-  export namespace callback {
-    export const enum SteamCallback {
-      PersonaStateChange = 0,
-      SteamServersConnected = 1,
-      SteamServersDisconnected = 2,
-      SteamServerConnectFailure = 3,
-      LobbyDataUpdate = 4,
-      LobbyChatUpdate = 5,
-      P2PSessionRequest = 6,
-      P2PSessionConnectFail = 7,
-      GameLobbyJoinRequested = 8,
-      MicroTxnAuthorizationResponse = 9,
-    }
-    export function register<C extends keyof CallbackReturns>(
-      steamCallback: C,
-      handler: (value: CallbackReturns[C]) => void
-    ): Handle;
-    export class Handle {
-      disconnect(): void;
-    }
-  }
-  export namespace cloud {
-    export function isEnabledForAccount(): boolean;
-    export function isEnabledForApp(): boolean;
-    export function readFile(name: string): string;
-    export function writeFile(name: string, content: string): boolean;
-    export function deleteFile(name: string): boolean;
-    export function fileExists(name: string): boolean;
-  }
-  export namespace input {
-    export interface AnalogActionVector {
-      x: number;
-      y: number;
-    }
-    export function init(): void;
-    export function getControllers(): Array<Controller>;
-    export function getActionSet(actionSetName: string): bigint;
-    export function getDigitalAction(actionName: string): bigint;
-    export function getAnalogAction(actionName: string): bigint;
-    export function shutdown(): void;
-    export class Controller {
-      activateActionSet(actionSetHandle: bigint): void;
-      isDigitalActionPressed(actionHandle: bigint): boolean;
-      getAnalogActionVector(actionHandle: bigint): AnalogActionVector;
-    }
-  }
-  export namespace localplayer {
-    export function getSteamId(): PlayerSteamId;
-    export function getName(): string;
-    export function getLevel(): number;
-    /** @returns the 2 digit ISO 3166-1-alpha-2 format country code which client is running in, e.g. "US" or "UK". */
-    export function getIpCountry(): string;
-    export function setRichPresence(
-      key: string,
-      value?: string | undefined | null
-    ): void;
-  }
-  export namespace matchmaking {
-    export const enum LobbyType {
-      Private = 0,
-      FriendsOnly = 1,
-      Public = 2,
-      Invisible = 3,
-    }
-    export function createLobby(
-      lobbyType: LobbyType,
-      maxMembers: number
-    ): Promise<Lobby>;
-    export function joinLobby(lobbyId: bigint): Promise<Lobby>;
-    export function getLobbies(): Promise<Array<Lobby>>;
-    export class Lobby {
-      id: bigint;
-      join(): Promise<Lobby>;
-      leave(): void;
-      openInviteDialog(): void;
-      getMemberCount(): bigint;
-      getMemberLimit(): bigint | null;
-      getMembers(): Array<PlayerSteamId>;
-      getOwner(): PlayerSteamId;
-      setJoinable(joinable: boolean): boolean;
-      getData(key: string): string | null;
-      setData(key: string, value: string): boolean;
-      deleteData(key: string): boolean;
-      /** Get an object containing all the lobby data */
-      getFullData(): Record<string, string>;
-      /**
-       * Merge current lobby data with provided data in a single batch
-       * @returns true if all data was set successfully
-       */
-      mergeFullData(data: Record<string, string>): boolean;
-    }
-  }
-  export namespace networking {
-    export interface P2PPacket {
-      data: Buffer;
-      size: number;
-      steamId: PlayerSteamId;
-    }
-    /** The method used to send a packet */
-    export const enum SendType {
-      /**
-       * Send the packet directly over udp.
-       *
-       * Can't be larger than 1200 bytes
-       */
-      Unreliable = 0,
-      /**
-       * Like `Unreliable` but doesn't buffer packets
-       * sent before the connection has started.
-       */
-      UnreliableNoDelay = 1,
-      /**
-       * Reliable packet sending.
-       *
-       * Can't be larger than 1 megabyte.
-       */
-      Reliable = 2,
-      /**
-       * Like `Reliable` but applies the nagle
-       * algorithm to packets being sent
-       */
-      ReliableWithBuffering = 3,
-    }
-    export function sendP2PPacket(
-      steamId64: bigint,
-      sendType: SendType,
-      data: Buffer
-    ): boolean;
-    export function isP2PPacketAvailable(): number;
-    export function readP2PPacket(size: number): P2PPacket;
-    export function acceptP2PSession(steamId64: bigint): void;
-  }
-  export namespace overlay {
-    export const enum Dialog {
-      Friends = 0,
-      Community = 1,
-      Players = 2,
-      Settings = 3,
-      OfficialGameGroup = 4,
-      Stats = 5,
-      Achievements = 6,
-    }
-    export const enum StoreFlag {
-      None = 0,
-      AddToCart = 1,
-      AddToCartAndShow = 2,
-    }
-    export function activateDialog(dialog: Dialog): void;
-    export function activateDialogToUser(
-      dialog: Dialog,
-      steamId64: bigint
-    ): void;
-    export function activateInviteDialog(lobbyId: bigint): void;
-    export function activateToWebPage(url: string): void;
-    export function activateToStore(appId: number, flag: StoreFlag): void;
-  }
-  export namespace stats {
-    export function getInt(name: string): number | null;
-    export function setInt(name: string, value: number): boolean;
-    export function store(): boolean;
-    export function resetAll(achievementsToo: boolean): boolean;
-  }
-  export namespace utils {
-    export function getAppId(): number;
-    export function getServerRealTime(): number;
-    export function isSteamRunningOnSteamDeck(): boolean;
-  }
-  export namespace workshop {
-    export interface UgcResult {
-      itemId: bigint;
-      needsToAcceptAgreement: boolean;
-    }
-    export const enum UgcItemVisibility {
-      Public = 0,
-      FriendsOnly = 1,
-      Private = 2,
-      Unlisted = 3,
-    }
-    export interface UgcUpdate {
-      title?: string;
-      description?: string;
-      changeNote?: string;
-      previewPath?: string;
-      contentPath?: string;
-      tags?: Array<string>;
-      visibility?: UgcItemVisibility;
-    }
-    export interface InstallInfo {
-      folder: string;
-      sizeOnDisk: bigint;
-      timestamp: number;
-    }
-    export interface DownloadInfo {
-      current: bigint;
-      total: bigint;
-    }
-    export function createItem(
-      appId?: number | undefined | null
-    ): Promise<UgcResult>;
-    export function updateItem(
-      itemId: bigint,
-      updateDetails: UgcUpdate,
-      appId?: number | undefined | null
-    ): Promise<UgcResult>;
-    /**
-     * Subscribe to a workshop item. It will be downloaded and installed as soon as possible.
-     *
-     * {@link https://partner.steamgames.com/doc/api/ISteamUGC#SubscribeItem}
-     */
-    export function subscribe(itemId: bigint): Promise<void>;
-    /**
-     * Unsubscribe from a workshop item. This will result in the item being removed after the game quits.
-     *
-     * {@link https://partner.steamgames.com/doc/api/ISteamUGC#UnsubscribeItem}
-     */
-    export function unsubscribe(itemId: bigint): Promise<void>;
-    /**
-     * Gets the current state of a workshop item on this client. States can be combined.
-     *
-     * @returns a number with the current item state, e.g. 9
-     * 9 = 1 (The current user is subscribed to this item) + 8 (The item needs an update)
-     *
-     * {@link https://partner.steamgames.com/doc/api/ISteamUGC#GetItemState}
-     * {@link https://partner.steamgames.com/doc/api/ISteamUGC#EItemState}
-     */
-    export function state(itemId: bigint): number;
-    /**
-     * Gets info about currently installed content on the disc for workshop item.
-     *
-     * @returns an object with the the properties {folder, size_on_disk, timestamp}
-     *
-     * {@link https://partner.steamgames.com/doc/api/ISteamUGC#GetItemInstallInfo}
-     */
-    export function installInfo(itemId: bigint): InstallInfo | null;
-    /**
-     * Get info about a pending download of a workshop item.
-     *
-     * @returns an object with the properties {current, total}
-     *
-     * {@link https://partner.steamgames.com/doc/api/ISteamUGC#GetItemDownloadInfo}
-     */
-    export function downloadInfo(itemId: bigint): DownloadInfo | null;
-    /**
-     * Download or update a workshop item.
-     *
-     * @param highPriority - If high priority is true, start the download in high priority mode, pausing any existing in-progress Steam downloads and immediately begin downloading this workshop item.
-     * @returns true or false
-     *
-     * {@link https://partner.steamgames.com/doc/api/ISteamUGC#DownloadItem}
-     */
-    export function download(itemId: bigint, highPriority: boolean): boolean;
-  }
-}
-
-declare module 'steamworks.js' {
-  export function init(appId?: number): Client;
-  export function restartAppIfNecessary(appId: number): boolean;
-  export function electronEnableSteamOverlay(
-    disableEachFrameInvalidation?: boolean
-  ): void;
-  export type Client = Omit<
-    typeof import('steamworks.js/client'),
-    'init' | 'runCallbacks'
-  >;
-  export const SteamCallback: typeof import('steamworks.js/client').callback.SteamCallback;
-}

Extensions/SystemInfo/CMakeLists.txt

@@ -1,20 +1,23 @@
-cmake_minimum_required(VERSION 2.6)
-cmake_policy(SET CMP0015 NEW)
+cmake_minimum_required(VERSION 3.5)
 
 project(SystemInfo)
 gd_add_extension_includes()
 
-#Defines
-###
+# Defines
+#
 gd_add_extension_definitions(SystemInfo)
 
-#The targets
-###
+# The targets
+#
 include_directories(.)
-file(GLOB source_files *.cpp *.h)
+file(
+	GLOB
+	source_files
+	*.cpp
+	*.h)
 gd_add_clang_utils(SystemInfo "${source_files}")
 gd_add_extension_target(SystemInfo "${source_files}")
 
-#Linker files for the IDE extension
-###
+# Linker files for the IDE extension
+#
 gd_extension_link_libraries(SystemInfo)