Fix flow

.circleci/config.yml

@@ -18,13 +18,13 @@ jobs:
   # Build the **entire** app for macOS (including the GDevelop.js library).
   build-macos:
     macos:
-      xcode: 16.4.0
-    resource_class: m4pro.medium
+      xcode: 14.2.0
+    resource_class: macos.m1.large.gen1
     steps:
       - checkout
       # Install Rosetta for AWS CLI and disable TSO to speed up S3 uploads (https://support.circleci.com/hc/en-us/articles/19334402064027-Troubleshooting-slow-uploads-to-S3-for-jobs-using-an-m1-macOS-resource-class)
       - macos/install-rosetta
-      # - run: sudo sysctl net.inet.tcp.tso=0
+      - run: sudo sysctl net.inet.tcp.tso=0
 
       # Install a recent version of npm to workaround a notarization issue because of a symlink made by npm: https://github.com/electron-userland/electron-builder/issues/7755
       # Node.js v20.14.0 comes with npm v10.7.0.
@@ -94,29 +94,25 @@ jobs:
           name: Deploy to S3 (specific commit)
           command: |
             export PATH=~/.local/bin:$PATH
-            for i in 1 2 3 4 5 6 7; do
+            for i in 1 2 3; do
               aws s3 sync newIDE/electron-app/dist s3://gdevelop-releases/$(git rev-parse --abbrev-ref HEAD)/commit/$(git rev-parse HEAD)/ && break
               echo "Retry $i failed... retrying in 10 seconds"
               sleep 10
             done
-            if [ $i -eq 7 ]; then
-              echo "All retries for deployment failed!" >&2
-              exit 1
-            fi
+            echo "All retries for deployment failed!" >&2
+            exit 1
 
       - run:
           name: Deploy to S3 (latest)
           command: |
             export PATH=~/.local/bin:$PATH
-            for i in 1 2 3 4 5 6 7; do
+            for i in 1 2 3; do
               aws s3 sync newIDE/electron-app/dist s3://gdevelop-releases/$(git rev-parse --abbrev-ref HEAD)/latest/ && break
               echo "Retry $i failed... retrying in 10 seconds"
               sleep 10
             done
-            if [ $i -eq 7 ]; then
-              echo "All retries for deployment failed!" >&2
-              exit 1
-            fi
+            echo "All retries for deployment failed!" >&2
+            exit 1
 
   # Build the app for Linux (using a pre-built GDevelop.js library).
   build-linux:

.gitignore

@@ -33,4 +33,3 @@
 .Spotlight-V100
 .Trashes
 Thumbs.db
-.claude

.vscode/tasks.json

@@ -38,7 +38,8 @@
       "presentation": {
         "reveal": "silent"
       },
-      "isBackground": true
+      "isBackground": true,
+      "runOptions": { "instanceLimit": 1, "runOn": "folderOpen" }
     },
     {
       "type": "npm",

Core/GDCore/Events/CodeGeneration/EventsCodeGenerator.cpp

@@ -42,19 +42,15 @@ gd::String EventsCodeGenerator::GenerateRelationalOperatorCall(
     const vector<gd::String>& arguments,
     const gd::String& callStartString,
     std::size_t startFromArgument) {
-  std::size_t relationalOperatorIndex =
-      instrInfos.parameters.GetParametersCount();
-  for (std::size_t i = startFromArgument;
-       i < instrInfos.parameters.GetParametersCount();
+  std::size_t relationalOperatorIndex = instrInfos.parameters.GetParametersCount();
+  for (std::size_t i = startFromArgument; i < instrInfos.parameters.GetParametersCount();
        ++i) {
-    if (instrInfos.parameters.GetParameter(i).GetType() ==
-        "relationalOperator") {
+    if (instrInfos.parameters.GetParameter(i).GetType() == "relationalOperator") {
       relationalOperatorIndex = i;
     }
   }
   // Ensure that there is at least one parameter after the relational operator
-  if (relationalOperatorIndex + 1 >=
-      instrInfos.parameters.GetParametersCount()) {
+  if (relationalOperatorIndex + 1 >= instrInfos.parameters.GetParametersCount()) {
     ReportError();
     return "";
   }
@@ -91,23 +87,20 @@ gd::String EventsCodeGenerator::GenerateRelationalOperation(
     const gd::String& relationalOperator,
     const gd::String& lhs,
     const gd::String& rhs) {
-  return lhs + " " + GenerateRelationalOperatorCodes(relationalOperator) + " " +
-         rhs;
+  return lhs + " " + GenerateRelationalOperatorCodes(relationalOperator) + " " + rhs;
 }
 
-const gd::String EventsCodeGenerator::GenerateRelationalOperatorCodes(
-    const gd::String& operatorString) {
-  if (operatorString == "=") {
-    return "==";
-  }
-  if (operatorString != "<" && operatorString != ">" &&
-      operatorString != "<=" && operatorString != ">=" &&
-      operatorString != "!=" && operatorString != "startsWith" &&
-      operatorString != "endsWith" && operatorString != "contains") {
-    cout << "Warning: Bad relational operator: Set to == by default." << endl;
-    return "==";
-  }
-  return operatorString;
+const gd::String EventsCodeGenerator::GenerateRelationalOperatorCodes(const gd::String &operatorString) {
+    if (operatorString == "=") {
+        return "==";
+    }
+    if (operatorString != "<" && operatorString != ">" &&
+        operatorString != "<=" && operatorString != ">=" && operatorString != "!=" &&
+        operatorString != "startsWith" && operatorString != "endsWith" && operatorString != "contains") {
+      cout << "Warning: Bad relational operator: Set to == by default." << endl;
+      return "==";
+    }
+    return operatorString;
 }
 
 /**
@@ -131,8 +124,7 @@ gd::String EventsCodeGenerator::GenerateOperatorCall(
     const gd::String& getterStartString,
     std::size_t startFromArgument) {
   std::size_t operatorIndex = instrInfos.parameters.GetParametersCount();
-  for (std::size_t i = startFromArgument;
-       i < instrInfos.parameters.GetParametersCount();
+  for (std::size_t i = startFromArgument; i < instrInfos.parameters.GetParametersCount();
        ++i) {
     if (instrInfos.parameters.GetParameter(i).GetType() == "operator") {
       operatorIndex = i;
@@ -203,8 +195,7 @@ gd::String EventsCodeGenerator::GenerateCompoundOperatorCall(
     const gd::String& callStartString,
     std::size_t startFromArgument) {
   std::size_t operatorIndex = instrInfos.parameters.GetParametersCount();
-  for (std::size_t i = startFromArgument;
-       i < instrInfos.parameters.GetParametersCount();
+  for (std::size_t i = startFromArgument; i < instrInfos.parameters.GetParametersCount();
        ++i) {
     if (instrInfos.parameters.GetParameter(i).GetType() == "operator") {
       operatorIndex = i;
@@ -257,8 +248,7 @@ gd::String EventsCodeGenerator::GenerateMutatorCall(
     const gd::String& callStartString,
     std::size_t startFromArgument) {
   std::size_t operatorIndex = instrInfos.parameters.GetParametersCount();
-  for (std::size_t i = startFromArgument;
-       i < instrInfos.parameters.GetParametersCount();
+  for (std::size_t i = startFromArgument; i < instrInfos.parameters.GetParametersCount();
        ++i) {
     if (instrInfos.parameters.GetParameter(i).GetType() == "operator") {
       operatorIndex = i;
@@ -333,97 +323,83 @@ gd::String EventsCodeGenerator::GenerateConditionCode(
   }
 
   // Insert code only parameters and be sure there is no lack of parameter.
-  while (condition.GetParameters().size() <
-         instrInfos.parameters.GetParametersCount()) {
+  while (condition.GetParameters().size() < instrInfos.parameters.GetParametersCount()) {
     vector<gd::Expression> parameters = condition.GetParameters();
     parameters.push_back(gd::Expression(""));
     condition.SetParameters(parameters);
   }
 
+  gd::EventsCodeGenerator::CheckBehaviorParameters(condition, instrInfos);
   // Verify that there are no mismatches between object type in parameters.
-  for (std::size_t pNb = 0; pNb < instrInfos.parameters.GetParametersCount();
-       ++pNb) {
-    if (ParameterMetadata::IsObject(
-            instrInfos.parameters.GetParameter(pNb).GetType())) {
+  for (std::size_t pNb = 0; pNb < instrInfos.parameters.GetParametersCount(); ++pNb) {
+    if (ParameterMetadata::IsObject(instrInfos.parameters.GetParameter(pNb).GetType())) {
       gd::String objectInParameter =
           condition.GetParameter(pNb).GetPlainString();
 
-      const auto& expectedObjectType =
+      const auto &expectedObjectType =
           instrInfos.parameters.GetParameter(pNb).GetExtraInfo();
-      const auto& actualObjectType =
+      const auto &actualObjectType =
           GetObjectsContainersList().GetTypeOfObject(objectInParameter);
       if (!GetObjectsContainersList().HasObjectOrGroupNamed(
               objectInParameter)) {
         gd::ProjectDiagnostic projectDiagnostic(
-            gd::ProjectDiagnostic::ErrorType::UnknownObject,
-            "",
-            objectInParameter,
-            "");
+            gd::ProjectDiagnostic::ErrorType::UnknownObject, "",
+            objectInParameter, "");
         if (diagnosticReport) diagnosticReport->Add(projectDiagnostic);
         return "/* Unknown object - skipped. */";
       } else if (!expectedObjectType.empty() &&
                  actualObjectType != expectedObjectType) {
         gd::ProjectDiagnostic projectDiagnostic(
-            gd::ProjectDiagnostic::ErrorType::MismatchedObjectType,
-            "",
-            actualObjectType,
-            expectedObjectType,
-            objectInParameter);
+            gd::ProjectDiagnostic::ErrorType::MismatchedObjectType, "",
+            actualObjectType, expectedObjectType, objectInParameter);
         if (diagnosticReport) diagnosticReport->Add(projectDiagnostic);
         return "/* Mismatched object type - skipped. */";
       }
     }
   }
-  bool isAnyBehaviorMissing =
-      gd::EventsCodeGenerator::CheckBehaviorParameters(condition, instrInfos);
-  if (isAnyBehaviorMissing) {
-    return "/* Missing behavior - skipped. */";
-  }
 
   if (instrInfos.IsObjectInstruction()) {
     gd::String objectName = condition.GetParameter(0).GetPlainString();
     if (!objectName.empty() && instrInfos.parameters.GetParametersCount() > 0) {
       std::vector<gd::String> realObjects =
-          GetObjectsContainersList().ExpandObjectName(
-              objectName, context.GetCurrentObject());
+          GetObjectsContainersList().ExpandObjectName(objectName, context.GetCurrentObject());
       for (std::size_t i = 0; i < realObjects.size(); ++i) {
         // Set up the context
-        gd::String objectType =
-            GetObjectsContainersList().GetTypeOfObject(realObjects[i]);
+        gd::String objectType = GetObjectsContainersList().GetTypeOfObject(realObjects[i]);
         const ObjectMetadata& objInfo =
             MetadataProvider::GetObjectMetadata(platform, objectType);
 
-        AddIncludeFiles(objInfo.includeFiles);
-        context.SetCurrentObject(realObjects[i]);
-        context.ObjectsListNeeded(realObjects[i]);
+          AddIncludeFiles(objInfo.includeFiles);
+          context.SetCurrentObject(realObjects[i]);
+          context.ObjectsListNeeded(realObjects[i]);
 
-        // Prepare arguments and generate the condition whole code
-        vector<gd::String> arguments = GenerateParametersCodes(
-            condition.GetParameters(), instrInfos.parameters, context);
-        conditionCode += GenerateObjectCondition(realObjects[i],
-                                                 objInfo,
-                                                 arguments,
-                                                 instrInfos,
-                                                 returnBoolean,
-                                                 condition.IsInverted(),
-                                                 context);
+          // Prepare arguments and generate the condition whole code
+          vector<gd::String> arguments = GenerateParametersCodes(
+              condition.GetParameters(), instrInfos.parameters, context);
+          conditionCode += GenerateObjectCondition(realObjects[i],
+                                                   objInfo,
+                                                   arguments,
+                                                   instrInfos,
+                                                   returnBoolean,
+                                                   condition.IsInverted(),
+                                                   context);
 
-        context.SetNoCurrentObject();
+          context.SetNoCurrentObject();
       }
     }
   } else if (instrInfos.IsBehaviorInstruction()) {
     if (instrInfos.parameters.GetParametersCount() >= 2) {
-      const gd::String& objectName = condition.GetParameter(0).GetPlainString();
-      const gd::String& behaviorName =
+      const gd::String &objectName = condition.GetParameter(0).GetPlainString();
+      const gd::String &behaviorName =
           condition.GetParameter(1).GetPlainString();
-      const gd::String& actualBehaviorType =
+      const gd::String &actualBehaviorType =
           GetObjectsContainersList().GetTypeOfBehavior(behaviorName);
 
       std::vector<gd::String> realObjects =
           GetObjectsContainersList().ExpandObjectName(
               objectName, context.GetCurrentObject());
 
-      const BehaviorMetadata& autoInfo =
+      const BehaviorMetadata &autoInfo =
           MetadataProvider::GetBehaviorMetadata(platform, actualBehaviorType);
 
       for (std::size_t i = 0; i < realObjects.size(); ++i) {
@@ -435,14 +411,15 @@ gd::String EventsCodeGenerator::GenerateConditionCode(
         // Prepare arguments and generate the whole condition code
         vector<gd::String> arguments = GenerateParametersCodes(
             condition.GetParameters(), instrInfos.parameters, context);
-        conditionCode += GenerateBehaviorCondition(realObjects[i],
-                                                   behaviorName,
-                                                   autoInfo,
-                                                   arguments,
-                                                   instrInfos,
-                                                   returnBoolean,
-                                                   condition.IsInverted(),
-                                                   context);
+        conditionCode += GenerateBehaviorCondition(
+            realObjects[i],
+            behaviorName,
+            autoInfo,
+            arguments,
+            instrInfos,
+            returnBoolean,
+            condition.IsInverted(),
+            context);
 
         context.SetNoCurrentObject();
       }
@@ -511,50 +488,31 @@ gd::String EventsCodeGenerator::GenerateConditionsListCode(
   return outputCode;
 }
 
-bool EventsCodeGenerator::CheckBehaviorParameters(
-    const gd::Instruction& instruction,
-    const gd::InstructionMetadata& instrInfos) {
-  bool isAnyBehaviorMissing = false;
-  gd::ParameterMetadataTools::IterateOverParametersWithIndex(
-      instruction.GetParameters(),
-      instrInfos.parameters,
-      [this, &isAnyBehaviorMissing, &instrInfos](
-          const gd::ParameterMetadata& parameterMetadata,
-          const gd::Expression& parameterValue,
-          size_t parameterIndex,
-          const gd::String& lastObjectName,
-          size_t lastObjectIndex) {
+void EventsCodeGenerator::CheckBehaviorParameters(
+    const gd::Instruction &instruction,
+    const gd::InstructionMetadata &instrInfos) {
+  gd::ParameterMetadataTools::IterateOverParameters(
+      instruction.GetParameters(), instrInfos.parameters,
+      [this](const gd::ParameterMetadata &parameterMetadata,
+             const gd::Expression &parameterValue,
+             const gd::String &lastObjectName) {
         if (ParameterMetadata::IsBehavior(parameterMetadata.GetType())) {
-          const gd::String& behaviorName = parameterValue.GetPlainString();
-          const gd::String& actualBehaviorType =
+          const gd::String &behaviorName = parameterValue.GetPlainString();
+          const gd::String &actualBehaviorType =
               GetObjectsContainersList().GetTypeOfBehaviorInObjectOrGroup(
                   lastObjectName, behaviorName);
-          const gd::String& expectedBehaviorType =
+          const gd::String &expectedBehaviorType =
               parameterMetadata.GetExtraInfo();
 
           if (!expectedBehaviorType.empty() &&
               actualBehaviorType != expectedBehaviorType) {
-            const auto& objectParameterMetadata =
-                instrInfos.GetParameter(lastObjectIndex);
-            // Event functions crash if some objects in a group are missing
-            // the required behaviors, since they lose reference to the original
-            // objects. Missing behaviors are considered "fatal" only for
-            // ObjectList parameters, in order to minimize side effects on
-            // built-in functions.
-            if (objectParameterMetadata.GetType() == "objectList") {
-              isAnyBehaviorMissing = true;
-            }
             gd::ProjectDiagnostic projectDiagnostic(
-                gd::ProjectDiagnostic::ErrorType::MissingBehavior,
-                "",
-                actualBehaviorType,
-                expectedBehaviorType,
-                lastObjectName);
+                gd::ProjectDiagnostic::ErrorType::MissingBehavior, "",
+                actualBehaviorType, expectedBehaviorType, lastObjectName);
             if (diagnosticReport) diagnosticReport->Add(projectDiagnostic);
           }
         }
       });
-  return isAnyBehaviorMissing;
 }
 
 /**
@@ -563,8 +521,7 @@ bool EventsCodeGenerator::CheckBehaviorParameters(
 gd::String EventsCodeGenerator::GenerateActionCode(
     gd::Instruction& action,
     EventsCodeGenerationContext& context,
-    const gd::String& optionalAsyncCallbackName,
-    const gd::String& optionalAsyncCallbackId) {
+    const gd::String& optionalAsyncCallbackName) {
   gd::String actionCode;
 
   const gd::InstructionMetadata& instrInfos =
@@ -589,51 +546,39 @@ gd::String EventsCodeGenerator::GenerateActionCode(
           : instrInfos.codeExtraInformation.functionCallName;
 
   // Be sure there is no lack of parameter.
-  while (action.GetParameters().size() <
-         instrInfos.parameters.GetParametersCount()) {
+  while (action.GetParameters().size() < instrInfos.parameters.GetParametersCount()) {
     vector<gd::Expression> parameters = action.GetParameters();
     parameters.push_back(gd::Expression(""));
     action.SetParameters(parameters);
   }
 
+  gd::EventsCodeGenerator::CheckBehaviorParameters(action, instrInfos);
   // Verify that there are no mismatches between object type in parameters.
-  for (std::size_t pNb = 0; pNb < instrInfos.parameters.GetParametersCount();
-       ++pNb) {
-    if (ParameterMetadata::IsObject(
-            instrInfos.parameters.GetParameter(pNb).GetType())) {
+  for (std::size_t pNb = 0; pNb < instrInfos.parameters.GetParametersCount(); ++pNb) {
+    if (ParameterMetadata::IsObject(instrInfos.parameters.GetParameter(pNb).GetType())) {
       gd::String objectInParameter = action.GetParameter(pNb).GetPlainString();
 
-      const auto& expectedObjectType =
+      const auto &expectedObjectType =
           instrInfos.parameters.GetParameter(pNb).GetExtraInfo();
-      const auto& actualObjectType =
+      const auto &actualObjectType =
           GetObjectsContainersList().GetTypeOfObject(objectInParameter);
       if (!GetObjectsContainersList().HasObjectOrGroupNamed(
               objectInParameter)) {
         gd::ProjectDiagnostic projectDiagnostic(
-            gd::ProjectDiagnostic::ErrorType::UnknownObject,
-            "",
-            objectInParameter,
-            "");
+            gd::ProjectDiagnostic::ErrorType::UnknownObject, "",
+            objectInParameter, "");
         if (diagnosticReport) diagnosticReport->Add(projectDiagnostic);
         return "/* Unknown object - skipped. */";
       } else if (!expectedObjectType.empty() &&
                  actualObjectType != expectedObjectType) {
         gd::ProjectDiagnostic projectDiagnostic(
-            gd::ProjectDiagnostic::ErrorType::MismatchedObjectType,
-            "",
-            actualObjectType,
-            expectedObjectType,
-            objectInParameter);
+            gd::ProjectDiagnostic::ErrorType::MismatchedObjectType, "",
+            actualObjectType, expectedObjectType, objectInParameter);
         if (diagnosticReport) diagnosticReport->Add(projectDiagnostic);
         return "/* Mismatched object type - skipped. */";
       }
     }
   }
-  bool isAnyBehaviorMissing =
-      gd::EventsCodeGenerator::CheckBehaviorParameters(action, instrInfos);
-  if (isAnyBehaviorMissing) {
-    return "/* Missing behavior - skipped. */";
-  }
 
   // Call free function first if available
   if (instrInfos.IsObjectInstruction()) {
@@ -641,46 +586,43 @@ gd::String EventsCodeGenerator::GenerateActionCode(
 
     if (instrInfos.parameters.GetParametersCount() > 0) {
       std::vector<gd::String> realObjects =
-          GetObjectsContainersList().ExpandObjectName(
-              objectName, context.GetCurrentObject());
+          GetObjectsContainersList().ExpandObjectName(objectName, context.GetCurrentObject());
       for (std::size_t i = 0; i < realObjects.size(); ++i) {
         // Setup context
-        gd::String objectType =
-            GetObjectsContainersList().GetTypeOfObject(realObjects[i]);
+        gd::String objectType = GetObjectsContainersList().GetTypeOfObject(realObjects[i]);
         const ObjectMetadata& objInfo =
             MetadataProvider::GetObjectMetadata(platform, objectType);
 
-        AddIncludeFiles(objInfo.includeFiles);
-        context.SetCurrentObject(realObjects[i]);
-        context.ObjectsListNeeded(realObjects[i]);
+          AddIncludeFiles(objInfo.includeFiles);
+          context.SetCurrentObject(realObjects[i]);
+          context.ObjectsListNeeded(realObjects[i]);
 
-        // Prepare arguments and generate the whole action code
-        vector<gd::String> arguments = GenerateParametersCodes(
-            action.GetParameters(), instrInfos.parameters, context);
-        actionCode += GenerateObjectAction(realObjects[i],
-                                           objInfo,
-                                           functionCallName,
-                                           arguments,
-                                           instrInfos,
-                                           context,
-                                           optionalAsyncCallbackName,
-                                           optionalAsyncCallbackId);
+          // Prepare arguments and generate the whole action code
+          vector<gd::String> arguments = GenerateParametersCodes(
+              action.GetParameters(), instrInfos.parameters, context);
+          actionCode += GenerateObjectAction(realObjects[i],
+                                             objInfo,
+                                             functionCallName,
+                                             arguments,
+                                             instrInfos,
+                                             context,
+                                             optionalAsyncCallbackName);
 
-        context.SetNoCurrentObject();
+          context.SetNoCurrentObject();
       }
     }
   } else if (instrInfos.IsBehaviorInstruction()) {
     if (instrInfos.parameters.GetParametersCount() >= 2) {
-      const gd::String& objectName = action.GetParameter(0).GetPlainString();
-      const gd::String& behaviorName = action.GetParameter(1).GetPlainString();
-      const gd::String& actualBehaviorType =
+      const gd::String &objectName = action.GetParameter(0).GetPlainString();
+      const gd::String &behaviorName = action.GetParameter(1).GetPlainString();
+      const gd::String &actualBehaviorType =
           GetObjectsContainersList().GetTypeOfBehavior(behaviorName);
 
       std::vector<gd::String> realObjects =
           GetObjectsContainersList().ExpandObjectName(
               objectName, context.GetCurrentObject());
 
-      const BehaviorMetadata& autoInfo =
+      const BehaviorMetadata &autoInfo =
           MetadataProvider::GetBehaviorMetadata(platform, actualBehaviorType);
 
       AddIncludeFiles(autoInfo.includeFiles);
@@ -692,15 +634,15 @@ gd::String EventsCodeGenerator::GenerateActionCode(
         // Prepare arguments and generate the whole action code
         vector<gd::String> arguments = GenerateParametersCodes(
             action.GetParameters(), instrInfos.parameters, context);
-        actionCode += GenerateBehaviorAction(realObjects[i],
-                                             behaviorName,
-                                             autoInfo,
-                                             functionCallName,
-                                             arguments,
-                                             instrInfos,
-                                             context,
-                                             optionalAsyncCallbackName,
-                                             optionalAsyncCallbackId);
+        actionCode +=
+            GenerateBehaviorAction(realObjects[i],
+                                   behaviorName,
+                                   autoInfo,
+                                   functionCallName,
+                                   arguments,
+                                   instrInfos,
+                                   context,
+                                   optionalAsyncCallbackName);
 
         context.SetNoCurrentObject();
       }
@@ -712,8 +654,7 @@ gd::String EventsCodeGenerator::GenerateActionCode(
                                      arguments,
                                      instrInfos,
                                      context,
-                                     optionalAsyncCallbackName,
-                                     optionalAsyncCallbackId);
+                                     optionalAsyncCallbackName);
   }
 
   return actionCode;
@@ -726,8 +667,8 @@ gd::String EventsCodeGenerator::GenerateLocalVariablesStackAccessor() {
 }
 
 gd::String EventsCodeGenerator::GenerateAnyOrSceneVariableGetter(
-    const gd::Expression& variableExpression,
-    EventsCodeGenerationContext& context) {
+    const gd::Expression &variableExpression,
+    EventsCodeGenerationContext &context) {
   const auto variableName = gd::ExpressionVariableNameFinder::GetVariableName(
       *variableExpression.GetRootNode());
 
@@ -738,12 +679,8 @@ gd::String EventsCodeGenerator::GenerateAnyOrSceneVariableGetter(
           : "scenevar";
 
   return gd::ExpressionCodeGenerator::GenerateExpressionCode(
-      *this,
-      context,
-      variableParameterType,
-      variableExpression.GetPlainString(),
-      "",
-      "AllowUndeclaredVariable");
+      *this, context, variableParameterType,
+      variableExpression.GetPlainString(), "", "AllowUndeclaredVariable");
 }
 
 const EventsCodeGenerator::CallbackDescriptor
@@ -790,11 +727,6 @@ EventsCodeGenerator::GenerateCallback(
 
   AddCustomCodeOutsideMain(callbackCode);
 
-  const gd::String idToCallbackMapUpdate = GetCodeNamespaceAccessor() +
-                                           "idToCallbackMap.set(" + callbackID +
-                                           ", " + callbackFunctionName + ");\n";
-  AddCustomCodeOutsideMain(idToCallbackMapUpdate);
-
   std::set<gd::String> requiredObjects;
   // Build the list of all objects required by the callback. Any object that has
   // already been declared could have gone through previous object picking, so
@@ -837,7 +769,7 @@ gd::String EventsCodeGenerator::GenerateActionsListCode(
     } else {
       outputCode += actionCode;
     }
-    outputCode += "}\n";
+    outputCode += "}";
   }
 
   return outputCode;
@@ -854,28 +786,13 @@ gd::String EventsCodeGenerator::GenerateParameterCodes(
 
   if (ParameterMetadata::IsExpression("number", metadata.GetType())) {
     argOutput = gd::ExpressionCodeGenerator::GenerateExpressionCode(
-        *this,
-        context,
-        "number",
-        parameter,
-        lastObjectName,
-        metadata.GetExtraInfo());
+        *this, context, "number", parameter, lastObjectName, metadata.GetExtraInfo());
   } else if (ParameterMetadata::IsExpression("string", metadata.GetType())) {
     argOutput = gd::ExpressionCodeGenerator::GenerateExpressionCode(
-        *this,
-        context,
-        "string",
-        parameter,
-        lastObjectName,
-        metadata.GetExtraInfo());
+        *this, context, "string", parameter, lastObjectName, metadata.GetExtraInfo());
   } else if (ParameterMetadata::IsExpression("variable", metadata.GetType())) {
     argOutput = gd::ExpressionCodeGenerator::GenerateExpressionCode(
-        *this,
-        context,
-        metadata.GetType(),
-        parameter,
-        lastObjectName,
-        metadata.GetExtraInfo());
+        *this, context, metadata.GetType(), parameter, lastObjectName, metadata.GetExtraInfo());
   } else if (ParameterMetadata::IsObject(metadata.GetType())) {
     // It would be possible to run a gd::ExpressionCodeGenerator if later
     // objects can have nested objects, or function returning objects.
@@ -910,8 +827,7 @@ gd::String EventsCodeGenerator::GenerateParameterCodes(
              metadata.GetType() == "atlasResource" ||
              metadata.GetType() == "spineResource" ||
              // Deprecated, old parameter names:
-             metadata.GetType() == "password" ||
-             metadata.GetType() == "musicfile" ||
+             metadata.GetType() == "password" || metadata.GetType() == "musicfile" ||
              metadata.GetType() == "soundfile") {
     argOutput = "\"" + ConvertToString(parameter.GetPlainString()) + "\"";
   } else if (metadata.GetType() == "mouse") {
@@ -1061,8 +977,7 @@ gd::String EventsCodeGenerator::GenerateEventsListCode(
   for (std::size_t eId = 0; eId < events.size(); ++eId) {
     auto& event = events[eId];
     if (event.HasVariables()) {
-      GetProjectScopedContainers().GetVariablesContainersList().Push(
-          event.GetVariables());
+      GetProjectScopedContainers().GetVariablesContainersList().Push(event.GetVariables());
     }
 
     // Each event has its own context : Objects picked in an event are totally
@@ -1187,7 +1102,7 @@ gd::String EventsCodeGenerator::GenerateFreeCondition(
         instrInfos.codeExtraInformation.functionCallName);
   } else {
     predicate = instrInfos.codeExtraInformation.functionCallName + "(" +
-                GenerateArgumentsList(arguments, 0) + ")";
+               GenerateArgumentsList(arguments, 0) + ")";
   }
 
   // Add logical not if needed
@@ -1231,7 +1146,7 @@ gd::String EventsCodeGenerator::GenerateObjectCondition(
         instrInfos, arguments, objectFunctionCallNamePart, 1);
   } else {
     predicate = objectFunctionCallNamePart + "(" +
-                GenerateArgumentsList(arguments, 1) + ")";
+               GenerateArgumentsList(arguments, 1) + ")";
   }
   if (conditionInverted) predicate = GenerateNegatedPredicate(predicate);
 
@@ -1263,20 +1178,18 @@ gd::String EventsCodeGenerator::GenerateBehaviorCondition(
 }
 
 gd::String EventsCodeGenerator::GenerateFreeAction(
-    const gd::String& functionCallName,
+      const gd::String& functionCallName,
     const std::vector<gd::String>& arguments,
     const gd::InstructionMetadata& instrInfos,
     gd::EventsCodeGenerationContext& context,
-    const gd::String& optionalAsyncCallbackName,
-    const gd::String& optionalAsyncCallbackId) {
+    const gd::String& optionalAsyncCallbackName) {
   // Generate call
   gd::String call;
   if (instrInfos.codeExtraInformation.type == "number" ||
       instrInfos.codeExtraInformation.type == "string" ||
       // Boolean actions declared with addExpressionAndConditionAndAction uses
-      // MutatorAndOrAccessor even though they don't declare an operator
-      // parameter. Boolean operators are only used with SetMutators or
-      // SetCustomCodeGenerator.
+      // MutatorAndOrAccessor even though they don't declare an operator parameter.
+      // Boolean operators are only used with SetMutators or SetCustomCodeGenerator.
       (instrInfos.codeExtraInformation.type == "boolean" &&
        instrInfos.codeExtraInformation.accessType ==
            gd::InstructionMetadata::ExtraInformation::AccessType::Mutators)) {
@@ -1289,19 +1202,23 @@ gd::String EventsCodeGenerator::GenerateFreeAction(
           instrInfos.codeExtraInformation.optionalAssociatedInstruction);
     else if (instrInfos.codeExtraInformation.accessType ==
              gd::InstructionMetadata::ExtraInformation::Mutators)
-      call = GenerateMutatorCall(instrInfos, arguments, functionCallName);
-    else
       call =
-          GenerateCompoundOperatorCall(instrInfos, arguments, functionCallName);
+          GenerateMutatorCall(instrInfos,
+                              arguments,
+                              functionCallName);
+    else
+      call = GenerateCompoundOperatorCall(
+          instrInfos,
+          arguments,
+          functionCallName);
   } else {
-    call = functionCallName + "(" + GenerateArgumentsList(arguments) + ")";
+    call = functionCallName + "(" +
+           GenerateArgumentsList(arguments) + ")";
   }
 
-  if (!optionalAsyncCallbackName.empty() && !optionalAsyncCallbackId.empty()) {
+  if (!optionalAsyncCallbackName.empty())
     call = "runtimeScene.getAsyncTasksManager().addTask(" + call + ", " +
-           optionalAsyncCallbackName + ", " + optionalAsyncCallbackId +
-           ", asyncObjectsList)";
-  }
+           optionalAsyncCallbackName + ")";
 
   return call + ";\n";
 }
@@ -1313,8 +1230,7 @@ gd::String EventsCodeGenerator::GenerateObjectAction(
     const std::vector<gd::String>& arguments,
     const gd::InstructionMetadata& instrInfos,
     gd::EventsCodeGenerationContext& context,
-    const gd::String& optionalAsyncCallbackName,
-    const gd::String& optionalAsyncCallbackId) {
+    const gd::String& optionalAsyncCallbackName) {
   // Create call
   gd::String call;
   if ((instrInfos.codeExtraInformation.type == "number" ||
@@ -1355,8 +1271,7 @@ gd::String EventsCodeGenerator::GenerateBehaviorAction(
     const std::vector<gd::String>& arguments,
     const gd::InstructionMetadata& instrInfos,
     gd::EventsCodeGenerationContext& context,
-    const gd::String& optionalAsyncCallbackName,
-    const gd::String& optionalAsyncCallbackId) {
+    const gd::String& optionalAsyncCallbackName) {
   // Create call
   gd::String call;
   if ((instrInfos.codeExtraInformation.type == "number" ||
@@ -1371,13 +1286,17 @@ gd::String EventsCodeGenerator::GenerateBehaviorAction(
           2);
     else
       call = GenerateCompoundOperatorCall(
-          instrInfos, arguments, functionCallName, 2);
+          instrInfos,
+          arguments,
+          functionCallName,
+          2);
     return "For each picked object \"" + objectName + "\", call " + call +
            " for behavior \"" + behaviorName + "\".\n";
   } else {
     gd::String argumentsStr = GenerateArgumentsList(arguments, 2);
 
-    call = functionCallName + "(" + argumentsStr + ")";
+    call = functionCallName + "(" +
+           argumentsStr + ")";
 
     return "For each picked object \"" + objectName + "\", call " + call + "(" +
            argumentsStr + ")" + " for behavior \"" + behaviorName + "\"" +
@@ -1432,47 +1351,42 @@ gd::String EventsCodeGenerator::GenerateArgumentsList(
   return argumentsStr;
 }
 
-gd::String EventsCodeGenerator::GeneratePropertyGetter(
-    const gd::PropertiesContainer& propertiesContainer,
-    const gd::NamedPropertyDescriptor& property,
-    const gd::String& type,
-    gd::EventsCodeGenerationContext& context) {
+gd::String EventsCodeGenerator::GeneratePropertyGetter(const gd::PropertiesContainer& propertiesContainer,
+                                                       const gd::NamedPropertyDescriptor& property,
+                                                       const gd::String& type,
+                                                       gd::EventsCodeGenerationContext& context) {
   return "getProperty" + property.GetName() + "As" + type + "()";
 }
 
 gd::String EventsCodeGenerator::GeneratePropertyGetterWithoutCasting(
-    const gd::PropertiesContainer& propertiesContainer,
-    const gd::NamedPropertyDescriptor& property) {
+    const gd::PropertiesContainer &propertiesContainer,
+    const gd::NamedPropertyDescriptor &property) {
   return "getProperty" + property.GetName() + "()";
 }
 
 gd::String EventsCodeGenerator::GeneratePropertySetterWithoutCasting(
-    const gd::PropertiesContainer& propertiesContainer,
-    const gd::NamedPropertyDescriptor& property,
-    const gd::String& operandCode) {
+    const gd::PropertiesContainer &propertiesContainer,
+    const gd::NamedPropertyDescriptor &property,
+    const gd::String &operandCode) {
   return "setProperty" + property.GetName() + "(" + operandCode + ")";
-}
+    }
 
-gd::String EventsCodeGenerator::GenerateParameterGetter(
-    const gd::ParameterMetadata& parameter,
-    const gd::String& type,
-    gd::EventsCodeGenerationContext& context) {
+gd::String EventsCodeGenerator::GenerateParameterGetter(const gd::ParameterMetadata& parameter,
+                                                        const gd::String& type,
+                                                        gd::EventsCodeGenerationContext& context) {
   return "getParameter" + parameter.GetName() + "As" + type + "()";
 }
 
 gd::String EventsCodeGenerator::GenerateParameterGetterWithoutCasting(
-    const gd::ParameterMetadata& parameter) {
-  return "getParameter" + parameter.GetName() + "()";
-}
+    const gd::ParameterMetadata &parameter) {
+      return "getParameter" + parameter.GetName() + "()";
+    }
 
 EventsCodeGenerator::EventsCodeGenerator(const gd::Project& project_,
                                          const gd::Layout& layout,
                                          const gd::Platform& platform_)
     : platform(platform_),
-      projectScopedContainers(
-          gd::ProjectScopedContainers::
-              MakeNewProjectScopedContainersForProjectAndLayout(project_,
-                                                                layout)),
+      projectScopedContainers(gd::ProjectScopedContainers::MakeNewProjectScopedContainersForProjectAndLayout(project_, layout)),
       hasProjectAndLayout(true),
       project(&project_),
       scene(&layout),
@@ -1481,7 +1395,7 @@ EventsCodeGenerator::EventsCodeGenerator(const gd::Project& project_,
       maxCustomConditionsDepth(0),
       maxConditionsListsSize(0),
       eventsListNextUniqueId(0),
-      diagnosticReport(nullptr) {};
+      diagnosticReport(nullptr){};
 
 EventsCodeGenerator::EventsCodeGenerator(
     const gd::Platform& platform_,
@@ -1496,6 +1410,6 @@ EventsCodeGenerator::EventsCodeGenerator(
       maxCustomConditionsDepth(0),
       maxConditionsListsSize(0),
       eventsListNextUniqueId(0),
-      diagnosticReport(nullptr) {};
+      diagnosticReport(nullptr){};
 
 }  // namespace gd

Core/GDCore/Events/CodeGeneration/EventsCodeGenerator.h

@@ -9,9 +9,9 @@
 #include <utility>
 #include <vector>
 
-#include "GDCore/Events/CodeGeneration/DiagnosticReport.h"
 #include "GDCore/Events/Event.h"
 #include "GDCore/Events/Instruction.h"
+#include "GDCore/Events/CodeGeneration/DiagnosticReport.h"
 #include "GDCore/Project/ProjectScopedContainers.h"
 #include "GDCore/String.h"
 
@@ -62,7 +62,7 @@ class GD_CORE_API EventsCodeGenerator {
   EventsCodeGenerator(
       const gd::Platform& platform,
       const gd::ProjectScopedContainers& projectScopedContainers_);
-  virtual ~EventsCodeGenerator() {};
+  virtual ~EventsCodeGenerator(){};
 
   /**
    * \brief Preprocess an events list (replacing for example links with the
@@ -160,8 +160,7 @@ class GD_CORE_API EventsCodeGenerator {
   gd::String GenerateActionCode(
       gd::Instruction& action,
       EventsCodeGenerationContext& context,
-      const gd::String& optionalAsyncCallbackName = "",
-      const gd::String& optionalAsyncCallbackId = "");
+      const gd::String& optionalAsyncCallbackName = "");
 
   struct CallbackDescriptor {
     CallbackDescriptor(const gd::String functionName_,
@@ -169,7 +168,7 @@ class GD_CORE_API EventsCodeGenerator {
                        const std::set<gd::String> requiredObjects_)
         : functionName(functionName_),
           argumentsList(argumentsList_),
-          requiredObjects(requiredObjects_) {};
+          requiredObjects(requiredObjects_){};
     /**
      * The name by which the function can be invoked.
      */
@@ -339,9 +338,9 @@ class GD_CORE_API EventsCodeGenerator {
   }
 
   /**
-   * @brief Give access to the project scoped containers as code generation
-   * might push and pop variable containers (for local variables). This could be
-   * passed as a parameter recursively in code generation, but this requires
+   * @brief Give access to the project scoped containers as code generation might
+   * push and pop variable containers (for local variables).
+   * This could be passed as a parameter recursively in code generation, but this requires
    * heavy refactoring. Instead, we use this single instance.
    */
   gd::ProjectScopedContainers& GetProjectScopedContainers() {
@@ -388,7 +387,9 @@ class GD_CORE_API EventsCodeGenerator {
     diagnosticReport = diagnosticReport_;
   }
 
-  gd::DiagnosticReport* GetDiagnosticReport() { return diagnosticReport; }
+  gd::DiagnosticReport* GetDiagnosticReport() {
+    return diagnosticReport;
+  }
 
   /**
    * \brief Generate the full name for accessing to a boolean variable used for
@@ -512,16 +513,16 @@ class GD_CORE_API EventsCodeGenerator {
    * \brief Generate an any variable getter that fallbacks on scene variable for
    * compatibility reason.
    */
-  gd::String GenerateAnyOrSceneVariableGetter(
-      const gd::Expression& variableExpression,
-      EventsCodeGenerationContext& context);
+  gd::String
+  GenerateAnyOrSceneVariableGetter(const gd::Expression &variableExpression,
+                                   EventsCodeGenerationContext &context);
 
   virtual gd::String GeneratePropertySetterWithoutCasting(
-      const gd::PropertiesContainer& propertiesContainer,
-      const gd::NamedPropertyDescriptor& property,
-      const gd::String& operandCode);
+      const gd::PropertiesContainer &propertiesContainer,
+      const gd::NamedPropertyDescriptor &property,
+      const gd::String &operandCode);
 
- protected:
+protected:
   virtual const gd::String GenerateRelationalOperatorCodes(
       const gd::String& operatorString);
 
@@ -642,16 +643,16 @@ class GD_CORE_API EventsCodeGenerator {
       gd::EventsCodeGenerationContext& context);
 
   virtual gd::String GeneratePropertyGetterWithoutCasting(
-      const gd::PropertiesContainer& propertiesContainer,
-      const gd::NamedPropertyDescriptor& property);
+      const gd::PropertiesContainer &propertiesContainer,
+      const gd::NamedPropertyDescriptor &property);
 
   virtual gd::String GenerateParameterGetter(
       const gd::ParameterMetadata& parameter,
       const gd::String& type,
       gd::EventsCodeGenerationContext& context);
 
-  virtual gd::String GenerateParameterGetterWithoutCasting(
-      const gd::ParameterMetadata& parameter);
+  virtual gd::String
+  GenerateParameterGetterWithoutCasting(const gd::ParameterMetadata &parameter);
 
   /**
    * \brief Generate the code to reference an object which is
@@ -768,8 +769,7 @@ class GD_CORE_API EventsCodeGenerator {
       const std::vector<gd::String>& arguments,
       const gd::InstructionMetadata& instrInfos,
       gd::EventsCodeGenerationContext& context,
-      const gd::String& optionalAsyncCallbackName = "",
-      const gd::String& optionalAsyncCallbackId = "");
+      const gd::String& optionalAsyncCallbackName = "");
 
   virtual gd::String GenerateObjectAction(
       const gd::String& objectName,
@@ -778,8 +778,7 @@ class GD_CORE_API EventsCodeGenerator {
       const std::vector<gd::String>& arguments,
       const gd::InstructionMetadata& instrInfos,
       gd::EventsCodeGenerationContext& context,
-      const gd::String& optionalAsyncCallbackName = "",
-      const gd::String& optionalAsyncCallbackId = "");
+      const gd::String& optionalAsyncCallbackName = "");
 
   virtual gd::String GenerateBehaviorAction(
       const gd::String& objectName,
@@ -789,8 +788,7 @@ class GD_CORE_API EventsCodeGenerator {
       const std::vector<gd::String>& arguments,
       const gd::InstructionMetadata& instrInfos,
       gd::EventsCodeGenerationContext& context,
-      const gd::String& optionalAsyncCallbackName = "",
-      const gd::String& optionalAsyncCallbackId = "");
+      const gd::String& optionalAsyncCallbackName = "");
 
   gd::String GenerateRelationalOperatorCall(
       const gd::InstructionMetadata& instrInfos,
@@ -839,8 +837,9 @@ class GD_CORE_API EventsCodeGenerator {
   virtual gd::String GenerateGetBehaviorNameCode(
       const gd::String& behaviorName);
 
-  bool CheckBehaviorParameters(const gd::Instruction& instruction,
-                               const gd::InstructionMetadata& instrInfos);
+  void CheckBehaviorParameters(
+      const gd::Instruction &instruction,
+      const gd::InstructionMetadata &instrInfos);
 
   const gd::Platform& platform;  ///< The platform being used.
 
@@ -877,3 +876,4 @@ class GD_CORE_API EventsCodeGenerator {
 };
 
 }  // namespace gd
+

Core/GDCore/Extensions/Builtin/BaseObjectExtension.cpp

@@ -37,8 +37,8 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
       .SetIcon("res/actions/position24_black.png");
   extension.AddInstructionOrExpressionGroupMetadata(_("Angle"))
       .SetIcon("res/actions/direction24_black.png");
-  extension.AddInstructionOrExpressionGroupMetadata(_("Size")).SetIcon(
-      "res/actions/scale24_black.png");
+  extension.AddInstructionOrExpressionGroupMetadata(_("Size"))
+      .SetIcon("res/actions/scale24_black.png");
 
   gd::ObjectMetadata& obj = extension.AddObject<gd::ObjectConfiguration>(
       "", _("Base object"), _("Base object"), "res/objeticon24.png");
@@ -293,25 +293,6 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
       .AddCodeOnlyParameter("currentScene", "")
       .MarkAsAdvanced();
 
-  obj.AddAction(
-         "RotateTowardObject",
-         _("Rotate toward another object"),
-         _("Rotate an object towards another object, with the specified speed. "
-           "Note that if multiple instances of the target object are picked, "
-           "only the first one will be used. Use a For Each event or actions "
-           "like \"Pick nearest object\", \"Pick a random object\" to refine "
-           "the choice of the target object."),
-         _("Rotate _PARAM0_ towards _PARAM1_ at speed _PARAM2_ deg/second"),
-         _("Angle"),
-         "res/actions/rotate24_black.png",
-         "res/actions/rotate_black.png")
-      .AddParameter("object", _("Object"))
-      .AddParameter("objectPtr", _("Target object"))
-      .AddParameter("expression", _("Angular speed (in degrees per second)"))
-      .SetParameterLongDescription(_("Enter 0 for an immediate rotation."))
-      .AddCodeOnlyParameter("currentScene", "")
-      .MarkAsAdvanced();
-
   obj.AddAction(
          "AddForceXY",
          _("Add a force"),
@@ -857,13 +838,14 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
       .MarkAsAdvanced()
       .SetRelevantForLayoutEventsOnly();
 
-  obj.AddAction("PushBooleanToObjectVariable",
-                _("Add value to object array variable"),
-                _("Adds a boolean to the end of an object array variable."),
-                _("Add value _PARAM2_ to array variable _PARAM1_ of _PARAM0_"),
-                _("Variables ❯ Arrays and structures"),
-                "res/actions/var24.png",
-                "res/actions/var.png")
+  obj.AddAction(
+         "PushBooleanToObjectVariable",
+         _("Add value to object array variable"),
+         _("Adds a boolean to the end of an object array variable."),
+         _("Add value _PARAM2_ to array variable _PARAM1_ of _PARAM0_"),
+         _("Variables ❯ Arrays and structures"),
+         "res/actions/var24.png",
+         "res/actions/var.png")
       .AddParameter("object", _("Object"))
       .AddParameter("objectvar", _("Array variable"))
       .AddParameter("trueorfalse", _("Boolean to add"))
@@ -1593,9 +1575,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
   extension
       .AddAction("Create",
                  _("Create an object"),
-                 _("Create an instance of the object at the specified position."
-                   "The created object instance will be available for the next "
-                   "actions and sub-events."),
+                 _("Create an object at specified position"),
                  _("Create object _PARAM1_ at position _PARAM2_;_PARAM3_ "
                    "(layer: _PARAM4_)"),
                  "",
@@ -1636,7 +1616,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
 
   extension
       .AddAction("AjoutObjConcern",
-                 _("Pick all object instances"),
+                 _("Pick all instances"),
                  _("Pick all instances of the specified object(s). When you "
                    "pick all instances, "
                    "the next conditions and actions of this event work on all "
@@ -1650,34 +1630,20 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
       .MarkAsAdvanced();
 
   extension
-      .AddAction("AjoutHasard",
-                 _("Pick a random object"),
-                 _("Pick one instance from all the specified objects. When an "
-                   "instance is picked, the next conditions and actions of "
-                   "this event work only on that object instance."),
-                 _("Pick a random _PARAM1_"),
-                 _("Objects"),
-                 "res/actions/ajouthasard24.png",
-                 "res/actions/ajouthasard.png")
+      .AddAction(
+          "AjoutHasard",
+          _("Pick a random object"),
+          _("Pick one object from all the specified objects. When an object "
+            "is picked, the next conditions and actions of this event work "
+            "only on that object."),
+          _("Pick a random _PARAM1_"),
+          _("Objects"),
+          "res/actions/ajouthasard24.png",
+          "res/actions/ajouthasard.png")
       .AddCodeOnlyParameter("objectsContext", "")
       .AddParameter("objectList", _("Object"))
       .MarkAsSimple();
 
-  extension
-      .AddAction(
-          "PickNearest",
-          _("Pick nearest object"),
-          _("Pick the instance of this object that is nearest to the specified "
-            "position."),
-          _("Pick the _PARAM0_ that is nearest to _PARAM1_;_PARAM2_"),
-          _("Objects"),
-          "res/conditions/distance24.png",
-          "res/conditions/distance.png")
-      .AddParameter("objectList", _("Object"))
-      .AddParameter("expression", _("X position"))
-      .AddParameter("expression", _("Y position"))
-      .MarkAsSimple();
-
   extension
       .AddAction(
           "MoveObjects",
@@ -1727,12 +1693,11 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
   extension
       .AddCondition(
           "AjoutObjConcern",
-          _("Pick all object instances"),
-          _("Pick all instances of the specified object(s). When you "
-            "pick all instances, "
+          _("Pick all objects"),
+          _("Pick all the specified objects. When you pick all objects, "
             "the next conditions and actions of this event work on all "
             "of them."),
-          _("Pick all instances of _PARAM1_"),
+          _("Pick all _PARAM1_ objects"),
           _("Objects"),
           "res/conditions/add24.png",
           "res/conditions/add.png")
@@ -1741,15 +1706,16 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
       .MarkAsAdvanced();
 
   extension
-      .AddCondition("AjoutHasard",
-                    _("Pick a random object"),
-                    _("Pick one instance from all the specified objects. When "
-                      "an instance is picked, the next conditions and actions "
-                      "of this event work only on that object instance."),
-                    _("Pick a random _PARAM1_"),
-                    _("Objects"),
-                    "res/conditions/ajouthasard24.png",
-                    "res/conditions/ajouthasard.png")
+      .AddCondition(
+          "AjoutHasard",
+          _("Pick a random object"),
+          _("Pick one object from all the specified objects. When an object "
+            "is picked, the next conditions and actions of this event work "
+            "only on that object."),
+          _("Pick a random _PARAM1_"),
+          _("Objects"),
+          "res/conditions/ajouthasard24.png",
+          "res/conditions/ajouthasard.png")
       .AddCodeOnlyParameter("objectsContext", "")
       .AddParameter("objectList", _("Object"))
       .MarkAsSimple();
@@ -1758,9 +1724,9 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
       .AddCondition(
           "PickNearest",
           _("Pick nearest object"),
-          _("Pick the instance of this object that is nearest to the specified "
-            "position. If the condition is inverted, the instance farthest "
-            "from the specified position is picked instead."),
+          _("Pick the object of this type that is nearest to the specified "
+            "position. If the condition is inverted, the object farthest from "
+            "the specified position is picked instead."),
           _("Pick the _PARAM0_ that is nearest to _PARAM1_;_PARAM2_"),
           _("Objects"),
           "res/conditions/distance24.png",

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

@@ -18,21 +18,21 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsAnimatableExtension(
     gd::PlatformExtension& extension) {
   extension
       .SetExtensionInformation("AnimatableCapability",
-                               _("Objects with animations"),
-                               _("Actions and conditions for objects having animations (sprite, 3D models...)."),
+                               _("Animatable capability"),
+                               _("Animate objects."),
                                "Florian Rival",
                                "Open source (MIT License)")
       .SetExtensionHelpPath("/objects");
-  extension.AddInstructionOrExpressionGroupMetadata(_("Objects with animations"))
+  extension.AddInstructionOrExpressionGroupMetadata(_("Animatable capability"))
       .SetIcon("res/actions/animation24.png");
   extension.AddInstructionOrExpressionGroupMetadata(_("Animations and images"))
       .SetIcon("res/actions/animation24.png");
 
   gd::BehaviorMetadata& aut = extension.AddBehavior(
       "AnimatableBehavior",
-      _("Objects with animations"),
+      _("Animatable capability"),
       "Animation",
-      _("Actions and conditions for objects having animations (sprite, 3D models...).."),
+      _("Animate objects."),
       "",
       "res/actions/animation24.png",
       "AnimatableBehavior",

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

@@ -18,8 +18,8 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsEffectExtension(
     gd::PlatformExtension& extension) {
   extension
       .SetExtensionInformation("EffectCapability",
-                               _("Objects with effects"),
-                               _("Actions/conditions to enable/disable and change parameters of visual effects applied on objects."),
+                               _("Effect capability"),
+                               _("Apply visual effects to objects."),
                                "Florian Rival",
                                "Open source (MIT License)")
       .SetExtensionHelpPath("/objects");
@@ -28,9 +28,9 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsEffectExtension(
 
   gd::BehaviorMetadata& aut = extension.AddBehavior(
       "EffectBehavior",
-      _("Objects with effects"),
+      _("Effect capability"),
       "Effect",
-      _("Actions/conditions to enable/disable and change parameters of visual effects applied on objects."),
+      _("Apply visual effects to objects."),
       "",
       "res/actions/effect_black.svg",
       "EffectBehavior",

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

@@ -18,8 +18,8 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsFlippableExtension(
     gd::PlatformExtension& extension) {
   extension
       .SetExtensionInformation("FlippableCapability",
-                               _("Flippable objects"),
-                               _("Actions/conditions for objects which can be flipped horizontally or vertically."),
+                               _("Flippable capability"),
+                               _("Flip objects."),
                                "Florian Rival",
                                "Open source (MIT License)")
       .SetExtensionHelpPath("/objects");
@@ -28,9 +28,9 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsFlippableExtension(
 
   gd::BehaviorMetadata& aut = extension.AddBehavior(
       "FlippableBehavior",
-      _("Flippable objects"),
+      _("Flippable capability"),
       "Flippable",
-      _("Actions/conditions for objects which can be flipped horizontally or vertically."),
+      _("Flip objects."),
       "",
       "res/actions/flipX24.png",
       "FlippableBehavior",

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

@@ -18,30 +18,27 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsOpacityExtension(
     gd::PlatformExtension& extension) {
   extension
       .SetExtensionInformation("OpacityCapability",
-                               _("Objects with opacity"),
-                               _("Action/condition/expression to change or "
-                                 "check the opacity of an object (0-255)."),
+                               _("Opacity capability"),
+                               _("Change the object opacity."),
                                "Florian Rival",
                                "Open source (MIT License)")
       .SetExtensionHelpPath("/objects");
-  extension.AddInstructionOrExpressionGroupMetadata(_("Objects with opacity"))
+  extension.AddInstructionOrExpressionGroupMetadata(_("Opacity capability"))
       .SetIcon("res/actions/opacity24.png");
   extension.AddInstructionOrExpressionGroupMetadata(_("Visibility"))
       .SetIcon("res/actions/opacity24.png");
 
-  gd::BehaviorMetadata& aut =
-      extension
-          .AddBehavior("OpacityBehavior",
-                       _("Objects with opacity"),
-                       "Opacity",
-                       _("Action/condition/expression to change or check the "
-                         "opacity of an object (0-255)."),
-                       "",
-                       "res/actions/opacity24.png",
-                       "OpacityBehavior",
-                       std::make_shared<gd::Behavior>(),
-                       std::make_shared<gd::BehaviorsSharedData>())
-          .SetHidden();
+  gd::BehaviorMetadata& aut = extension.AddBehavior(
+      "OpacityBehavior",
+      _("Opacity capability"),
+      "Opacity",
+      _("Change the object opacity."),
+      "",
+      "res/actions/opacity24.png",
+      "OpacityBehavior",
+      std::make_shared<gd::Behavior>(),
+      std::make_shared<gd::BehaviorsSharedData>())
+    .SetHidden();
 
   aut.AddExpressionAndConditionAndAction(
          "number",
@@ -55,9 +52,8 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsOpacityExtension(
       .AddParameter("object", _("Object"))
       .AddParameter("behavior", _("Behavior"), "OpacityBehavior")
       .UseStandardParameters(
-          "number",
-          gd::ParameterOptions::MakeNewOptions().SetDescription(
-              _("Opacity (0-255)")))
+          "number", gd::ParameterOptions::MakeNewOptions().SetDescription(
+                        _("Opacity (0-255)")))
       .SetFunctionName("setOpacity")
       .SetGetter("getOpacity");
   aut.GetAllExpressions()["Value"].SetGroup("");

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

@@ -16,13 +16,11 @@ namespace gd {
 void GD_CORE_API BuiltinExtensionsImplementer::ImplementsResizableExtension(
     gd::PlatformExtension &extension) {
   extension
-      .SetExtensionInformation(
-          "ResizableCapability",
-          _("Resizable objects"),
-          _("Change or compare the size (width/height) of an object which can "
-            "be resized (i.e: most objects)."),
-          "Florian Rival",
-          "Open source (MIT License)")
+      .SetExtensionInformation("ResizableCapability",
+                               _("Resizable capability"),
+                               _("Change the object dimensions."),
+                               "Florian Rival",
+                               "Open source (MIT License)")
       .SetExtensionHelpPath("/objects");
   extension.AddInstructionOrExpressionGroupMetadata(_("Size")).SetIcon(
       "res/actions/scale24_black.png");
@@ -30,10 +28,9 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsResizableExtension(
   gd::BehaviorMetadata &aut =
       extension
           .AddBehavior("ResizableBehavior",
-                       _("Resizable objects"),
+                       _("Resizable capability"),
                        "Resizable",
-                       _("Change or compare the size (width/height) of an "
-                         "object which can be resized (i.e: most objects)."),
+                       _("Change the object dimensions."),
                        "",
                        "res/actions/scale24_black.png",
                        "ResizableBehavior",

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

@@ -18,30 +18,27 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsScalableExtension(
     gd::PlatformExtension& extension) {
   extension
       .SetExtensionInformation("ScalableCapability",
-                               _("Scalable objects"),
-                               _("Actions/conditions/expression to change or "
-                                 "check the scale of an object (default: 1)."),
+                               _("Scalable capability"),
+                               _("Change the object scale."),
                                "Florian Rival",
                                "Open source (MIT License)")
       .SetExtensionHelpPath("/objects");
-  extension.AddInstructionOrExpressionGroupMetadata(_("Scalable objects"))
+  extension.AddInstructionOrExpressionGroupMetadata(_("Scalable capability"))
+      .SetIcon("res/actions/scale24_black.png");
+  extension.AddInstructionOrExpressionGroupMetadata(_("Size"))
       .SetIcon("res/actions/scale24_black.png");
-  extension.AddInstructionOrExpressionGroupMetadata(_("Size")).SetIcon(
-      "res/actions/scale24_black.png");
 
-  gd::BehaviorMetadata& aut =
-      extension
-          .AddBehavior("ScalableBehavior",
-                       _("Scalable objects"),
-                       "Scale",
-                       _("Actions/conditions/expression to change or check the "
-                         "scale of an object (default: 1)."),
-                       "",
-                       "res/actions/scale24_black.png",
-                       "ResizableBehavior",
-                       std::make_shared<gd::Behavior>(),
-                       std::make_shared<gd::BehaviorsSharedData>())
-          .SetHidden();
+  gd::BehaviorMetadata& aut = extension.AddBehavior(
+      "ScalableBehavior",
+      _("Scalable capability"),
+      "Scale",
+      _("Change the object scale."),
+      "",
+      "res/actions/scale24_black.png",
+      "ResizableBehavior",
+      std::make_shared<gd::Behavior>(),
+      std::make_shared<gd::BehaviorsSharedData>())
+    .SetHidden();
 
   aut.AddExpressionAndConditionAndAction(
          "number",

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

@@ -18,17 +18,17 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsTextContainerExtension(
     gd::PlatformExtension& extension) {
   extension
       .SetExtensionInformation("TextContainerCapability",
-                               _("Objects containing a text"),
+                               _("Text capability"),
                                _("Allows an object to contain a text, usually shown on screen, that can be modified."),
                                "Florian Rival",
                                "Open source (MIT License)")
       .SetExtensionHelpPath("/objects");
-  extension.AddInstructionOrExpressionGroupMetadata(_("Objects containing a text"))
+  extension.AddInstructionOrExpressionGroupMetadata(_("Text capability"))
       .SetIcon("res/conditions/text24_black.png");
 
   gd::BehaviorMetadata& aut = extension.AddBehavior(
       "TextContainerBehavior",
-      _("Objects containing a text"),
+      _("Text capability"),
       "Text",
       _("Allows an object to contain a text, usually shown on screen, that can be modified."),
       "",

Core/GDCore/Extensions/Builtin/CommonConversionsExtension.cpp

@@ -16,9 +16,7 @@ BuiltinExtensionsImplementer::ImplementsCommonConversionsExtension(
       .SetExtensionInformation(
           "BuiltinCommonConversions",
           _("Conversion"),
-          "Expressions to convert numbers to string, strings to numbers, "
-          "angles (degrees from/to radians) and a GDevelop variable to/from a "
-          "JSON string.",
+          "Expressions to convert number, texts and quantities.",
           "Florian Rival",
           "Open source (MIT License)")
       .SetExtensionHelpPath("/all-features/common-conversions");
@@ -43,7 +41,7 @@ BuiltinExtensionsImplementer::ImplementsCommonConversionsExtension(
 
   extension
       .AddStrExpression("LargeNumberToString",
-                        _("Number > Text (without scientific notation)"),
+                        _("Number > Text ( without scientific notation )"),
                         _("Convert the result of the expression to text, "
                           "without using the scientific notation"),
                         "",
@@ -74,8 +72,7 @@ BuiltinExtensionsImplementer::ImplementsCommonConversionsExtension(
                         _("Convert a variable to JSON"),
                         _("JSON"),
                         "res/conditions/toujours24_black.png")
-      .AddParameter("variable",
-                    _("The variable to be stringified"),
+      .AddParameter("variable", _("The variable to be stringified"),
                     "AllowUndeclaredVariable");
 
   // Deprecated

Core/GDCore/Extensions/Builtin/FileExtension.cpp

@@ -42,17 +42,13 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsFileExtension(
   extension
       .AddAction(
           "LoadFile",
-          _("Manually preload a storage in memory"),
-          _("Forces the specified storage to be loaded and kept in "
-            "memory, allowing faster reads/writes. "
-            "However, it requires manual management: if you use this "
-            "action, you *must* also unload the storage manually when "
-            "it's no longer needed to ensure data is persisted.\n\n"
-            "Unless you have a specific performance need, avoid using this "
-            "action. The system already handles loading/unloading "
-            "automatically."),
-          _("Load data storage _PARAM0_ in memory"),
-          _("Advanced"),
+          _("Load a storage in memory"),
+          _("This action loads the specified storage in memory, so you can "
+            "write and read it.\nYou can open and write without using this "
+            "action, but it will be slower.\nIf you use this action, do not "
+            "forget to unload the storage from memory."),
+          _("Load storage _PARAM0_ in memory"),
+          "",
           "res/actions/fichier24.png",
           "res/actions/fichier.png")
       .AddParameter("string", _("Storage name"))
@@ -60,11 +56,11 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsFileExtension(
 
   extension
       .AddAction("UnloadFile",
-                 _("Manually unload and persist a storage"),
-                 _("Close the specified storage previously loaded "
+                 _("Close a storage"),
+                 _("This action closes the structured data previously loaded "
                    "in memory, saving all changes made."),
-                 _("Unload and persist data storage _PARAM0_"),
-                 _("Advanced"),
+                 _("Close structured data _PARAM0_"),
+                 "",
                  "res/actions/fichier24.png",
                  "res/actions/fichier.png")
       .AddParameter("string", _("Storage name"))

Core/GDCore/Extensions/Builtin/KeyboardExtension.cpp

@@ -15,11 +15,10 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsKeyboardExtension(
       .SetExtensionInformation(
           "BuiltinKeyboard",
           _("Keyboard"),
-          _("Conditions to check keys pressed on a keyboard. Note that this "
+          _("Allows your game to respond to keyboard input. Note that this "
             "does not work with on-screen keyboard on touch devices: use "
-            "instead mouse/touch conditions when making a game for "
-            "mobile/touchscreen devices or when making a new game from "
-            "scratch."),
+            "instead conditions related to touch when making a game for "
+            "mobile/touchscreen devices."),
           "Florian Rival",
           "Open source (MIT License)")
       .SetExtensionHelpPath("/all-features/keyboard")
@@ -52,25 +51,10 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsKeyboardExtension(
       .SetHidden();
 
   extension
-      .AddCondition(
-          "KeyFromTextPressed",
-          _("Key pressed"),
-          _("Check if a key is pressed. This stays true as long as "
-            "the key is held down. To check if a key was pressed during "
-            "the frame, use \"Key just pressed\" instead."),
-          _("_PARAM1_ key is pressed"),
-          "",
-          "res/conditions/keyboard24.png",
-          "res/conditions/keyboard.png")
-      .AddCodeOnlyParameter("currentScene", "")
-      .AddParameter("keyboardKey", _("Key to check"))
-      .MarkAsSimple();
-
-  extension
-      .AddCondition("KeyFromTextJustPressed",
-                    _("Key just pressed"),
-                    _("Check if a key was just pressed."),
-                    _("_PARAM1_ key was just pressed"),
+      .AddCondition("KeyFromTextPressed",
+                    _("Key pressed"),
+                    _("Check if a key is pressed"),
+                    _("_PARAM1_ key is pressed"),
                     "",
                     "res/conditions/keyboard24.png",
                     "res/conditions/keyboard.png")
@@ -81,7 +65,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsKeyboardExtension(
   extension
       .AddCondition("KeyFromTextReleased",
                     _("Key released"),
-                    _("Check if a key was just released."),
+                    _("Check if a key was just released"),
                     _("_PARAM1_ key is released"),
                     "",
                     "res/conditions/keyboard24.png",
@@ -100,7 +84,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsKeyboardExtension(
                     "res/conditions/keyboard.png")
       .AddCodeOnlyParameter("currentScene", "");
 
-  extension
+ extension
       .AddCondition("AnyKeyReleased",
                     _("Any key released"),
                     _("Check if any key is released"),

Core/GDCore/Extensions/Builtin/MathematicalToolsExtension.cpp

@@ -72,8 +72,7 @@ BuiltinExtensionsImplementer::ImplementsMathematicalToolsExtension(
 
   extension
       .AddExpression("normalize",
-                     _("Normalize a value between `min` and `max` to a value "
-                       "between 0 and 1."),
+                     _("Normalize a value between `min` and `max` to a value between 0 and 1."),
                      _("Remap a value between 0 and 1."),
                      "",
                      "res/mathfunction.png")
@@ -125,8 +124,7 @@ BuiltinExtensionsImplementer::ImplementsMathematicalToolsExtension(
   extension
       .AddExpression("mod",
                      _("Modulo"),
-                     _("Compute \"x mod y\". GDevelop does NOT support the \% "
-                       "operator. Use this mod(x, y) function instead."),
+                     _("x mod y"),
                      "",
                      "res/mathfunction.png")
       .AddParameter("expression", _("x (as in x mod y)"))
@@ -186,8 +184,11 @@ BuiltinExtensionsImplementer::ImplementsMathematicalToolsExtension(
       .AddParameter("expression", _("Expression"));
 
   extension
-      .AddExpression(
-          "asinh", _("Arcsine"), _("Arcsine"), "", "res/mathfunction.png")
+      .AddExpression("asinh",
+                     _("Arcsine"),
+                     _("Arcsine"),
+                     "",
+                     "res/mathfunction.png")
       .AddParameter("expression", _("Expression"));
 
   extension
@@ -217,8 +218,11 @@ BuiltinExtensionsImplementer::ImplementsMathematicalToolsExtension(
       .AddParameter("expression", _("Expression"));
 
   extension
-      .AddExpression(
-          "cbrt", _("Cube root"), _("Cube root"), "", "res/mathfunction.png")
+      .AddExpression("cbrt",
+                     _("Cube root"),
+                     _("Cube root"),
+                     "",
+                     "res/mathfunction.png")
       .AddParameter("expression", _("Expression"));
 
   extension
@@ -256,13 +260,12 @@ BuiltinExtensionsImplementer::ImplementsMathematicalToolsExtension(
       .AddParameter("expression", _("Expression"), "", true);
 
   extension
-      .AddExpression(
-          "cos",
-          _("Cosine"),
-          _("Cosine of an angle (in radian). "
-            "If you want to use degrees, use`ToRad`: `sin(ToRad(45))`."),
-          "",
-          "res/mathfunction.png")
+      .AddExpression("cos",
+                     _("Cosine"),
+                     _("Cosine of an angle (in radian). "
+                       "If you want to use degrees, use`ToRad`: `sin(ToRad(45))`."),
+                     "",
+                     "res/mathfunction.png")
       .AddParameter("expression", _("Expression"));
 
   extension
@@ -290,20 +293,29 @@ BuiltinExtensionsImplementer::ImplementsMathematicalToolsExtension(
       .AddParameter("expression", _("Expression"));
 
   extension
-      .AddExpression(
-          "int", _("Round"), _("Round a number"), "", "res/mathfunction.png")
+      .AddExpression("int",
+                     _("Round"),
+                     _("Round a number"),
+                     "",
+                     "res/mathfunction.png")
       .SetHidden()
       .AddParameter("expression", _("Expression"));
 
   extension
-      .AddExpression(
-          "rint", _("Round"), _("Round a number"), "", "res/mathfunction.png")
+      .AddExpression("rint",
+                     _("Round"),
+                     _("Round a number"),
+                     "",
+                     "res/mathfunction.png")
       .SetHidden()
       .AddParameter("expression", _("Expression"));
 
   extension
-      .AddExpression(
-          "round", _("Round"), _("Round a number"), "", "res/mathfunction.png")
+      .AddExpression("round",
+                     _("Round"),
+                     _("Round a number"),
+                     "",
+                     "res/mathfunction.png")
       .AddParameter("expression", _("Expression"));
 
   extension
@@ -312,8 +324,8 @@ BuiltinExtensionsImplementer::ImplementsMathematicalToolsExtension(
                      _("Round a number to the Nth decimal place"),
                      "",
                      "res/mathfunction.png")
-      .AddParameter("expression", _("Number to Round"))
-      .AddParameter("expression", _("Decimal Places"), "", true);
+      .AddParameter("expression", _("Expression"))
+      .AddParameter("expression", _("Expression"), "", true);
 
   extension
       .AddExpression("exp",
@@ -324,13 +336,19 @@ BuiltinExtensionsImplementer::ImplementsMathematicalToolsExtension(
       .AddParameter("expression", _("Expression"));
 
   extension
-      .AddExpression(
-          "log", _("Logarithm"), _("Logarithm"), "", "res/mathfunction.png")
+      .AddExpression("log",
+                     _("Logarithm"),
+                     _("Logarithm"),
+                     "",
+                     "res/mathfunction.png")
       .AddParameter("expression", _("Expression"));
 
   extension
-      .AddExpression(
-          "ln", _("Logarithm"), _("Logarithm"), "", "res/mathfunction.png")
+      .AddExpression("ln",
+                     _("Logarithm"),
+                     _("Logarithm"),
+                     "",
+                     "res/mathfunction.png")
       .SetHidden()
       .AddParameter("expression", _("Expression"));
 
@@ -369,8 +387,11 @@ BuiltinExtensionsImplementer::ImplementsMathematicalToolsExtension(
       .AddParameter("expression", _("The exponent (n in x^n)"));
 
   extension
-      .AddExpression(
-          "sec", _("Secant"), _("Secant"), "", "res/mathfunction.png")
+      .AddExpression("sec",
+                     _("Secant"),
+                     _("Secant"),
+                     "",
+                     "res/mathfunction.png")
       .AddParameter("expression", _("Expression"));
 
   extension
@@ -382,13 +403,12 @@ BuiltinExtensionsImplementer::ImplementsMathematicalToolsExtension(
       .AddParameter("expression", _("Expression"));
 
   extension
-      .AddExpression(
-          "sin",
-          _("Sine"),
-          _("Sine of an angle (in radian). "
-            "If you want to use degrees, use`ToRad`: `sin(ToRad(45))`."),
-          "",
-          "res/mathfunction.png")
+      .AddExpression("sin",
+                     _("Sine"),
+                     _("Sine of an angle (in radian). "
+                       "If you want to use degrees, use`ToRad`: `sin(ToRad(45))`."),
+                     "",
+                     "res/mathfunction.png")
       .AddParameter("expression", _("Expression"));
 
   extension
@@ -408,13 +428,12 @@ BuiltinExtensionsImplementer::ImplementsMathematicalToolsExtension(
       .AddParameter("expression", _("Expression"));
 
   extension
-      .AddExpression(
-          "tan",
-          _("Tangent"),
-          _("Tangent of an angle (in radian). "
-            "If you want to use degrees, use`ToRad`: `tan(ToRad(45))`."),
-          "",
-          "res/mathfunction.png")
+      .AddExpression("tan",
+                     _("Tangent"),
+                     _("Tangent of an angle (in radian). "
+                       "If you want to use degrees, use`ToRad`: `tan(ToRad(45))`."),
+                     "",
+                     "res/mathfunction.png")
       .AddParameter("expression", _("Expression"));
 
   extension
@@ -444,28 +463,26 @@ BuiltinExtensionsImplementer::ImplementsMathematicalToolsExtension(
       .AddParameter("expression", _("x (in a+(b-a)*x)"));
 
   extension
-      .AddExpression(
-          "XFromAngleAndDistance",
-          _("X position from angle and distance"),
-          _("Compute the X position when given an angle and distance "
-            "relative to the origin (0;0). This is also known as "
-            "getting the cartesian coordinates of a 2D vector, using "
-            "its polar coordinates."),
-          "",
-          "res/mathfunction.png")
+      .AddExpression("XFromAngleAndDistance",
+                     _("X position from angle and distance"),
+                     _("Compute the X position when given an angle and distance "
+                      "relative to the origin (0;0). This is also known as "
+                      "getting the cartesian coordinates of a 2D vector, using "
+                      "its polar coordinates."),
+                     "",
+                     "res/mathfunction.png")
       .AddParameter("expression", _("Angle, in degrees"))
       .AddParameter("expression", _("Distance"));
 
   extension
-      .AddExpression(
-          "YFromAngleAndDistance",
-          _("Y position from angle and distance"),
-          _("Compute the Y position when given an angle and distance "
-            "relative to the origin (0;0). This is also known as "
-            "getting the cartesian coordinates of a 2D vector, using "
-            "its polar coordinates."),
-          "",
-          "res/mathfunction.png")
+      .AddExpression("YFromAngleAndDistance",
+                     _("Y position from angle and distance"),
+                     _("Compute the Y position when given an angle and distance "
+                      "relative to the origin (0;0). This is also known as "
+                      "getting the cartesian coordinates of a 2D vector, using "
+                      "its polar coordinates."),
+                     "",
+                     "res/mathfunction.png")
       .AddParameter("expression", _("Angle, in degrees"))
       .AddParameter("expression", _("Distance"));
 
@@ -480,8 +497,7 @@ BuiltinExtensionsImplementer::ImplementsMathematicalToolsExtension(
   extension
       .AddExpression("lerpAngle",
                      _("Lerp (Linear interpolation) between two angles"),
-                     _("Linearly interpolates between two angles (in degrees) "
-                       "by taking the shortest direction around the circle."),
+                     _("Linearly interpolates between two angles (in degrees) by taking the shortest direction around the circle."),
                      "",
                      "res/mathfunction.png")
       .AddParameter("expression", _("Starting angle, in degrees"))

Core/GDCore/Extensions/Builtin/MouseExtension.cpp

@@ -16,11 +16,8 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsMouseExtension(
       .SetExtensionInformation(
           "BuiltinMouse",
           _("Mouse and touch"),
-          "Conditions, actions and expressions to handle either the mouse or "
-          "touches on a touchscreen. Notably: cursor position, mouse wheel, "
-          "mouse buttons, touch positions, started/end touches, etc...\n"
-          "\n"
-          "By default, conditions related to the mouse will also "
+          "Conditions and actions to handle either the mouse or touches on "
+          "touchscreen. By default, conditions related to the mouse will also "
           "handle the touches - so that it's easier to handle both in your "
           "game. You can disable this behavior if you want to handle them "
           "separately in different events.",
@@ -276,26 +273,28 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsMouseExtension(
       .SetHidden();
 
   extension
-      .AddCondition("MouseButtonFromTextPressed",
-                    _("Mouse button pressed or touch held"),
-                    _("Check if the specified mouse button is pressed or "
-                      "if a touch is in contact with the screen."),
-                    _("Touch or _PARAM1_ mouse button is down"),
-                    "",
-                    "res/conditions/mouse24.png",
-                    "res/conditions/mouse.png")
+      .AddCondition(
+          "MouseButtonFromTextPressed",
+          _("Mouse button pressed or touch held"),
+          _("Check if the specified mouse button is pressed or "
+              "if a touch is in contact with the screen."),
+          _("Touch or _PARAM1_ mouse button is down"),
+          "",
+          "res/conditions/mouse24.png",
+          "res/conditions/mouse.png")
       .AddCodeOnlyParameter("currentScene", "")
       .AddParameter("mouseButton", _("Button to check"))
       .MarkAsSimple();
 
   extension
-      .AddCondition("MouseButtonFromTextReleased",
-                    _("Mouse button released"),
-                    _("Check if the specified mouse button was released."),
-                    _("Touch or _PARAM1_ mouse button is released"),
-                    "",
-                    "res/conditions/mouse24.png",
-                    "res/conditions/mouse.png")
+      .AddCondition(
+          "MouseButtonFromTextReleased",
+          _("Mouse button released"),
+          _("Check if the specified mouse button was released."),
+          _("Touch or _PARAM1_ mouse button is released"),
+          "",
+          "res/conditions/mouse24.png",
+          "res/conditions/mouse.png")
       .AddCodeOnlyParameter("currentScene", "")
       .AddParameter("mouseButton", _("Button to check"))
       .MarkAsSimple();

Core/GDCore/Extensions/Builtin/NetworkExtension.cpp

@@ -15,9 +15,8 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsNetworkExtension(
       .SetExtensionInformation(
           "BuiltinNetwork",
           _("Network"),
-          _("Actions to send web requests, communicate with external \"APIs\" "
-            "and other network related tasks. Also contains an action to open "
-            "a URL on the device browser."),
+          _("Features to send web requests, communicate with external \"APIs\" "
+            "and other network related tasks."),
           "Florian Rival",
           "Open source (MIT License)")
       .SetExtensionHelpPath("/all-features/network")

Core/GDCore/Extensions/Builtin/SceneExtension.cpp

@@ -4,8 +4,8 @@
  * reserved. This project is released under the MIT License.
  */
 #include "AllBuiltinExtensions.h"
-#include "GDCore/Extensions/Metadata/MultipleInstructionMetadata.h"
 #include "GDCore/Tools/Localization.h"
+#include "GDCore/Extensions/Metadata/MultipleInstructionMetadata.h"
 
 using namespace std;
 namespace gd {
@@ -16,11 +16,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsSceneExtension(
       .SetExtensionInformation(
           "BuiltinScene",
           _("Scene"),
-          _("Actions/conditions to change the current scene (or pause it and "
-            "launch another one, or go back to the previous one), check if a "
-            "scene or the game has just started/resumed, preload assets of a "
-            "scene, get the current scene name or loading progress, quit the "
-            "game, set background color, or disable input when focus is lost."),
+          _("Actions and conditions to manipulate the scenes during the game."),
           "Florian Rival",
           "Open source (MIT License)")
       .SetExtensionHelpPath("" /*TODO: Add a documentation page for this */);
@@ -170,28 +166,25 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsSceneExtension(
       .AddCodeOnlyParameter("currentScene", "");
 
   extension
-      .AddAction(
-          "PrioritizeLoadingOfScene",
-          _("Preload scene"),
-          _("Preload a scene resources as soon as possible in background."),
-          _("Preload scene _PARAM1_ in background"),
-          "",
-          "res/actions/hourglass_black.svg",
-          "res/actions/hourglass_black.svg")
+      .AddAction("PrioritizeLoadingOfScene",
+                 _("Preload scene"),
+                 _("Preload a scene resources as soon as possible in background."),
+                 _("Preload scene _PARAM1_ in background"),
+                 "",
+                 "res/actions/hourglass_black.svg",
+                 "res/actions/hourglass_black.svg")
       .SetHelpPath("/all-features/resources-loading")
       .AddCodeOnlyParameter("currentScene", "")
       .AddParameter("sceneName", _("Name of the new scene"))
       .MarkAsAdvanced();
 
-  extension
-      .AddExpressionAndCondition("number",
-                                 "SceneLoadingProgress",
-                                 _("Scene loading progress"),
-                                 _("The progress of resources loading in "
-                                   "background for a scene (between 0 and 1)."),
-                                 _("_PARAM1_ loading progress"),
-                                 _(""),
-                                 "res/actions/hourglass_black.svg")
+  extension.AddExpressionAndCondition("number",
+                                "SceneLoadingProgress",
+                                _("Scene loading progress"),
+                                _("The progress of resources loading in background for a scene (between 0 and 1)."),
+                                _("_PARAM1_ loading progress"),
+                                _(""),
+                                "res/actions/hourglass_black.svg")
       .SetHelpPath("/all-features/resources-loading")
       .AddCodeOnlyParameter("currentScene", "")
       .AddParameter("sceneName", _("Scene name"))
@@ -199,14 +192,13 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsSceneExtension(
       .MarkAsAdvanced();
 
   extension
-      .AddCondition(
-          "AreSceneAssetsLoaded",
-          _("Scene preloaded"),
-          _("Check if scene resources have finished to load in background."),
-          _("Scene _PARAM1_ was preloaded in background"),
-          "",
-          "res/actions/hourglass_black.svg",
-          "res/actions/hourglass_black.svg")
+      .AddCondition("AreSceneAssetsLoaded",
+                    _("Scene preloaded"),
+                    _("Check if scene resources have finished to load in background."),
+                    _("Scene _PARAM1_ was preloaded in background"),
+                    "",
+                    "res/actions/hourglass_black.svg",
+                    "res/actions/hourglass_black.svg")
       .SetHelpPath("/all-features/resources-loading")
       .AddCodeOnlyParameter("currentScene", "")
       .AddParameter("sceneName", _("Scene name"))

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

@@ -15,13 +15,12 @@ namespace gd {
 void GD_CORE_API BuiltinExtensionsImplementer::ImplementsSpriteExtension(
     gd::PlatformExtension& extension) {
   extension
-      .SetExtensionInformation(
-          "Sprite",
-          _("Sprite"),
-          _("Sprite are animated objects which can be used "
-            "for most elements of a 2D game."),
-          "Florian Rival",
-          "Open source (MIT License)")
+      .SetExtensionInformation("Sprite",
+                               _("Sprite"),
+                               _("Sprite are animated object which can be used "
+                                 "for most elements of a game."),
+                               "Florian Rival",
+                               "Open source (MIT License)")
       .SetExtensionHelpPath("/objects/sprite");
   extension.AddInstructionOrExpressionGroupMetadata(_("Sprite"))
       .SetIcon("CppPlatform/Extensions/spriteicon.png");
@@ -31,7 +30,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsSpriteExtension(
           .AddObject<SpriteObject>("Sprite",
                                    _("Sprite"),
                                    _("Animated object which can be used for "
-                                     "most elements of a 2D game."),
+                                     "most elements of a game."),
                                    "CppPlatform/Extensions/spriteicon.png")
           .SetCategoryFullName(_("General"))
           .SetOpenFullEditorLabel(_("Edit animations"))
@@ -646,12 +645,11 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsSpriteExtension(
                     "res/actions/sprite.png")
       .AddParameter("object", _("Object"), "Sprite");
 
-  obj.AddExpression(
-         "AnimationFrameCount",
-         _("Number of frames"),
-         _("Number of frames in the current animation of the object"),
-         _("Animations and images"),
-         "res/actions/sprite.png")
+  obj.AddExpression("AnimationFrameCount",
+                    _("Number of frames"),
+                    _("Number of frames in the current animation of the object"),
+                    _("Animations and images"),
+                    "res/actions/sprite.png")
       .AddParameter("object", _("Object"), "Sprite");
 
   // Deprecated

Core/GDCore/Extensions/Builtin/StringInstructionsExtension.cpp

@@ -16,8 +16,7 @@ BuiltinExtensionsImplementer::ImplementsStringInstructionsExtension(
       .SetExtensionInformation(
           "BuiltinStringInstructions",
           _("Text manipulation"),
-          "Provides expressions to manipulate strings (also called texts): new "
-          "line, upper/lowercase, substring, find, replace, etc...",
+          "Provides expressions to manipulate strings (also called texts).",
           "Florian Rival",
           "Open source (MIT License)")
       .SetExtensionHelpPath("" /*TODO: Add a documentation page for this */);
@@ -192,8 +191,7 @@ BuiltinExtensionsImplementer::ImplementsStringInstructionsExtension(
                         "res/conditions/toujours24_black.png")
       .AddParameter("string", _("Text in which the replacement must be done"))
       .AddParameter("string", _("Text to find inside the first text"))
-      .AddParameter("string",
-                    _("Replacement to put instead of the text to find"));
+      .AddParameter("string", _("Replacement to put instead of the text to find"));
 
   extension
       .AddStrExpression("StrReplaceAll",
@@ -201,11 +199,10 @@ BuiltinExtensionsImplementer::ImplementsStringInstructionsExtension(
                         _("Replace all occurrences of a text by another."),
                         "",
                         "res/conditions/toujours24_black.png")
-      .AddParameter("string",
-                    _("Text in which the replacement(s) must be done"))
+      .AddParameter("string", _("Text in which the replacement(s) must be done"))
       .AddParameter("string", _("Text to find inside the first text"))
-      .AddParameter("string",
-                    _("Replacement to put instead of the text to find"));
+      .AddParameter("string", _("Replacement to put instead of the text to find"));
+
 }
 
 }  // namespace gd

Core/GDCore/Extensions/Builtin/TimeExtension.cpp

@@ -15,12 +15,9 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsTimeExtension(
       .SetExtensionInformation(
           "BuiltinTime",
           _("Timers and time"),
-          "Actions and conditions to start, pause or reset scene timers, "
-          "modify the time scale (speed at which the game "
-          "is running - useful for slow motion effects). Also contains an "
-          "action that wait for a delay before running the next actions and "
-          "sub-events and expressions to read the time scale, time delta of "
-          "the last frame or timer elapsed time.",
+          "Actions and conditions to run timers, get the current time or "
+          "modify the time scale (speed at which the game is running - useful "
+          "for slow motion effects).",
           "Florian Rival",
           "Open source (MIT License)")
       .SetExtensionHelpPath("/all-features/timers-and-time");
@@ -195,28 +192,26 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsTimeExtension(
   extension
       .AddExpression("TimerElapsedTime",
                      _("Scene timer value"),
-                     _("Value of a scene timer (in seconds)"),
+                     _("Value of a scene timer"),
                      "",
                      "res/actions/time.png")
       .AddCodeOnlyParameter("currentScene", "")
       .AddParameter("identifier", _("Timer's name"), "sceneTimer");
 
   extension
-      .AddExpression(
-          "TimeFromStart",
-          _("Time elapsed since the beginning of the scene (in seconds)."),
-          _("Time elapsed since the beginning of the scene (in seconds)."),
-          "",
-          "res/actions/time.png")
+      .AddExpression("TimeFromStart",
+                     _("Time elapsed since the beginning of the scene"),
+                     _("Time elapsed since the beginning of the scene"),
+                     "",
+                     "res/actions/time.png")
       .AddCodeOnlyParameter("currentScene", "");
 
   extension
-      .AddExpression(
-          "TempsDebut",
-          _("Time elapsed since the beginning of the scene (in seconds)."),
-          _("Time elapsed since the beginning of the scene (in seconds)."),
-          "",
-          "res/actions/time.png")
+      .AddExpression("TempsDebut",
+                     _("Time elapsed since the beginning of the scene"),
+                     _("Time elapsed since the beginning of the scene"),
+                     "",
+                     "res/actions/time.png")
       .SetHidden()
       .AddCodeOnlyParameter("currentScene", "");
 
@@ -231,21 +226,16 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsTimeExtension(
   extension
       .AddExpression("Time",
                      _("Current time"),
-                     _("Gives the current time"),
+                     _("Current time"),
                      "",
                      "res/actions/time.png")
       .AddCodeOnlyParameter("currentScene", "")
       .AddParameter(
           "stringWithSelector",
-          _("- Hour of the day: \"hour\"\n"
-            "- Minutes: \"min\"\n"
-            "- Seconds: \"sec\"\n"
-            "- Day of month: \"mday\"\n"
-            "- Months since January: \"mon\"\n"
-            "- Year since 1900: \"year\"\n"
-            "- Days since Sunday: \"wday\"\n"
-            "- Days since Jan 1st: \"yday\"\n"
-            "- Timestamp (ms): \"timestamp\""),
+          _("Hour: hour - Minutes: min - Seconds: sec - Day of month: "
+            "mday - Months since January: mon - Year since 1900: year - Days "
+            "since Sunday: wday - Days since Jan 1st: yday - Timestamp (ms): "
+            "timestamp\""),
           "[\"hour\", \"min\", \"sec\", \"mon\", \"year\", \"wday\", \"mday\", "
           "\"yday\", \"timestamp\"]");
 }

Core/GDCore/Extensions/Builtin/WindowExtension.cpp

@@ -15,17 +15,16 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsWindowExtension(
       .SetExtensionInformation(
           "BuiltinWindow",
           _("Game window and resolution"),
-          "Actions and conditions to manipulate the game window or change how "
-          "the game is resized according to the screen size. "
+          "Provides actions and conditions to manipulate the game window. "
           "Depending on the platform on which the game is running, not all of "
-          "these features can be applied.\n"
-          "Also contains expressions to read the screen size.",
+          "these features can be applied.",
           "Florian Rival",
           "Open source (MIT License)")
       .SetCategory("User interface")
       .SetExtensionHelpPath("/all-features/window");
   extension
-      .AddInstructionOrExpressionGroupMetadata(_("Game window and resolution"))
+      .AddInstructionOrExpressionGroupMetadata(
+          _("Game window and resolution"))
       .SetIcon("res/actions/window24.png");
 
   extension

Core/GDCore/Extensions/Metadata/BehaviorMetadata.h

@@ -298,19 +298,6 @@ class GD_CORE_API BehaviorMetadata : public InstructionOrExpressionContainerMeta
     return *this;
   }
 
-  /**
-   * Check if the behavior can be used on objects from event-based objects.
-   */
-  bool IsRelevantForChildObjects() const { return isRelevantForChildObjects; }
-
-  /**
-   * Set that behavior can't be used on objects from event-based objects.
-   */
-  BehaviorMetadata &MarkAsIrrelevantForChildObjects() {
-    isRelevantForChildObjects = false;
-    return *this;
-  }
-
   QuickCustomization::Visibility GetQuickCustomizationVisibility() const {
     return quickCustomizationVisibility;
   }
@@ -406,7 +393,6 @@ class GD_CORE_API BehaviorMetadata : public InstructionOrExpressionContainerMeta
   mutable std::vector<gd::String> requiredBehaviors;
   bool isPrivate = false;
   bool isHidden = false;
-  bool isRelevantForChildObjects = true;
   gd::String openFullEditorLabel;
   QuickCustomization::Visibility quickCustomizationVisibility = QuickCustomization::Visibility::Default;
 

Core/GDCore/Extensions/Metadata/MetadataProvider.h

@@ -277,10 +277,6 @@ class GD_CORE_API MetadataProvider {
     return &metadata == &badObjectInfo;
   }
 
-  static bool IsBadEffectMetadata(const gd::EffectMetadata& metadata) {
-    return &metadata == &badEffectMetadata;
-  }
-
   virtual ~MetadataProvider();
 
  private:

Core/GDCore/Extensions/Metadata/ParameterMetadataTools.cpp

@@ -194,8 +194,7 @@ void ParameterMetadataTools::IterateOverParameters(
       [&fn](const gd::ParameterMetadata& parameterMetadata,
             const gd::Expression& parameterValue,
             size_t parameterIndex,
-            const gd::String& lastObjectName,
-            size_t lastObjectIndex) {
+            const gd::String& lastObjectName) {
         fn(parameterMetadata, parameterValue, lastObjectName);
       });
 }
@@ -206,10 +205,8 @@ void ParameterMetadataTools::IterateOverParametersWithIndex(
     std::function<void(const gd::ParameterMetadata& parameterMetadata,
                        const gd::Expression& parameterValue,
                        size_t parameterIndex,
-                       const gd::String& lastObjectName,
-                       size_t lastObjectIndex)> fn) {
+                       const gd::String& lastObjectName)> fn) {
   gd::String lastObjectName = "";
-  size_t lastObjectIndex = 0;
   for (std::size_t pNb = 0; pNb < parametersMetadata.GetParametersCount();
        ++pNb) {
     const gd::ParameterMetadata &parameterMetadata =
@@ -221,17 +218,15 @@ void ParameterMetadataTools::IterateOverParametersWithIndex(
             ? Expression(parameterMetadata.GetDefaultValue())
             : parameterValue;
 
-    fn(parameterMetadata, parameterValueOrDefault, pNb, lastObjectName, lastObjectIndex);
+    fn(parameterMetadata, parameterValueOrDefault, pNb, lastObjectName);
 
     // Memorize the last object name. By convention, parameters that require
     // an object (mainly, "objectvar" and "behavior") should be placed after
     // the object in the list of parameters (if possible, just after).
     // Search "lastObjectName" in the codebase for other place where this
     // convention is enforced.
-    if (gd::ParameterMetadata::IsObject(parameterMetadata.GetType())) {
+    if (gd::ParameterMetadata::IsObject(parameterMetadata.GetType()))
       lastObjectName = parameterValueOrDefault.GetPlainString();
-      lastObjectIndex = pNb;
-    }
   }
 }
 

Core/GDCore/Extensions/Metadata/ParameterMetadataTools.h

@@ -64,8 +64,7 @@ class GD_CORE_API ParameterMetadataTools {
       std::function<void(const gd::ParameterMetadata& parameterMetadata,
                          const gd::Expression& parameterValue,
                          size_t parameterIndex,
-                         const gd::String& lastObjectName,
-                         size_t lastObjectIndex)> fn);
+                         const gd::String& lastObjectName)> fn);
 
   /**
    * Iterate over the parameters of a FunctionCallNode.

Core/GDCore/IDE/Events/BehaviorParametersFiller.cpp

@@ -29,7 +29,7 @@ bool BehaviorParametersFiller::DoVisitInstruction(gd::Instruction &instruction,
       instruction.GetParameters(), metadata.GetParameters(),
       [&](const gd::ParameterMetadata &parameterMetadata,
           const gd::Expression &parameterValue, size_t parameterIndex,
-          const gd::String &lastObjectName, size_t lastObjectIndex) {
+          const gd::String &lastObjectName) {
         if (parameterMetadata.GetValueTypeMetadata().IsBehavior() &&
             parameterValue.GetPlainString().length() == 0) {
 

Core/GDCore/IDE/Events/EventsBehaviorRenamer.cpp

@@ -108,10 +108,12 @@ bool EventsBehaviorRenamer::DoVisitInstruction(gd::Instruction& instruction,
                                    platform, instruction.GetType());
 
   gd::ParameterMetadataTools::IterateOverParametersWithIndex(
-      instruction.GetParameters(), metadata.GetParameters(),
-      [&](const gd::ParameterMetadata &parameterMetadata,
-          const gd::Expression &parameterValue, size_t parameterIndex,
-          const gd::String &lastObjectName, size_t lastObjectIndex) {
+      instruction.GetParameters(),
+      metadata.GetParameters(),
+      [&](const gd::ParameterMetadata& parameterMetadata,
+          const gd::Expression& parameterValue,
+          size_t parameterIndex,
+          const gd::String& lastObjectName) {
         const gd::String& type = parameterMetadata.GetType();
 
         if (gd::ParameterMetadata::IsBehavior(type)) {

Core/GDCore/IDE/Events/EventsParameterReplacer.cpp

@@ -183,10 +183,12 @@ bool EventsParameterReplacer::DoVisitInstruction(gd::Instruction& instruction,
                                    platform, instruction.GetType());
 
   gd::ParameterMetadataTools::IterateOverParametersWithIndex(
-      instruction.GetParameters(), metadata.GetParameters(),
-      [&](const gd::ParameterMetadata &parameterMetadata,
-          const gd::Expression &parameterValue, size_t parameterIndex,
-          const gd::String &lastObjectName, size_t lastObjectIndex) {
+      instruction.GetParameters(),
+      metadata.GetParameters(),
+      [&](const gd::ParameterMetadata& parameterMetadata,
+          const gd::Expression& parameterValue,
+          size_t parameterIndex,
+          const gd::String& lastObjectName) {
         if (!gd::EventsParameterReplacer::CanContainParameter(
           parameterMetadata.GetValueTypeMetadata())) {
           return;

Core/GDCore/IDE/Events/EventsPropertyReplacer.cpp

@@ -217,10 +217,12 @@ bool EventsPropertyReplacer::DoVisitInstruction(gd::Instruction& instruction,
   bool shouldDeleteInstruction = false;
 
   gd::ParameterMetadataTools::IterateOverParametersWithIndex(
-      instruction.GetParameters(), metadata.GetParameters(),
-      [&](const gd::ParameterMetadata &parameterMetadata,
-          const gd::Expression &parameterValue, size_t parameterIndex,
-          const gd::String &lastObjectName, size_t lastObjectIndex) {
+      instruction.GetParameters(),
+      metadata.GetParameters(),
+      [&](const gd::ParameterMetadata& parameterMetadata,
+          const gd::Expression& parameterValue,
+          size_t parameterIndex,
+          const gd::String& lastObjectName) {
         if (!gd::EventsPropertyReplacer::CanContainProperty(
           parameterMetadata.GetValueTypeMetadata())) {
           return;

Core/GDCore/IDE/Events/EventsRefactorer.cpp

@@ -334,7 +334,7 @@ private:
         instruction.GetParameters(), metadata.GetParameters(),
         [&](const gd::ParameterMetadata &parameterMetadata,
             const gd::Expression &parameterValue, size_t parameterIndex,
-            const gd::String &lastObjectName, size_t lastObjectIndex) {
+            const gd::String &lastObjectName) {
           if (!gd::EventsObjectReplacer::CanContainObject(
                   parameterMetadata.GetValueTypeMetadata())) {
             return;

Core/GDCore/IDE/Events/EventsVariableInstructionTypeSwitcher.cpp

@@ -42,16 +42,18 @@ bool EventsVariableInstructionTypeSwitcher::DoVisitInstruction(gd::Instruction&
                                    platform, instruction.GetType());
 
   gd::ParameterMetadataTools::IterateOverParametersWithIndex(
-      instruction.GetParameters(), metadata.GetParameters(),
-      [&](const gd::ParameterMetadata &parameterMetadata,
-          const gd::Expression &parameterValue, size_t parameterIndex,
-          const gd::String &lastObjectName, size_t lastObjectIndex) {
+      instruction.GetParameters(),
+      metadata.GetParameters(),
+      [&](const gd::ParameterMetadata& parameterMetadata,
+          const gd::Expression& parameterValue,
+          size_t parameterIndex,
+          const gd::String& lastObjectName) {
         const gd::String& type = parameterMetadata.GetType();
 
         if (!gd::ParameterMetadata::IsExpression("variable", type) ||
             !gd::VariableInstructionSwitcher::IsSwitchableVariableInstruction(
                 instruction.GetType())) {
-          return;
+                  return;
         }
         const auto variableName =
             gd::ExpressionVariableNameFinder::GetVariableName(
@@ -70,11 +72,10 @@ bool EventsVariableInstructionTypeSwitcher::DoVisitInstruction(gd::Instruction&
                     .GetObjectOrGroupVariablesContainer(lastObjectName);
           }
         } else if (type == "variableOrProperty") {
-          variablesContainer =
-              &GetProjectScopedContainers()
-                   .GetVariablesContainersList()
-                   .GetVariablesContainerFromVariableOrPropertyName(
-                       variableName);
+            variablesContainer =
+                &GetProjectScopedContainers()
+                      .GetVariablesContainersList()
+                      .GetVariablesContainerFromVariableOrPropertyName(variableName);
         } else {
           if (GetProjectScopedContainers().GetVariablesContainersList().Has(
                   variableName)) {

Core/GDCore/IDE/Events/EventsVariableReplacer.cpp

@@ -448,10 +448,12 @@ bool EventsVariableReplacer::DoVisitInstruction(gd::Instruction& instruction,
   bool shouldDeleteInstruction = false;
 
   gd::ParameterMetadataTools::IterateOverParametersWithIndex(
-      instruction.GetParameters(), metadata.GetParameters(),
-      [&](const gd::ParameterMetadata &parameterMetadata,
-          const gd::Expression &parameterValue, size_t parameterIndex,
-          const gd::String &lastObjectName, size_t lastObjectIndex) {
+      instruction.GetParameters(),
+      metadata.GetParameters(),
+      [&](const gd::ParameterMetadata& parameterMetadata,
+          const gd::Expression& parameterValue,
+          size_t parameterIndex,
+          const gd::String& lastObjectName) {
         const gd::String& type = parameterMetadata.GetType();
 
         if (!gd::ParameterMetadata::IsExpression("variable", type) &&

Core/GDCore/IDE/Events/ProjectElementRenamer.cpp

@@ -150,7 +150,7 @@ bool ProjectElementRenamer::DoVisitInstruction(gd::Instruction &instruction,
       instruction.GetParameters(), metadata.GetParameters(),
       [&](const gd::ParameterMetadata &parameterMetadata,
           const gd::Expression &parameterValue, size_t parameterIndex,
-          const gd::String &lastObjectName, size_t lastObjectIndex) {
+          const gd::String &lastObjectName) {
         if (parameterMetadata.GetType() == "layer") {
           if (parameterValue.GetPlainString().length() < 2) {
             // This is either the base layer or an invalid layer name.

Core/GDCore/IDE/EventsBasedObjectVariantHelper.cpp

@@ -63,6 +63,7 @@ void EventsBasedObjectVariantHelper::ComplyVariantsToEventsBasedObject(
       }
 
       // Copy missing behaviors
+      auto &behaviors = object.GetAllBehaviorContents();
       for (const auto &pair : defaultBehaviors) {
         const auto &behaviorName = pair.first;
         const auto &defaultBehavior = pair.second;
@@ -81,9 +82,11 @@ void EventsBasedObjectVariantHelper::ComplyVariantsToEventsBasedObject(
         }
       }
       // Delete extra behaviors
-      for (auto &behaviorName : object.GetAllBehaviorNames()) {
+      for (auto it = behaviors.begin(); it != behaviors.end(); ++it) {
+        const auto &behaviorName = it->first;
         if (!defaultObject->HasBehaviorNamed(behaviorName)) {
           object.RemoveBehavior(behaviorName);
+          --it;
         }
       }
 

Core/GDCore/IDE/ObjectAssetSerializer.cpp

@@ -76,7 +76,6 @@ void ObjectAssetSerializer::SerializeTo(
 
   double width = 0;
   double height = 0;
-  std::unordered_set<gd::String> alreadyUsedVariantIdentifiers;
   if (project.HasEventsBasedObject(object.GetType())) {
     SerializerElement &variantsElement =
         objectAssetElement.AddChild("variants");
@@ -88,6 +87,7 @@ void ObjectAssetSerializer::SerializeTo(
       height = variant->GetAreaMaxY() - variant->GetAreaMinY();
     }
 
+    std::unordered_set<gd::String> alreadyUsedVariantIdentifiers;
     gd::ObjectAssetSerializer::SerializeUsedVariantsTo(
         project, object, variantsElement, alreadyUsedVariantIdentifiers);
   }
@@ -114,24 +114,14 @@ void ObjectAssetSerializer::SerializeTo(
     resourceElement.SetAttribute("name", resource.GetName());
   }
 
-  std::unordered_set<gd::String> usedExtensionNames;
-  usedExtensionNames.insert(extensionName);
-  for (auto &usedVariantIdentifier : alreadyUsedVariantIdentifiers) {
-    usedExtensionNames.insert(PlatformExtension::GetExtensionFromFullObjectType(
-        usedVariantIdentifier));
-  }
   SerializerElement &requiredExtensionsElement =
       objectAssetElement.AddChild("requiredExtensions");
   requiredExtensionsElement.ConsiderAsArrayOf("requiredExtension");
-  for (auto &usedExtensionName : usedExtensionNames) {
-    if (project.HasEventsFunctionsExtensionNamed(usedExtensionName)) {
-      auto &extension = project.GetEventsFunctionsExtension(usedExtensionName);
-      SerializerElement &requiredExtensionElement =
-          requiredExtensionsElement.AddChild("requiredExtension");
-      requiredExtensionElement.SetAttribute("extensionName", usedExtensionName);
-      requiredExtensionElement.SetAttribute("extensionVersion",
-                                            extension.GetVersion());
-    }
+  if (project.HasEventsFunctionsExtensionNamed(extensionName)) {
+    SerializerElement &requiredExtensionElement =
+        requiredExtensionsElement.AddChild("requiredExtension");
+    requiredExtensionElement.SetAttribute("extensionName", extensionName);
+    requiredExtensionElement.SetAttribute("extensionVersion", "1.0.0");
   }
 
   // TODO This can be removed when the asset script no longer require it.

Core/GDCore/IDE/Project/ArbitraryResourceWorker.cpp

@@ -227,11 +227,12 @@ bool ResourceWorkerInEventsWorker::DoVisitInstruction(gd::Instruction& instructi
                                     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, size_t lastObjectIndex) {
+      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() == "fontResource") {
           gd::String updatedParameterValue = parameterValue;

Core/GDCore/IDE/PropertyFunctionGenerator.cpp

@@ -248,13 +248,12 @@ gd::String PropertyFunctionGenerator::GetStringifiedExtraInfo(
     gd::String arrayString;
     arrayString += "[";
     bool isFirst = true;
-    for (const auto &choice : property.GetChoices()) {
+    for (const gd::String &choice : property.GetExtraInfo()) {
       if (!isFirst) {
         arrayString += ",";
       }
       isFirst = false;
-      // TODO Handle labels (and search "choice label")
-      arrayString += "\"" + choice.GetValue() + "\"";
+      arrayString += "\"" + choice + "\"";
     }
     arrayString += "]";
     return arrayString;

Core/GDCore/IDE/ResourceExposer.cpp

@@ -75,17 +75,6 @@ void ResourceExposer::ExposeProjectResources(
   // Expose global objects configuration resources
   auto objectWorker = gd::GetResourceWorkerOnObjects(project, worker);
   objectWorker.Launch(project.GetObjects());
-
-  // Exposed extension event resources
-  // Note that using resources in extensions is very unlikely and probably not
-  // worth the effort of something smart.
-  auto eventWorker = gd::GetResourceWorkerOnEvents(project, worker);
-  for (std::size_t e = 0; e < project.GetEventsFunctionsExtensionsCount();
-       e++) {
-    auto &eventsFunctionsExtension = project.GetEventsFunctionsExtension(e);
-    gd::ProjectBrowserHelper::ExposeEventsFunctionsExtensionEvents(
-        project, eventsFunctionsExtension, eventWorker);
-  }
 }
 
 void ResourceExposer::ExposeLayoutResources(
@@ -114,6 +103,16 @@ void ResourceExposer::ExposeLayoutResources(
   auto eventWorker = gd::GetResourceWorkerOnEvents(project, worker);
   gd::ProjectBrowserHelper::ExposeLayoutEventsAndDependencies(
       project, layout, eventWorker);
+
+  // Exposed extension event resources
+  // Note that using resources in extensions is very unlikely and probably not
+  // worth the effort of something smart.
+  for (std::size_t e = 0; e < project.GetEventsFunctionsExtensionsCount();
+       e++) {
+    auto &eventsFunctionsExtension = project.GetEventsFunctionsExtension(e);
+    gd::ProjectBrowserHelper::ExposeEventsFunctionsExtensionEvents(
+        project, eventsFunctionsExtension, eventWorker);
+  }
 }
 
 void ResourceExposer::ExposeEffectResources(

Core/GDCore/Project/CustomObjectConfiguration.cpp

@@ -250,28 +250,25 @@ void CustomObjectConfiguration::ExposeResources(gd::ArbitraryResourceWorker& wor
   }
   const auto &eventsBasedObject = project->GetEventsBasedObject(GetType());
 
-  if (IsForcedToOverrideEventsBasedObjectChildrenConfiguration()) {
-    for (auto &childObject : eventsBasedObject.GetObjects().GetObjects()) {
-      auto &configuration = GetChildObjectConfiguration(childObject->GetName());
-      configuration.ExposeResources(worker);
-    }
-  }
-  else if (eventsBasedObject.GetVariants().HasVariantNamed(variantName)) {
-    for (auto &childObject : eventsBasedObject.GetVariants()
-                                 .GetVariant(variantName)
-                                 .GetObjects()
-                                 .GetObjects()) {
-      childObject->GetConfiguration().ExposeResources(worker);
-    }
-  } else if (isMarkedAsOverridingEventsBasedObjectChildrenConfiguration) {
+  if (isMarkedAsOverridingEventsBasedObjectChildrenConfiguration) {
     for (auto &childObject : eventsBasedObject.GetObjects().GetObjects()) {
       auto &configuration = GetChildObjectConfiguration(childObject->GetName());
       configuration.ExposeResources(worker);
     }
   } else {
-    for (auto &childObject :
-         eventsBasedObject.GetDefaultVariant().GetObjects().GetObjects()) {
-      childObject->GetConfiguration().ExposeResources(worker);
+    if (variantName.empty() ||
+        !eventsBasedObject.GetVariants().HasVariantNamed(variantName)) {
+      for (auto &childObject :
+           eventsBasedObject.GetDefaultVariant().GetObjects().GetObjects()) {
+        childObject->GetConfiguration().ExposeResources(worker);
+      }
+    } else {
+      for (auto &childObject : eventsBasedObject.GetVariants()
+                                   .GetVariant(variantName)
+                                   .GetObjects()
+                                   .GetObjects()) {
+        childObject->GetConfiguration().ExposeResources(worker);
+      }
     }
   }
 }

Core/GDCore/Project/CustomObjectConfiguration.h

@@ -78,15 +78,6 @@ public:
     variantName = variantName_;
   }
 
-  /**
-   * Legacy events-based objects don't have any instance in their default
-   * variant since there wasn't a graphical editor at the time. In this case,
-   * the editor doesn't allow to choose a variant, but a variant may have stayed
-   * after a user rolled back the extension. This variant must be ignored.
-   *
-   * @return true when its events-based object doesn't have any initial
-   * instance.
-   */
   bool IsForcedToOverrideEventsBasedObjectChildrenConfiguration() const;
 
   bool IsMarkedAsOverridingEventsBasedObjectChildrenConfiguration() const {

Core/GDCore/Project/Effect.cpp

@@ -8,8 +8,6 @@
 #include "GDCore/Serialization/SerializerElement.h"
 
 namespace gd {
-  
-gd::String Effect::badStringParameterValue;
 
 void Effect::SerializeTo(SerializerElement& element) const {
   element.SetAttribute("name", GetName());

Core/GDCore/Project/Effect.h

@@ -3,7 +3,8 @@
  * Copyright 2008-2016 Florian Rival (Florian.Rival@gmail.com). All rights
  * reserved. This project is released under the MIT License.
  */
-#pragma once
+#ifndef GDCORE_EFFECT_H
+#define GDCORE_EFFECT_H
 #include <map>
 namespace gd {
 class SerializerElement;
@@ -34,43 +35,28 @@ class GD_CORE_API Effect {
   void SetFolded(bool fold = true) { folded = fold; }
   bool IsFolded() const { return folded; }
 
-  void SetDoubleParameter(const gd::String &name, double value) {
+  void SetDoubleParameter(const gd::String& name, double value) {
     doubleParameters[name] = value;
   }
 
-  double GetDoubleParameter(const gd::String &name) const {
-    auto itr = doubleParameters.find(name);
-    return itr == doubleParameters.end() ? 0 : itr->second;
+  double GetDoubleParameter(const gd::String& name) {
+    return doubleParameters[name];
   }
 
-  bool HasDoubleParameter(const gd::String &name) const {
-    return doubleParameters.find(name) != doubleParameters.end();
-  }
-
-  void SetStringParameter(const gd::String &name, const gd::String &value) {
+  void SetStringParameter(const gd::String& name, const gd::String& value) {
     stringParameters[name] = value;
   }
 
-  const gd::String &GetStringParameter(const gd::String &name) const {
-    auto itr = stringParameters.find(name);
-    return itr == stringParameters.end() ? badStringParameterValue : itr->second;
+  const gd::String& GetStringParameter(const gd::String& name) {
+    return stringParameters[name];
   }
 
-  bool HasStringParameter(const gd::String &name) const {
-    return stringParameters.find(name) != stringParameters.end();
-  }
-
-  void SetBooleanParameter(const gd::String &name, bool value) {
+  void SetBooleanParameter(const gd::String& name, bool value) {
     booleanParameters[name] = value;
   }
 
-  bool GetBooleanParameter(const gd::String &name) const {
-    auto itr = booleanParameters.find(name);
-    return itr == booleanParameters.end() ? false : itr->second;
-  }
-
-  bool HasBooleanParameter(const gd::String &name) const {
-    return booleanParameters.find(name) != booleanParameters.end();
+  bool GetBooleanParameter(const gd::String& name) {
+    return booleanParameters[name];
   }
 
   const std::map<gd::String, double>& GetAllDoubleParameters() const {
@@ -108,9 +94,7 @@ class GD_CORE_API Effect {
   std::map<gd::String, double> doubleParameters; ///< Values of parameters being doubles, keyed by names.
   std::map<gd::String, gd::String> stringParameters; ///< Values of parameters being strings, keyed by names.
   std::map<gd::String, bool> booleanParameters; ///< Values of parameters being booleans, keyed by names.
-
-  static gd::String badStringParameterValue;  ///< Empty string returned by
-                                              ///< GeStringParameter
 };
 
 }  // namespace gd
+#endif

Core/GDCore/Project/EventsBasedObjectVariant.cpp

@@ -37,7 +37,6 @@ void EventsBasedObjectVariant::SerializeTo(SerializerElement &element) const {
 
   layers.SerializeLayersTo(element.AddChild("layers"));
   initialInstances.SerializeTo(element.AddChild("instances"));
-  editorSettings.SerializeTo(element.AddChild("editionSettings"));
 }
 
 void EventsBasedObjectVariant::UnserializeFrom(
@@ -67,7 +66,6 @@ void EventsBasedObjectVariant::UnserializeFrom(
     layers.Reset();
   }
   initialInstances.UnserializeFrom(element.GetChild("instances"));
-  editorSettings.UnserializeFrom(element.GetChild("editionSettings"));
 }
 
 } // namespace gd

Core/GDCore/Project/EventsBasedObjectVariant.h

@@ -5,7 +5,6 @@
  */
 #pragma once
 
-#include "GDCore/IDE/Dialogs/LayoutEditorCanvas/EditorSettings.h"
 #include "GDCore/Project/InitialInstancesContainer.h"
 #include "GDCore/Project/LayersContainer.h"
 #include "GDCore/Project/ObjectsContainer.h"
@@ -200,19 +199,6 @@ public:
   const gd::String &GetAssetStoreOriginalName() const {
     return assetStoreOriginalName;
   };
-  
-  /**
-   * 
-   * \brief Get the user settings for the IDE.
-   */
-  const gd::EditorSettings& GetAssociatedEditorSettings() const {
-    return editorSettings;
-  }
-
-  /**
-   * \brief Get the user settings for the IDE.
-   */
-  gd::EditorSettings& GetAssociatedEditorSettings() { return editorSettings; }
 
   void SerializeTo(SerializerElement &element) const;
 
@@ -238,7 +224,6 @@ private:
    * store.
    */
   gd::String assetStoreOriginalName;
-  gd::EditorSettings editorSettings;
 };
 
 } // namespace gd

Core/GDCore/Project/Layout.cpp

@@ -36,7 +36,7 @@ namespace gd {
 
 gd::BehaviorsSharedData Layout::badBehaviorSharedData("", "");
 
-Layout::Layout(const Layout& other)
+Layout::Layout(const Layout &other)
     : objectsContainer(gd::ObjectsContainer::SourceType::Scene) {
   Init(other);
 }
@@ -54,8 +54,6 @@ Layout::Layout()
       backgroundColorG(209),
       backgroundColorB(209),
       stopSoundsOnStartup(true),
-      resourcesPreloading("inherit"),
-      resourcesUnloading("inherit"),
       standardSortMethod(true),
       disableInputWhenNotFocused(true),
       variables(gd::VariablesContainer::SourceType::Scene),
@@ -246,10 +244,6 @@ void Layout::SerializeTo(SerializerElement& element) const {
   element.SetAttribute("title", GetWindowDefaultTitle());
   element.SetAttribute("standardSortMethod", standardSortMethod);
   element.SetAttribute("stopSoundsOnStartup", stopSoundsOnStartup);
-  if (resourcesPreloading != "inherit")
-    element.SetAttribute("resourcesPreloading", resourcesPreloading);
-  if (resourcesUnloading != "inherit")
-    element.SetAttribute("resourcesUnloading", resourcesUnloading);
   element.SetAttribute("disableInputWhenNotFocused",
                        disableInputWhenNotFocused);
 
@@ -310,10 +304,6 @@ void Layout::UnserializeFrom(gd::Project& project,
       element.GetStringAttribute("title", "(No title)", "titre"));
   standardSortMethod = element.GetBoolAttribute("standardSortMethod");
   stopSoundsOnStartup = element.GetBoolAttribute("stopSoundsOnStartup");
-  resourcesPreloading =
-      element.GetStringAttribute("resourcesPreloading", "inherit");
-  resourcesUnloading =
-      element.GetStringAttribute("resourcesUnloading", "inherit");
   disableInputWhenNotFocused =
       element.GetBoolAttribute("disableInputWhenNotFocused");
 
@@ -401,8 +391,6 @@ void Layout::Init(const Layout& other) {
   standardSortMethod = other.standardSortMethod;
   title = other.title;
   stopSoundsOnStartup = other.stopSoundsOnStartup;
-  resourcesPreloading = other.resourcesPreloading;
-  resourcesUnloading = other.resourcesUnloading;
   disableInputWhenNotFocused = other.disableInputWhenNotFocused;
   initialInstances = other.initialInstances;
   layers = other.layers;

Core/GDCore/Project/Layout.h

@@ -349,36 +349,6 @@ class GD_CORE_API Layout {
    * launched
    */
   bool StopSoundsOnStartup() const { return stopSoundsOnStartup; }
-
-  /**
-   * Set when the scene must preload its resources: `at-startup`, `never` or
-   * `inherit` (default).
-   */
-  void SetResourcesPreloading(gd::String resourcesPreloading_) {
-    resourcesPreloading = resourcesPreloading_;
-  }
-
-  /**
-   * Get when the scene must preload its resources: `at-startup`, `never` or
-   * `inherit` (default).
-   */
-  const gd::String& GetResourcesPreloading() const {
-    return resourcesPreloading;
-  }
-
-  /**
-   * Set when the scene must unload its resources: `at-scene-exit`, `never` or
-   * `inherit` (default).
-   */
-  void SetResourcesUnloading(gd::String resourcesUnloading_) {
-    resourcesUnloading = resourcesUnloading_;
-  }
-
-  /**
-   * Get when the scene must unload its resources: `at-scene-exit`, `never` or
-   * `inherit` (default).
-   */
-  const gd::String& GetResourcesUnloading() const { return resourcesUnloading; }
   ///@}
 
   /** \name Saving and loading
@@ -411,10 +381,6 @@ class GD_CORE_API Layout {
       behaviorsSharedData;   ///< Initial shared datas of behaviors
   bool stopSoundsOnStartup = true;  ///< True to make the scene stop all sounds at
                                     ///< startup.
-  gd::String
-      resourcesPreloading;  ///< `at-startup`, `never` or `inherit` (default).
-  gd::String
-      resourcesUnloading;  ///< `at-scene-exit`, `never` or `inherit` (default).
   bool standardSortMethod = true;   ///< True to sort objects using standard sort.
   bool disableInputWhenNotFocused = true;  /// If set to true, the input must be
                                            /// disabled when the window do not have the

Core/GDCore/Project/Project.cpp

@@ -74,9 +74,7 @@ Project::Project()
       gdMinorVersion(gd::VersionWrapper::Minor()),
       gdBuildVersion(gd::VersionWrapper::Build()),
       variables(gd::VariablesContainer::SourceType::Global),
-      objectsContainer(gd::ObjectsContainer::SourceType::Global),
-      sceneResourcesPreloading("at-startup"),
-      sceneResourcesUnloading("never") {}
+      objectsContainer(gd::ObjectsContainer::SourceType::Global) {}
 
 Project::~Project() {}
 
@@ -1168,13 +1166,6 @@ void Project::SerializeTo(SerializerElement& element) const {
   else
     std::cout << "ERROR: The project current platform is NULL.";
 
-  if (sceneResourcesPreloading != "at-startup") {
-    propElement.SetAttribute("sceneResourcesPreloading", sceneResourcesPreloading);
-  }
-  if (sceneResourcesUnloading != "never") {
-    propElement.SetAttribute("sceneResourcesUnloading", sceneResourcesUnloading);
-  }
-
   resourcesManager.SerializeTo(element.AddChild("resources"));
   objectsContainer.SerializeObjectsTo(element.AddChild("objects"));
   objectsContainer.SerializeFoldersTo(element.AddChild("objectsFolderStructure"));
@@ -1316,9 +1307,6 @@ void Project::Init(const gd::Project& game) {
   variables = game.GetVariables();
 
   projectFile = game.GetProjectFile();
-
-  sceneResourcesPreloading = game.sceneResourcesPreloading;
-  sceneResourcesUnloading = game.sceneResourcesUnloading;
 }
 
 }  // namespace gd

Core/GDCore/Project/Project.h

@@ -964,37 +964,6 @@ class GD_CORE_API Project {
    */
   ResourcesManager& GetResourcesManager() { return resourcesManager; }
 
-  /**
-   * Set when the scenes must preload their resources: `at-startup`, `never`
-   * (default).
-   */
-  void SetSceneResourcesPreloading(gd::String sceneResourcesPreloading_) {
-    sceneResourcesPreloading = sceneResourcesPreloading_;
-  }
-
-  /**
-   * Get when the scenes must preload their resources: `at-startup`, `never`
-   * (default).
-   */
-  const gd::String& GetSceneResourcesPreloading() const {
-    return sceneResourcesPreloading;
-  }
-
-  /**
-   * Set when the scenes must unload their resources: `at-scene-exit`, `never`
-   * (default).
-   */
-  void SetSceneResourcesUnloading(gd::String sceneResourcesUnloading_) {
-    sceneResourcesUnloading = sceneResourcesUnloading_;
-  }
-
-  /**
-   * Get when the scenes must unload their resources: `at-scene-exit`, `never`
-   * (default).
-   */
-  const gd::String& GetSceneResourcesUnloading() const {
-    return sceneResourcesUnloading;
-  }
   ///@}
 
   /** \name Variable management
@@ -1152,10 +1121,6 @@ class GD_CORE_API Project {
   ExtensionProperties
       extensionProperties;  ///< The properties of the extensions.
   gd::WholeProjectDiagnosticReport wholeProjectDiagnosticReport;
-  gd::String sceneResourcesPreloading;  ///< `at-startup` or `never`
-                                        ///< (default: `at-startup`).
-  gd::String sceneResourcesUnloading;   ///< `at-scene-exit` or `never`
-                                        ///< (default: `never`).
   mutable unsigned int gdMajorVersion =
       0;  ///< The GD major version used the last
           ///< time the project was saved.

Core/GDCore/Project/PropertyDescriptor.cpp

@@ -34,20 +34,6 @@ void PropertyDescriptor::SerializeTo(SerializerElement& element) const {
     }
   }
 
-  if (!choices.empty()
-      // Compatibility with GD <= 5.5.239
-      || !extraInformation.empty()
-      // end of compatibility code
-  ) {
-    SerializerElement &choicesElement = element.AddChild("choices");
-    choicesElement.ConsiderAsArrayOf("choice");
-    for (const auto &choice : choices) {
-      auto &choiceElement = choicesElement.AddChild("Choice");
-      choiceElement.SetStringAttribute("value", choice.GetValue());
-      choiceElement.SetStringAttribute("label", choice.GetLabel());
-    }
-  }
-
   if (hidden) {
     element.AddChild("hidden").SetBoolValue(hidden);
   }
@@ -94,26 +80,6 @@ void PropertyDescriptor::UnserializeFrom(const SerializerElement& element) {
           extraInformationElement.GetChild(i).GetStringValue());
   }
 
-  if (element.HasChild("choices")) {
-    choices.clear();
-    const SerializerElement &choicesElement = element.GetChild("choices");
-    choicesElement.ConsiderAsArrayOf("choice");
-    for (std::size_t i = 0; i < choicesElement.GetChildrenCount(); ++i) {
-      auto &choiceElement = choicesElement.GetChild(i);
-      AddChoice(choiceElement.GetStringAttribute("value"),
-                choiceElement.GetStringAttribute("label"));
-    }
-  }
-  // Compatibility with GD <= 5.5.239
-  else if (type == "Choice") {
-    choices.clear();
-    for (auto &choiceValue : extraInformation) {
-      AddChoice(choiceValue, choiceValue);
-    }
-    extraInformation.clear();
-  }
-  // end of compatibility code
-
   hidden = element.HasChild("hidden")
                ? element.GetChild("hidden").GetBoolValue()
                : false;

Core/GDCore/Project/PropertyDescriptor.h

@@ -7,9 +7,9 @@
 #define GDCORE_PROPERTYDESCRIPTOR
 #include <vector>
 
+#include "GDCore/String.h"
 #include "GDCore/Project/MeasurementUnit.h"
 #include "GDCore/Project/QuickCustomization.h"
-#include "GDCore/String.h"
 
 namespace gd {
 class SerializerElement;
@@ -17,19 +17,6 @@ class SerializerElement;
 
 namespace gd {
 
-class GD_CORE_API PropertyDescriptorChoice {
- public:
-  PropertyDescriptorChoice(const gd::String& value, const gd::String& label)
-      : value(value), label(label) {}
-
-  const gd::String& GetValue() const { return value; }
-  const gd::String& GetLabel() const { return label; }
-
- private:
-  gd::String value;
-  gd::String label;
-};
-
 /**
  * \brief Used to describe a property shown in a property grid.
  * \see gd::Object
@@ -44,12 +31,8 @@ class GD_CORE_API PropertyDescriptor {
    * \param propertyValue The value of the property.
    */
   PropertyDescriptor(gd::String propertyValue)
-      : currentValue(propertyValue),
-        type("string"),
-        label(""),
-        hidden(false),
-        deprecated(false),
-        advanced(false),
+      : currentValue(propertyValue), type("string"), label(""), hidden(false),
+        deprecated(false), advanced(false),
         hasImpactOnOtherProperties(false),
         measurementUnit(gd::MeasurementUnit::GetUndefined()),
         quickCustomizationVisibility(QuickCustomization::Visibility::Default) {}
@@ -58,13 +41,10 @@ class GD_CORE_API PropertyDescriptor {
    * \brief Empty constructor creating an empty property to be displayed.
    */
   PropertyDescriptor()
-      : hidden(false),
-        deprecated(false),
-        advanced(false),
+      : hidden(false), deprecated(false), advanced(false),
         hasImpactOnOtherProperties(false),
         measurementUnit(gd::MeasurementUnit::GetUndefined()),
-        quickCustomizationVisibility(QuickCustomization::Visibility::Default) {
-        };
+        quickCustomizationVisibility(QuickCustomization::Visibility::Default){};
 
   /**
    * \brief Destructor
@@ -108,25 +88,13 @@ class GD_CORE_API PropertyDescriptor {
   }
 
   /**
-   * \brief Change the group where this property is displayed to the user, if
-   * any.
+   * \brief Change the group where this property is displayed to the user, if any.
    */
   PropertyDescriptor& SetGroup(gd::String group_) {
     group = group_;
     return *this;
   }
 
-  PropertyDescriptor& ClearChoices() {
-    choices.clear();
-    return *this;
-  }
-
-  PropertyDescriptor& AddChoice(const gd::String& value,
-                                const gd::String& label) {
-    choices.push_back(PropertyDescriptorChoice(value, label));
-    return *this;
-  }
-
   /**
    * \brief Set and replace the additional information for the property.
    */
@@ -150,8 +118,7 @@ class GD_CORE_API PropertyDescriptor {
   /**
    * \brief Change the unit of measurement of the property value.
    */
-  PropertyDescriptor& SetMeasurementUnit(
-      const gd::MeasurementUnit& measurementUnit_) {
+  PropertyDescriptor& SetMeasurementUnit(const gd::MeasurementUnit &measurementUnit_) {
     measurementUnit = measurementUnit_;
     return *this;
   }
@@ -161,18 +128,14 @@ class GD_CORE_API PropertyDescriptor {
   const gd::String& GetLabel() const { return label; }
   const gd::String& GetDescription() const { return description; }
   const gd::String& GetGroup() const { return group; }
-  const gd::MeasurementUnit& GetMeasurementUnit() const {
-    return measurementUnit;
-  }
+  const gd::MeasurementUnit& GetMeasurementUnit() const { return measurementUnit; }
 
   const std::vector<gd::String>& GetExtraInfo() const {
     return extraInformation;
   }
 
-  std::vector<gd::String>& GetExtraInfo() { return extraInformation; }
-
-  const std::vector<PropertyDescriptorChoice>& GetChoices() const {
-    return choices;
+  std::vector<gd::String>& GetExtraInfo() {
+    return extraInformation;
   }
 
   /**
@@ -215,26 +178,23 @@ class GD_CORE_API PropertyDescriptor {
   bool IsAdvanced() const { return advanced; }
 
   /**
-   * \brief Check if the property has impact on other properties - which means a
-   * change must re-render other properties.
+   * \brief Check if the property has impact on other properties - which means a change
+   * must re-render other properties.
    */
   bool HasImpactOnOtherProperties() const { return hasImpactOnOtherProperties; }
 
   /**
-   * \brief Set if the property has impact on other properties - which means a
-   * change must re-render other properties.
+   * \brief Set if the property has impact on other properties - which means a change
+   * must re-render other properties.
    */
   PropertyDescriptor& SetHasImpactOnOtherProperties(bool enable) {
     hasImpactOnOtherProperties = enable;
     return *this;
   }
 
-  QuickCustomization::Visibility GetQuickCustomizationVisibility() const {
-    return quickCustomizationVisibility;
-  }
+  QuickCustomization::Visibility GetQuickCustomizationVisibility() const { return quickCustomizationVisibility; }
 
-  PropertyDescriptor& SetQuickCustomizationVisibility(
-      QuickCustomization::Visibility visibility) {
+  PropertyDescriptor& SetQuickCustomizationVisibility(QuickCustomization::Visibility visibility) {
     quickCustomizationVisibility = visibility;
     return *this;
   }
@@ -271,17 +231,15 @@ class GD_CORE_API PropertyDescriptor {
   gd::String label;        //< The user-friendly property name
   gd::String description;  //< The user-friendly property description
   gd::String group;        //< The user-friendly property group
-  std::vector<PropertyDescriptorChoice>
-      choices;  //< The optional choices for the property.
   std::vector<gd::String>
-      extraInformation;  ///< Can be used to store an additional information
-                         ///< like an object type.
+      extraInformation;  ///< Can be used to store for example the available
+                         ///< choices, if a property is a displayed as a combo
+                         ///< box.
   bool hidden;
   bool deprecated;
   bool advanced;
   bool hasImpactOnOtherProperties;
-  gd::MeasurementUnit
-      measurementUnit;  //< The unit of measurement of the property vale.
+  gd::MeasurementUnit measurementUnit; //< The unit of measurement of the property vale.
   QuickCustomization::Visibility quickCustomizationVisibility;
 };
 

Core/GDevelop-Architecture-Overview.md

@@ -24,7 +24,7 @@ The rest of this page is an introduction to the main concepts of GDevelop archit
 
 Extensions do have the same distinction between the "**IDE**" part and the "**Runtime**" part. For example, most extensions have:
 
--   A file called [`JsExtension.js`](https://github.com/4ian/GDevelop/blob/master/Extensions/ExampleJsExtension/JsExtension.js), which contains the _declaration_ of the extension for the **IDE**
+-   A file called [`JsExtension.js`(https://github.com/4ian/GDevelop/blob/master/Extensions/ExampleJsExtension/JsExtension.js)], which contains the _declaration_ of the extension for the **IDE**
 -   One or more files implementing the feature for the game, in other words for **Runtime**. This can be a [Runtime Object](https://github.com/4ian/GDevelop/blob/master/Extensions/ExampleJsExtension/dummyruntimeobject.ts) or a [Runtime Behavior](https://github.com/4ian/GDevelop/blob/master/Extensions/ExampleJsExtension/dummyruntimebehavior.ts), [functions called by actions or conditions](https://github.com/4ian/GDevelop/blob/master/Extensions/ExampleJsExtension/examplejsextensiontools.ts) or by the game engine.
 
 ### "Runtime" and "IDE" difference using an example: the `gd::Variable` class

Core/tests/ArbitraryResourceWorker.cpp

@@ -764,6 +764,129 @@ TEST_CASE("ArbitraryResourceWorker", "[common][resources]") {
       REQUIRE(worker.audios[0] == "res4");
     }
 
+    SECTION("Can find resource usages 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(project.GetResourcesManager());
+
+      auto& extension = project.InsertNewEventsFunctionsExtension("MyEventExtension", 0);
+      auto &function = extension.GetEventsFunctions().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);
+
+      auto& layout = project.InsertNewLayout("MyScene", 0);
+
+      // MyEventExtension::MyFreeFunction doesn't need to be actually used in
+      // events because the implementation is naive.
+
+      gd::ResourceExposer::ExposeLayoutResources(project, layout, 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 usages 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(project.GetResourcesManager());
+
+      auto& extension = project.InsertNewEventsFunctionsExtension("MyEventExtension", 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);
+
+      auto& layout = project.InsertNewLayout("MyScene", 0);
+
+      // MyEventExtension::MyBehavior::MyFunction doesn't need to be actually used in
+      // events because the implementation is naive.
+
+      gd::ResourceExposer::ExposeLayoutResources(project, layout, 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 usages 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(project.GetResourcesManager());
+
+      auto& extension = project.InsertNewEventsFunctionsExtension("MyEventExtension", 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);
+
+      auto& layout = project.InsertNewLayout("MyScene", 0);
+
+      // MyEventExtension::MyObject::MyFunction doesn't need to be actually used in
+      // events because the implementation is naive.
+
+      gd::ResourceExposer::ExposeLayoutResources(project, layout, 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 usages in layer effects") {
       gd::Project project;
       gd::Platform platform;

Core/tests/PropertyFunctionGenerator.cpp

@@ -139,8 +139,8 @@ TEST_CASE("PropertyFunctionGenerator", "[common]") {
         .SetLabel("Dot shape")
         .SetDescription("The shape is used for collision.")
         .SetGroup("Movement");
-    property.AddChoice("DotShape", "Dot shape");
-    property.AddChoice("BoundingDisk", "Bounding disk");
+    property.GetExtraInfo().push_back("Dot shape");
+    property.GetExtraInfo().push_back("Bounding disk");
 
     gd::PropertyFunctionGenerator::GenerateBehaviorGetterAndSetter(
         project, extension, behavior, property, false);
@@ -157,7 +157,7 @@ TEST_CASE("PropertyFunctionGenerator", "[common]") {
             gd::EventsFunction::ExpressionAndCondition);
     REQUIRE(getter.GetExpressionType().GetName() == "stringWithSelector");
     REQUIRE(getter.GetExpressionType().GetExtraInfo() ==
-            "[\"DotShape\",\"BoundingDisk\"]");
+            "[\"Dot shape\",\"Bounding disk\"]");
   }
 
   SECTION("Can generate functions for a boolean property in a behavior") {
@@ -386,8 +386,8 @@ TEST_CASE("PropertyFunctionGenerator", "[common]") {
         .SetLabel("Dot shape")
         .SetDescription("The shape is used for collision.")
         .SetGroup("Movement");
-    property.AddChoice("DotShape", "Dot shape");
-    property.AddChoice("BoundingDisk", "Bounding disk");
+    property.GetExtraInfo().push_back("Dot shape");
+    property.GetExtraInfo().push_back("Bounding disk");
 
     gd::PropertyFunctionGenerator::GenerateObjectGetterAndSetter(
         project, extension, object, property);
@@ -404,7 +404,7 @@ TEST_CASE("PropertyFunctionGenerator", "[common]") {
             gd::EventsFunction::ExpressionAndCondition);
     REQUIRE(getter.GetExpressionType().GetName() == "stringWithSelector");
     REQUIRE(getter.GetExpressionType().GetExtraInfo() ==
-            "[\"DotShape\",\"BoundingDisk\"]");
+            "[\"Dot shape\",\"Bounding disk\"]");
   }
 
   SECTION("Can generate functions for a boolean property in an object") {

Extensions/3D/A_RuntimeObject3D.ts

@@ -5,6 +5,8 @@ namespace gdjs {
   type Object3DNetworkSyncDataType = {
     // z is position on the Z axis, different from zo, which is Z order
     z: number;
+    w: number;
+    h: number;
     d: number;
     rx: number;
     ry: number;
@@ -97,14 +99,6 @@ namespace gdjs {
       oldObjectData: Object3DData,
       newObjectData: Object3DData
     ): boolean {
-      this.updateOriginalDimensionsFromObjectData(oldObjectData, newObjectData);
-      return true;
-    }
-
-    updateOriginalDimensionsFromObjectData(
-      oldObjectData: Object3DData,
-      newObjectData: Object3DData
-    ): void {
       // There is no need to check if they changed because events can't modify them.
       this._setOriginalWidth(
         getValidDimensionValue(newObjectData.content.width)
@@ -115,14 +109,15 @@ namespace gdjs {
       this._setOriginalDepth(
         getValidDimensionValue(newObjectData.content.depth)
       );
+      return true;
     }
 
-    getNetworkSyncData(
-      syncOptions: GetNetworkSyncDataOptions
-    ): Object3DNetworkSyncData {
+    getNetworkSyncData(): Object3DNetworkSyncData {
       return {
-        ...super.getNetworkSyncData(syncOptions),
+        ...super.getNetworkSyncData(),
         z: this.getZ(),
+        w: this.getWidth(),
+        h: this.getHeight(),
         d: this.getDepth(),
         rx: this.getRotationX(),
         ry: this.getRotationY(),
@@ -132,12 +127,11 @@ namespace gdjs {
       };
     }
 
-    updateFromNetworkSyncData(
-      networkSyncData: Object3DNetworkSyncData,
-      options: UpdateFromNetworkSyncDataOptions
-    ) {
-      super.updateFromNetworkSyncData(networkSyncData, options);
+    updateFromNetworkSyncData(networkSyncData: Object3DNetworkSyncData) {
+      super.updateFromNetworkSyncData(networkSyncData);
       if (networkSyncData.z !== undefined) this.setZ(networkSyncData.z);
+      if (networkSyncData.w !== undefined) this.setWidth(networkSyncData.w);
+      if (networkSyncData.h !== undefined) this.setHeight(networkSyncData.h);
       if (networkSyncData.d !== undefined) this.setDepth(networkSyncData.d);
       if (networkSyncData.rx !== undefined)
         this.setRotationX(networkSyncData.rx);

Extensions/3D/Cube3DRuntimeObject.ts

@@ -25,8 +25,6 @@ namespace gdjs {
       topFaceVisible: boolean;
       bottomFaceVisible: boolean;
       tint: string | undefined;
-      isCastingShadow: boolean;
-      isReceivingShadow: boolean;
       materialType: 'Basic' | 'StandardWithoutMetalness';
     };
   }
@@ -73,10 +71,8 @@ namespace gdjs {
       string,
     ];
     _materialType: gdjs.Cube3DRuntimeObject.MaterialType =
-      gdjs.Cube3DRuntimeObject.MaterialType.StandardWithoutMetalness;
+      gdjs.Cube3DRuntimeObject.MaterialType.Basic;
     _tint: string;
-    _isCastingShadow: boolean = true;
-    _isReceivingShadow: boolean = true;
 
     constructor(
       instanceContainer: gdjs.RuntimeInstanceContainer,
@@ -125,8 +121,6 @@ namespace gdjs {
       ];
 
       this._tint = objectData.content.tint || '255;255;255';
-      this._isCastingShadow = objectData.content.isCastingShadow || false;
-      this._isReceivingShadow = objectData.content.isReceivingShadow || false;
 
       this._materialType = this._convertMaterialType(
         objectData.content.materialType
@@ -436,27 +430,13 @@ namespace gdjs {
       ) {
         this.setMaterialType(newObjectData.content.materialType);
       }
-      if (
-        oldObjectData.content.isCastingShadow !==
-        newObjectData.content.isCastingShadow
-      ) {
-        this.updateShadowCasting(newObjectData.content.isCastingShadow);
-      }
-      if (
-        oldObjectData.content.isReceivingShadow !==
-        newObjectData.content.isReceivingShadow
-      ) {
-        this.updateShadowReceiving(newObjectData.content.isReceivingShadow);
-      }
 
       return true;
     }
 
-    getNetworkSyncData(
-      syncOptions: GetNetworkSyncDataOptions
-    ): Cube3DObjectNetworkSyncData {
+    getNetworkSyncData(): Cube3DObjectNetworkSyncData {
       return {
-        ...super.getNetworkSyncData(syncOptions),
+        ...super.getNetworkSyncData(),
         mt: this._materialType,
         fo: this._facesOrientation,
         bfu: this._backFaceUpThroughWhichAxisRotation,
@@ -468,10 +448,9 @@ namespace gdjs {
     }
 
     updateFromNetworkSyncData(
-      networkSyncData: Cube3DObjectNetworkSyncData,
-      options: UpdateFromNetworkSyncDataOptions
+      networkSyncData: Cube3DObjectNetworkSyncData
     ): void {
-      super.updateFromNetworkSyncData(networkSyncData, options);
+      super.updateFromNetworkSyncData(networkSyncData);
 
       if (networkSyncData.mt !== undefined) {
         this._materialType = networkSyncData.mt;
@@ -552,14 +531,6 @@ namespace gdjs {
       this._materialType = newMaterialType;
       this._renderer._updateMaterials();
     }
-    updateShadowCasting(value: boolean) {
-      this._isCastingShadow = value;
-      this._renderer.updateShadowCasting();
-    }
-    updateShadowReceiving(value: boolean) {
-      this._isReceivingShadow = value;
-      this._renderer.updateShadowReceiving();
-    }
   }
 
   export namespace Cube3DRuntimeObject {

Extensions/3D/Cube3DRuntimeObjectPixiRenderer.ts

@@ -81,14 +81,13 @@ namespace gdjs {
         .map((_, index) =>
           getFaceMaterial(runtimeObject, materialIndexToFaceIndex[index])
         );
+
       const boxMesh = new THREE.Mesh(geometry, materials);
 
       super(runtimeObject, instanceContainer, boxMesh);
       this._boxMesh = boxMesh;
       this._cube3DRuntimeObject = runtimeObject;
 
-      boxMesh.receiveShadow = this._cube3DRuntimeObject._isReceivingShadow;
-      boxMesh.castShadow = this._cube3DRuntimeObject._isCastingShadow;
       this.updateSize();
       this.updatePosition();
       this.updateRotation();
@@ -115,13 +114,6 @@ namespace gdjs {
         new THREE.BufferAttribute(new Float32Array(tints), 3)
       );
     }
-    updateShadowCasting() {
-      this._boxMesh.castShadow = this._cube3DRuntimeObject._isCastingShadow;
-    }
-    updateShadowReceiving() {
-      this._boxMesh.receiveShadow =
-        this._cube3DRuntimeObject._isReceivingShadow;
-    }
 
     updateFace(faceIndex: integer) {
       const materialIndex = faceIndexToMaterialIndex[faceIndex];

Extensions/3D/CustomRuntimeObject3D.ts

@@ -1,16 +1,4 @@
 namespace gdjs {
-  type CustomObject3DNetworkSyncDataType = {
-    z: float;
-    d: float;
-    rx: float;
-    ry: float;
-    ifz: boolean;
-    ccz: float;
-  };
-
-  type CustomObject3DNetworkSyncData = CustomObjectNetworkSyncData &
-    CustomObject3DNetworkSyncDataType;
-
   /**
    * Base class for 3D custom objects.
    */
@@ -46,6 +34,7 @@ namespace gdjs {
       objectData: gdjs.Object3DData & gdjs.CustomObjectConfiguration
     ) {
       super(parent, objectData);
+      this._renderer.reinitialize(this, parent);
     }
 
     protected override _createRender() {
@@ -89,36 +78,6 @@ namespace gdjs {
       }
     }
 
-    getNetworkSyncData(
-      syncOptions: GetNetworkSyncDataOptions
-    ): CustomObject3DNetworkSyncData {
-      return {
-        ...super.getNetworkSyncData(syncOptions),
-        z: this.getZ(),
-        d: this.getDepth(),
-        rx: this.getRotationX(),
-        ry: this.getRotationY(),
-        ifz: this.isFlippedZ(),
-        ccz: this._customCenterZ,
-      };
-    }
-
-    updateFromNetworkSyncData(
-      networkSyncData: CustomObject3DNetworkSyncData,
-      options: UpdateFromNetworkSyncDataOptions
-    ): void {
-      super.updateFromNetworkSyncData(networkSyncData, options);
-      if (networkSyncData.z !== undefined) this.setZ(networkSyncData.z);
-      if (networkSyncData.d !== undefined) this.setDepth(networkSyncData.d);
-      if (networkSyncData.rx !== undefined)
-        this.setRotationX(networkSyncData.rx);
-      if (networkSyncData.ry !== undefined)
-        this.setRotationY(networkSyncData.ry);
-      if (networkSyncData.ifz !== undefined) this.flipZ(networkSyncData.ifz);
-      if (networkSyncData.ccz !== undefined)
-        this._customCenterZ = networkSyncData.ccz;
-    }
-
     /**
      * Set the object position on the Z axis.
      */

Extensions/3D/CustomRuntimeObject3DRenderer.ts

@@ -44,7 +44,10 @@ namespace gdjs {
     ) {
       this._object = object;
       this._isContainerDirty = true;
-      this._threeGroup.clear();
+      const layer = parent.getLayer('');
+      if (layer) {
+        layer.getRenderer().add3DRendererObject(this._threeGroup);
+      }
     }
 
     _updateThreeGroup() {

Extensions/3D/DirectionalLight.ts

@@ -6,7 +6,6 @@ namespace gdjs {
     r: number;
     t: string;
   }
-  const shadowHelper = false;
   gdjs.PixiFiltersTools.registerFilterCreator(
     'Scene3D::DirectionalLight',
     new (class implements gdjs.PixiFiltersTools.FilterCreator {
@@ -18,63 +17,19 @@ namespace gdjs {
           return new gdjs.PixiFiltersTools.EmptyFilter();
         }
         return new (class implements gdjs.PixiFiltersTools.Filter {
-          private _top: string = 'Z+';
-          private _elevation: float = 45;
-          private _rotation: float = 0;
-          private _shadowMapSize: float = 1024;
-          private _minimumShadowBias: float = 0;
-          private _distanceFromCamera: float = 1500;
-          private _frustumSize: float = 4000;
-
-          private _isEnabled: boolean = false;
-          private _light: THREE.DirectionalLight;
-          private _shadowMapDirty = true;
-          private _shadowCameraDirty = true;
-          private _shadowCameraHelper: THREE.CameraHelper | null;
+          light: THREE.DirectionalLight;
+          rotationObject: THREE.Group;
+          _isEnabled: boolean = false;
+          top: string = 'Y-';
+          elevation: float = 45;
+          rotation: float = 0;
 
           constructor() {
-            this._light = new THREE.DirectionalLight();
-
-            if (shadowHelper) {
-              this._shadowCameraHelper = new THREE.CameraHelper(
-                this._light.shadow.camera
-              );
-            } else {
-              this._shadowCameraHelper = null;
-            }
-
-            this._light.shadow.camera.updateProjectionMatrix();
-          }
-
-          private _updateShadowCamera(): void {
-            if (!this._shadowCameraDirty) {
-              return;
-            }
-            this._shadowCameraDirty = false;
-
-            this._light.shadow.camera.near = 1;
-            this._light.shadow.camera.far = this._distanceFromCamera + 10000;
-            this._light.shadow.camera.right = this._frustumSize / 2;
-            this._light.shadow.camera.left = -this._frustumSize / 2;
-            this._light.shadow.camera.top = this._frustumSize / 2;
-            this._light.shadow.camera.bottom = -this._frustumSize / 2;
-          }
-
-          private _updateShadowMapSize(): void {
-            if (!this._shadowMapDirty) {
-              return;
-            }
-            this._shadowMapDirty = false;
-
-            this._light.shadow.mapSize.set(
-              this._shadowMapSize,
-              this._shadowMapSize
-            );
-
-            // Force the recreation of the shadow map texture:
-            this._light.shadow.map?.dispose();
-            this._light.shadow.map = null;
-            this._light.shadow.needsUpdate = true;
+            this.light = new THREE.DirectionalLight();
+            this.light.position.set(1, 0, 0);
+            this.rotationObject = new THREE.Group();
+            this.rotationObject.add(this.light);
+            this.updateRotation();
           }
 
           isEnabled(target: EffectsTarget): boolean {
@@ -98,12 +53,7 @@ namespace gdjs {
             if (!scene) {
               return false;
             }
-            scene.add(this._light);
-            scene.add(this._light.target);
-            if (this._shadowCameraHelper) {
-              scene.add(this._shadowCameraHelper);
-            }
-
+            scene.add(this.rotationObject);
             this._isEnabled = true;
             return true;
           }
@@ -115,164 +65,82 @@ namespace gdjs {
             if (!scene) {
               return false;
             }
-            scene.remove(this._light);
-            scene.remove(this._light.target);
-            if (this._shadowCameraHelper) {
-              scene.remove(this._shadowCameraHelper);
-            }
+            scene.remove(this.rotationObject);
             this._isEnabled = false;
             return true;
           }
-          updatePreRender(target: gdjs.EffectsTarget): any {
-            // Apply any update to the camera or shadow map size.
-            this._updateShadowCamera();
-            this._updateShadowMapSize();
-
-            // Avoid shadow acne due to depth buffer precision.
-            const biasMultiplier =
-              this._shadowMapSize < 1024
-                ? 2
-                : this._shadowMapSize < 2048
-                  ? 1.25
-                  : 1;
-            this._light.shadow.bias = -this._minimumShadowBias * biasMultiplier;
-
-            // Apply update to the light position and its target.
-            // By doing this, the shadows are "following" the GDevelop camera.
-            if (!target.getRuntimeLayer) {
-              return;
-            }
-            const layer = target.getRuntimeLayer();
-            const x = layer.getCameraX();
-            const y = layer.getCameraY();
-            const z = layer.getCameraZ(layer.getInitialCamera3DFieldOfView());
-
-            const roundedX = Math.floor(x / 100) * 100;
-            const roundedY = Math.floor(y / 100) * 100;
-            const roundedZ = Math.floor(z / 100) * 100;
-            if (this._top === 'Y-') {
-              const posLightX =
-                roundedX +
-                this._distanceFromCamera *
-                  Math.cos(gdjs.toRad(-this._rotation + 90)) *
-                  Math.cos(gdjs.toRad(this._elevation));
-              const posLightY =
-                roundedY -
-                this._distanceFromCamera *
-                  Math.sin(gdjs.toRad(this._elevation));
-              const posLightZ =
-                roundedZ +
-                this._distanceFromCamera *
-                  Math.sin(gdjs.toRad(-this._rotation + 90)) *
-                  Math.cos(gdjs.toRad(this._elevation));
-              this._light.position.set(posLightX, posLightY, posLightZ);
-              this._light.target.position.set(roundedX, roundedY, roundedZ);
-            } else {
-              const posLightX =
-                roundedX +
-                this._distanceFromCamera *
-                  Math.cos(gdjs.toRad(this._rotation)) *
-                  Math.cos(gdjs.toRad(this._elevation));
-              const posLightY =
-                roundedY +
-                this._distanceFromCamera *
-                  Math.sin(gdjs.toRad(this._rotation)) *
-                  Math.cos(gdjs.toRad(this._elevation));
-              const posLightZ =
-                roundedZ +
-                this._distanceFromCamera *
-                  Math.sin(gdjs.toRad(this._elevation));
-
-              this._light.position.set(posLightX, posLightY, posLightZ);
-              this._light.target.position.set(roundedX, roundedY, roundedZ);
-            }
-          }
+          updatePreRender(target: gdjs.EffectsTarget): any {}
           updateDoubleParameter(parameterName: string, value: number): void {
             if (parameterName === 'intensity') {
-              this._light.intensity = value;
+              this.light.intensity = value;
             } else if (parameterName === 'elevation') {
-              this._elevation = value;
+              this.elevation = value;
+              this.updateRotation();
             } else if (parameterName === 'rotation') {
-              this._rotation = value;
-            } else if (parameterName === 'distanceFromCamera') {
-              this._distanceFromCamera = value;
-            } else if (parameterName === 'frustumSize') {
-              this._frustumSize = value;
-            } else if (parameterName === 'minimumShadowBias') {
-              this._minimumShadowBias = value;
+              this.rotation = value;
+              this.updateRotation();
             }
           }
           getDoubleParameter(parameterName: string): number {
             if (parameterName === 'intensity') {
-              return this._light.intensity;
+              return this.light.intensity;
             } else if (parameterName === 'elevation') {
-              return this._elevation;
+              return this.elevation;
             } else if (parameterName === 'rotation') {
-              return this._rotation;
-            } else if (parameterName === 'distanceFromCamera') {
-              return this._distanceFromCamera;
-            } else if (parameterName === 'frustumSize') {
-              return this._frustumSize;
-            } else if (parameterName === 'minimumShadowBias') {
-              return this._minimumShadowBias;
+              return this.rotation;
             }
             return 0;
           }
           updateStringParameter(parameterName: string, value: string): void {
             if (parameterName === 'color') {
-              this._light.color = new THREE.Color(
+              this.light.color = new THREE.Color(
                 gdjs.rgbOrHexStringToNumber(value)
               );
             }
             if (parameterName === 'top') {
-              this._top = value;
-            }
-            if (parameterName === 'shadowQuality') {
-              if (value === 'low' && this._shadowMapSize !== 512) {
-                this._shadowMapSize = 512;
-                this._shadowMapDirty = true;
-              }
-              if (value === 'medium' && this._shadowMapSize !== 1024) {
-                this._shadowMapSize = 1024;
-                this._shadowMapDirty = true;
-              }
-              if (value === 'high' && this._shadowMapSize !== 2048) {
-                this._shadowMapSize = 2048;
-                this._shadowMapDirty = true;
-              }
+              this.top = value;
+              this.updateRotation();
             }
           }
           updateColorParameter(parameterName: string, value: number): void {
             if (parameterName === 'color') {
-              this._light.color.setHex(value);
+              this.light.color.setHex(value);
             }
           }
           getColorParameter(parameterName: string): number {
             if (parameterName === 'color') {
-              return this._light.color.getHex();
+              return this.light.color.getHex();
             }
             return 0;
           }
-          updateBooleanParameter(parameterName: string, value: boolean): void {
-            if (parameterName === 'isCastingShadow') {
-              this._light.castShadow = value;
+          updateBooleanParameter(parameterName: string, value: boolean): void {}
+          updateRotation() {
+            if (this.top === 'Z+') {
+              // 0° is a light from the right of the screen.
+              this.rotationObject.rotation.z = gdjs.toRad(this.rotation);
+              this.rotationObject.rotation.y = -gdjs.toRad(this.elevation);
+            } else {
+              // 0° becomes a light from Z+.
+              this.rotationObject.rotation.y = gdjs.toRad(this.rotation - 90);
+              this.rotationObject.rotation.z = -gdjs.toRad(this.elevation);
             }
           }
           getNetworkSyncData(): DirectionalLightFilterNetworkSyncData {
             return {
-              i: this._light.intensity,
-              c: this._light.color.getHex(),
-              e: this._elevation,
-              r: this._rotation,
-              t: this._top,
+              i: this.light.intensity,
+              c: this.light.color.getHex(),
+              e: this.elevation,
+              r: this.rotation,
+              t: this.top,
             };
           }
           updateFromNetworkSyncData(syncData: any): void {
-            this._light.intensity = syncData.i;
-            this._light.color.setHex(syncData.c);
-            this._elevation = syncData.e;
-            this._rotation = syncData.r;
-            this._top = syncData.t;
+            this.light.intensity = syncData.i;
+            this.light.color.setHex(syncData.c);
+            this.elevation = syncData.e;
+            this.rotation = syncData.r;
+            this.top = syncData.t;
+            this.updateRotation();
           }
         })();
       }

Extensions/3D/HemisphereLight.ts

@@ -18,15 +18,18 @@ namespace gdjs {
           return new gdjs.PixiFiltersTools.EmptyFilter();
         }
         return new (class implements gdjs.PixiFiltersTools.Filter {
-          _top: string = 'Z+';
-          _elevation: float = 90;
-          _rotation: float = 0;
-
+          light: THREE.HemisphereLight;
+          rotationObject: THREE.Group;
           _isEnabled: boolean = false;
-          _light: THREE.HemisphereLight;
+          top: string = 'Y-';
+          elevation: float = 45;
+          rotation: float = 0;
 
           constructor() {
-            this._light = new THREE.HemisphereLight();
+            this.light = new THREE.HemisphereLight();
+            this.light.position.set(1, 0, 0);
+            this.rotationObject = new THREE.Group();
+            this.rotationObject.add(this.light);
             this.updateRotation();
           }
 
@@ -51,7 +54,7 @@ namespace gdjs {
             if (!scene) {
               return false;
             }
-            scene.add(this._light);
+            scene.add(this.rotationObject);
             this._isEnabled = true;
             return true;
           }
@@ -63,106 +66,96 @@ namespace gdjs {
             if (!scene) {
               return false;
             }
-            scene.remove(this._light);
+            scene.remove(this.rotationObject);
             this._isEnabled = false;
             return true;
           }
           updatePreRender(target: gdjs.EffectsTarget): any {}
           updateDoubleParameter(parameterName: string, value: number): void {
             if (parameterName === 'intensity') {
-              this._light.intensity = value;
+              this.light.intensity = value;
             } else if (parameterName === 'elevation') {
-              this._elevation = value;
+              this.elevation = value;
               this.updateRotation();
             } else if (parameterName === 'rotation') {
-              this._rotation = value;
+              this.rotation = value;
               this.updateRotation();
             }
           }
           getDoubleParameter(parameterName: string): number {
             if (parameterName === 'intensity') {
-              return this._light.intensity;
+              return this.light.intensity;
             } else if (parameterName === 'elevation') {
-              return this._elevation;
+              return this.elevation;
             } else if (parameterName === 'rotation') {
-              return this._rotation;
+              return this.rotation;
             }
             return 0;
           }
           updateStringParameter(parameterName: string, value: string): void {
             if (parameterName === 'skyColor') {
-              this._light.color = new THREE.Color(
+              this.light.color = new THREE.Color(
                 gdjs.rgbOrHexStringToNumber(value)
               );
             }
             if (parameterName === 'groundColor') {
-              this._light.groundColor = new THREE.Color(
+              this.light.groundColor = new THREE.Color(
                 gdjs.rgbOrHexStringToNumber(value)
               );
             }
             if (parameterName === 'top') {
-              this._top = value;
+              this.top = value;
               this.updateRotation();
             }
           }
           updateColorParameter(parameterName: string, value: number): void {
             if (parameterName === 'skyColor') {
-              this._light.color.setHex(value);
+              this.light.color.setHex(value);
             }
             if (parameterName === 'groundColor') {
-              this._light.groundColor.setHex(value);
+              this.light.groundColor.setHex(value);
             }
           }
           getColorParameter(parameterName: string): number {
             if (parameterName === 'skyColor') {
-              return this._light.color.getHex();
+              return this.light.color.getHex();
             }
             if (parameterName === 'groundColor') {
-              return this._light.groundColor.getHex();
+              return this.light.groundColor.getHex();
             }
             return 0;
           }
           updateBooleanParameter(parameterName: string, value: boolean): void {}
           updateRotation() {
-            if (this._top === 'Y-') {
-              // `rotation` at 0° becomes a light from Z+.
-              this._light.position.set(
-                Math.cos(gdjs.toRad(-this._rotation + 90)) *
-                  Math.cos(gdjs.toRad(this._elevation)),
-                -Math.sin(gdjs.toRad(this._elevation)),
-                Math.sin(gdjs.toRad(-this._rotation + 90)) *
-                  Math.cos(gdjs.toRad(this._elevation))
-              );
+            if (this.top === 'Z+') {
+              // 0° is a light from the right of the screen.
+              this.rotationObject.rotation.z = gdjs.toRad(this.rotation);
+              this.rotationObject.rotation.y = -gdjs.toRad(this.elevation);
             } else {
-              // `rotation` at 0° is a light from the right of the screen.
-              this._light.position.set(
-                Math.cos(gdjs.toRad(this._rotation)) *
-                  Math.cos(gdjs.toRad(this._elevation)),
-                Math.sin(gdjs.toRad(this._rotation)) *
-                  Math.cos(gdjs.toRad(this._elevation)),
-                Math.sin(gdjs.toRad(this._elevation))
-              );
+              // 0° becomes a light from Z+.
+              this.rotationObject.rotation.y = gdjs.toRad(this.rotation - 90);
+              this.rotationObject.rotation.z = -gdjs.toRad(this.elevation);
             }
           }
           getNetworkSyncData(): HemisphereLightFilterNetworkSyncData {
             return {
-              i: this._light.intensity,
-              sc: this._light.color.getHex(),
-              gc: this._light.groundColor.getHex(),
-              e: this._elevation,
-              r: this._rotation,
-              t: this._top,
+              i: this.light.intensity,
+              sc: this.light.color.getHex(),
+              gc: this.light.groundColor.getHex(),
+              e: this.elevation,
+              r: this.rotation,
+              t: this.top,
             };
           }
           updateFromNetworkSyncData(
             syncData: HemisphereLightFilterNetworkSyncData
           ): void {
-            this._light.intensity = syncData.i;
-            this._light.color.setHex(syncData.sc);
-            this._light.groundColor.setHex(syncData.gc);
-            this._elevation = syncData.e;
-            this._rotation = syncData.r;
-            this._top = syncData.t;
+            this.light.intensity = syncData.i;
+            this.light.color.setHex(syncData.sc);
+            this.light.groundColor.setHex(syncData.gc);
+            this.elevation = syncData.e;
+            this.rotation = syncData.r;
+            this.top = syncData.t;
             this.updateRotation();
           }
         })();

Extensions/3D/JsExtension.js

@@ -162,12 +162,7 @@ module.exports = {
         )
         .addParameter('object', _('3D object'), '', false)
         .addParameter('behavior', _('Behavior'), 'Base3DBehavior')
-        .useStandardParameters(
-          'number',
-          gd.ParameterOptions.makeNewOptions().setDescription(
-            _('Angle (in degrees)')
-          )
-        )
+        .useStandardParameters('number', gd.ParameterOptions.makeNewOptions())
         .setFunctionName('setRotationX')
         .setGetter('getRotationX');
 
@@ -183,12 +178,7 @@ module.exports = {
         )
         .addParameter('object', _('3D object'), '', false)
         .addParameter('behavior', _('Behavior'), 'Base3DBehavior')
-        .useStandardParameters(
-          'number',
-          gd.ParameterOptions.makeNewOptions().setDescription(
-            _('Angle (in degrees)')
-          )
-        )
+        .useStandardParameters('number', gd.ParameterOptions.makeNewOptions())
         .setFunctionName('setRotationY')
         .setGetter('getRotationY');
 
@@ -206,7 +196,7 @@ module.exports = {
         )
         .addParameter('object', _('3D object'), '', false)
         .addParameter('behavior', _('Behavior'), 'Base3DBehavior')
-        .addParameter('number', _('Angle to add (in degrees)'), '', false)
+        .addParameter('number', _('Rotation angle'), '', false)
         .markAsAdvanced()
         .setFunctionName('turnAroundX');
 
@@ -224,7 +214,7 @@ module.exports = {
         )
         .addParameter('object', _('3D object'), '', false)
         .addParameter('behavior', _('Behavior'), 'Base3DBehavior')
-        .addParameter('number', _('Angle to add (in degrees)'), '', false)
+        .addParameter('number', _('Rotation angle'), '', false)
         .markAsAdvanced()
         .setFunctionName('turnAroundY');
 
@@ -242,7 +232,7 @@ module.exports = {
         )
         .addParameter('object', _('3D object'), '', false)
         .addParameter('behavior', _('Behavior'), 'Base3DBehavior')
-        .addParameter('number', _('Angle to add (in degrees)'), '', false)
+        .addParameter('number', _('Rotation angle'), '', false)
         .markAsAdvanced()
         .setFunctionName('turnAroundZ');
     }
@@ -252,7 +242,7 @@ module.exports = {
         .addObject(
           'Model3DObject',
           _('3D Model'),
-          _('An animated 3D model, useful for most elements of a 3D game.'),
+          _('An animated 3D model.'),
           'JsPlatform/Extensions/3d_model.svg',
           new gd.Model3DObjectConfiguration()
         )
@@ -604,12 +594,7 @@ module.exports = {
           'res/conditions/3d_box.svg'
         )
         .addParameter('object', _('3D model'), 'Model3DObject', false)
-        .useStandardParameters(
-          'number',
-          gd.ParameterOptions.makeNewOptions().setDescription(
-            _('Angle (in degrees)')
-          )
-        )
+        .useStandardParameters('number', gd.ParameterOptions.makeNewOptions())
         .setHidden()
         .setFunctionName('setRotationX')
         .setGetter('getRotationX');
@@ -626,12 +611,7 @@ module.exports = {
           'res/conditions/3d_box.svg'
         )
         .addParameter('object', _('3D model'), 'Model3DObject', false)
-        .useStandardParameters(
-          'number',
-          gd.ParameterOptions.makeNewOptions().setDescription(
-            _('Angle (in degrees)')
-          )
-        )
+        .useStandardParameters('number', gd.ParameterOptions.makeNewOptions())
         .setHidden()
         .setFunctionName('setRotationY')
         .setGetter('getRotationY');
@@ -650,7 +630,7 @@ module.exports = {
           'res/conditions/3d_box.svg'
         )
         .addParameter('object', _('3D model'), 'Model3DObject', false)
-        .addParameter('number', _('Angle to add (in degrees)'), '', false)
+        .addParameter('number', _('Rotation angle'), '', false)
         .markAsAdvanced()
         .setHidden()
         .setFunctionName('turnAroundX');
@@ -669,7 +649,7 @@ module.exports = {
           'res/conditions/3d_box.svg'
         )
         .addParameter('object', _('3D model'), 'Model3DObject', false)
-        .addParameter('number', _('Angle to add (in degrees)'), '', false)
+        .addParameter('number', _('Rotation angle'), '', false)
         .markAsAdvanced()
         .setHidden()
         .setFunctionName('turnAroundY');
@@ -688,7 +668,7 @@ module.exports = {
           'res/conditions/3d_box.svg'
         )
         .addParameter('object', _('3D model'), 'Model3DObject', false)
-        .addParameter('number', _('Angle to add (in degrees)'), '', false)
+        .addParameter('number', _('Rotation angle'), '', false)
         .markAsAdvanced()
         .setHidden()
         .setFunctionName('turnAroundZ');
@@ -879,9 +859,7 @@ module.exports = {
         propertyName === 'rightFaceResourceRepeat' ||
         propertyName === 'topFaceResourceRepeat' ||
         propertyName === 'bottomFaceResourceRepeat' ||
-        propertyName === 'enableTextureTransparency' ||
-        propertyName === 'isCastingShadow' ||
-        propertyName === 'isReceivingShadow'
+        propertyName === 'enableTextureTransparency'
       ) {
         objectContent[propertyName] = newValue === '1';
         return true;
@@ -909,8 +887,8 @@ module.exports = {
         .getOrCreate('facesOrientation')
         .setValue(objectContent.facesOrientation || 'Y')
         .setType('choice')
-        .addChoice('Y', 'Y')
-        .addChoice('Z', 'Z')
+        .addExtraInfo('Y')
+        .addExtraInfo('Z')
         .setLabel(_('Faces orientation'))
         .setDescription(
           _(
@@ -970,8 +948,8 @@ module.exports = {
         .getOrCreate('backFaceUpThroughWhichAxisRotation')
         .setValue(objectContent.backFaceUpThroughWhichAxisRotation || 'X')
         .setType('choice')
-        .addChoice('X', 'X')
-        .addChoice('Y', 'Y')
+        .addExtraInfo('X')
+        .addExtraInfo('Y')
         .setLabel(_('Back face orientation'))
         .setDescription(
           _(
@@ -1105,29 +1083,11 @@ module.exports = {
 
       objectProperties
         .getOrCreate('materialType')
-        .setValue(objectContent.materialType || 'StandardWithoutMetalness')
+        .setValue(objectContent.materialType || 'Basic')
         .setType('choice')
-        .addChoice('Basic', _('Basic (no lighting, no shadows)'))
-        .addChoice(
-          'StandardWithoutMetalness',
-          _('Standard (without metalness)')
-        )
-        .setLabel(_('Material type'))
-        .setGroup(_('Lighting'));
-
-      objectProperties
-        .getOrCreate('isCastingShadow')
-        .setValue(objectContent.isCastingShadow ? 'true' : 'false')
-        .setType('boolean')
-        .setLabel(_('Shadow casting'))
-        .setGroup(_('Lighting'));
-
-      objectProperties
-        .getOrCreate('isReceivingShadow')
-        .setValue(objectContent.isReceivingShadow ? 'true' : 'false')
-        .setType('boolean')
-        .setLabel(_('Shadow receiving'))
-        .setGroup(_('Lighting'));
+        .addExtraInfo('Basic')
+        .addExtraInfo('StandardWithoutMetalness')
+        .setLabel(_('Material type'));
 
       return objectProperties;
     };
@@ -1145,7 +1105,7 @@ module.exports = {
       topFaceResourceName: '',
       bottomFaceResourceName: '',
       frontFaceVisible: true,
-      backFaceVisible: true,
+      backFaceVisible: false,
       leftFaceVisible: true,
       rightFaceVisible: true,
       topFaceVisible: true,
@@ -1156,10 +1116,8 @@ module.exports = {
       rightFaceResourceRepeat: false,
       topFaceResourceRepeat: false,
       bottomFaceResourceRepeat: false,
-      materialType: 'StandardWithoutMetalness',
+      materialType: 'Basic',
       tint: '255;255;255',
-      isCastingShadow: true,
-      isReceivingShadow: true,
     };
 
     Cube3DObject.updateInitialInstanceProperty = function (
@@ -1513,12 +1471,7 @@ module.exports = {
         'res/conditions/3d_box.svg'
       )
       .addParameter('object', _('3D cube'), 'Cube3DObject', false)
-      .useStandardParameters(
-        'number',
-        gd.ParameterOptions.makeNewOptions().setDescription(
-          _('Angle (in degrees)')
-        )
-      )
+      .useStandardParameters('number', gd.ParameterOptions.makeNewOptions())
       .setFunctionName('setRotationX')
       .setHidden()
       .setGetter('getRotationX');
@@ -1535,12 +1488,7 @@ module.exports = {
         'res/conditions/3d_box.svg'
       )
       .addParameter('object', _('3D cube'), 'Cube3DObject', false)
-      .useStandardParameters(
-        'number',
-        gd.ParameterOptions.makeNewOptions().setDescription(
-          _('Angle (in degrees)')
-        )
-      )
+      .useStandardParameters('number', gd.ParameterOptions.makeNewOptions())
       .setFunctionName('setRotationY')
       .setHidden()
       .setGetter('getRotationY');
@@ -1901,11 +1849,6 @@ module.exports = {
         .getOrCreate('density')
         .setValue('0.0012')
         .setLabel(_('Density'))
-        .setDescription(
-          _(
-            'Density of the fog. Usual values are between 0.0005 (far away) and 0.005 (very thick fog).'
-          )
-        )
         .setType('number');
     }
     {
@@ -1913,9 +1856,7 @@ module.exports = {
         .addEffect('AmbientLight')
         .setFullName(_('Ambient light'))
         .setDescription(
-          _(
-            'A light that illuminates all objects from every direction. Often used along with a Directional light (though a Hemisphere light can be used instead of an Ambient light).'
-          )
+          _('A light that illuminates all objects from every direction.')
         )
         .markAsNotWorkingForObjects()
         .markAsOnlyWorkingFor3D()
@@ -1936,11 +1877,7 @@ module.exports = {
       const effect = extension
         .addEffect('DirectionalLight')
         .setFullName(_('Directional light'))
-        .setDescription(
-          _(
-            "A very far light source like the sun. This is the light to use for casting shadows for 3D objects (other lights won't emit shadows). Often used along with a Hemisphere light."
-          )
-        )
+        .setDescription(_('A very far light source like the sun.'))
         .markAsNotWorkingForObjects()
         .markAsOnlyWorkingFor3D()
         .addIncludeFile('Extensions/3D/DirectionalLight.js');
@@ -1957,11 +1894,11 @@ module.exports = {
         .setType('number');
       properties
         .getOrCreate('top')
-        .setValue('Z+')
+        .setValue('Y-')
         .setLabel(_('3D world top'))
         .setType('choice')
-        .addExtraInfo('Z+')
         .addExtraInfo('Y-')
+        .addExtraInfo('Z+')
         .setGroup(_('Orientation'));
       properties
         .getOrCreate('elevation')
@@ -1976,47 +1913,6 @@ module.exports = {
         .setLabel(_('Rotation (in degrees)'))
         .setType('number')
         .setGroup(_('Orientation'));
-      properties
-        .getOrCreate('isCastingShadow')
-        .setValue('false')
-        .setLabel(_('Shadow casting'))
-        .setType('boolean')
-        .setGroup(_('Shadows'));
-      properties
-        .getOrCreate('shadowQuality')
-        .setValue('medium')
-        .addChoice('low', _('Low quality'))
-        .addChoice('medium', _('Medium quality'))
-        .addChoice('high', _('High quality'))
-        .setLabel(_('Shadow quality'))
-        .setType('choice')
-        .setGroup(_('Shadows'));
-      properties
-        .getOrCreate('minimumShadowBias')
-        .setValue('0')
-        .setLabel(_('Shadow bias'))
-        .setDescription(
-          _(
-            'Use this to avoid "shadow acne" due to depth buffer precision. Choose a value small enough like 0.001 to avoid creating distance between shadows and objects but not too small to avoid shadow glitches on low/medium quality. This value is used for high quality, and multiplied by 1.25 for medium quality and 2 for low quality.'
-          )
-        )
-        .setType('number')
-        .setGroup(_('Shadows'))
-        .setAdvanced(true);
-      properties
-        .getOrCreate('frustumSize')
-        .setValue('4000')
-        .setLabel(_('Shadow frustum size'))
-        .setType('number')
-        .setGroup(_('Shadows'))
-        .setAdvanced(true);
-      properties
-        .getOrCreate('distanceFromCamera')
-        .setValue('1500')
-        .setLabel(_("Distance from layer's camera"))
-        .setType('number')
-        .setGroup(_('Shadows'))
-        .setAdvanced(true);
     }
     {
       const effect = extension
@@ -2024,7 +1920,7 @@ module.exports = {
         .setFullName(_('Hemisphere light'))
         .setDescription(
           _(
-            'A light that illuminates objects from every direction with a gradient. Often used along with a Directional light.'
+            'A light that illuminates objects from every direction with a gradient.'
           )
         )
         .markAsNotWorkingForObjects()
@@ -2048,11 +1944,11 @@ module.exports = {
         .setType('number');
       properties
         .getOrCreate('top')
-        .setValue('Z+')
+        .setValue('Y-')
         .setLabel(_('3D world top'))
         .setType('choice')
-        .addExtraInfo('Z+')
         .addExtraInfo('Y-')
+        .addExtraInfo('Z+')
         .setGroup(_('Orientation'));
       properties
         .getOrCreate('elevation')
@@ -2068,48 +1964,6 @@ module.exports = {
         .setType('number')
         .setGroup(_('Orientation'));
     }
-    {
-      const effect = extension
-        .addEffect('Skybox')
-        .setFullName(_('Skybox'))
-        .setDescription(
-          _('Display a background on a cube surrounding the scene.')
-        )
-        .markAsNotWorkingForObjects()
-        .markAsOnlyWorkingFor3D()
-        .addIncludeFile('Extensions/3D/Skybox.js');
-      const properties = effect.getProperties();
-      properties
-        .getOrCreate('rightFaceResourceName')
-        .setType('resource')
-        .addExtraInfo('image')
-        .setLabel(_('Right face (X+)'));
-      properties
-        .getOrCreate('leftFaceResourceName')
-        .setType('resource')
-        .addExtraInfo('image')
-        .setLabel(_('Left face (X-)'));
-      properties
-        .getOrCreate('bottomFaceResourceName')
-        .setType('resource')
-        .addExtraInfo('image')
-        .setLabel(_('Bottom face (Y+)'));
-      properties
-        .getOrCreate('topFaceResourceName')
-        .setType('resource')
-        .addExtraInfo('image')
-        .setLabel(_('Top face (Y-)'));
-      properties
-        .getOrCreate('frontFaceResourceName')
-        .setType('resource')
-        .addExtraInfo('image')
-        .setLabel(_('Front face (Z+)'));
-      properties
-        .getOrCreate('backFaceResourceName')
-        .setType('resource')
-        .addExtraInfo('image')
-        .setLabel(_('Back face (Z-)'));
-    }
     {
       const effect = extension
         .addEffect('HueAndSaturation')
@@ -3356,8 +3210,6 @@ module.exports = {
 
         this._threeObject = new THREE.Group();
         this._threeObject.rotation.order = 'ZYX';
-        this._threeObject.castShadow = true;
-        this._threeObject.receiveShadow = true;
         this._threeGroup.add(this._threeObject);
       }
 

Extensions/3D/Model3DObjectConfiguration.cpp

@@ -23,7 +23,7 @@ Model3DObjectConfiguration::Model3DObjectConfiguration()
     : width(100), height(100), depth(100), rotationX(0), rotationY(0),
       rotationZ(0), modelResourceName(""), materialType("StandardWithoutMetalness"),
       originLocation("ModelOrigin"), centerLocation("ModelOrigin"),
-      keepAspectRatio(true), crossfadeDuration(0.1f), isCastingShadow(true), isReceivingShadow(true) {}
+      keepAspectRatio(true), crossfadeDuration(0.1f) {}
 
 bool Model3DObjectConfiguration::UpdateProperty(const gd::String &propertyName,
                                                 const gd::String &newValue) {
@@ -75,16 +75,6 @@ bool Model3DObjectConfiguration::UpdateProperty(const gd::String &propertyName,
     crossfadeDuration = newValue.To<double>();
     return true;
   }
-  if(propertyName == "isCastingShadow")
-  {
-    isCastingShadow = newValue == "1";
-    return true;
-  }
-  if(propertyName == "isReceivingShadow")
-  {
-    isReceivingShadow = newValue == "1";
-    return true;
-  }
 
   return false;
 }
@@ -153,20 +143,19 @@ Model3DObjectConfiguration::GetProperties() const {
   objectProperties["materialType"]
       .SetValue(materialType.empty() ? "Basic" : materialType)
       .SetType("choice")
-      .AddChoice("Basic", _("Basic (no lighting, no shadows)"))
-      .AddChoice("StandardWithoutMetalness", _("Standard (without metalness)"))
-      .AddChoice("KeepOriginal", _("Keep original"))
-      .SetLabel(_("Material"))
-      .SetGroup(_("Lighting"));
+      .AddExtraInfo("Basic")
+      .AddExtraInfo("StandardWithoutMetalness")
+      .AddExtraInfo("KeepOriginal")
+      .SetLabel(_("Material"));
 
   objectProperties["originLocation"]
       .SetValue(originLocation.empty() ? "TopLeft" : originLocation)
       .SetType("choice")
-      .AddChoice("ModelOrigin", _("Model origin"))
-      .AddChoice("TopLeft", _("Top left"))
-      .AddChoice("ObjectCenter", _("Object center"))
-      .AddChoice("BottomCenterZ", _("Bottom center (Z)"))
-      .AddChoice("BottomCenterY", _("Bottom center (Y)"))
+      .AddExtraInfo("ModelOrigin")
+      .AddExtraInfo("TopLeft")
+      .AddExtraInfo("ObjectCenter")
+      .AddExtraInfo("BottomCenterZ")
+      .AddExtraInfo("BottomCenterY")
       .SetLabel(_("Origin point"))
       .SetGroup(_("Points"))
       .SetAdvanced(true);
@@ -174,10 +163,10 @@ Model3DObjectConfiguration::GetProperties() const {
   objectProperties["centerLocation"]
       .SetValue(centerLocation.empty() ? "ObjectCenter" : centerLocation)
       .SetType("choice")
-      .AddChoice("ModelOrigin", _("Model origin"))
-      .AddChoice("ObjectCenter", _("Object center"))
-      .AddChoice("BottomCenterZ", _("Bottom center (Z)"))
-      .AddChoice("BottomCenterY", _("Bottom center (Y)"))
+      .AddExtraInfo("ModelOrigin")
+      .AddExtraInfo("ObjectCenter")
+      .AddExtraInfo("BottomCenterZ")
+      .AddExtraInfo("BottomCenterY")
       .SetLabel(_("Center point"))
       .SetGroup(_("Points"))
       .SetAdvanced(true);
@@ -189,20 +178,6 @@ Model3DObjectConfiguration::GetProperties() const {
       .SetGroup(_("Animations"))
       .SetMeasurementUnit(gd::MeasurementUnit::GetSecond());
 
-  objectProperties["isCastingShadow"]
-      .SetValue(isCastingShadow ? "true" : "false")
-      .SetType("boolean")
-      .SetLabel(_("Shadow casting"))
-      .SetGroup(_("Lighting"));
-
-  objectProperties["isReceivingShadow"]
-      .SetValue(isReceivingShadow ? "true" : "false")
-      .SetType("boolean")
-      .SetLabel(_("Shadow receiving"))
-      .SetGroup(_("Lighting"));
-
-
-
   return objectProperties;
 }
 
@@ -235,8 +210,6 @@ void Model3DObjectConfiguration::DoUnserializeFrom(
   centerLocation = content.GetStringAttribute("centerLocation");
   keepAspectRatio = content.GetBoolAttribute("keepAspectRatio");
   crossfadeDuration = content.GetDoubleAttribute("crossfadeDuration");
-  isCastingShadow = content.GetBoolAttribute("isCastingShadow");
-  isReceivingShadow = content.GetBoolAttribute("isReceivingShadow");
 
   RemoveAllAnimations();
   auto &animationsElement = content.GetChild("animations");
@@ -266,8 +239,6 @@ void Model3DObjectConfiguration::DoSerializeTo(
   content.SetAttribute("centerLocation", centerLocation);
   content.SetAttribute("keepAspectRatio", keepAspectRatio);
   content.SetAttribute("crossfadeDuration", crossfadeDuration);
-  content.SetAttribute("isCastingShadow", isCastingShadow);
-  content.SetAttribute("isReceivingShadow", isReceivingShadow);
 
   auto &animationsElement = content.AddChild("animations");
   animationsElement.ConsiderAsArrayOf("animation");

Extensions/3D/Model3DObjectConfiguration.h

@@ -160,8 +160,6 @@ public:
   const gd::String& GetCenterLocation() const { return centerLocation; };
 
   bool shouldKeepAspectRatio() const { return keepAspectRatio; };
-  bool shouldCastShadow() const { return isCastingShadow; };
-  bool shouldReceiveShadow() const { return isReceivingShadow; };
   ///@}
 
 protected:
@@ -184,8 +182,6 @@ private:
   gd::String centerLocation;
 
   bool keepAspectRatio;
-  bool isCastingShadow;
-  bool isReceivingShadow;
 
   std::vector<Model3DAnimation> animations;
   static Model3DAnimation badAnimation; //< Bad animation when an out of bound

Extensions/3D/Model3DRuntimeObject.ts

@@ -8,7 +8,6 @@ namespace gdjs {
     anis: Model3DAnimation[];
     ai: integer;
     ass: float;
-    aet: float;
     ap: boolean;
     cfd: float;
   };
@@ -39,8 +38,6 @@ namespace gdjs {
         | 'BottomCenterY';
       animations: Model3DAnimation[];
       crossfadeDuration: float;
-      isCastingShadow: boolean;
-      isReceivingShadow: boolean;
     };
   }
 
@@ -104,8 +101,6 @@ namespace gdjs {
     _animationSpeedScale: float = 1;
     _animationPaused: boolean = false;
     _crossfadeDuration: float = 0;
-    _isCastingShadow: boolean = true;
-    _isReceivingShadow: boolean = true;
 
     constructor(
       instanceContainer: gdjs.RuntimeInstanceContainer,
@@ -128,8 +123,6 @@ namespace gdjs {
         objectData.content.materialType
       );
 
-      this.setIsCastingShadow(objectData.content.isCastingShadow);
-      this.setIsReceivingShadow(objectData.content.isReceivingShadow);
       this.onModelChanged(objectData);
 
       this._crossfadeDuration = objectData.content.crossfadeDuration || 0;
@@ -153,14 +146,6 @@ namespace gdjs {
       }
     }
 
-    override updateOriginalDimensionsFromObjectData(
-      oldObjectData: Object3DData,
-      newObjectData: Object3DData
-    ): void {
-      // Original dimensions must not be reset by `super.updateFromObjectData`.
-      // `_updateModel` has a different logic to evaluate them using `keepAspectRatio`.
-    }
-
     updateFromObjectData(
       oldObjectData: Model3DObjectData,
       newObjectData: Model3DObjectData
@@ -190,14 +175,8 @@ namespace gdjs {
         oldObjectData.content.keepAspectRatio !==
           newObjectData.content.keepAspectRatio ||
         oldObjectData.content.materialType !==
-          newObjectData.content.materialType ||
-        oldObjectData.content.centerLocation !==
-          newObjectData.content.centerLocation
+          newObjectData.content.materialType
       ) {
-        // The center is applied to the model by `_updateModel`.
-        this._centerPoint = getPointForLocation(
-          newObjectData.content.centerLocation
-        );
         this._updateModel(newObjectData);
       }
       if (
@@ -207,45 +186,36 @@ namespace gdjs {
         this._originPoint = getPointForLocation(
           newObjectData.content.originLocation
         );
-        this._renderer.updatePosition();
       }
       if (
-        oldObjectData.content.isCastingShadow !==
-        newObjectData.content.isCastingShadow
+        oldObjectData.content.centerLocation !==
+        newObjectData.content.centerLocation
       ) {
-        this.setIsCastingShadow(newObjectData.content.isCastingShadow);
-      }
-      if (
-        oldObjectData.content.isReceivingShadow !==
-        newObjectData.content.isReceivingShadow
-      ) {
-        this.setIsReceivingShadow(newObjectData.content.isReceivingShadow);
+        this._centerPoint = getPointForLocation(
+          newObjectData.content.centerLocation
+        );
       }
       return true;
     }
 
-    getNetworkSyncData(
-      syncOptions: GetNetworkSyncDataOptions
-    ): Model3DObjectNetworkSyncData {
+    getNetworkSyncData(): Model3DObjectNetworkSyncData {
       return {
-        ...super.getNetworkSyncData(syncOptions),
+        ...super.getNetworkSyncData(),
         mt: this._materialType,
         op: this._originPoint,
         cp: this._centerPoint,
         anis: this._animations,
         ai: this._currentAnimationIndex,
         ass: this._animationSpeedScale,
-        aet: this.getAnimationElapsedTime(),
         ap: this._animationPaused,
         cfd: this._crossfadeDuration,
       };
     }
 
     updateFromNetworkSyncData(
-      networkSyncData: Model3DObjectNetworkSyncData,
-      options: UpdateFromNetworkSyncDataOptions
+      networkSyncData: Model3DObjectNetworkSyncData
     ): void {
-      super.updateFromNetworkSyncData(networkSyncData, options);
+      super.updateFromNetworkSyncData(networkSyncData);
 
       if (networkSyncData.mt !== undefined) {
         this._materialType = networkSyncData.mt;
@@ -259,14 +229,11 @@ namespace gdjs {
       if (networkSyncData.anis !== undefined) {
         this._animations = networkSyncData.anis;
       }
-      if (networkSyncData.ass !== undefined) {
-        this.setAnimationSpeedScale(networkSyncData.ass);
-      }
       if (networkSyncData.ai !== undefined) {
         this.setAnimationIndex(networkSyncData.ai);
       }
-      if (networkSyncData.aet !== undefined) {
-        this.setAnimationElapsedTime(networkSyncData.aet);
+      if (networkSyncData.ass !== undefined) {
+        this.setAnimationSpeedScale(networkSyncData.ass);
       }
       if (networkSyncData.ap !== undefined) {
         if (networkSyncData.ap !== this.isAnimationPaused()) {
@@ -288,17 +255,14 @@ namespace gdjs {
       const rotationX = objectData.content.rotationX || 0;
       const rotationY = objectData.content.rotationY || 0;
       const rotationZ = objectData.content.rotationZ || 0;
-      const width = objectData.content.width || 100;
-      const height = objectData.content.height || 100;
-      const depth = objectData.content.depth || 100;
       const keepAspectRatio = objectData.content.keepAspectRatio;
       this._renderer._updateModel(
         rotationX,
         rotationY,
         rotationZ,
-        width,
-        height,
-        depth,
+        this._getOriginalWidth(),
+        this._getOriginalHeight(),
+        this._getOriginalDepth(),
         keepAspectRatio
       );
     }
@@ -394,16 +358,6 @@ namespace gdjs {
       return this._renderer.hasAnimationEnded();
     }
 
-    setIsCastingShadow(value: boolean): void {
-      this._isCastingShadow = value;
-      this._renderer._updateShadow();
-    }
-
-    setIsReceivingShadow(value: boolean): void {
-      this._isReceivingShadow = value;
-      this._renderer._updateShadow();
-    }
-
     setCrossfadeDuration(duration: number): void {
       if (this._crossfadeDuration === duration) return;
       this._crossfadeDuration = duration;

Extensions/3D/Model3DRuntimeObject3DRenderer.ts

@@ -233,10 +233,6 @@ namespace gdjs {
         this._object._setOriginalWidth(scaleRatio * modelWidth);
         this._object._setOriginalHeight(scaleRatio * modelHeight);
         this._object._setOriginalDepth(scaleRatio * modelDepth);
-      } else {
-        this._object._setOriginalWidth(originalWidth);
-        this._object._setOriginalHeight(originalHeight);
-        this._object._setOriginalDepth(originalDepth);
       }
     }
 
@@ -290,8 +286,6 @@ namespace gdjs {
       this.get3DRendererObject().remove(this._threeObject);
       this.get3DRendererObject().add(threeObject);
       this._threeObject = threeObject;
-      this.updatePosition();
-      this._updateShadow();
 
       // Start the current animation on the new 3D object.
       this._animationMixer = new THREE.AnimationMixer(root);
@@ -329,13 +323,6 @@ namespace gdjs {
       return this._originalModel.animations[animationIndex].name;
     }
 
-    _updateShadow() {
-      this._threeObject.traverse((child) => {
-        child.castShadow = this._model3DRuntimeObject._isCastingShadow;
-        child.receiveShadow = this._model3DRuntimeObject._isReceivingShadow;
-      });
-    }
-
     /**
      * Return true if animation has ended.
      * The animation had ended if:

Extensions/3D/Skybox.ts

@@ -1,102 +0,0 @@
-namespace gdjs {
-  interface SkyboxFilterNetworkSyncData {}
-  gdjs.PixiFiltersTools.registerFilterCreator(
-    'Scene3D::Skybox',
-    new (class implements gdjs.PixiFiltersTools.FilterCreator {
-      makeFilter(
-        target: EffectsTarget,
-        effectData: EffectData
-      ): gdjs.PixiFiltersTools.Filter {
-        if (typeof THREE === 'undefined') {
-          return new gdjs.PixiFiltersTools.EmptyFilter();
-        }
-        return new (class implements gdjs.PixiFiltersTools.Filter {
-          _cubeTexture: THREE.CubeTexture;
-          _oldBackground:
-            | THREE.CubeTexture
-            | THREE.Texture
-            | THREE.Color
-            | null = null;
-          _isEnabled: boolean = false;
-
-          constructor() {
-            this._cubeTexture = target
-              .getRuntimeScene()
-              .getGame()
-              .getImageManager()
-              .getThreeCubeTexture(
-                effectData.stringParameters.rightFaceResourceName,
-                effectData.stringParameters.leftFaceResourceName,
-                effectData.stringParameters.topFaceResourceName,
-                effectData.stringParameters.bottomFaceResourceName,
-                effectData.stringParameters.frontFaceResourceName,
-                effectData.stringParameters.backFaceResourceName
-              );
-          }
-
-          isEnabled(target: EffectsTarget): boolean {
-            return this._isEnabled;
-          }
-          setEnabled(target: EffectsTarget, enabled: boolean): boolean {
-            if (this._isEnabled === enabled) {
-              return true;
-            }
-            if (enabled) {
-              return this.applyEffect(target);
-            } else {
-              return this.removeEffect(target);
-            }
-          }
-          applyEffect(target: EffectsTarget): boolean {
-            const scene = target.get3DRendererObject() as
-              | THREE.Scene
-              | null
-              | undefined;
-            if (!scene) {
-              return false;
-            }
-            // TODO Add a background stack in LayerPixiRenderer to allow
-            // filters to stack them.
-            this._oldBackground = scene.background;
-            scene.background = this._cubeTexture;
-            if (!scene.environment) {
-              scene.environment = this._cubeTexture;
-            }
-            this._isEnabled = true;
-            return true;
-          }
-          removeEffect(target: EffectsTarget): boolean {
-            const scene = target.get3DRendererObject() as
-              | THREE.Scene
-              | null
-              | undefined;
-            if (!scene) {
-              return false;
-            }
-            scene.background = this._oldBackground;
-            scene.environment = null;
-            this._isEnabled = false;
-            return true;
-          }
-          updatePreRender(target: gdjs.EffectsTarget): any {}
-          updateDoubleParameter(parameterName: string, value: number): void {}
-          getDoubleParameter(parameterName: string): number {
-            return 0;
-          }
-          updateStringParameter(parameterName: string, value: string): void {}
-          updateColorParameter(parameterName: string, value: number): void {}
-          getColorParameter(parameterName: string): number {
-            return 0;
-          }
-          updateBooleanParameter(parameterName: string, value: boolean): void {}
-          getNetworkSyncData(): SkyboxFilterNetworkSyncData {
-            return {};
-          }
-          updateFromNetworkSyncData(
-            syncData: SkyboxFilterNetworkSyncData
-          ): void {}
-        })();
-      }
-    })()
-  );
-}

Extensions/AnchorBehavior/anchorruntimebehavior.ts

@@ -473,14 +473,7 @@ namespace gdjs {
       this._parentOldMaxY = instanceContainer.getUnrotatedViewportMaxY();
     }
 
-    doStepPostEvents(instanceContainer: gdjs.RuntimeInstanceContainer) {
-      // Custom objects can be resized during the events step.
-      // The anchor constraints must be applied on child-objects after the parent events.
-      const isChildObject = instanceContainer !== instanceContainer.getScene();
-      if (isChildObject) {
-        this.doStepPreEvents(instanceContainer);
-      }
-    }
+    doStepPostEvents(instanceContainer: gdjs.RuntimeInstanceContainer) {}
 
     private _convertCoords(
       instanceContainer: gdjs.RuntimeInstanceContainer,

Extensions/AnchorBehavior/tests/AnchorRuntimeBehaviorInCustomObject.spec.js

@@ -14,7 +14,6 @@ describe('gdjs.AnchorRuntimeBehavior', () => {
       effects: [],
       content: {},
       childrenContent: {},
-      isInnerAreaFollowingParentSize: false,
     });
     runtimeScene.addObject(customObject);
     customObject.setPosition(500, 250);

Extensions/BBText/JsExtension.js

@@ -75,9 +75,9 @@ module.exports = {
         .getOrCreate('align')
         .setValue(objectContent.align)
         .setType('choice')
-        .addChoice('left', _('Left'))
-        .addChoice('center', _('Center'))
-        .addChoice('right', _('Right'))
+        .addExtraInfo('left')
+        .addExtraInfo('center')
+        .addExtraInfo('right')
         .setLabel(_('Base alignment'))
         .setGroup(_('Appearance'));
 
@@ -88,9 +88,9 @@ module.exports = {
         .getOrCreate('verticalTextAlignment')
         .setValue(objectContent.verticalTextAlignment)
         .setType('choice')
-        .addChoice('top', _('Top'))
-        .addChoice('center', _('Center'))
-        .addChoice('bottom', _('Bottom'))
+        .addExtraInfo('top')
+        .addExtraInfo('center')
+        .addExtraInfo('bottom')
         .setLabel(_('Vertical alignment'))
         .setGroup(_('Appearance'));
 
@@ -508,7 +508,7 @@ module.exports = {
         associatedObjectConfiguration,
         pixiContainer,
         pixiResourcesLoader,
-        getPropertyOverridings
+        propertyOverridings
       ) {
         super(
           project,
@@ -516,7 +516,7 @@ module.exports = {
           associatedObjectConfiguration,
           pixiContainer,
           pixiResourcesLoader,
-          getPropertyOverridings
+          propertyOverridings
         );
 
         const bbTextStyles = {
@@ -555,11 +555,9 @@ module.exports = {
           gd.ObjectJsImplementation
         );
 
-        const propertyOverridings = this.getPropertyOverridings();
-        const rawText =
-          propertyOverridings && propertyOverridings.has('Text')
-            ? propertyOverridings.get('Text')
-            : object.content.text;
+        const rawText = this._propertyOverridings.has('Text')
+          ? this._propertyOverridings.get('Text')
+          : object.content.text;
         if (rawText !== this._pixiObject.text) {
           this._pixiObject.text = rawText;
         }

Extensions/BBText/bbtextruntimeobject.ts

@@ -145,11 +145,9 @@ namespace gdjs {
       return true;
     }
 
-    override getNetworkSyncData(
-      syncOptions: GetNetworkSyncDataOptions
-    ): BBTextObjectNetworkSyncData {
+    override getNetworkSyncData(): BBTextObjectNetworkSyncData {
       return {
-        ...super.getNetworkSyncData(syncOptions),
+        ...super.getNetworkSyncData(),
         text: this._text,
         o: this._opacity,
         c: this._color,
@@ -164,10 +162,9 @@ namespace gdjs {
     }
 
     override updateFromNetworkSyncData(
-      networkSyncData: BBTextObjectNetworkSyncData,
-      options: UpdateFromNetworkSyncDataOptions
+      networkSyncData: BBTextObjectNetworkSyncData
     ): void {
-      super.updateFromNetworkSyncData(networkSyncData, options);
+      super.updateFromNetworkSyncData(networkSyncData);
       if (this._text !== undefined) {
         this.setBBText(networkSyncData.text);
       }
@@ -386,10 +383,6 @@ namespace gdjs {
       return this._renderer.getHeight();
     }
 
-    override setWidth(width: float): void {
-      this.setWrappingWidth(width);
-    }
-
     override getDrawableY(): float {
       return (
         this.getY() -

Extensions/BitmapText/JsExtension.js

@@ -61,9 +61,9 @@ module.exports = {
         .getOrCreate('align')
         .setValue(objectContent.align)
         .setType('choice')
-        .addChoice('left', _('Left'))
-        .addChoice('center', _('Center'))
-        .addChoice('right', _('Right'))
+        .addExtraInfo('left')
+        .addExtraInfo('center')
+        .addExtraInfo('right')
         .setLabel(_('Alignment'))
         .setGroup(_('Appearance'));
 
@@ -74,9 +74,9 @@ module.exports = {
         .getOrCreate('verticalTextAlignment')
         .setValue(objectContent.verticalTextAlignment)
         .setType('choice')
-        .addChoice('top', _('Top'))
-        .addChoice('center', _('Center'))
-        .addChoice('bottom', _('Bottom'))
+        .addExtraInfo('top')
+        .addExtraInfo('center')
+        .addExtraInfo('bottom')
         .setLabel(_('Vertical alignment'))
         .setGroup(_('Appearance'));
 
@@ -631,7 +631,7 @@ module.exports = {
         associatedObjectConfiguration,
         pixiContainer,
         pixiResourcesLoader,
-        getPropertyOverridings
+        propertyOverridings
       ) {
         super(
           project,
@@ -639,7 +639,7 @@ module.exports = {
           associatedObjectConfiguration,
           pixiContainer,
           pixiResourcesLoader,
-          getPropertyOverridings
+          propertyOverridings
         );
 
         // We'll track changes of the font to trigger the loading of the new font.
@@ -665,11 +665,9 @@ module.exports = {
 
         // Update the rendered text properties (note: Pixi is only
         // applying changes if there were changed).
-        const propertyOverridings = this.getPropertyOverridings();
-        this._pixiObject.text =
-          propertyOverridings && propertyOverridings.has('Text')
-            ? propertyOverridings.get('Text')
-            : object.content.text;
+        this._pixiObject.text = this._propertyOverridings.has('Text')
+          ? this._propertyOverridings.get('Text')
+          : object.content.text;
 
         const align = object.content.align;
         this._pixiObject.align = align;

Extensions/BitmapText/bitmaptextruntimeobject.ts

@@ -155,11 +155,9 @@ namespace gdjs {
       return true;
     }
 
-    override getNetworkSyncData(
-      syncOptions: GetNetworkSyncDataOptions
-    ): BitmapTextObjectNetworkSyncData {
+    override getNetworkSyncData(): BitmapTextObjectNetworkSyncData {
       return {
-        ...super.getNetworkSyncData(syncOptions),
+        ...super.getNetworkSyncData(),
         text: this._text,
         opa: this._opacity,
         tint: this._tint,
@@ -174,10 +172,9 @@ namespace gdjs {
     }
 
     override updateFromNetworkSyncData(
-      networkSyncData: BitmapTextObjectNetworkSyncData,
-      options: UpdateFromNetworkSyncDataOptions
+      networkSyncData: BitmapTextObjectNetworkSyncData
     ): void {
-      super.updateFromNetworkSyncData(networkSyncData, options);
+      super.updateFromNetworkSyncData(networkSyncData);
       if (this._text !== undefined) {
         this.setText(networkSyncData.text);
       }
@@ -429,10 +426,6 @@ namespace gdjs {
       return this._renderer.getHeight();
     }
 
-    override setWidth(width: float): void {
-      this.setWrappingWidth(width);
-    }
-
     override getDrawableY(): float {
       return (
         this.getY() -

Extensions/DebuggerTools/JsExtension.js

@@ -21,9 +21,7 @@ module.exports = {
       .setExtensionInformation(
         'DebuggerTools',
         _('Debugger Tools'),
-        _(
-          'Allow to interact with the editor debugger from the game (notably: enable 2D debug draw, log a message in the debugger console).'
-        ),
+        _('Allow to interact with the editor debugger from the game.'),
         'Arthur Pacaud (arthuro555), Aurélien Vivet (Bouh)',
         'MIT'
       )

Extensions/DestroyOutsideBehavior/DestroyOutsideBehavior.cpp

@@ -12,8 +12,7 @@ This project is released under the MIT License.
 #include "GDCore/Tools/Localization.h"
 
 void DestroyOutsideBehavior::InitializeContent(gd::SerializerElement& content) {
-  content.SetAttribute("extraBorder", 200);
-  content.SetAttribute("unseenGraceDistance", 10000);
+  content.SetAttribute("extraBorder", 300);
 }
 
 #if defined(GD_IDE_ONLY)
@@ -28,15 +27,7 @@ DestroyOutsideBehavior::GetProperties(
       .SetType("Number")
       .SetMeasurementUnit(gd::MeasurementUnit::GetPixel())
       .SetLabel(_("Deletion margin"))
-      .SetDescription(_("Margin before deleting the object, in pixels."));
-
-  properties["unseenGraceDistance"]
-      .SetValue(gd::String::From(
-          behaviorContent.GetDoubleAttribute("unseenGraceDistance", 0)))
-      .SetType("Number")
-      .SetMeasurementUnit(gd::MeasurementUnit::GetPixel())
-      .SetLabel(_("Unseen object grace distance"))
-      .SetDescription(_("If the object hasn't been visible yet, don't delete it until it travels this far beyond the screen (in pixels). Useful to avoid objects being deleted before they are visible when they spawn."));
+      .SetDescription(_("Margin before deleting the object, in pixels"));
 
   return properties;
 }
@@ -47,8 +38,6 @@ bool DestroyOutsideBehavior::UpdateProperty(
     const gd::String& value) {
   if (name == "extraBorder")
     behaviorContent.SetAttribute("extraBorder", value.To<double>());
-  else if (name == "unseenGraceDistance")
-    behaviorContent.SetAttribute("unseenGraceDistance", value.To<double>());
   else
     return false;
 

Extensions/DestroyOutsideBehavior/Extension.cpp

@@ -6,7 +6,6 @@ This project is released under the MIT License.
 */
 
 #include "DestroyOutsideBehavior.h"
-#include "GDCore/Extensions/Metadata/MultipleInstructionMetadata.h"
 #include "GDCore/Extensions/PlatformExtension.h"
 #include "GDCore/Project/BehaviorsSharedData.h"
 #include "GDCore/Tools/Localization.h"
@@ -20,10 +19,11 @@ void DeclareDestroyOutsideBehaviorExtension(gd::PlatformExtension& extension) {
             "outside of the bounds of the 2D camera. Useful for 2D bullets or "
             "other short-lived objects. Don't use it for 3D objects in a "
             "FPS/TPS game or any game with a camera not being a top view "
-            "(for 3D objects, prefer comparing the position, for example Z "
-            "position to see if an object goes outside of the bound of the "
-            "map). If the object appears outside of the screen, it's not "
-            "removed unless it goes beyond the unseen object grace distance."),
+            "(for 3D objects, prefer comparing "
+            "the position, for example Z position to see if an object goes "
+            "outside of the bound of the map). Be careful when using this "
+            "behavior because if the object appears outside of the screen, it "
+            "will be immediately removed."),
           "Florian Rival",
           "Open source (MIT License)")
       .SetCategory("Game mechanic")
@@ -44,39 +44,34 @@ void DeclareDestroyOutsideBehaviorExtension(gd::PlatformExtension& extension) {
                        std::shared_ptr<gd::BehaviorsSharedData>())
           .SetQuickCustomizationVisibility(gd::QuickCustomization::Hidden);
 
-  aut.AddExpressionAndConditionAndAction(
-         "number",
-         "ExtraBorder",
-         _("Additional border (extra distance before deletion)"),
-         _("the extra distance (in pixels) the object must "
-           "travel beyond the screen before it gets deleted"),
-         _("the additional border"),
-         _("Destroy outside configuration"),
-         "CppPlatform/Extensions/destroyoutsideicon24.png")
+  aut.AddCondition("ExtraBorder",
+                   _("Additional border (extra distance before deletion)"),
+                   _("Compare the extra distance (in pixels) the object must "
+                     "travel beyond the screen before it gets deleted."),
+                   _("the additional border"),
+                   _("Destroy outside configuration"),
+                   "CppPlatform/Extensions/destroyoutsideicon24.png",
+                   "CppPlatform/Extensions/destroyoutsideicon16.png")
       .AddParameter("object", _("Object"))
       .AddParameter("behavior", _("Behavior"), "DestroyOutside")
-      .UseStandardParameters("number", gd::ParameterOptions::MakeNewOptions())
-      .MarkAsAdvanced();
+      .UseStandardRelationalOperatorParameters(
+          "number", gd::ParameterOptions::MakeNewOptions())
+      .MarkAsAdvanced()
+      .SetFunctionName("GetExtraBorder");
 
-  // Deprecated:
-  aut.AddDuplicatedAction("ExtraBorder", "DestroyOutside::SetExtraBorder")
-      .SetHidden();
-  aut.AddDuplicatedCondition("ExtraBorder", "DestroyOutside::ExtraBorder")
-      .SetHidden();
-
-  aut.AddExpressionAndConditionAndAction(
-         "number",
-         "UnseenGraceDistance",
-         _("Unseen object grace distance"),
-         _("the grace distance (in pixels) before deleting the object if it "
-           "has "
-           "never been visible on the screen. Useful to avoid objects being "
-           "deleted before they are visible when they spawn"),
-         _("the unseen grace distance"),
-         _("Destroy outside configuration"),
-         "CppPlatform/Extensions/destroyoutsideicon24.png")
+  aut.AddAction("ExtraBorder",
+                _("Additional border (extra distance before deletion)"),
+                _("Change the extra distance (in pixels) the object must "
+                  "travel beyond the screen before it gets deleted."),
+                _("the additional border"),
+                _("Destroy outside configuration"),
+                "CppPlatform/Extensions/destroyoutsideicon24.png",
+                "CppPlatform/Extensions/destroyoutsideicon16.png")
       .AddParameter("object", _("Object"))
       .AddParameter("behavior", _("Behavior"), "DestroyOutside")
-      .UseStandardParameters("number", gd::ParameterOptions::MakeNewOptions())
-      .MarkAsAdvanced();
+      .UseStandardOperatorParameters("number",
+                                     gd::ParameterOptions::MakeNewOptions())
+      .MarkAsAdvanced()
+      .SetFunctionName("SetExtraBorder")
+      .SetGetter("GetExtraBorder");
 }

Extensions/DestroyOutsideBehavior/JsExtension.cpp

@@ -5,11 +5,11 @@ Copyright (c) 2014-2016 Florian Rival (Florian.Rival@gmail.com)
 This project is released under the MIT License.
 */
 #if defined(GD_IDE_ONLY)
-#include <iostream>
-
 #include "GDCore/Extensions/PlatformExtension.h"
 #include "GDCore/Tools/Localization.h"
 
+#include <iostream>
+
 void DeclareDestroyOutsideBehaviorExtension(gd::PlatformExtension& extension);
 
 /**
@@ -29,36 +29,19 @@ class DestroyOutsideBehaviorJsExtension : public gd::PlatformExtension {
             "Extensions/DestroyOutsideBehavior/"
             "destroyoutsideruntimebehavior.js");
 
-    GetAllExpressionsForBehavior(
-        "DestroyOutsideBehavior::DestroyOutside")["ExtraBorder"]
-        .SetFunctionName("getExtraBorder");
-    GetAllConditionsForBehavior("DestroyOutsideBehavior::DestroyOutside")
-        ["DestroyOutsideBehavior::DestroyOutside::ExtraBorder"]
-            .SetFunctionName("getExtraBorder");
-    GetAllActionsForBehavior("DestroyOutsideBehavior::DestroyOutside")
-        ["DestroyOutsideBehavior::DestroyOutside::SetExtraBorder"]
-            .SetFunctionName("setExtraBorder")
-            .SetGetter("getExtraBorder");
-
-    // Deprecated:
     GetAllConditionsForBehavior("DestroyOutsideBehavior::DestroyOutside")
         ["DestroyOutsideBehavior::ExtraBorder"]
-            .SetFunctionName("getExtraBorder");
+            .SetFunctionName("getExtraBorder")
+            .SetIncludeFile(
+                "Extensions/DestroyOutsideBehavior/"
+                "destroyoutsideruntimebehavior.js");
     GetAllActionsForBehavior("DestroyOutsideBehavior::DestroyOutside")
         ["DestroyOutsideBehavior::ExtraBorder"]
             .SetFunctionName("setExtraBorder")
-            .SetGetter("getExtraBorder");
-
-    GetAllExpressionsForBehavior(
-        "DestroyOutsideBehavior::DestroyOutside")["UnseenGraceDistance"]
-        .SetFunctionName("getUnseenGraceDistance");
-    GetAllConditionsForBehavior("DestroyOutsideBehavior::DestroyOutside")
-        ["DestroyOutsideBehavior::DestroyOutside::UnseenGraceDistance"]
-            .SetFunctionName("getUnseenGraceDistance");
-    GetAllActionsForBehavior("DestroyOutsideBehavior::DestroyOutside")
-        ["DestroyOutsideBehavior::DestroyOutside::SetUnseenGraceDistance"]
-            .SetFunctionName("setUnseenGraceDistance")
-            .SetGetter("getUnseenGraceDistance");
+            .SetGetter("getExtraBorder")
+            .SetIncludeFile(
+                "Extensions/DestroyOutsideBehavior/"
+                "destroyoutsideruntimebehavior.js");
 
     GD_COMPLETE_EXTENSION_COMPILATION_INFORMATION();
   };

Extensions/DestroyOutsideBehavior/destroyoutsideruntimebehavior.ts

@@ -8,9 +8,7 @@ namespace gdjs {
    * The DestroyOutsideRuntimeBehavior represents a behavior that destroys the object when it leaves the screen.
    */
   export class DestroyOutsideRuntimeBehavior extends gdjs.RuntimeBehavior {
-    _extraBorder: float;
-    _unseenGraceDistance: float;
-    _hasBeenOnScreen: boolean;
+    _extraBorder: any;
 
     constructor(
       instanceContainer: gdjs.RuntimeInstanceContainer,
@@ -19,20 +17,12 @@ namespace gdjs {
     ) {
       super(instanceContainer, behaviorData, owner);
       this._extraBorder = behaviorData.extraBorder || 0;
-      this._unseenGraceDistance = behaviorData.unseenGraceDistance || 0;
-      this._hasBeenOnScreen = false;
     }
 
     updateFromBehaviorData(oldBehaviorData, newBehaviorData): boolean {
       if (oldBehaviorData.extraBorder !== newBehaviorData.extraBorder) {
         this._extraBorder = newBehaviorData.extraBorder;
       }
-      if (
-        oldBehaviorData.unseenGraceDistance !==
-        newBehaviorData.unseenGraceDistance
-      ) {
-        this._unseenGraceDistance = newBehaviorData.unseenGraceDistance;
-      }
       return true;
     }
 
@@ -45,47 +35,23 @@ namespace gdjs {
       const ocy = this.owner.getDrawableY() + this.owner.getCenterY();
       const layer = instanceContainer.getLayer(this.owner.getLayer());
       const boundingCircleRadius = Math.sqrt(ow * ow + oh * oh) / 2.0;
-
-      const cameraLeft = layer.getCameraX() - layer.getCameraWidth() / 2;
-      const cameraRight = layer.getCameraX() + layer.getCameraWidth() / 2;
-      const cameraTop = layer.getCameraY() - layer.getCameraHeight() / 2;
-      const cameraBottom = layer.getCameraY() + layer.getCameraHeight() / 2;
-
       if (
-        ocx + boundingCircleRadius + this._extraBorder < cameraLeft ||
-        ocx - boundingCircleRadius - this._extraBorder > cameraRight ||
-        ocy + boundingCircleRadius + this._extraBorder < cameraTop ||
-        ocy - boundingCircleRadius - this._extraBorder > cameraBottom
+        ocx + boundingCircleRadius + this._extraBorder <
+          layer.getCameraX() - layer.getCameraWidth() / 2 ||
+        ocx - boundingCircleRadius - this._extraBorder >
+          layer.getCameraX() + layer.getCameraWidth() / 2 ||
+        ocy + boundingCircleRadius + this._extraBorder <
+          layer.getCameraY() - layer.getCameraHeight() / 2 ||
+        ocy - boundingCircleRadius - this._extraBorder >
+          layer.getCameraY() + layer.getCameraHeight() / 2
       ) {
-        if (this._hasBeenOnScreen) {
-          // Object is outside the camera area and object was previously seen inside it:
-          // delete it now.
-          this.owner.deleteFromScene();
-        } else if (
-          ocx + boundingCircleRadius + this._unseenGraceDistance < cameraLeft ||
-          ocx - boundingCircleRadius - this._unseenGraceDistance >
-            cameraRight ||
-          ocy + boundingCircleRadius + this._unseenGraceDistance < cameraTop ||
-          ocy - boundingCircleRadius - this._unseenGraceDistance > cameraBottom
-        ) {
-          // Object is outside the camera area and also outside the grace distance:
-          // force deletion.
-          this.owner.deleteFromScene();
-        } else {
-          // Object is outside the camera area but inside the grace distance
-          // and was never seen inside the camera area: don't delete it yet.
-        }
-      } else {
-        this._hasBeenOnScreen = true;
+        //We are outside the camera area.
+        this.owner.deleteFromScene();
       }
     }
 
     /**
-     * Set the additional border outside the camera area.
-     *
-     * If the object goes beyond the camera area and this border, it will be deleted (unless it was
-     * never seen inside the camera area and this border before, in which case it will be deleted
-     * according to the grace distance).
+     * Set an additional border to the camera viewport as a buffer before the object gets destroyed.
      * @param val Border in pixels.
      */
     setExtraBorder(val: number): void {
@@ -93,36 +59,12 @@ namespace gdjs {
     }
 
     /**
-     * Get the additional border outside the camera area.
+     * Get the additional border of the camera viewport buffer which triggers the destruction of an object.
      * @return The additional border around the camera viewport in pixels
      */
     getExtraBorder(): number {
       return this._extraBorder;
     }
-
-    /**
-     * Change the grace distance before an object is deleted if it's outside the camera area
-     * and was never seen inside the camera area. Typically useful to avoid objects being deleted
-     * before they are visible when they spawn.
-     */
-    setUnseenGraceDistance(val: number): void {
-      this._unseenGraceDistance = val;
-    }
-
-    /**
-     * Get the grace distance before an object is deleted if it's outside the camera area
-     * and was never seen inside the camera area.
-     */
-    getUnseenGraceDistance(): number {
-      return this._unseenGraceDistance;
-    }
-
-    /**
-     * Check if this object has been visible on screen (precisely: inside the camera area *including* the extra border).
-     */
-    hasBeenOnScreen(): boolean {
-      return this._hasBeenOnScreen;
-    }
   }
   gdjs.registerBehavior(
     'DestroyOutsideBehavior::DestroyOutside',

Extensions/FileSystem/JsExtension.js

@@ -21,9 +21,7 @@ module.exports = {
       .setExtensionInformation(
         'FileSystem',
         _('File system'),
-        _(
-          'Access the filesystem of the operating system - only works on native, desktop games exported to Windows, Linux or macOS.'
-        ),
+        _('Access the filesystem of the operating system.'),
         'Matthias Meike',
         'Open source (MIT License)'
       )

Extensions/Inventory/Extension.cpp

@@ -5,25 +5,23 @@ Copyright (c) 2008-2016 Florian Rival (Florian.Rival@gmail.com)
 This project is released under the MIT License.
 */
 
-#include <iostream>
-
 #include "GDCore/Extensions/PlatformExtension.h"
 #include "GDCore/Tools/Localization.h"
 
+#include <iostream>
+
 void DeclareInventoryExtension(gd::PlatformExtension& extension) {
-  extension
-      .SetExtensionInformation(
-          "Inventory",
-          _("Inventories"),
-          _("Actions and conditions to store named inventories in memory, "
-            "with items (indexed by their name), a count for each of them, "
-            "a maximum count and an equipped state. Can be loaded/saved "
-            "from/to a GDevelop variable."),
-          "Florian Rival",
-          "Open source (MIT License)")
+  extension.SetExtensionInformation(
+      "Inventory",
+      _("Inventories"),
+      _("Provides actions and conditions to add an inventory to your game, "
+        "with items in memory."),
+      "Florian Rival",
+      "Open source (MIT License)")
       .SetExtensionHelpPath("/all-features/inventory")
       .SetCategory("Game mechanic");
-  extension.AddInstructionOrExpressionGroupMetadata(_("Inventories"))
+    extension
+      .AddInstructionOrExpressionGroupMetadata(_("Inventories"))
       .SetIcon("CppPlatform/Extensions/Inventoryicon.png");
 
   extension
@@ -166,15 +164,14 @@ void DeclareInventoryExtension(gd::PlatformExtension& extension) {
       .SetFunctionName("InventoryTools::IsEquipped");
 
   extension
-      .AddAction(
-          "SerializeToVariable",
-          _("Save an inventory in a scene variable"),
-          _("Save all the items of the inventory in a scene variable, so that "
-            "it can be restored later."),
-          _("Save inventory _PARAM1_ in variable _PARAM2_"),
-          _("Variables"),
-          "CppPlatform/Extensions/Inventoryicon.png",
-          "CppPlatform/Extensions/Inventoryicon.png")
+      .AddAction("SerializeToVariable",
+                 _("Save an inventory in a scene variable"),
+                 _("Save all the items of the inventory in a scene variable, so that "
+                   "it can be restored later."),
+                 _("Save inventory _PARAM1_ in variable _PARAM2_"),
+                 _("Variables"),
+                 "CppPlatform/Extensions/Inventoryicon.png",
+                 "CppPlatform/Extensions/Inventoryicon.png")
 
       .AddCodeOnlyParameter("currentScene", "")
       .AddParameter("string", _("Inventory name"))
@@ -207,14 +204,13 @@ void DeclareInventoryExtension(gd::PlatformExtension& extension) {
       .SetFunctionName("InventoryTools::Count");
 
   extension
-      .AddExpression("Maximum",
-                     _("Item maximum"),
-                     _("Get the maximum of an item in the inventory, or 0 if "
-                       "it is unlimited"),
-                     "",
-                     "CppPlatform/Extensions/Inventoryicon.png")
-      .AddCodeOnlyParameter("currentScene", "")
-      .AddParameter("string", _("Inventory name"))
-      .AddParameter("string", _("Item name"))
-      .SetFunctionName("InventoryTools::Maximum");
+	  .AddExpression("Maximum",
+		  _("Item maximum"),
+		  _("Get the maximum of an item in the inventory, or 0 if it is unlimited"),
+		  "",
+		  "CppPlatform/Extensions/Inventoryicon.png")
+	  .AddCodeOnlyParameter("currentScene", "")
+	  .AddParameter("string", _("Inventory name"))
+	  .AddParameter("string", _("Item name"))
+	  .SetFunctionName("InventoryTools::Maximum");
 }

Extensions/JsExtensionTypes.d.ts

@@ -27,7 +27,7 @@ class RenderedInstance {
     associatedObjectConfiguration: gdObjectConfiguration,
     pixiContainer: PIXI.Container,
     pixiResourcesLoader: Class<PixiResourcesLoader>,
-    getPropertyOverridings: (() => Map<string, string>) | null = null
+    propertyOverridings: Map<string, string> = new Map<string, string>()
   );
 
   /**
@@ -80,8 +80,6 @@ class RenderedInstance {
   getDefaultHeight(): number;
 
   getDefaultDepth(): number;
-
-  getPropertyOverridings(): Map<string, string> | null;
 }
 
 /**
@@ -109,8 +107,7 @@ class Rendered3DInstance {
     associatedObjectConfiguration: gdObjectConfiguration,
     pixiContainer: PIXI.Container,
     threeGroup: THREE.Group,
-    pixiResourcesLoader: Class<PixiResourcesLoader>,
-    getPropertyOverridings: (() => Map<string, string>) | null = null
+    pixiResourcesLoader: Class<PixiResourcesLoader>
   );
 
   /**
@@ -177,8 +174,6 @@ class Rendered3DInstance {
    * Return the depth of the instance when the instance doesn't have a custom size.
    */
   getDefaultDepth(): number;
-
-  getPropertyOverridings(): Map<string, string> | null;
 }
 
 declare type ObjectsRenderingService = {

Extensions/Leaderboards/JsExtension.js

@@ -21,9 +21,7 @@ module.exports = {
       .setExtensionInformation(
         'Leaderboards',
         _('Leaderboards'),
-        _(
-          'Allow your game to send scores to your leaderboards (anonymously or from the logged-in player) or display existing leaderboards to the player.'
-        ),
+        _('Allow your game to send scores to your leaderboards.'),
         'Florian Rival',
         'Open source (MIT License)'
       )
@@ -32,12 +30,6 @@ module.exports = {
       .addInstructionOrExpressionGroupMetadata(_('Leaderboards'))
       .setIcon('JsPlatform/Extensions/leaderboard.svg');
 
-    extension
-      .addDependency()
-      .setName('Safari View Controller Cordova plugin')
-      .setDependencyType('cordova')
-      .setExportName('@gdevelop/cordova-plugin-safariviewcontroller');
-
     extension
       .addAction(
         'SavePlayerScore',

Extensions/Lighting/JsExtension.js

@@ -22,7 +22,7 @@ module.exports = {
         'Lighting',
         _('Lights'),
 
-        'This provides a 2D light object, and a behavior to mark other 2D objects as being obstacles for the lights. This is a great way to create a special atmosphere to your game, along with effects, make it more realistic or to create gameplays based on lights.',
+        'This provides a light object, and a behavior to mark other objects as being obstacles for the lights. This is a great way to create a special atmosphere to your game, along with effects, make it more realistic or to create gameplays based on lights.',
         'Harsimran Virk',
         'MIT'
       )
@@ -51,7 +51,7 @@ module.exports = {
         _('Light Obstacle Behavior'),
         'LightObstacleBehavior',
         _(
-          'Flag objects as being obstacles to 2D lights. The light emitted by light objects will be stopped by the object. This does not work on 3D objects and 3D games.'
+          'Flag objects as being obstacles to light. The light emitted by light objects will be stopped by the object.'
         ),
         '',
         'CppPlatform/Extensions/lightObstacleIcon32.png',
@@ -164,7 +164,7 @@ module.exports = {
         'LightObject',
         _('Light'),
         _(
-          'Displays a 2D light on the scene, with a customizable radius and color. Add then the Light Obstacle behavior to the objects that must act as obstacle to the lights.'
+          'Displays a light on the scene, with a customizable radius and color. Add then the Light Obstacle behavior to the objects that must act as obstacle to the lights.'
         ),
         'CppPlatform/Extensions/lightIcon32.png',
         lightObject

Extensions/Lighting/lightruntimeobject.ts

@@ -87,21 +87,16 @@ namespace gdjs {
       return true;
     }
 
-    getNetworkSyncData(
-      syncOptions: GetNetworkSyncDataOptions
-    ): LightNetworkSyncData {
+    getNetworkSyncData(): LightNetworkSyncData {
       return {
-        ...super.getNetworkSyncData(syncOptions),
+        ...super.getNetworkSyncData(),
         rad: this.getRadius(),
         col: this.getColor(),
       };
     }
 
-    updateFromNetworkSyncData(
-      networkSyncData: LightNetworkSyncData,
-      options: UpdateFromNetworkSyncDataOptions
-    ): void {
-      super.updateFromNetworkSyncData(networkSyncData, options);
+    updateFromNetworkSyncData(networkSyncData: LightNetworkSyncData): void {
+      super.updateFromNetworkSyncData(networkSyncData);
 
       if (networkSyncData.rad !== undefined) {
         this.setRadius(networkSyncData.rad);

Extensions/LinkedObjects/linkedobjects.ts

@@ -239,7 +239,7 @@ namespace gdjs {
         instanceContainer: gdjs.RuntimeInstanceContainer,
         objectsLists: Hashtable<gdjs.RuntimeObject[]>,
         obj: gdjs.RuntimeObject | null,
-        eventsFunctionContext: EventsFunctionContext | null | undefined
+        eventsFunctionContext: EventsFunctionContext | undefined
       ) {
         if (obj === null) {
           return false;

Extensions/Multiplayer/JsExtension.js

@@ -21,9 +21,7 @@ module.exports = {
       .setExtensionInformation(
         'Multiplayer',
         _('Multiplayer'),
-        _(
-          'This allows players to join online lobbies and synchronize gameplay across devices without needing to manage servers or networking.\n\nUse the "Open game lobbies" action to let players join a game, and use conditions like "Lobby game has just started" to begin gameplay. Add the "Multiplayer object" behavior to game objects that should be synchronized, and assign or change their ownership using player numbers. Variables and game state (like scenes, scores, or timers) are automatically synced by the host, with options to change ownership or disable sync when needed. Common multiplayer logic —like handling joins/leaves, collisions, and host migration— is supported out-of-the-box for up to 8 players per game.'
-        ),
+        _('Allow players to connect to lobbies and play together.'),
         'Florian Rival',
         'Open source (MIT License)'
       )
@@ -33,79 +31,6 @@ module.exports = {
       .addInstructionOrExpressionGroupMetadata(_('Multiplayer'))
       .setIcon('JsPlatform/Extensions/multiplayer.svg');
 
-    extension
-      .addDependency()
-      .setName('Safari View Controller Cordova plugin')
-      .setDependencyType('cordova')
-      .setExportName('@gdevelop/cordova-plugin-safariviewcontroller');
-
-    extension
-      .addStrExpression(
-        'CurrentLobbyID',
-        _('Current lobby ID'),
-        _('Returns current lobby ID.'),
-        _('Lobbies'),
-        'JsPlatform/Extensions/multiplayer.svg'
-      )
-      .getCodeExtraInformation()
-      .setIncludeFile('Extensions/Multiplayer/peer.js')
-      .addIncludeFile('Extensions/Multiplayer/peerJsHelper.js')
-      .addIncludeFile(
-        'Extensions/PlayerAuthentication/playerauthenticationcomponents.js'
-      )
-      .addIncludeFile(
-        'Extensions/PlayerAuthentication/playerauthenticationtools.js'
-      )
-      .addIncludeFile('Extensions/Multiplayer/multiplayercomponents.js')
-      .addIncludeFile('Extensions/Multiplayer/messageManager.js')
-      .addIncludeFile('Extensions/Multiplayer/multiplayerVariablesManager.js')
-      .addIncludeFile('Extensions/Multiplayer/multiplayertools.js')
-      .setFunctionName('gdjs.multiplayer.getLobbyID');
-
-    extension
-      .addAction(
-        'QuickJoinWithLobbyID',
-        _('Join a specific lobby by its ID'),
-        _(
-          'Join a specific lobby. The player will join the game instantly if this is possible.'
-        ),
-        _('Join a specific lobby by its ID _PARAM1_'),
-        _('Lobbies'),
-        'JsPlatform/Extensions/multiplayer.svg',
-        'JsPlatform/Extensions/multiplayer.svg'
-      )
-      .addCodeOnlyParameter('currentScene', '')
-      .addParameter('string', _('Lobby ID'), '', false)
-      .addParameter(
-        'yesorno',
-        _('Display loader while joining a lobby.'),
-        '',
-        true
-      )
-      .setDefaultValue('yes')
-      .addParameter(
-        'yesorno',
-        _('Display game lobbies if unable to join a specific one.'),
-        '',
-        true
-      )
-      .setDefaultValue('yes')
-      .setHelpPath('/all-features/multiplayer')
-      .getCodeExtraInformation()
-      .setIncludeFile('Extensions/Multiplayer/peer.js')
-      .addIncludeFile('Extensions/Multiplayer/peerJsHelper.js')
-      .addIncludeFile(
-        'Extensions/PlayerAuthentication/playerauthenticationcomponents.js'
-      )
-      .addIncludeFile(
-        'Extensions/PlayerAuthentication/playerauthenticationtools.js'
-      )
-      .addIncludeFile('Extensions/Multiplayer/multiplayercomponents.js')
-      .addIncludeFile('Extensions/Multiplayer/messageManager.js')
-      .addIncludeFile('Extensions/Multiplayer/multiplayerVariablesManager.js')
-      .addIncludeFile('Extensions/Multiplayer/multiplayertools.js')
-      .setFunctionName('gdjs.multiplayer.authenticateAndQuickJoinWithLobbyID');
-
     extension
       .addAction(
         'QuickJoinLobby',

Extensions/Multiplayer/messageManager.ts

@@ -729,9 +729,7 @@ namespace gdjs {
             behavior.playerNumber = ownerPlayerNumber;
           }
 
-          instance.updateFromNetworkSyncData(messageData, {
-            clearInputs: false,
-          });
+          instance.updateFromNetworkSyncData(messageData);
 
           setLastClockReceivedForInstanceOnScene({
             sceneNetworkId,
@@ -1739,7 +1737,7 @@ namespace gdjs {
               return;
             }
 
-            runtimeScene.updateFromNetworkSyncData(messageData, {});
+            runtimeScene.updateFromNetworkSyncData(messageData);
           } else {
             // If the game is not ready to receive game update messages, we need to save the data for later use.
             // This can happen when joining a game that is already running.
@@ -1892,7 +1890,7 @@ namespace gdjs {
           const messageData = message.getData();
           const messageSender = message.getSender();
           if (gdjs.multiplayer.isReadyToSendOrReceiveGameUpdateMessages()) {
-            runtimeScene.getGame().updateFromNetworkSyncData(messageData, {});
+            runtimeScene.getGame().updateFromNetworkSyncData(messageData);
           } else {
             // If the game is not ready to receive game update messages, we need to save the data for later use.
             // This can happen when joining a game that is already running.
@@ -1920,7 +1918,7 @@ namespace gdjs {
       // Reapply the game saved updates.
       lastReceivedGameSyncDataUpdates.getUpdates().forEach((messageData) => {
         debugLogger.info(`Reapplying saved update of game.`);
-        runtimeScene.getGame().updateFromNetworkSyncData(messageData, {});
+        runtimeScene.getGame().updateFromNetworkSyncData(messageData);
       });
       // Game updates are always applied properly, so we can clear them.
       lastReceivedGameSyncDataUpdates.clear();
@@ -1939,7 +1937,7 @@ namespace gdjs {
 
         debugLogger.info(`Reapplying saved update of scene ${sceneNetworkId}.`);
 
-        runtimeScene.updateFromNetworkSyncData(messageData, {});
+        runtimeScene.updateFromNetworkSyncData(messageData);
         // We only remove the message if it was successfully applied, so it can be reapplied later,
         // in case we were not on the right scene.
         lastReceivedSceneSyncDataUpdates.remove(messageData);

Extensions/Multiplayer/multiplayerobjectruntimebehavior.ts

@@ -278,7 +278,7 @@ namespace gdjs {
 
       const instanceNetworkId = this._getOrCreateInstanceNetworkId();
       const objectName = this.owner.getName();
-      const objectNetworkSyncData = this.owner.getNetworkSyncData({});
+      const objectNetworkSyncData = this.owner.getNetworkSyncData();
 
       // this._logToConsoleWithThrottle(
       //   `Synchronizing object ${this.owner.getName()} (instance ${
@@ -293,8 +293,6 @@ namespace gdjs {
           x: objectNetworkSyncData.x,
           y: objectNetworkSyncData.y,
           z: objectNetworkSyncData.z,
-          w: objectNetworkSyncData.w,
-          h: objectNetworkSyncData.h,
           zo: objectNetworkSyncData.zo,
           a: objectNetworkSyncData.a,
           hid: objectNetworkSyncData.hid,
@@ -371,9 +369,6 @@ namespace gdjs {
         this._lastSentBasicObjectSyncData = {
           x: objectNetworkSyncData.x,
           y: objectNetworkSyncData.y,
-          z: objectNetworkSyncData.z,
-          w: objectNetworkSyncData.w,
-          h: objectNetworkSyncData.h,
           zo: objectNetworkSyncData.zo,
           a: objectNetworkSyncData.a,
           hid: objectNetworkSyncData.hid,
@@ -448,7 +443,7 @@ namespace gdjs {
           objectOwner: this.playerNumber,
           objectName,
           instanceNetworkId,
-          objectNetworkSyncData: this.owner.getNetworkSyncData({}),
+          objectNetworkSyncData: this.owner.getNetworkSyncData(),
           sceneNetworkId,
         });
       this._sendDataToPeersWithIncreasedClock(
@@ -598,7 +593,7 @@ namespace gdjs {
         debugLogger.info(
           'Sending update message to move the object immediately.'
         );
-        const objectNetworkSyncData = this.owner.getNetworkSyncData({});
+        const objectNetworkSyncData = this.owner.getNetworkSyncData();
         const {
           messageName: updateMessageName,
           messageData: updateMessageData,

Extensions/Multiplayer/multiplayertools.ts

@@ -17,29 +17,9 @@ namespace gdjs {
     }[];
   };
 
-  type LobbyStatus =
-    | 'waiting'
-    | 'starting'
-    | 'playing'
-    | 'migrating'
-    | 'migrated';
-  type LobbyConnectionStatus = 'waiting' | 'ready' | 'connected';
-  type InGamePlayerStatus = 'playing' | 'left';
-  type PlayerStatus = LobbyConnectionStatus | InGamePlayerStatus;
-
-  type LobbyPlayer = {
-    playerId: string;
-    status: PlayerStatus;
-    playerNumber: number;
-  };
-
   type Lobby = {
     id: string;
-    minPlayers: number;
-    maxPlayers: number;
-    canJoinAfterStart: boolean;
-    players: LobbyPlayer[];
-    status: LobbyStatus;
+    status: 'waiting' | 'starting' | 'playing' | 'migrating' | 'migrated';
   };
 
   type QuickJoinLobbyResponse =
@@ -125,7 +105,6 @@ namespace gdjs {
     let _quickJoinLobbyFailureReason:
       | 'FULL'
       | 'NOT_ENOUGH_PLAYERS'
-      | 'DOES_NOT_EXIST'
       | 'UNKNOWN'
       | null = null;
     let _lobbyId: string | null = null;
@@ -1718,87 +1697,11 @@ namespace gdjs {
       }
     };
 
-    export const getLobbyID = (): string => {
-      return _lobbyId || '';
-    };
-
-    const quickJoinWithLobbyID = async (
+    export const authenticateAndQuickJoinLobby = async (
       runtimeScene: gdjs.RuntimeScene,
-      lobbyID: string,
       displayLoader: boolean,
       openLobbiesPageIfFailure: boolean
     ) => {
-      if (_isQuickJoiningOrStartingAGame) return;
-      const _gameId = gdjs.projectData.properties.projectUuid;
-      if (!_gameId) {
-        logger.error(
-          'The game ID is missing, the quick join lobby action cannot continue.'
-        );
-        return;
-      }
-
-      _quickJoinLobbyFailureReason = null;
-      _isQuickJoiningOrStartingAGame = true;
-      if (displayLoader) {
-        gdjs.multiplayerComponents.displayLoader(runtimeScene, true);
-      }
-
-      const quickJoinWithLobbyIDRelativeUrl = `/play/game/${_gameId}/public-lobby/${lobbyID}`;
-
-      try {
-        const lobby: Lobby = await gdjs.evtTools.network.retryIfFailed(
-          { times: 2 },
-          () =>
-            fetchAsPlayer({
-              relativeUrl: quickJoinWithLobbyIDRelativeUrl,
-              method: 'GET',
-              dev: isUsingGDevelopDevelopmentEnvironment,
-            })
-        );
-
-        const isFull = lobby.players.length === lobby.maxPlayers;
-        if (isFull) {
-          logger.error('Lobby is full - cannot quick join it.');
-          _quickJoinLobbyJustFailed = true;
-          _quickJoinLobbyFailureReason = 'FULL';
-          onLobbyQuickJoinFinished(runtimeScene);
-          if (openLobbiesPageIfFailure) {
-            openLobbiesWindow(runtimeScene);
-          }
-          return;
-        }
-
-        if (lobby.status === 'playing') {
-          _actionAfterJoiningLobby = 'JOIN_GAME';
-        } else if (lobby.status === 'waiting') {
-          if (lobby.players.length === 0) {
-            _actionAfterJoiningLobby = 'START_GAME';
-          } else {
-            _actionAfterJoiningLobby = 'OPEN_LOBBY_PAGE';
-          }
-        } else {
-          throw new Error(`Lobby in wrong status: ${lobby.status}`);
-        }
-
-        handleJoinLobbyEvent(runtimeScene, lobbyID);
-      } catch (error) {
-        const errorCode = parseInt(error.message.match(/\d{3}/)?.[0]);
-        if (errorCode === 404) {
-          logger.error('Lobby does not exist.');
-          _quickJoinLobbyFailureReason = 'DOES_NOT_EXIST';
-        } else {
-          logger.error('An error occurred while joining a lobby:', error);
-          _quickJoinLobbyFailureReason = 'UNKNOWN';
-        }
-        _quickJoinLobbyJustFailed = true;
-        onLobbyQuickJoinFinished(runtimeScene);
-        if (openLobbiesPageIfFailure) {
-          openLobbiesWindow(runtimeScene);
-        }
-      }
-    };
-
-    const isQuickJoiningTooFast = () => {
       const requestDoneAt = Date.now();
       if (_lastQuickJoinRequestDoneAt) {
         if (requestDoneAt - _lastQuickJoinRequestDoneAt < 500) {
@@ -1806,18 +1709,12 @@ namespace gdjs {
           logger.warn(
             'Last request to quick join a lobby was sent too little time ago. Ignoring this one.'
           );
-          return true;
+          return;
         }
       } else {
         _lastQuickJoinRequestDoneAt = requestDoneAt;
       }
 
-      return false;
-    };
-
-    const isNotCorrectlyAuthenticatedForQuickJoin = async (
-      runtimeScene: RuntimeScene
-    ) => {
       const playerId = gdjs.playerAuthentication.getUserId();
       const playerToken = gdjs.playerAuthentication.getUserToken();
       if (!playerId || !playerToken) {
@@ -1827,43 +1724,14 @@ namespace gdjs {
             .promise;
         _isWaitingForLogin = false;
 
-        if (status !== 'logged') {
-          return true;
+        if (status === 'logged') {
+          await quickJoinLobby(
+            runtimeScene,
+            displayLoader,
+            openLobbiesPageIfFailure
+          );
         }
-      }
 
-      return false;
-    };
-
-    export const authenticateAndQuickJoinWithLobbyID = async (
-      runtimeScene: gdjs.RuntimeScene,
-      lobbyID: string,
-      displayLoader: boolean,
-      openLobbiesPageIfFailure: boolean
-    ) => {
-      if (isQuickJoiningTooFast()) {
-        return;
-      }
-      if (await isNotCorrectlyAuthenticatedForQuickJoin(runtimeScene)) {
-        return;
-      }
-      await quickJoinWithLobbyID(
-        runtimeScene,
-        lobbyID,
-        displayLoader,
-        openLobbiesPageIfFailure
-      );
-    };
-
-    export const authenticateAndQuickJoinLobby = async (
-      runtimeScene: gdjs.RuntimeScene,
-      displayLoader: boolean,
-      openLobbiesPageIfFailure: boolean
-    ) => {
-      if (isQuickJoiningTooFast()) {
-        return;
-      }
-      if (await isNotCorrectlyAuthenticatedForQuickJoin(runtimeScene)) {
         return;
       }
       await quickJoinLobby(

Extensions/PanelSpriteObject/panelspriteruntimeobject-pixi-renderer.ts

@@ -389,15 +389,26 @@ namespace gdjs {
       this.updatePosition();
     }
 
-    setColor(rgbOrHexColor: string): void {
-      const tint = gdjs.rgbOrHexStringToNumber(rgbOrHexColor);
-      this._centerSprite.tint = tint;
+    setColor(rgbColor): void {
+      const colors = rgbColor.split(';');
+      if (colors.length < 3) {
+        return;
+      }
+      this._centerSprite.tint = gdjs.rgbToHexNumber(
+        parseInt(colors[0], 10),
+        parseInt(colors[1], 10),
+        parseInt(colors[2], 10)
+      );
       for (
         let borderCounter = 0;
         borderCounter < this._borderSprites.length;
         borderCounter++
       ) {
-        this._borderSprites[borderCounter].tint = tint;
+        this._borderSprites[borderCounter].tint = gdjs.rgbToHexNumber(
+          parseInt(colors[0], 10),
+          parseInt(colors[1], 10),
+          parseInt(colors[2], 10)
+        );
       }
       this._spritesContainer.cacheAsBitmap = false;
     }
@@ -405,11 +416,11 @@ namespace gdjs {
     getColor() {
       const rgb = new PIXI.Color(this._centerSprite.tint).toRgbArray();
       return (
-        Math.round(rgb[0] * 255) +
+        Math.floor(rgb[0] * 255) +
         ';' +
-        Math.round(rgb[1] * 255) +
+        Math.floor(rgb[1] * 255) +
         ';' +
-        Math.round(rgb[2] * 255)
+        Math.floor(rgb[2] * 255)
       );
     }
 

Extensions/PanelSpriteObject/panelspriteruntimeobject.ts

@@ -25,6 +25,8 @@ namespace gdjs {
   export type PanelSpriteObjectData = ObjectData & PanelSpriteObjectDataType;
 
   export type PanelSpriteNetworkSyncDataType = {
+    wid: number;
+    hei: number;
     op: number;
     color: string;
   };
@@ -119,24 +121,29 @@ namespace gdjs {
       return true;
     }
 
-    getNetworkSyncData(
-      syncOptions: GetNetworkSyncDataOptions
-    ): PanelSpriteNetworkSyncData {
+    getNetworkSyncData(): PanelSpriteNetworkSyncData {
       return {
-        ...super.getNetworkSyncData(syncOptions),
+        ...super.getNetworkSyncData(),
+        wid: this.getWidth(),
+        hei: this.getHeight(),
         op: this.getOpacity(),
         color: this.getColor(),
       };
     }
 
     updateFromNetworkSyncData(
-      networkSyncData: PanelSpriteNetworkSyncData,
-      options: UpdateFromNetworkSyncDataOptions
+      networkSyncData: PanelSpriteNetworkSyncData
     ): void {
-      super.updateFromNetworkSyncData(networkSyncData, options);
+      super.updateFromNetworkSyncData(networkSyncData);
 
       // Texture is not synchronized, see if this is asked or not.
 
+      if (networkSyncData.wid !== undefined) {
+        this.setWidth(networkSyncData.wid);
+      }
+      if (networkSyncData.hei !== undefined) {
+        this.setHeight(networkSyncData.hei);
+      }
       if (networkSyncData.op !== undefined) {
         this.setOpacity(networkSyncData.op);
       }

Extensions/ParticleSystem/ParticleEmitterObject.cpp

@@ -194,9 +194,9 @@ ParticleEmitterObject::GetProperties() const {
                 : GetRendererType() == Line ? "Line"
                                             : "Image")
       .SetType("choice")
-      .AddChoice("Circle", _("Circle"))
-      .AddChoice("Line", _("Line"))
-      .AddChoice("Image", _("Image"))
+      .AddExtraInfo("Circle")
+      .AddExtraInfo("Line")
+      .AddExtraInfo("Image")
       .SetLabel(_("Particle type"))
       .SetHasImpactOnOtherProperties(true);
 

Extensions/ParticleSystem/particleemitterobject.ts

@@ -370,11 +370,9 @@ namespace gdjs {
       return true;
     }
 
-    getNetworkSyncData(
-      syncOptions: GetNetworkSyncDataOptions
-    ): ParticleEmitterObjectNetworkSyncData {
+    getNetworkSyncData(): ParticleEmitterObjectNetworkSyncData {
       return {
-        ...super.getNetworkSyncData(syncOptions),
+        ...super.getNetworkSyncData(),
         prms: this.particleRotationMinSpeed,
         prmx: this.particleRotationMaxSpeed,
         mpc: this.maxParticlesCount,
@@ -401,10 +399,9 @@ namespace gdjs {
     }
 
     updateFromNetworkSyncData(
-      syncData: ParticleEmitterObjectNetworkSyncData,
-      options: UpdateFromNetworkSyncDataOptions
+      syncData: ParticleEmitterObjectNetworkSyncData
     ): void {
-      super.updateFromNetworkSyncData(syncData, options);
+      super.updateFromNetworkSyncData(syncData);
       if (syncData.x !== undefined) {
         this.setX(syncData.x);
       }

Extensions/PathfindingBehavior/pathfindingruntimebehavior.ts

@@ -6,7 +6,7 @@ namespace gdjs {
   const logger = new gdjs.Logger('Pathfinding behavior');
 
   interface PathfindingNetworkSyncDataType {
-    // Syncing the path and its position on it should be enough to have a good prediction.
+    // Syncing the path should be enough to have a good prediction.
     path: FloatPoint[];
     pf: boolean;
     sp: number;
@@ -15,7 +15,6 @@ namespace gdjs {
     tss: number;
     re: boolean;
     ma: number;
-    dos: number;
   }
 
   export interface PathfindingNetworkSyncData extends BehaviorNetworkSyncData {
@@ -134,11 +133,9 @@ namespace gdjs {
       return true;
     }
 
-    getNetworkSyncData(
-      options: GetNetworkSyncDataOptions
-    ): PathfindingNetworkSyncData {
+    getNetworkSyncData(): PathfindingNetworkSyncData {
       return {
-        ...super.getNetworkSyncData(options),
+        ...super.getNetworkSyncData(),
         props: {
           path: this._path,
           pf: this._pathFound,
@@ -148,16 +145,14 @@ namespace gdjs {
           tss: this._totalSegmentDistance,
           re: this._reachedEnd,
           ma: this._movementAngle,
-          dos: this._distanceOnSegment,
         },
       };
     }
 
     updateFromNetworkSyncData(
-      networkSyncData: PathfindingNetworkSyncData,
-      options: UpdateFromNetworkSyncDataOptions
+      networkSyncData: PathfindingNetworkSyncData
     ): void {
-      super.updateFromNetworkSyncData(networkSyncData, options);
+      super.updateFromNetworkSyncData(networkSyncData);
       const behaviorSpecificProps = networkSyncData.props;
       if (behaviorSpecificProps.path !== undefined) {
         this._path = behaviorSpecificProps.path;
@@ -186,9 +181,6 @@ namespace gdjs {
       if (behaviorSpecificProps.ma !== undefined) {
         this._movementAngle = behaviorSpecificProps.ma;
       }
-      if (behaviorSpecificProps.dos !== undefined) {
-        this._distanceOnSegment = behaviorSpecificProps.dos;
-      }
     }
 
     setCellWidth(width: float): void {

Extensions/Physics2Behavior/JsExtension.js

@@ -21,11 +21,7 @@ module.exports = {
       .setExtensionInformation(
         'Physics2',
         _('2D Physics Engine'),
-        "The 2D physics engine simulates realistic object physics, with gravity, forces, collisions, joints, etc. It's perfect for 2D games that need to have realistic behaving objects and a gameplay centered around it.\n" +
-          '\n' +
-          'Objects like floors or wall objects should usually be set to "Static" as type. Objects that should be moveable are usually "Dynamic" (default). "Kinematic" objects (typically, players or controlled characters) are only moved by their "linear velocity" and "angular velocity" - they can interact with other objects but only these other objects will move.\n' +
-          '\n' +
-          'Forces (and impulses) are expressed in all conditions/expressions/actions of the 2D physics engine in Newtons (N). Typical values for a force are 10-200 N. One meter is 100 pixels by default in the game (check the world scale). Mass is expressed in kilograms (kg).',
+        "The 2D physics engine simulates realistic object physics, with gravity, forces, collisions, joints, etc. It's perfect for 2D games that need to have realistic behaving objects and a gameplay centered around it.",
         'Florian Rival, Franco Maciel',
         'MIT'
       )
@@ -531,7 +527,6 @@ module.exports = {
         physics2Behavior,
         sharedData
       )
-      .markAsIrrelevantForChildObjects()
       .setIncludeFile('Extensions/Physics2Behavior/physics2runtimebehavior.js')
       .addIncludeFile('Extensions/Physics2Behavior/Box2D_v2.3.1_min.wasm.js')
       .addRequiredFile('Extensions/Physics2Behavior/Box2D_v2.3.1_min.wasm.wasm')
@@ -823,7 +818,7 @@ module.exports = {
       )
       .addParameter('object', _('Object'), '', false)
       .addParameter('behavior', _('Behavior'), 'Physics2Behavior')
-      .addParameter('yesorno', _('Treat as bullet'), '', false)
+      .addParameter('yesorno', _('Treat as bullet?'), '', false)
       .setDefaultValue('false')
       .getCodeExtraInformation()
       .setFunctionName('setBullet');
@@ -857,7 +852,7 @@ module.exports = {
       )
       .addParameter('object', _('Object'), '', false)
       .addParameter('behavior', _('Behavior'), 'Physics2Behavior')
-      .addParameter('yesorno', _('Fixed rotation'), '', false)
+      .addParameter('yesorno', _('Fixed rotation?'), '', false)
       .setDefaultValue('false')
       .getCodeExtraInformation()
       .setFunctionName('setFixedRotation');
@@ -891,7 +886,7 @@ module.exports = {
       )
       .addParameter('object', _('Object'), '', false)
       .addParameter('behavior', _('Behavior'), 'Physics2Behavior')
-      .addParameter('yesorno', _('Can sleep'), '', false)
+      .addParameter('yesorno', _('Can sleep?'), '', false)
       .setDefaultValue('true')
       .getCodeExtraInformation()
       .setFunctionName('setSleepingAllowed');
@@ -1301,7 +1296,7 @@ module.exports = {
       .addParameter('object', _('Object'), '', false)
       .addParameter('behavior', _('Behavior'), 'Physics2Behavior')
       .addParameter('expression', _('Layer (1 - 16)'))
-      .addParameter('yesorno', _('Enable'), '', false)
+      .addParameter('yesorno', _('Enable?'), '', false)
       .setDefaultValue('true')
       .getCodeExtraInformation()
       .setFunctionName('enableLayer');
@@ -1337,7 +1332,7 @@ module.exports = {
       .addParameter('object', _('Object'), '', false)
       .addParameter('behavior', _('Behavior'), 'Physics2Behavior')
       .addParameter('expression', _('Mask (1 - 16)'))
-      .addParameter('yesorno', _('Enable'), '', false)
+      .addParameter('yesorno', _('Enable?'), '', false)
       .setDefaultValue('true')
       .getCodeExtraInformation()
       .setFunctionName('enableMask');
@@ -2414,7 +2409,7 @@ module.exports = {
       .addParameter('object', _('Object'), '', false)
       .addParameter('behavior', _('Behavior'), 'Physics2Behavior')
       .addParameter('expression', _('Joint ID'))
-      .addParameter('yesorno', _('Enable'))
+      .addParameter('yesorno', _('Enable?'))
       .getCodeExtraInformation()
       .setFunctionName('enableRevoluteJointLimits');
 
@@ -2493,7 +2488,7 @@ module.exports = {
       .addParameter('object', _('Object'), '', false)
       .addParameter('behavior', _('Behavior'), 'Physics2Behavior')
       .addParameter('expression', _('Joint ID'))
-      .addParameter('yesorno', _('Enable'))
+      .addParameter('yesorno', _('Enable?'))
       .getCodeExtraInformation()
       .setFunctionName('enableRevoluteJointMotor');
 
@@ -2732,7 +2727,7 @@ module.exports = {
       .addParameter('object', _('Object'), '', false)
       .addParameter('behavior', _('Behavior'), 'Physics2Behavior')
       .addParameter('expression', _('Joint ID'))
-      .addParameter('yesorno', _('Enable'))
+      .addParameter('yesorno', _('Enable?'))
       .getCodeExtraInformation()
       .setFunctionName('enablePrismaticJointLimits');
 
@@ -2811,7 +2806,7 @@ module.exports = {
       .addParameter('object', _('Object'), '', false)
       .addParameter('behavior', _('Behavior'), 'Physics2Behavior')
       .addParameter('expression', _('Joint ID'))
-      .addParameter('yesorno', _('Enable'))
+      .addParameter('yesorno', _('Enable?'))
       .getCodeExtraInformation()
       .setFunctionName('enablePrismaticJointMotor');
 
@@ -3491,7 +3486,7 @@ module.exports = {
       .addParameter('object', _('Object'), '', false)
       .addParameter('behavior', _('Behavior'), 'Physics2Behavior')
       .addParameter('expression', _('Joint ID'))
-      .addParameter('yesorno', _('Enable'))
+      .addParameter('yesorno', _('Enable?'))
       .getCodeExtraInformation()
       .setFunctionName('enableWheelJointMotor');
 

Extensions/Physics2Behavior/physics2runtimebehavior.ts

@@ -499,9 +499,7 @@ namespace gdjs {
       return true;
     }
 
-    getNetworkSyncData(
-      options: GetNetworkSyncDataOptions
-    ): Physics2NetworkSyncData {
+    getNetworkSyncData(): Physics2NetworkSyncData {
       const bodyProps = this._body
         ? {
             tpx: this._body.GetTransform().get_p().get_x(),
@@ -522,7 +520,7 @@ namespace gdjs {
             aw: undefined,
           };
       return {
-        ...super.getNetworkSyncData(options),
+        ...super.getNetworkSyncData(),
         props: {
           ...bodyProps,
           layers: this.layers,
@@ -531,13 +529,45 @@ namespace gdjs {
       };
     }
 
-    updateFromNetworkSyncData(
-      networkSyncData: Physics2NetworkSyncData,
-      options: UpdateFromNetworkSyncDataOptions
-    ) {
-      super.updateFromNetworkSyncData(networkSyncData, options);
+    updateFromNetworkSyncData(networkSyncData: Physics2NetworkSyncData) {
+      super.updateFromNetworkSyncData(networkSyncData);
 
       const behaviorSpecificProps = networkSyncData.props;
+      if (
+        behaviorSpecificProps.tpx !== undefined &&
+        behaviorSpecificProps.tpy !== undefined &&
+        behaviorSpecificProps.tqa !== undefined
+      ) {
+        if (this._body) {
+          this._body.SetTransform(
+            this.b2Vec2(behaviorSpecificProps.tpx, behaviorSpecificProps.tpy),
+            behaviorSpecificProps.tqa
+          );
+        }
+      }
+
+      if (
+        behaviorSpecificProps.lvx !== undefined &&
+        behaviorSpecificProps.lvy !== undefined
+      ) {
+        if (this._body) {
+          this._body.SetLinearVelocity(
+            this.b2Vec2(behaviorSpecificProps.lvx, behaviorSpecificProps.lvy)
+          );
+        }
+      }
+
+      if (behaviorSpecificProps.av !== undefined) {
+        if (this._body) {
+          this._body.SetAngularVelocity(behaviorSpecificProps.av);
+        }
+      }
+
+      if (behaviorSpecificProps.aw !== undefined) {
+        if (this._body) {
+          this._body.SetAwake(behaviorSpecificProps.aw);
+        }
+      }
 
       if (behaviorSpecificProps.layers !== undefined) {
         this.layers = behaviorSpecificProps.layers;
@@ -546,38 +576,6 @@ namespace gdjs {
       if (behaviorSpecificProps.masks !== undefined) {
         this.masks = behaviorSpecificProps.masks;
       }
-
-      this.updateBodyFromObject();
-
-      if (!this._body) return;
-
-      if (
-        behaviorSpecificProps.tpx !== undefined &&
-        behaviorSpecificProps.tpy !== undefined &&
-        behaviorSpecificProps.tqa !== undefined
-      ) {
-        this._body.SetTransform(
-          this.b2Vec2(behaviorSpecificProps.tpx, behaviorSpecificProps.tpy),
-          behaviorSpecificProps.tqa
-        );
-      }
-
-      if (
-        behaviorSpecificProps.lvx !== undefined &&
-        behaviorSpecificProps.lvy !== undefined
-      ) {
-        this._body.SetLinearVelocity(
-          this.b2Vec2(behaviorSpecificProps.lvx, behaviorSpecificProps.lvy)
-        );
-      }
-
-      if (behaviorSpecificProps.av !== undefined) {
-        this._body.SetAngularVelocity(behaviorSpecificProps.av);
-      }
-
-      if (behaviorSpecificProps.aw !== undefined) {
-        this._body.SetAwake(behaviorSpecificProps.aw);
-      }
     }
 
     onDeActivate() {

Extensions/Physics3DBehavior/JsExtension.js

@@ -21,11 +21,7 @@ module.exports = {
       .setExtensionInformation(
         'Physics3D',
         _('3D physics engine'),
-        "The 3D physics engine simulates realistic object physics, with gravity, forces, collisions, joints, etc. It's perfect for almost all 3D games.\n" +
-          '\n' +
-          'Objects like floors or wall objects should usually be set to "Static" as type. Objects that should be moveable are usually "Dynamic" (default). "Kinematic" objects (typically, players or controlled characters) are only moved by their "linear velocity" and "angular velocity" - they can interact with other objects but only these other objects will move.\n' +
-          '\n' +
-          'Forces (and impulses) are expressed in all conditions/expressions/actions of the 3D physics engine in Newtons (N). Typical values for a force are 10-200 N. One meter is 100 pixels by default in the game (check the world scale). Mass is expressed in kilograms (kg).',
+        "The 3D physics engine simulates realistic object physics, with gravity, forces, collisions, joints, etc. It's perfect for almost all 3D games.",
         'Florian Rival',
         'MIT'
       )
@@ -278,7 +274,7 @@ module.exports = {
           .setLabel('Fixed Rotation')
           .setDescription(
             _(
-              "If enabled, the object won't rotate and will stay at the same angle."
+              "If enabled, the object won't rotate and will stay at the same angle. Useful for characters for example."
             )
           )
           .setGroup(_('Movement'));
@@ -679,7 +675,6 @@ module.exports = {
           behavior,
           sharedData
         )
-        .markAsIrrelevantForChildObjects()
         .addIncludeFile(
           'Extensions/Physics3DBehavior/Physics3DRuntimeBehavior.js'
         )
@@ -850,7 +845,7 @@ module.exports = {
         )
         .addParameter('object', _('Object'), '', false)
         .addParameter('behavior', _('Behavior'), 'Physics3DBehavior')
-        .addParameter('yesorno', _('Treat as bullet'), '', false)
+        .addParameter('yesorno', _('Treat as bullet?'), '', false)
         .setDefaultValue('false')
         .getCodeExtraInformation()
         .setFunctionName('setBullet');
@@ -875,7 +870,7 @@ module.exports = {
           'SetFixedRotation',
           _('Fixed rotation'),
           _(
-            "Enable or disable an object fixed rotation. If enabled the object won't be able to rotate. This action has no effect on characters."
+            "Enable or disable an object fixed rotation. If enabled the object won't be able to rotate."
           ),
           _('Set _PARAM0_ fixed rotation: _PARAM2_'),
           _('Dynamics'),
@@ -884,7 +879,7 @@ module.exports = {
         )
         .addParameter('object', _('Object'), '', false)
         .addParameter('behavior', _('Behavior'), 'Physics3DBehavior')
-        .addParameter('yesorno', _('Fixed rotation'), '', false)
+        .addParameter('yesorno', _('Fixed rotation?'), '', false)
         .setDefaultValue('false')
         .getCodeExtraInformation()
         .setFunctionName('setFixedRotation');
@@ -932,54 +927,6 @@ module.exports = {
         .setFunctionName('setDensity')
         .setGetter('getDensity');
 
-      aut
-        .addExpressionAndConditionAndAction(
-          'number',
-          'ShapeOffsetX',
-          _('Shape offset X'),
-          _('the object shape offset on X.'),
-          _('the shape offset on X'),
-          _('Body settings'),
-          'JsPlatform/Extensions/physics3d.svg'
-        )
-        .addParameter('object', _('Object'), '', false)
-        .addParameter('behavior', _('Behavior'), 'Physics3DBehavior')
-        .useStandardParameters('number', gd.ParameterOptions.makeNewOptions())
-        .setFunctionName('setShapeOffsetX')
-        .setGetter('getShapeOffsetX');
-
-      aut
-        .addExpressionAndConditionAndAction(
-          'number',
-          'ShapeOffsetY',
-          _('Shape offset Y'),
-          _('the object shape offset on Y.'),
-          _('the shape offset on Y'),
-          _('Body settings'),
-          'JsPlatform/Extensions/physics3d.svg'
-        )
-        .addParameter('object', _('Object'), '', false)
-        .addParameter('behavior', _('Behavior'), 'Physics3DBehavior')
-        .useStandardParameters('number', gd.ParameterOptions.makeNewOptions())
-        .setFunctionName('setShapeOffsetY')
-        .setGetter('getShapeOffsetY');
-
-      aut
-        .addExpressionAndConditionAndAction(
-          'number',
-          'ShapeOffsetZ',
-          _('Shape offset Z'),
-          _('the object shape offset on Z.'),
-          _('the shape offset on Z'),
-          _('Body settings'),
-          'JsPlatform/Extensions/physics3d.svg'
-        )
-        .addParameter('object', _('Object'), '', false)
-        .addParameter('behavior', _('Behavior'), 'Physics3DBehavior')
-        .useStandardParameters('number', gd.ParameterOptions.makeNewOptions())
-        .setFunctionName('setShapeOffsetZ')
-        .setGetter('getShapeOffsetZ');
-
       aut
         .addExpressionAndConditionAndAction(
           'number',
@@ -1107,7 +1054,7 @@ module.exports = {
         .addParameter('object', _('Object'), '', false)
         .addParameter('behavior', _('Behavior'), 'Physics3DBehavior')
         .addParameter('expression', _('Layer (1 - 8)'))
-        .addParameter('yesorno', _('Enable'), '', false)
+        .addParameter('yesorno', _('Enable?'), '', false)
         .setDefaultValue('true')
         .getCodeExtraInformation()
         .setFunctionName('enableLayer');
@@ -1143,7 +1090,7 @@ module.exports = {
         .addParameter('object', _('Object'), '', false)
         .addParameter('behavior', _('Behavior'), 'Physics3DBehavior')
         .addParameter('expression', _('Mask (1 - 8)'))
-        .addParameter('yesorno', _('Enable'), '', false)
+        .addParameter('yesorno', _('Enable?'), '', false)
         .setDefaultValue('true')
         .getCodeExtraInformation()
         .setFunctionName('enableMask');
@@ -1323,7 +1270,7 @@ module.exports = {
         .addParameter('expression', _('Application point on Z axis'))
         .setParameterLongDescription(
           _(
-            'Use `MassCenterX`, `MassCenterY` and `MassCenterZ` expressions to avoid any rotation.'
+            'Use `MassCenterX` and `MassCenterY` expressions to avoid any rotation.'
           )
         )
         .getCodeExtraInformation()
@@ -1597,19 +1544,6 @@ module.exports = {
         .addParameter('behavior', _('Behavior'), 'Physics3DBehavior')
         .getCodeExtraInformation()
         .setFunctionName('getMassCenterY');
-
-      aut
-        .addExpression(
-          'MassCenterZ',
-          _('Mass center Z'),
-          _('Mass center Z'),
-          '',
-          'JsPlatform/Extensions/physics3d.svg'
-        )
-        .addParameter('object', _('Object'), '', false)
-        .addParameter('behavior', _('Behavior'), 'Physics3DBehavior')
-        .getCodeExtraInformation()
-        .setFunctionName('getMassCenterZ');
     }
     // Collision
     extension
@@ -2048,12 +1982,7 @@ module.exports = {
           'PhysicsCharacter3D',
           _('3D physics character'),
           'PhysicsCharacter3D',
-          _(
-            'Allow an object to jump and run on platforms that have the 3D physics behavior' +
-              '(and which are generally set to "Static" as type, unless the platform is animated/moved in events).\n' +
-              '\n' +
-              'This behavior is usually used with one or more "mapper" behavior to let the player move it.'
-          ),
+          _('Jump and run on platforms.'),
           '',
           'JsPlatform/Extensions/physics_character3d.svg',
           'PhysicsCharacter3D',
@@ -2622,7 +2551,7 @@ module.exports = {
           'JumpSustainTime',
           _('Jump sustain time'),
           _(
-            'the jump sustain time of an object. This is the time during which keeping the jump button held allow the initial jump speed to be maintained'
+            'the jump sustain time of an object. This is the time during which keeping the jump button held allow the initial jump speed to be maintained.'
           ),
           _('the jump sustain time'),
           _('Character configuration'),
@@ -3310,11 +3239,7 @@ module.exports = {
           'PhysicsCar3D',
           _('3D physics car'),
           'PhysicsCar3D',
-          _(
-            "Simulate a realistic car using the 3D physics engine. This is mostly useful for the car controlled by the player (it's usually too complex for other cars in a game).\n" +
-              '\n' +
-              'This behavior is usually used with one or more "mapper" behavior to let the player move it.'
-          ),
+          _('Simulate a realistic car using the 3D physics engine.'),
           '',
           'JsPlatform/Extensions/physics_car3d.svg',
           'PhysicsCar3D',

Extensions/Physics3DBehavior/Physics3DRuntimeBehavior.ts

@@ -495,9 +495,7 @@ namespace gdjs {
       return true;
     }
 
-    override getNetworkSyncData(
-      options: GetNetworkSyncDataOptions
-    ): Physics3DNetworkSyncData {
+    override getNetworkSyncData(): Physics3DNetworkSyncData {
       let bodyProps;
       if (this._body) {
         const position = this._body.GetPosition();
@@ -539,7 +537,7 @@ namespace gdjs {
         };
       }
       return {
-        ...super.getNetworkSyncData(options),
+        ...super.getNetworkSyncData(),
         props: {
           ...bodyProps,
           layers: this.layers,
@@ -549,40 +547,27 @@ namespace gdjs {
     }
 
     override updateFromNetworkSyncData(
-      networkSyncData: Physics3DNetworkSyncData,
-      options: UpdateFromNetworkSyncDataOptions
+      networkSyncData: Physics3DNetworkSyncData
     ) {
-      super.updateFromNetworkSyncData(networkSyncData, options);
+      super.updateFromNetworkSyncData(networkSyncData);
 
       const behaviorSpecificProps = networkSyncData.props;
-
-      if (behaviorSpecificProps.layers !== undefined) {
-        this.layers = behaviorSpecificProps.layers;
-      }
-      if (behaviorSpecificProps.masks !== undefined) {
-        this.masks = behaviorSpecificProps.masks;
-      }
-
-      this._needToRecreateShape = true;
-      this._needToRecreateBody = true;
-      this.updateBodyFromObject();
-
-      if (!this._body) return;
-
       if (
         behaviorSpecificProps.px !== undefined &&
         behaviorSpecificProps.py !== undefined &&
         behaviorSpecificProps.pz !== undefined
       ) {
-        this._sharedData.bodyInterface.SetPosition(
-          this._body.GetID(),
-          this.getRVec3(
-            behaviorSpecificProps.px,
-            behaviorSpecificProps.py,
-            behaviorSpecificProps.pz
-          ),
-          Jolt.EActivation_DontActivate
-        );
+        if (this._body) {
+          this._sharedData.bodyInterface.SetPosition(
+            this._body.GetID(),
+            this.getRVec3(
+              behaviorSpecificProps.px,
+              behaviorSpecificProps.py,
+              behaviorSpecificProps.pz
+            ),
+            Jolt.EActivation_DontActivate
+          );
+        }
       }
       if (
         behaviorSpecificProps.rx !== undefined &&
@@ -590,77 +575,79 @@ namespace gdjs {
         behaviorSpecificProps.rz !== undefined &&
         behaviorSpecificProps.rw !== undefined
       ) {
-        this._sharedData.bodyInterface.SetRotation(
-          this._body.GetID(),
-          this.getQuat(
-            behaviorSpecificProps.rx,
-            behaviorSpecificProps.ry,
-            behaviorSpecificProps.rz,
-            behaviorSpecificProps.rw
-          ),
-          Jolt.EActivation_DontActivate
-        );
+        if (this._body) {
+          this._sharedData.bodyInterface.SetRotation(
+            this._body.GetID(),
+            this.getQuat(
+              behaviorSpecificProps.rx,
+              behaviorSpecificProps.ry,
+              behaviorSpecificProps.rz,
+              behaviorSpecificProps.rw
+            ),
+            Jolt.EActivation_DontActivate
+          );
+        }
       }
       if (
         behaviorSpecificProps.lvx !== undefined &&
         behaviorSpecificProps.lvy !== undefined &&
         behaviorSpecificProps.lvz !== undefined
       ) {
-        this._sharedData.bodyInterface.SetLinearVelocity(
-          this._body.GetID(),
-          this.getVec3(
-            behaviorSpecificProps.lvx,
-            behaviorSpecificProps.lvy,
-            behaviorSpecificProps.lvz
-          )
-        );
+        if (this._body) {
+          this._sharedData.bodyInterface.SetLinearVelocity(
+            this._body.GetID(),
+            this.getVec3(
+              behaviorSpecificProps.lvx,
+              behaviorSpecificProps.lvy,
+              behaviorSpecificProps.lvz
+            )
+          );
+        }
       }
       if (
         behaviorSpecificProps.avx !== undefined &&
         behaviorSpecificProps.avy !== undefined &&
         behaviorSpecificProps.avz !== undefined
       ) {
-        this._sharedData.bodyInterface.SetAngularVelocity(
-          this._body.GetID(),
-          this.getVec3(
-            behaviorSpecificProps.avx,
-            behaviorSpecificProps.avy,
-            behaviorSpecificProps.avz
-          )
-        );
+        if (this._body) {
+          this._sharedData.bodyInterface.SetAngularVelocity(
+            this._body.GetID(),
+            this.getVec3(
+              behaviorSpecificProps.avx,
+              behaviorSpecificProps.avy,
+              behaviorSpecificProps.avz
+            )
+          );
+        }
+      }
+      if (behaviorSpecificProps.layers !== undefined) {
+        this.layers = behaviorSpecificProps.layers;
+      }
+      if (behaviorSpecificProps.masks !== undefined) {
+        this.masks = behaviorSpecificProps.masks;
       }
     }
 
     override onDeActivate() {
       this._sharedData.removeFromBehaviorsList(this);
-      this._destroyBody();
-    }
-
-    override onActivate() {
-      this._sharedData.addToBehaviorsList(this);
-    }
-
-    override onDestroy() {
-      this._destroyedDuringFrameLogic = true;
-      this.onDeActivate();
-    }
-
-    _destroyBody() {
       this.bodyUpdater.destroyBody();
       this._contactsEndedThisFrame.length = 0;
       this._contactsStartedThisFrame.length = 0;
       this._currentContacts.length = 0;
     }
 
-    resetToDefaultBodyUpdater() {
-      this.bodyUpdater = new gdjs.Physics3DRuntimeBehavior.DefaultBodyUpdater(
-        this
-      );
+    override onActivate() {
+      this._sharedData.addToBehaviorsList(this);
+
+      this._contactsEndedThisFrame.length = 0;
+      this._contactsStartedThisFrame.length = 0;
+      this._currentContacts.length = 0;
+      this.updateBodyFromObject();
     }
 
-    resetToDefaultCollisionChecker() {
-      this.collisionChecker =
-        new gdjs.Physics3DRuntimeBehavior.DefaultCollisionChecker(this);
+    override onDestroy() {
+      this._destroyedDuringFrameLogic = true;
+      this.onDeActivate();
     }
 
     createShape(): Jolt.Shape {
@@ -924,59 +911,34 @@ namespace gdjs {
       this.updateBodyFromObject();
     }
 
-    recreateBody(previousBodyData?: {
-      linearVelocityX: float;
-      linearVelocityY: float;
-      linearVelocityZ: float;
-      angularVelocityX: float;
-      angularVelocityY: float;
-      angularVelocityZ: float;
-    }) {
-      const bodyInterface = this._sharedData.bodyInterface;
-      const linearVelocityX = previousBodyData
-        ? previousBodyData.linearVelocityX
-        : this._body
-          ? this._body.GetLinearVelocity().GetX()
-          : 0;
-      const linearVelocityY = previousBodyData
-        ? previousBodyData.linearVelocityY
-        : this._body
-          ? this._body.GetLinearVelocity().GetY()
-          : 0;
-      const linearVelocityZ = previousBodyData
-        ? previousBodyData.linearVelocityZ
-        : this._body
-          ? this._body.GetLinearVelocity().GetZ()
-          : 0;
-      const angularVelocityX = previousBodyData
-        ? previousBodyData.angularVelocityX
-        : this._body
-          ? this._body.GetAngularVelocity().GetX()
-          : 0;
-      const angularVelocityY = previousBodyData
-        ? previousBodyData.angularVelocityY
-        : this._body
-          ? this._body.GetAngularVelocity().GetY()
-          : 0;
-      const angularVelocityZ = previousBodyData
-        ? previousBodyData.angularVelocityZ
-        : this._body
-          ? this._body.GetAngularVelocity().GetZ()
-          : 0;
-
-      if (this._body) {
-        this.bodyUpdater.destroyBody();
-        this._contactsEndedThisFrame.length = 0;
-        this._contactsStartedThisFrame.length = 0;
-        this._currentContacts.length = 0;
+    recreateBody() {
+      if (!this._body) {
+        this._createBody();
+        return;
       }
 
+      const bodyInterface = this._sharedData.bodyInterface;
+      const linearVelocity = this._body.GetLinearVelocity();
+      const linearVelocityX = linearVelocity.GetX();
+      const linearVelocityY = linearVelocity.GetY();
+      const linearVelocityZ = linearVelocity.GetZ();
+      const angularVelocity = this._body.GetAngularVelocity();
+      const angularVelocityX = angularVelocity.GetX();
+      const angularVelocityY = angularVelocity.GetY();
+      const angularVelocityZ = angularVelocity.GetZ();
+
+      let bodyID = this._body.GetID();
+      bodyInterface.RemoveBody(bodyID);
+      bodyInterface.DestroyBody(bodyID);
+      this._contactsEndedThisFrame.length = 0;
+      this._contactsStartedThisFrame.length = 0;
+      this._currentContacts.length = 0;
+
       this._createBody();
       if (!this._body) {
         return;
       }
-
-      const bodyID = this._body.GetID();
+      bodyID = this._body.GetID();
       bodyInterface.SetLinearVelocity(
         bodyID,
         this.getVec3(linearVelocityX, linearVelocityY, linearVelocityZ)
@@ -1216,33 +1178,6 @@ namespace gdjs {
       this._needToRecreateBody = true;
     }
 
-    getShapeOffsetX(): float {
-      return this.shapeOffsetX;
-    }
-
-    setShapeOffsetX(shapeOffsetX: float): void {
-      this.shapeOffsetX = shapeOffsetX;
-      this._needToRecreateShape = true;
-    }
-
-    getShapeOffsetY(): float {
-      return this.shapeOffsetY;
-    }
-
-    setShapeOffsetY(shapeOffsetY: float): void {
-      this.shapeOffsetY = shapeOffsetY;
-      this._needToRecreateShape = true;
-    }
-
-    getShapeOffsetZ(): float {
-      return this.shapeOffsetZ;
-    }
-
-    setShapeOffsetZ(shapeOffsetZ: float): void {
-      this.shapeOffsetZ = shapeOffsetZ;
-      this._needToRecreateShape = true;
-    }
-
     getFriction(): float {
       return this.friction;
     }
@@ -1607,9 +1542,9 @@ namespace gdjs {
       }
       const body = this._body!;
 
-      const deltaX = towardX - this.owner3D.getX();
-      const deltaY = towardY - this.owner3D.getY();
-      const deltaZ = towardZ - this.owner3D.getZ();
+      const deltaX = towardX - body.GetPosition().GetX();
+      const deltaY = towardY - body.GetPosition().GetY();
+      const deltaZ = towardZ - body.GetPosition().GetZ();
       const distanceSq = deltaX * deltaX + deltaY * deltaY + deltaZ * deltaZ;
       if (distanceSq === 0) {
         return;
@@ -1667,16 +1602,19 @@ namespace gdjs {
       length: float,
       towardX: float,
       towardY: float,
-      towardZ: float
+      towardZ: float,
+      originX: float,
+      originY: float,
+      originZ: float
     ): void {
       if (this._body === null) {
         if (!this._createBody()) return;
       }
       const body = this._body!;
 
-      const deltaX = towardX - this.owner3D.getX();
-      const deltaY = towardY - this.owner3D.getY();
-      const deltaZ = towardZ - this.owner3D.getZ();
+      const deltaX = towardX - originX;
+      const deltaY = towardY - originY;
+      const deltaZ = towardZ - originZ;
       const distanceSq = deltaX * deltaX + deltaY * deltaY + deltaZ * deltaZ;
       if (distanceSq === 0) {
         return;
@@ -1685,7 +1623,12 @@ namespace gdjs {
 
       this._sharedData.bodyInterface.AddImpulse(
         body.GetID(),
-        this.getVec3(deltaX * ratio, deltaY * ratio, deltaZ * ratio)
+        this.getVec3(deltaX * ratio, deltaY * ratio, deltaZ * ratio),
+        this.getRVec3(
+          originX * this._sharedData.worldInvScale,
+          originY * this._sharedData.worldInvScale,
+          originZ * this._sharedData.worldInvScale
+        )
       );
     }