Update translations

Don't show in changelog

.vscode/settings.json

@@ -84,7 +84,8 @@
         "any": "cpp",
         "array": "cpp",
         "cinttypes": "cpp",
-        "numeric": "cpp"
+        "numeric": "cpp",
+        "__memory": "cpp"
     },
     "files.exclude": {
         "Binaries/*build*": true,

CMakeLists.txt

@@ -75,6 +75,11 @@ else()
     message(FATAL_ERROR "The compiler ${CMAKE_CXX_COMPILER} has no C++11 support (with GNU extensions). Please use a different C++ compiler.")
 endif()
 
+# Mark some warnings as errors
+if(CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
+	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror=return-stack-address")
+endif()
+
 #Define common directories:
 set(GD_base_dir ${CMAKE_CURRENT_SOURCE_DIR})
 

Core/GDCore/Events/Builtin/ForEachEvent.cpp

@@ -31,12 +31,17 @@ vector<gd::InstructionsList*> ForEachEvent::GetAllActionsVectors() {
   return allActions;
 }
 
-vector<gd::Expression*> ForEachEvent::GetAllExpressions() {
-  vector<gd::Expression*> allExpressions;
-  allExpressions.push_back(&objectsToPick);
+vector<pair<gd::Expression*, gd::ParameterMetadata> >
+    ForEachEvent::GetAllExpressionsWithMetadata() {
+  vector<pair<gd::Expression*, gd::ParameterMetadata> >
+      allExpressionsWithMetadata;
+  auto metadata = gd::ParameterMetadata().SetType("object");
+  allExpressionsWithMetadata.push_back(
+      std::make_pair(&objectsToPick, metadata));
 
-  return allExpressions;
+  return allExpressionsWithMetadata;
 }
+
 vector<const gd::InstructionsList*> ForEachEvent::GetAllConditionsVectors()
     const {
   vector<const gd::InstructionsList*> allConditions;
@@ -52,11 +57,15 @@ vector<const gd::InstructionsList*> ForEachEvent::GetAllActionsVectors() const {
   return allActions;
 }
 
-vector<const gd::Expression*> ForEachEvent::GetAllExpressions() const {
-  vector<const gd::Expression*> allExpressions;
-  allExpressions.push_back(&objectsToPick);
+vector<pair<const gd::Expression*, const gd::ParameterMetadata> >
+    ForEachEvent::GetAllExpressionsWithMetadata() const {
+  vector<pair<const gd::Expression*, const gd::ParameterMetadata> >
+      allExpressionsWithMetadata;
+  auto metadata = gd::ParameterMetadata().SetType("object");
+  allExpressionsWithMetadata.push_back(
+      std::make_pair(&objectsToPick, metadata));
 
-  return allExpressions;
+  return allExpressionsWithMetadata;
 }
 
 void ForEachEvent::SerializeTo(SerializerElement& element) const {

Core/GDCore/Events/Builtin/ForEachEvent.h

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

Core/GDCore/Events/Builtin/RepeatEvent.cpp

@@ -31,11 +31,15 @@ vector<gd::InstructionsList*> RepeatEvent::GetAllActionsVectors() {
   return allActions;
 }
 
-vector<gd::Expression*> RepeatEvent::GetAllExpressions() {
-  vector<gd::Expression*> allExpressions;
-  allExpressions.push_back(&repeatNumberExpression);
+vector<pair<gd::Expression*, gd::ParameterMetadata> >
+    RepeatEvent::GetAllExpressionsWithMetadata() {
+  vector<pair<gd::Expression*, gd::ParameterMetadata> >
+      allExpressionsWithMetadata;
+  auto metadata = gd::ParameterMetadata().SetType("expression");
+  allExpressionsWithMetadata.push_back(
+      std::make_pair(&repeatNumberExpression, metadata));
 
-  return allExpressions;
+  return allExpressionsWithMetadata;
 }
 
 vector<const gd::InstructionsList*> RepeatEvent::GetAllConditionsVectors()
@@ -53,11 +57,15 @@ vector<const gd::InstructionsList*> RepeatEvent::GetAllActionsVectors() const {
   return allActions;
 }
 
-vector<const gd::Expression*> RepeatEvent::GetAllExpressions() const {
-  vector<const gd::Expression*> allExpressions;
-  allExpressions.push_back(&repeatNumberExpression);
+vector<pair<const gd::Expression*, const gd::ParameterMetadata> >
+    RepeatEvent::GetAllExpressionsWithMetadata() const {
+  vector<pair<const gd::Expression*, const gd::ParameterMetadata> >
+      allExpressionsWithMetadata;
+  auto metadata = gd::ParameterMetadata().SetType("expression");
+  allExpressionsWithMetadata.push_back(
+      std::make_pair(&repeatNumberExpression, metadata));
 
-  return allExpressions;
+  return allExpressionsWithMetadata;
 }
 
 void RepeatEvent::SerializeTo(SerializerElement& element) const {

Core/GDCore/Events/Builtin/RepeatEvent.h

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

Core/GDCore/Events/CodeGeneration/EventsCodeGenerator.cpp

@@ -1,6 +1,8 @@
 #include "GDCore/Events/CodeGeneration/EventsCodeGenerator.h"
+
 #include <algorithm>
 #include <utility>
+
 #include "GDCore/CommonTools.h"
 #include "GDCore/Events/CodeGeneration/EventsCodeGenerationContext.h"
 #include "GDCore/Events/CodeGeneration/ExpressionCodeGenerator.h"
@@ -628,7 +630,7 @@ gd::String EventsCodeGenerator::GenerateParameterCodes(
 
     argOutput = "\"" + argOutput + "\"";
   } else if (ParameterMetadata::IsBehavior(metadata.type)) {
-    argOutput = "\"" + ConvertToString(parameter) + "\"";
+    argOutput = GenerateGetBehaviorNameCode(parameter);
   } else if (metadata.type == "key") {
     argOutput = "\"" + ConvertToString(parameter) + "\"";
   } else if (metadata.type == "password" || metadata.type == "musicfile" ||
@@ -1109,6 +1111,33 @@ gd::String EventsCodeGenerator::GenerateBehaviorAction(
   }
 }
 
+size_t EventsCodeGenerator::GenerateSingleUsageUniqueIdForEventsList() {
+  return eventsListNextUniqueId++;
+}
+
+size_t EventsCodeGenerator::GenerateSingleUsageUniqueIdFor(
+    const Instruction* instruction) {
+  if (!instruction) {
+    std::cout << "ERROR: During code generation, a null pointer was passed to "
+                 "GenerateSingleUsageUniqueIdFor."
+              << std::endl;
+  }
+
+  // Base the unique id on the adress in memory so that the same instruction
+  // in memory will get the same id across different code generations.
+  size_t uniqueId = (size_t)instruction;
+
+  // While in most case this function is called a single time for each instruction,
+  // it's possible for an instruction to be appearing more than once in the events,
+  // if we used links. In this case, simply increment the unique id to be sure that
+  // ids are effectively uniques, and stay stable (given the same order of links).
+  while (instructionUniqueIds.find(uniqueId) != instructionUniqueIds.end()) {
+    uniqueId++;
+  }
+  instructionUniqueIds.insert(uniqueId);
+  return uniqueId;
+}
+
 gd::String EventsCodeGenerator::GetObjectListName(
     const gd::String& name, const gd::EventsCodeGenerationContext& context) {
   return ManObjListName(name);
@@ -1137,7 +1166,8 @@ EventsCodeGenerator::EventsCodeGenerator(gd::Project& project_,
       errorOccurred(false),
       compilationForRuntime(false),
       maxCustomConditionsDepth(0),
-      maxConditionsListsSize(0){};
+      maxConditionsListsSize(0),
+      eventsListNextUniqueId(0){};
 
 EventsCodeGenerator::EventsCodeGenerator(
     const gd::Platform& platform_,
@@ -1152,6 +1182,7 @@ EventsCodeGenerator::EventsCodeGenerator(
       errorOccurred(false),
       compilationForRuntime(false),
       maxCustomConditionsDepth(0),
-      maxConditionsListsSize(0){};
+      maxConditionsListsSize(0),
+      eventsListNextUniqueId(0){};
 
 }  // namespace gd

Core/GDCore/Events/CodeGeneration/EventsCodeGenerator.h

@@ -9,6 +9,7 @@
 #include <set>
 #include <utility>
 #include <vector>
+
 #include "GDCore/Events/Event.h"
 #include "GDCore/Events/Instruction.h"
 #include "GDCore/String.h"
@@ -123,7 +124,7 @@ class GD_CORE_API EventsCodeGenerator {
    *
    */
   std::vector<gd::String> GenerateParametersCodes(
-      const std::vector<gd::Expression> & parameters,
+      const std::vector<gd::Expression>& parameters,
       const std::vector<gd::ParameterMetadata>& parametersInfo,
       EventsCodeGenerationContext& context,
       std::vector<std::pair<gd::String, gd::String> >*
@@ -321,7 +322,7 @@ class GD_CORE_API EventsCodeGenerator {
    * group.
    *
    * Get a list containing the "real" objects name when the events refers to \a
-   * objectName :<br> If \a objectName if really an object, the list will only
+   * objectName :<br> If \a objectName is really an object, the list will only
    * contains \a objectName unchanged.<br> If \a objectName is a group, the list
    * will contains all the objects of the group.<br> If \a objectName is the
    * "current" object in the context ( i.e: The object being used for launching
@@ -411,6 +412,29 @@ class GD_CORE_API EventsCodeGenerator {
 
   enum VariableScope { LAYOUT_VARIABLE = 0, PROJECT_VARIABLE, OBJECT_VARIABLE };
 
+  /**
+   * Generate a single unique number for the specified instruction.
+   *
+   * This is useful for instructions that need to identify themselves in the
+   * generated code like the "Trigger Once" conditions. The id is stable across
+   * code generations if the instructions are the same objects in memory.
+   *
+   * Note that if this function is called multiple times with the same
+   * instruction, the unique number returned will be *different*. This is
+   * because a single instruction might appear at multiple places in events due
+   * to the usage of links.
+   */
+  size_t GenerateSingleUsageUniqueIdFor(const gd::Instruction* instruction);
+
+  /**
+   * Generate a single unique number for an events list.
+   *
+   * This is useful to create unique function names for events list, that are
+   * stable across code generation given the exact same list of events. They are
+   * *not* stable if events are moved/reorganized.
+   */
+  size_t GenerateSingleUsageUniqueIdForEventsList();
+
  protected:
   /**
    * \brief Generate the code for a single parameter.
@@ -704,7 +728,8 @@ class GD_CORE_API EventsCodeGenerator {
   /**
    * Generate the getter to get the name of the specified behavior.
    */
-  virtual gd::String GenerateGetBehaviorNameCode(const gd::String& behaviorName);
+  virtual gd::String GenerateGetBehaviorNameCode(
+      const gd::String& behaviorName);
 
   const gd::Platform& platform;  ///< The platform being used.
 
@@ -732,6 +757,11 @@ class GD_CORE_API EventsCodeGenerator {
   size_t maxCustomConditionsDepth;  ///< The maximum depth value for all the
                                     ///< custom conditions created.
   size_t maxConditionsListsSize;  ///< The maximum size of a list of conditions.
+
+  std::set<size_t>
+      instructionUniqueIds;  ///< The unique ids generated for instructions.
+  size_t eventsListNextUniqueId;  ///< The next identifier to use for an events
+                                  ///< list function name.
 };
 
 }  // namespace gd

Core/GDCore/Events/Event.h

@@ -12,6 +12,7 @@
 #include <vector>
 #include "GDCore/Events/Instruction.h"
 #include "GDCore/Events/InstructionsList.h"
+#include "GDCore/Extensions/Metadata/InstructionMetadata.h"
 #include "GDCore/String.h"
 namespace gd {
 class EventsList;
@@ -127,15 +128,17 @@ class GD_CORE_API BaseEvent {
   };
 
   /**
-   * \brief Return a list of all expressions of the event.
-   * \note Used to preprocess or search in the expressions.
+   * \brief Return a list of all expressions of the event, each with their associated metadata.
+   * \note Used to preprocess or search in the expressions of the event.
    */
-  virtual std::vector<gd::Expression*> GetAllExpressions() {
-    std::vector<gd::Expression*> noExpr;
+  virtual std::vector<std::pair<gd::Expression*, gd::ParameterMetadata> >
+      GetAllExpressionsWithMetadata() {
+    std::vector<std::pair<gd::Expression*, gd::ParameterMetadata> > noExpr;
     return noExpr;
   };
-  virtual std::vector<const gd::Expression*> GetAllExpressions() const {
-    std::vector<const gd::Expression*> noExpr;
+  virtual std::vector<std::pair<const gd::Expression*, const gd::ParameterMetadata> >
+      GetAllExpressionsWithMetadata() const {
+    std::vector<std::pair<const gd::Expression*, const gd::ParameterMetadata> > noExpr;
     return noExpr;
   };
 

Core/GDCore/Events/Instruction.cpp

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

Core/GDCore/Events/Instruction.h

@@ -5,7 +5,9 @@
  */
 #ifndef INSTRUCTION_H
 #define INSTRUCTION_H
+#include <memory>
 #include <vector>
+
 #include "GDCore/Events/Expression.h"
 #include "GDCore/Events/InstructionsList.h"
 #include "GDCore/String.h"
@@ -131,6 +133,17 @@ class GD_CORE_API Instruction {
    */
   inline gd::InstructionsList& GetSubInstructions() { return subInstructions; };
 
+  /**
+   * \brief Return the original instruction this instruction was copied from.
+   *
+   * Useful to get reference to the original instruction in memory during code
+   * generation, to ensure stable unique identifiers.
+   */
+  std::weak_ptr<Instruction> GetOriginalInstruction() { return originalInstruction; };
+
+  friend std::shared_ptr<Instruction> CloneRememberingOriginalElement(
+      std::shared_ptr<Instruction> instruction);
+
  private:
   gd::String type;  ///< Instruction type
   bool inverted;  ///< True if the instruction if inverted. Only applicable for
@@ -139,9 +152,23 @@ class GD_CORE_API Instruction {
       parameters;                        ///< Vector containing the parameters
   gd::InstructionsList subInstructions;  ///< Sub instructions, if applicable.
 
+  std::weak_ptr<Instruction>
+      originalInstruction;  ///< Pointer used to remember which gd::Instruction
+                            ///< this instruction was copied from. Useful to
+                            ///< ensure the stability of code generation (as
+                            ///< some part of code generation uses the pointer
+                            ///< to the instruction as a unique identifier).
+
   static gd::Expression badExpression;
 };
 
+/**
+ * Clone the given instruction, returning an instruction for which
+ * `GetOriginalInstruction()` returns the originally copied instruction.
+ */
+std::shared_ptr<Instruction> GD_CORE_API
+CloneRememberingOriginalElement(std::shared_ptr<Instruction> instruction);
+
 }  // namespace gd
 
 #endif  // INSTRUCTION_H

Core/GDCore/Events/Parsers/ExpressionParser2.h

@@ -348,7 +348,8 @@ class GD_CORE_API ExpressionParser2 {
       return std::move(child);
     }
 
-    return std::move(std::unique_ptr<VariableAccessorOrVariableBracketAccessorNode>());
+    return std::move(
+        std::unique_ptr<VariableAccessorOrVariableBracketAccessorNode>());
   }
 
   std::unique_ptr<FunctionCallNode> FreeFunction(
@@ -367,10 +368,10 @@ class GD_CORE_API ExpressionParser2 {
                          : MetadataProvider::GetStrExpressionMetadata(
                                platform, functionFullName);
 
-    auto parametersAndError = Parameters(metadata.parameters);
+    auto parametersNode = Parameters(metadata.parameters);
     auto function = gd::make_unique<FunctionCallNode>(
-        type, std::move(parametersAndError.first), metadata, functionFullName);
-    function->diagnostic = std::move(parametersAndError.second);
+        type, std::move(parametersNode.parameters), metadata, functionFullName);
+    function->diagnostic = std::move(parametersNode.diagnostic);
     if (!function->diagnostic)
       function->diagnostic =
           ValidateFunction(*function, identifierLocation.GetStartPosition());
@@ -379,6 +380,8 @@ class GD_CORE_API ExpressionParser2 {
         identifierLocation.GetStartPosition(), GetCurrentPosition());
     function->functionNameLocation = identifierLocation;
     function->openingParenthesisLocation = openingParenthesisLocation;
+    function->closingParenthesisLocation =
+        parametersNode.closingParenthesisLocation;
     return std::move(function);
   }
 
@@ -421,14 +424,14 @@ class GD_CORE_API ExpressionParser2 {
               : MetadataProvider::GetObjectStrExpressionMetadata(
                     platform, objectType, objectFunctionOrBehaviorName);
 
-      auto parametersAndError = Parameters(metadata.parameters, objectName);
-      auto function =
-          gd::make_unique<FunctionCallNode>(type,
-                                            objectName,
-                                            std::move(parametersAndError.first),
-                                            metadata,
-                                            objectFunctionOrBehaviorName);
-      function->diagnostic = std::move(parametersAndError.second);
+      auto parametersNode = Parameters(metadata.parameters, objectName);
+      auto function = gd::make_unique<FunctionCallNode>(
+          type,
+          objectName,
+          std::move(parametersNode.parameters),
+          metadata,
+          objectFunctionOrBehaviorName);
+      function->diagnostic = std::move(parametersNode.diagnostic);
       if (!function->diagnostic)
         function->diagnostic =
             ValidateFunction(*function, objectNameLocation.GetStartPosition());
@@ -439,6 +442,8 @@ class GD_CORE_API ExpressionParser2 {
       function->objectNameDotLocation = objectNameDotLocation;
       function->functionNameLocation = objectFunctionOrBehaviorNameLocation;
       function->openingParenthesisLocation = openingParenthesisLocation;
+      function->closingParenthesisLocation =
+          parametersNode.closingParenthesisLocation;
       return std::move(function);
     }
 
@@ -485,16 +490,16 @@ class GD_CORE_API ExpressionParser2 {
                            : MetadataProvider::GetBehaviorStrExpressionMetadata(
                                  platform, behaviorType, functionName);
 
-      auto parametersAndError =
+      auto parametersNode =
           Parameters(metadata.parameters, objectName, behaviorName);
-      auto function =
-          gd::make_unique<FunctionCallNode>(type,
-                                            objectName,
-                                            behaviorName,
-                                            std::move(parametersAndError.first),
-                                            metadata,
-                                            functionName);
-      function->diagnostic = std::move(parametersAndError.second);
+      auto function = gd::make_unique<FunctionCallNode>(
+          type,
+          objectName,
+          behaviorName,
+          std::move(parametersNode.parameters),
+          metadata,
+          functionName);
+      function->diagnostic = std::move(parametersNode.diagnostic);
       if (!function->diagnostic)
         function->diagnostic =
             ValidateFunction(*function, objectNameLocation.GetStartPosition());
@@ -507,6 +512,8 @@ class GD_CORE_API ExpressionParser2 {
       function->behaviorNameNamespaceSeparatorLocation =
           behaviorNameNamespaceSeparatorLocation;
       function->openingParenthesisLocation = openingParenthesisLocation;
+      function->closingParenthesisLocation =
+          parametersNode.closingParenthesisLocation;
       function->functionNameLocation = functionNameLocation;
       return std::move(function);
     } else {
@@ -527,11 +534,17 @@ class GD_CORE_API ExpressionParser2 {
     }
   }
 
-  std::pair<std::vector<std::unique_ptr<ExpressionNode>>,
-            std::unique_ptr<gd::ExpressionParserError>>
-  Parameters(std::vector<gd::ParameterMetadata> parameterMetadata,
-             const gd::String &objectName = "",
-             const gd::String &behaviorName = "") {
+  // A temporary node that will be integrated into function nodes.
+  struct ParametersNode {
+    std::vector<std::unique_ptr<ExpressionNode>> parameters;
+    std::unique_ptr<gd::ExpressionParserError> diagnostic;
+    ExpressionParserLocation closingParenthesisLocation;
+  };
+
+  ParametersNode Parameters(
+      std::vector<gd::ParameterMetadata> parameterMetadata,
+      const gd::String &objectName = "",
+      const gd::String &behaviorName = "") {
     std::vector<std::unique_ptr<ExpressionNode>> parameters;
 
     // By convention, object is always the first parameter, and behavior the
@@ -543,8 +556,9 @@ class GD_CORE_API ExpressionParser2 {
       SkipAllWhitespaces();
 
       if (CheckIfChar(IsClosingParenthesis)) {
-        SkipChar();
-        return std::make_pair(std::move(parameters), nullptr);
+        auto closingParenthesisLocation = SkipChar();
+        return ParametersNode{
+            std::move(parameters), nullptr, closingParenthesisLocation};
       } else {
         if (parameterIndex < parameterMetadata.size()) {
           const gd::String &type = parameterMetadata[parameterIndex].GetType();
@@ -588,10 +602,12 @@ class GD_CORE_API ExpressionParser2 {
       }
     }
 
-    return std::make_pair(
+    ExpressionParserLocation invalidClosingParenthesisLocation;
+    return ParametersNode{
         std::move(parameters),
         RaiseSyntaxError(_("The list of parameters is not terminated. Add a "
-                           "closing parenthesis to end the parameters.")));
+                           "closing parenthesis to end the parameters.")),
+        invalidClosingParenthesisLocation};
   }
   ///@}
 
@@ -821,6 +837,7 @@ class GD_CORE_API ExpressionParser2 {
 
   bool IsEndReached() { return currentPosition >= expression.size(); }
 
+  // A temporary node used when reading an identifier
   struct IdentifierAndLocation {
     gd::String name;
     ExpressionParserLocation location;

Core/GDCore/Events/Parsers/ExpressionParser2Node.h

@@ -385,6 +385,8 @@ struct FunctionCallNode : public FunctionCallOrObjectFunctionNameOrEmptyNode {
                                                ///separator, if any.
   ExpressionParserLocation
       openingParenthesisLocation;  ///< Location of the "(".
+  ExpressionParserLocation
+      closingParenthesisLocation;  ///< Location of the ")".
 };
 
 /**

Core/GDCore/Extensions/Builtin/BaseObjectExtension.cpp

@@ -13,11 +13,12 @@ namespace gd {
 void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
     gd::PlatformExtension& extension) {
   extension
-      .SetExtensionInformation("BuiltinObject",
-                               _("Features for all objects"),
-                               _("Common features that can be used for all objects in GDevelop."),
-                               "Florian Rival",
-                               "Open source (MIT License)")
+      .SetExtensionInformation(
+          "BuiltinObject",
+          _("Features for all objects"),
+          _("Common features that can be used for all objects in GDevelop."),
+          "Florian Rival",
+          "Open source (MIT License)")
       .SetExtensionHelpPath("/objects/base_object/events");
 
   gd::ObjectMetadata& obj = extension.AddObject<gd::Object>(
@@ -72,14 +73,14 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
       .UseStandardOperatorParameters("number")
       .MarkAsSimple();
 
-  obj.AddAction(
-         "MettreXY",
-         _("Position of an object"),
-         _("Change the position of an object."),
-         _("Change the position of _PARAM0_: _PARAM1_ _PARAM2_ (x axis), _PARAM3_ _PARAM4_ (y axis)"),
-         _("Position"),
-         "res/actions/position24.png",
-         "res/actions/position.png")
+  obj.AddAction("MettreXY",
+                _("Position of an object"),
+                _("Change the position of an object."),
+                _("Change the position of _PARAM0_: _PARAM1_ _PARAM2_ (x "
+                  "axis), _PARAM3_ _PARAM4_ (y axis)"),
+                _("Position"),
+                "res/actions/position24.png",
+                "res/actions/position.png")
 
       .AddParameter("object", _("Object"))
       .AddParameter("operator", _("Modification's sign"))
@@ -294,14 +295,13 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
       .AddParameter("objectvar", _("Variable"))
       .UseStandardOperatorParameters("number");
 
-  obj.AddAction(
-         "ModVarObjetTxt",
-         _("Modify the text of a variable of an object"),
-         _("Modify the text of a variable of an object"),
-         _("the text of variable _PARAM1_"),
-         _("Variables"),
-         "res/actions/var24.png",
-         "res/actions/var.png")
+  obj.AddAction("ModVarObjetTxt",
+                _("Modify the text of a variable of an object"),
+                _("Modify the text of a variable of an object"),
+                _("the text of variable _PARAM1_"),
+                _("Variables"),
+                "res/actions/var24.png",
+                "res/actions/var.png")
 
       .AddParameter("object", _("Object"))
       .AddParameter("objectvar", _("Variable"))
@@ -473,14 +473,13 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
       .AddParameter("objectvar", _("Variable"))
       .UseStandardRelationalOperatorParameters("number");
 
-  obj.AddCondition(
-         "VarObjetTxt",
-         _("Text of an object's variable"),
-         _("Compare the text of a variable of an object."),
-         _("the text of variable _PARAM1_"),
-         _("Variables"),
-         "res/conditions/var24.png",
-         "res/conditions/var.png")
+  obj.AddCondition("VarObjetTxt",
+                   _("Text of an object's variable"),
+                   _("Compare the text of a variable of an object."),
+                   _("the text of variable _PARAM1_"),
+                   _("Variables"),
+                   "res/conditions/var24.png",
+                   "res/conditions/var.png")
 
       .AddParameter("object", _("Object"))
       .AddParameter("objectvar", _("Variable"))
@@ -634,6 +633,23 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
       .AddParameter("expression", _("Y position of the point"))
       .MarkAsSimple();
 
+  extension
+      .AddCondition("SourisSurObjet",
+                    _("The cursor/touch is on an object"),
+                    _("Test if the cursor is over an object, or if the object "
+                      "is being touched."),
+                    _("The cursor/touch is on _PARAM0_"),
+                    _("Mouse and touch"),
+                    "res/conditions/surObjet24.png",
+                    "res/conditions/surObjet.png")
+
+      .AddParameter("objectList", _("Object"))
+      .AddCodeOnlyParameter("currentScene", "")
+      .AddParameter("yesorno", _("Accurate test (yes by default)"), "", true)
+      .SetDefaultValue("yes")
+      .AddCodeOnlyParameter("conditionInverted", "")
+      .MarkAsSimple();
+
   obj.AddCondition(
          "ObjectTimer",
          _("Value of a timer"),

Core/GDCore/Extensions/Builtin/MouseExtension.cpp

@@ -21,23 +21,6 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsMouseExtension(
       .SetExtensionHelpPath("/all-features/mouse-touch");
 
 #if defined(GD_IDE_ONLY)
-  extension
-      .AddCondition("SourisSurObjet",
-                    _("The cursor/touch is on an object"),
-                    _("Test if the cursor is over an object, or if the object "
-                      "is being touched."),
-                    _("The cursor/touch is on _PARAM0_"),
-                    _("Mouse and touch"),
-                    "res/conditions/surObjet24.png",
-                    "res/conditions/surObjet.png")
-
-      .AddParameter("objectList", _("Object"))
-      .AddCodeOnlyParameter("currentScene", "")
-      .AddParameter("yesorno", _("Accurate test (yes by default)"), "", true)
-      .SetDefaultValue("yes")
-      .AddCodeOnlyParameter("conditionInverted", "")
-      .MarkAsSimple();
-
   extension
       .AddCondition(
           "IsMouseWheelScrollingUp",

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

@@ -380,7 +380,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsSpriteExtension(
   obj.AddAction("ChangeBlendMode",
                 _("Blend mode"),
                 _("Change the number of the blend mode of an object.\nThe "
-                  "default blend mode is 0 (Alpha)."),
+                  "default blend mode is 0 (Normal)."),
                 _("Change Blend mode of _PARAM0_ to _PARAM1_"),
                 _("Effects"),
                 "res/actions/color24.png",
@@ -388,7 +388,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsSpriteExtension(
 
       .AddParameter("object", _("Object"), "Sprite")
       .AddParameter("expression",
-                    _("Mode (0 : Alpha, 1 : Add, 2 : Multiply, 3 : None)"))
+                    _("Mode (0: Normal, 1: Add, 2: Multiply, 3: Screen)"))
       .MarkAsSimple();
 
   obj.AddAction("FlipX",

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

@@ -107,8 +107,7 @@ void SpriteObject::DoSerializeTo(gd::SerializerElement& element) const {
   }
 }
 
-std::map<gd::String, gd::PropertyDescriptor> SpriteObject::GetProperties(
-    gd::Project& project) const {
+std::map<gd::String, gd::PropertyDescriptor> SpriteObject::GetProperties() const {
   std::map<gd::String, gd::PropertyDescriptor> properties;
   properties[_("Animate even if hidden or far from the screen")]
       .SetValue(updateIfNotVisible ? "true" : "false")
@@ -119,8 +118,7 @@ std::map<gd::String, gd::PropertyDescriptor> SpriteObject::GetProperties(
 }
 
 bool SpriteObject::UpdateProperty(const gd::String& name,
-                                  const gd::String& value,
-                                  gd::Project& project) {
+                                  const gd::String& value) {
   if (name == _("Animate even if hidden or far from the screen"))
     updateIfNotVisible = value == "1";
 

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

@@ -48,11 +48,9 @@ class GD_CORE_API SpriteObject : public gd::Object {
 #if defined(GD_IDE_ONLY)
   void ExposeResources(gd::ArbitraryResourceWorker& worker) override;
 
-  std::map<gd::String, gd::PropertyDescriptor> GetProperties(
-      gd::Project& project) const override;
+  std::map<gd::String, gd::PropertyDescriptor> GetProperties() const override;
   bool UpdateProperty(const gd::String& name,
-                      const gd::String& value,
-                      gd::Project& project) override;
+                      const gd::String& value) override;
 
   std::map<gd::String, gd::PropertyDescriptor> GetInitialInstanceProperties(
       const gd::InitialInstance& position,

Core/GDCore/Extensions/Builtin/StringInstructionsExtension.cpp

@@ -119,6 +119,18 @@ BuiltinExtensionsImplementer::ImplementsStringInstructionsExtension(
                      _("Manipulation of text"),
                      "res/conditions/toujours24.png")
 
+      .AddParameter("string", _("Text"))
+      .AddParameter("string", _("Text to search for"))
+      .SetHidden(); // Deprecated, see StrFindLast instead.
+
+  extension
+      .AddExpression("StrFindLast",
+                     _("Search the last occurence in a text"),
+                     _("Search the last occurence in a string (return the position of "
+                       "the result, from the beginning of the string, or -1 if not found)"),
+                     _("Manipulation of text"),
+                     "res/conditions/toujours24.png")
+
       .AddParameter("string", _("Text"))
       .AddParameter("string", _("Text to search for"));
 
@@ -145,6 +157,22 @@ BuiltinExtensionsImplementer::ImplementsStringInstructionsExtension(
           _("Manipulation of text"),
           "res/conditions/toujours24.png")
 
+      .AddParameter("string", _("Text"))
+      .AddParameter("string", _("Text to search for"))
+      .AddParameter("expression",
+                    _("Position of the last character in the string to be "
+                      "considered in the search"))
+      .SetHidden(); // Deprecated, see StrFindLastFrom instead.
+
+  extension
+      .AddExpression(
+          "StrFindLastFrom",
+          _("Search the last occurence in a text, starting from a position"),
+          _("Search in a text the last occurence, starting from a position (return "
+            " the position of the result, from the beginning of the string, or -1 if not found)"),
+          _("Manipulation of text"),
+          "res/conditions/toujours24.png")
+
       .AddParameter("string", _("Text"))
       .AddParameter("string", _("Text to search for"))
       .AddParameter("expression",

Core/GDCore/Extensions/Metadata/ParameterMetadataTools.cpp

@@ -90,7 +90,7 @@ size_t ParameterMetadataTools::GetObjectParameterIndexFor(
   // the object in the list of parameters (if possible, just after).
   // Search "lastObjectName" in the codebase for other place where this
   // convention is enforced.
-  for (std::size_t pNb = parameterIndex - 1; pNb < parametersMetadata.size();
+  for (std::size_t pNb = parameterIndex; pNb < parametersMetadata.size();
        pNb--) {
     if (gd::ParameterMetadata::IsObject(parametersMetadata[pNb].GetType())) {
       return pNb;

Core/GDCore/IDE/Events/EventsRefactorer.cpp

@@ -279,6 +279,43 @@ bool EventsRefactorer::RenameObjectInConditions(
   return somethingModified;
 }
 
+bool EventsRefactorer::RenameObjectInEventParameters(
+    const gd::Platform& platform,
+    gd::ObjectsContainer& project,
+    gd::ObjectsContainer& layout,
+    gd::Expression& expression,
+    gd::ParameterMetadata parameterMetadata,
+    gd::String oldName,
+    gd::String newName) {
+  bool somethingModified = false;
+
+  if (gd::ParameterMetadata::IsObject(parameterMetadata.GetType()) &&
+      expression.GetPlainString() == oldName)
+    expression = gd::Expression(newName);
+  // Replace object's name in expressions
+  else if (ParameterMetadata::IsExpression(
+               "number", parameterMetadata.GetType())) {
+    gd::ExpressionParser2 parser(platform, project, layout);
+    auto node = parser.ParseExpression("number", expression.GetPlainString());
+
+    if (ExpressionObjectRenamer::Rename(*node, oldName, newName)) {
+      expression = ExpressionParser2NodePrinter::PrintNode(*node);
+    }
+  }
+  // Replace object's name in text expressions
+  else if (ParameterMetadata::IsExpression(
+               "string", parameterMetadata.GetType())) {
+    gd::ExpressionParser2 parser(platform, project, layout);
+    auto node = parser.ParseExpression("string", expression.GetPlainString());
+
+    if (ExpressionObjectRenamer::Rename(*node, oldName, newName)) {
+      expression = ExpressionParser2NodePrinter::PrintNode(*node);
+    }
+  }
+
+  return somethingModified;
+}
+
 void EventsRefactorer::RenameObjectInEvents(const gd::Platform& platform,
                                             gd::ObjectsContainer& project,
                                             gd::ObjectsContainer& layout,
@@ -300,6 +337,15 @@ void EventsRefactorer::RenameObjectInEvents(const gd::Platform& platform,
           platform, project, layout, *actionsVectors[j], oldName, newName);
     }
 
+    vector<pair<gd::Expression*, gd::ParameterMetadata>> expressionsWithMetadata =
+        events[i].GetAllExpressionsWithMetadata();
+    for (std::size_t j = 0; j < expressionsWithMetadata.size(); ++j) {
+      gd::Expression* expression = expressionsWithMetadata[j].first;
+      gd::ParameterMetadata parameterMetadata = expressionsWithMetadata[j].second;
+      bool somethingModified = RenameObjectInEventParameters(
+        platform, project, layout, *expression, parameterMetadata, oldName, newName);
+    }
+
     if (events[i].CanHaveSubEvents())
       RenameObjectInEvents(platform,
                            project,

Core/GDCore/IDE/Events/EventsRefactorer.h

@@ -8,6 +8,7 @@
 #include <memory>
 #include <vector>
 #include "GDCore/Events/Instruction.h"
+#include "GDCore/Extensions/Metadata/InstructionMetadata.h"
 #include "GDCore/String.h"
 namespace gd {
 class EventsList;
@@ -146,6 +147,20 @@ class GD_CORE_API EventsRefactorer {
                                        gd::InstructionsList& instructions,
                                        gd::String oldName,
                                        gd::String newName);
+   /**
+   * Replace all occurrences of an object name by another name in an expression
+   * with the specified metadata
+   * ( include : objects or objects in math/text expressions ).
+   *
+   * \return true if something was modified.
+   */
+  static bool RenameObjectInEventParameters(const gd::Platform& platform,
+                                            gd::ObjectsContainer& project,
+                                            gd::ObjectsContainer& layout,
+                                            gd::Expression& expression,
+                                            gd::ParameterMetadata parameterMetadata,
+                                            gd::String oldName,
+                                            gd::String newName);
 
   /**
    * Remove all conditions of the list using an object

Core/GDCore/IDE/Events/ExpressionCompletionFinder.h

@@ -43,8 +43,9 @@ struct ExpressionCompletionDescription {
   /**
    * \brief Create a completion for an object with the given prefix
    */
-  static ExpressionCompletionDescription ForObject(const gd::String& prefix_) {
-    return ExpressionCompletionDescription(Object, "", prefix_);
+  static ExpressionCompletionDescription ForObject(const gd::String& type_,
+                                                   const gd::String& prefix_) {
+    return ExpressionCompletionDescription(Object, type_, prefix_);
   }
 
   /**
@@ -114,23 +115,21 @@ struct ExpressionCompletionDescription {
   const gd::String& GetBehaviorName() const { return behaviorName; }
 
   /**
-   * \brief Set if the completion description is informative, i.e: it's not used
-   * to
-   * complete anything. Rather, it should display information about what is
+   * \brief Set if the completion description is exact, i.e: it's not used
+   * to complete anything. Rather, it should display information about what is
    * described by the completion.
    */
-  ExpressionCompletionDescription& SetIsInformative(bool isInformative_) {
-    isInformative = isInformative_;
+  ExpressionCompletionDescription& SetIsExact(bool isExact_) {
+    isExact = isExact_;
     return *this;
   }
 
   /**
-   * \brief Check if the completion description is informative, i.e: it's not
-   * used to
-   * complete anything. Rather, it should display information about what is
-   * described by the completion.
+   * \brief Check if the completion description is exact, i.e: it's not
+   * used to complete anything. Rather, it should display information
+   * about what is described by the completion.
    */
-  bool IsInformative() const { return isInformative; }
+  bool IsExact() const { return isExact; }
 
   /** Default constructor, only to be used by Emscripten bindings. */
   ExpressionCompletionDescription() : completionKind(Object){};
@@ -146,14 +145,14 @@ struct ExpressionCompletionDescription {
         prefix(prefix_),
         objectName(objectName_),
         behaviorName(behaviorName_),
-        isInformative(false) {}
+        isExact(false) {}
 
   CompletionKind completionKind;
   gd::String type;
   gd::String prefix;
   gd::String objectName;
   gd::String behaviorName;
-  bool isInformative;
+  bool isExact;
 };
 
 /**
@@ -164,7 +163,7 @@ std::ostream& operator<<(std::ostream& os,
   os << "{ " << value.GetCompletionKind() << ", " << value.GetType() << ", "
      << value.GetPrefix() << ", " << value.GetObjectName() << ", "
      << value.GetBehaviorName() << ", "
-     << (value.IsInformative() ? "informative" : "non-informative") << " }";
+     << (value.IsExact() ? "exact" : "non-exact") << " }";
   return os;
 }
 
@@ -209,17 +208,20 @@ class GD_CORE_API ExpressionCompletionFinder
 
  protected:
   void OnVisitSubExpressionNode(SubExpressionNode& node) override {
-    completions.push_back(ExpressionCompletionDescription::ForObject(""));
+    completions.push_back(
+        ExpressionCompletionDescription::ForObject(node.type, ""));
     completions.push_back(
         ExpressionCompletionDescription::ForExpression(node.type, ""));
   }
   void OnVisitOperatorNode(OperatorNode& node) override {
-    completions.push_back(ExpressionCompletionDescription::ForObject(""));
+    completions.push_back(
+        ExpressionCompletionDescription::ForObject(node.type, ""));
     completions.push_back(
         ExpressionCompletionDescription::ForExpression(node.type, ""));
   }
   void OnVisitUnaryOperatorNode(UnaryOperatorNode& node) override {
-    completions.push_back(ExpressionCompletionDescription::ForObject(""));
+    completions.push_back(
+        ExpressionCompletionDescription::ForObject(node.type, ""));
     completions.push_back(
         ExpressionCompletionDescription::ForExpression(node.type, ""));
   }
@@ -243,12 +245,12 @@ class GD_CORE_API ExpressionCompletionFinder
   void OnVisitIdentifierNode(IdentifierNode& node) override {
     if (gd::ParameterMetadata::IsObject(node.type)) {
       // Only show completions of objects if an object is required
-      completions.push_back(
-          ExpressionCompletionDescription::ForObject(node.identifierName));
+      completions.push_back(ExpressionCompletionDescription::ForObject(
+          node.type, node.identifierName));
     } else {
       // Show completions for expressions and objects otherwise.
-      completions.push_back(
-          ExpressionCompletionDescription::ForObject(node.identifierName));
+      completions.push_back(ExpressionCompletionDescription::ForObject(
+          node.type, node.identifierName));
       completions.push_back(ExpressionCompletionDescription::ForExpression(
           node.type, node.identifierName));
     }
@@ -259,8 +261,8 @@ class GD_CORE_API ExpressionCompletionFinder
       // Behavior function (or behavior function being written, with the
       // function name missing)
       if (IsCaretOn(node.objectNameLocation)) {
-        completions.push_back(
-            ExpressionCompletionDescription::ForObject(node.objectName));
+        completions.push_back(ExpressionCompletionDescription::ForObject(
+            node.type, node.objectName));
       } else if (IsCaretOn(node.objectNameDotLocation) ||
                  IsCaretOn(node.objectFunctionOrBehaviorNameLocation)) {
         completions.push_back(ExpressionCompletionDescription::ForBehavior(
@@ -276,8 +278,8 @@ class GD_CORE_API ExpressionCompletionFinder
     } else {
       // Object function or behavior name
       if (IsCaretOn(node.objectNameLocation)) {
-        completions.push_back(
-            ExpressionCompletionDescription::ForObject(node.objectName));
+        completions.push_back(ExpressionCompletionDescription::ForObject(
+            node.type, node.objectName));
       } else if (IsCaretOn(node.objectNameDotLocation) ||
                  IsCaretOn(node.objectFunctionOrBehaviorNameLocation)) {
         completions.push_back(ExpressionCompletionDescription::ForBehavior(
@@ -288,11 +290,14 @@ class GD_CORE_API ExpressionCompletionFinder
     }
   }
   void OnVisitFunctionCallNode(FunctionCallNode& node) override {
+    bool isCaretOnParenthesis = IsCaretOn(node.openingParenthesisLocation) ||
+                                IsCaretOn(node.closingParenthesisLocation);
+
     if (!node.behaviorName.empty()) {
       // Behavior function
       if (IsCaretOn(node.objectNameLocation)) {
-        completions.push_back(
-            ExpressionCompletionDescription::ForObject(node.objectName));
+        completions.push_back(ExpressionCompletionDescription::ForObject(
+            node.type, node.objectName));
       } else if (IsCaretOn(node.objectNameDotLocation) ||
                  IsCaretOn(node.behaviorNameLocation)) {
         completions.push_back(ExpressionCompletionDescription::ForBehavior(
@@ -303,40 +308,38 @@ class GD_CORE_API ExpressionCompletionFinder
                                                            node.functionName,
                                                            node.objectName,
                                                            node.behaviorName)
-                .SetIsInformative(IsCaretOn(node.openingParenthesisLocation)));
+                .SetIsExact(isCaretOnParenthesis));
       }
     } else if (!node.objectName.empty()) {
       // Object function
       if (IsCaretOn(node.objectNameLocation)) {
-        completions.push_back(
-            ExpressionCompletionDescription::ForObject(node.objectName));
+        completions.push_back(ExpressionCompletionDescription::ForObject(
+            node.type, node.objectName));
       } else {
         // Add completions for behaviors, because we could imagine that the user
         // wants to move from an object function to a behavior function, and so
         // need behavior completions. Do this unless we're on the parenthesis
         // (at which point we're only showing informative message about the
         // function).
-        if (!IsCaretOn(node.openingParenthesisLocation)) {
+        if (!isCaretOnParenthesis) {
           completions.push_back(ExpressionCompletionDescription::ForBehavior(
               node.functionName, node.objectName));
         }
 
-        completions.push_back(
-            ExpressionCompletionDescription::ForExpression(
-                node.type, node.functionName, node.objectName)
-                .SetIsInformative(IsCaretOn(node.openingParenthesisLocation)));
+        completions.push_back(ExpressionCompletionDescription::ForExpression(
+                                  node.type, node.functionName, node.objectName)
+                                  .SetIsExact(isCaretOnParenthesis));
       }
     } else {
       // Free function
-      completions.push_back(
-          ExpressionCompletionDescription::ForExpression(node.type,
-                                                         node.functionName)
-              .SetIsInformative(IsCaretOn(node.openingParenthesisLocation)));
+      completions.push_back(ExpressionCompletionDescription::ForExpression(
+                                node.type, node.functionName)
+                                .SetIsExact(isCaretOnParenthesis));
     }
   }
   void OnVisitEmptyNode(EmptyNode& node) override {
     completions.push_back(
-        ExpressionCompletionDescription::ForObject(node.text));
+        ExpressionCompletionDescription::ForObject(node.type, node.text));
     completions.push_back(
         ExpressionCompletionDescription::ForExpression(node.type, node.text));
   }
@@ -344,6 +347,8 @@ class GD_CORE_API ExpressionCompletionFinder
  private:
   bool IsCaretOn(const ExpressionParserLocation& location,
                  bool inclusive = false) {
+    if (!location.IsValid()) return false;
+
     return (location.GetStartPosition() <= searchedPosition &&
             ((!inclusive && searchedPosition < location.GetEndPosition()) ||
              (inclusive && searchedPosition <= location.GetEndPosition())));

Core/GDCore/IDE/Events/InstructionSentenceFormatter.cpp

@@ -49,9 +49,15 @@ InstructionSentenceFormatter::GetAsFormattedText(
 
   gd::String sentence = metadata.GetSentence();
   std::replace(sentence.Raw().begin(), sentence.Raw().end(), '\n', ' ');
-  bool parse = true;
 
+  size_t loopCount = 0;
+  bool parse = true;
   while (parse) {
+    if (loopCount > 40) {
+      break;
+    }
+    loopCount++;
+
     // Search first parameter
     parse = false;
     size_t firstParamPosition = gd::String::npos;

Core/GDCore/IDE/ProjectStripper.cpp

@@ -4,6 +4,7 @@
  * reserved. This project is released under the MIT License.
  */
 #include "ProjectStripper.h"
+
 #include "GDCore/Project/ExternalEvents.h"
 #include "GDCore/Project/ExternalLayout.h"
 #include "GDCore/Project/Layout.h"
@@ -20,61 +21,8 @@ void GD_CORE_API ProjectStripper::StripProjectForExport(gd::Project& project) {
     project.GetLayout(i).GetObjectGroups().Clear();
     project.GetLayout(i).GetEvents().Clear();
   }
-}
 
-void GD_CORE_API ProjectStripper::StripProjectForLayoutEdition(
-    gd::Project& project, const gd::String& layoutName) {
-  while (project.GetExternalEventsCount() > 0)
-    project.RemoveExternalEvents(project.GetExternalEvents(0).GetName());
-
-  for (unsigned int i = 0; i < project.GetLayoutsCount(); ++i) {
-    auto& layout = project.GetLayout(i);
-    if (layoutName == layout.GetName()) continue;
-
-    project.GetLayout(i).GetEvents().Clear();
-    project.GetLayout(i).GetInitialInstances().Clear();
-  }
-
-  for (unsigned int i = 0; i < project.GetExternalEventsCount(); ++i) {
-    project.GetExternalEvents(i).GetEvents().Clear();
-  }
-
-  for (unsigned int i = 0; i < project.GetExternalLayoutsCount(); ++i) {
-    project.GetExternalLayout(i).GetInitialInstances().Clear();
-  }
-}
-
-void GD_CORE_API ProjectStripper::StripProjectForExternalLayoutEdition(
-    gd::Project& project, const gd::String& externalLayoutName) {
-  while (project.GetExternalEventsCount() > 0)
-    project.RemoveExternalEvents(project.GetExternalEvents(0).GetName());
-
-  gd::String associatedLayoutName;
-  if (project.HasExternalLayoutNamed(externalLayoutName)) {
-    associatedLayoutName =
-        project.GetExternalLayout(externalLayoutName).GetAssociatedLayout();
-  }
-
-  for (unsigned int i = 0; i < project.GetLayoutsCount(); ++i) {
-    auto& layout = project.GetLayout(i);
-    if (!associatedLayoutName.empty() &&
-        associatedLayoutName == layout.GetName())
-      continue;
-
-    project.GetLayout(i).GetEvents().Clear();
-    project.GetLayout(i).GetInitialInstances().Clear();
-  }
-
-  for (unsigned int i = 0; i < project.GetExternalEventsCount(); ++i) {
-    project.GetExternalEvents(i).GetEvents().Clear();
-  }
-
-  for (unsigned int i = 0; i < project.GetExternalLayoutsCount(); ++i) {
-    auto& externalLayout = project.GetExternalLayout(i);
-    if (externalLayoutName == externalLayout.GetName()) continue;
-
-    externalLayout.GetInitialInstances().Clear();
-  }
+  project.ClearEventsFunctionsExtensions();
 }
 
 }  // namespace gd

Core/GDCore/IDE/ProjectStripper.h

@@ -28,23 +28,6 @@ class GD_CORE_API ProjectStripper {
    */
   static void StripProjectForExport(gd::Project& project);
 
-  /**
-   * \brief Strip project to keep only the full content of the specified
-   * layout. The content of other layouts, external events and external layouts
-   * is removed.
-   */
-  static void StripProjectForLayoutEdition(gd::Project& project,
-                                           const gd::String& layoutName);
-
-  /**
-   * \brief Strip project to keep only the full content of the specified
-   * external layout and the associated layout.
-   * The content of other layouts, external events and external layouts is
-   * removed.
-   */
-  static void StripProjectForExternalLayoutEdition(
-      gd::Project& project, const gd::String& externalLayoutName);
-
  private:
   ProjectStripper(){};
   virtual ~ProjectStripper(){};

Core/GDCore/IDE/WholeProjectRefactorer.h

@@ -181,7 +181,7 @@ class GD_CORE_API WholeProjectRefactorer {
       bool isObjectGroup);
 
   /**
-   * \brief Refactor the events function after an object or group is renamed
+   * \brief Refactor the events function after an object or group is removed
    *
    * This will update the events of the function and groups.
    */

Core/GDCore/Project/Behavior.cpp

@@ -15,7 +15,7 @@ Behavior::~Behavior(){};
 
 #if defined(GD_IDE_ONLY)
 std::map<gd::String, gd::PropertyDescriptor> Behavior::GetProperties(
-    const gd::SerializerElement& behaviorContent, gd::Project& project) const {
+    const gd::SerializerElement& behaviorContent) const {
   std::map<gd::String, gd::PropertyDescriptor> nothing;
   return nothing;
 }

Core/GDCore/Project/Behavior.h

@@ -61,7 +61,7 @@ class GD_CORE_API Behavior {
    * \see gd::PropertyDescriptor
    */
   virtual std::map<gd::String, gd::PropertyDescriptor> GetProperties(
-      const gd::SerializerElement& behaviorContent, gd::Project& project) const;
+      const gd::SerializerElement& behaviorContent) const;
 
   /**
    * \brief Called when the IDE wants to update a custom property of the
@@ -72,8 +72,7 @@ class GD_CORE_API Behavior {
    */
   virtual bool UpdateProperty(gd::SerializerElement& behaviorContent,
                               const gd::String& name,
-                              const gd::String& value,
-                              gd::Project& project) {
+                              const gd::String& value) {
     return false;
   };
 #endif

Core/GDCore/Project/BehaviorsSharedData.cpp

@@ -16,7 +16,7 @@ BehaviorsSharedData::~BehaviorsSharedData(){};
 
 #if defined(GD_IDE_ONLY)
 std::map<gd::String, gd::PropertyDescriptor> BehaviorsSharedData::GetProperties(
-    const gd::SerializerElement& behaviorSharedDataContent, gd::Project& project) const {
+    const gd::SerializerElement& behaviorSharedDataContent) const {
   std::map<gd::String, gd::PropertyDescriptor> nothing;
   return nothing;
 }

Core/GDCore/Project/BehaviorsSharedData.h

@@ -64,8 +64,7 @@ class GD_CORE_API BehaviorsSharedData {
    * \see gd::PropertyDescriptor
    */
   virtual std::map<gd::String, gd::PropertyDescriptor> GetProperties(
-      const gd::SerializerElement& behaviorSharedDataContent,
-      gd::Project& project) const;
+      const gd::SerializerElement& behaviorSharedDataContent) const;
 
   /**
    * \brief Called when the IDE wants to update a property of the shared data
@@ -75,8 +74,7 @@ class GD_CORE_API BehaviorsSharedData {
    */
   virtual bool UpdateProperty(gd::SerializerElement& behaviorSharedDataContent,
                               const gd::String& name,
-                              const gd::String& value,
-                              gd::Project& project) {
+                              const gd::String& value) {
     return false;
   };
 #endif

Core/GDCore/Project/InitialInstance.cpp

@@ -5,10 +5,12 @@
  */
 
 #include "GDCore/Project/InitialInstance.h"
+
 #include "GDCore/Project/Layout.h"
 #include "GDCore/Project/Object.h"
 #include "GDCore/Project/Project.h"
 #include "GDCore/Serialization/SerializerElement.h"
+#include "GDCore/Tools/UUID/UUID.h"
 #if defined(GD_IDE_ONLY)
 #include "GDCore/Project/PropertyDescriptor.h"
 #endif
@@ -27,7 +29,8 @@ InitialInstance::InitialInstance()
       personalizedSize(false),
       width(0),
       height(0),
-      locked(false) {}
+      locked(false),
+      persistentUuid(UUID::MakeUuid4()) {}
 
 void InitialInstance::UnserializeFrom(const SerializerElement& element) {
   SetObjectName(element.GetStringAttribute("name", "", "nom"));
@@ -42,6 +45,9 @@ void InitialInstance::UnserializeFrom(const SerializerElement& element) {
   SetLayer(element.GetStringAttribute("layer"));
   SetLocked(element.GetBoolAttribute("locked", false));
 
+  persistentUuid = element.GetStringAttribute("persistentUuid");
+  if (persistentUuid.empty()) ResetPersistentUuid();
+
   floatInfos.clear();
   const SerializerElement& floatPropElement =
       element.GetChild("numberProperties", 0, "floatInfos");
@@ -79,6 +85,9 @@ void InitialInstance::SerializeTo(SerializerElement& element) const {
   element.SetAttribute("height", GetCustomHeight());
   element.SetAttribute("locked", IsLocked());
 
+  if (persistentUuid.empty()) persistentUuid = UUID::MakeUuid4();
+  element.SetStringAttribute("persistentUuid", persistentUuid);
+
   SerializerElement& floatPropElement = element.AddChild("numberProperties");
   floatPropElement.ConsiderAsArrayOf("property");
   for (std::map<gd::String, float>::const_iterator floatInfo =
@@ -104,6 +113,11 @@ void InitialInstance::SerializeTo(SerializerElement& element) const {
   GetVariables().SerializeTo(element.AddChild("initialVariables"));
 }
 
+InitialInstance& InitialInstance::ResetPersistentUuid() {
+  persistentUuid = UUID::MakeUuid4();
+  return *this;
+}
+
 #if defined(GD_IDE_ONLY)
 std::map<gd::String, gd::PropertyDescriptor>
 InitialInstance::GetCustomProperties(gd::Project& project, gd::Layout& layout) {
@@ -146,13 +160,12 @@ const gd::String& InitialInstance::GetRawStringProperty(
   return it != stringInfos.end() ? it->second : *badStringProperyValue;
 }
 
-void InitialInstance::SetRawFloatProperty(const gd::String& name, float value)
-{
+void InitialInstance::SetRawFloatProperty(const gd::String& name, float value) {
   floatInfos[name] = value;
 }
 
-void InitialInstance::SetRawStringProperty(const gd::String& name, const gd::String& value)
-{
+void InitialInstance::SetRawStringProperty(const gd::String& name,
+                                           const gd::String& value) {
   stringInfos[name] = value;
 }
 #endif

Core/GDCore/Project/InitialInstance.h

@@ -200,7 +200,7 @@ class GD_CORE_API InitialInstance {
   /**
    * \brief Get the value of a float property stored in the instance.
    * \note Only use this when \a GetCustomProperties is too slow (when rendering
-   * instances for example). 
+   * instances for example).
    * \return the value of the property, or 0 if it does
    * not exists.
    */
@@ -209,7 +209,7 @@ class GD_CORE_API InitialInstance {
   /**
    * \brief Get the value of a string property stored in the instance.
    * \note Only use this when \a GetCustomProperties is too slow (when rendering
-   * instances for example). 
+   * instances for example).
    * \return the value of the propety, or an empty
    * string if it does not exists.
    */
@@ -240,6 +240,12 @@ class GD_CORE_API InitialInstance {
    * \brief Unserialize the instances container.
    */
   virtual void UnserializeFrom(const SerializerElement& element);
+
+  /**
+   * \brief Reset the persistent UUID used to recognize
+   * the same initial instance between serialization.
+   */
+  InitialInstance& ResetPersistentUuid();
   ///@}
 
   // More properties can be stored in floatInfos and stringInfos.
@@ -260,6 +266,7 @@ class GD_CORE_API InitialInstance {
   float height;           ///< Object custom height
   gd::VariablesContainer initialVariables;  ///< Instance specific variables
   bool locked;                              ///< True if the instance is locked
+  mutable gd::String persistentUuid; ///< A persistent random version 4 UUID, useful for hot reloading.
 
   static gd::String*
       badStringProperyValue;  ///< Empty string returned by GetRawStringProperty

Core/GDCore/Project/Object.cpp

@@ -77,8 +77,7 @@ gd::BehaviorContent& Object::AddBehavior(
 }
 
 #if defined(GD_IDE_ONLY)
-std::map<gd::String, gd::PropertyDescriptor> Object::GetProperties(
-    gd::Project& project) const {
+std::map<gd::String, gd::PropertyDescriptor> Object::GetProperties() const {
   std::map<gd::String, gd::PropertyDescriptor> nothing;
   return nothing;
 }

Core/GDCore/Project/Object.h

@@ -139,8 +139,7 @@ class GD_CORE_API Object {
    * \return a std::map with properties names as key.
    * \see gd::PropertyDescriptor
    */
-  virtual std::map<gd::String, gd::PropertyDescriptor> GetProperties(
-      gd::Project& project) const;
+  virtual std::map<gd::String, gd::PropertyDescriptor> GetProperties() const;
 
   /**
    * \brief Called when the IDE wants to update a custom property of the object
@@ -148,8 +147,7 @@ class GD_CORE_API Object {
    * \return false if the new value cannot be set
    */
   virtual bool UpdateProperty(const gd::String& name,
-                              const gd::String& value,
-                              gd::Project& project) {
+                              const gd::String& value) {
     return false;
   };
   ///@}

Core/GDCore/Project/Project.cpp

@@ -7,6 +7,7 @@
 #include "Project.h"
 #include <stdio.h>
 #include <stdlib.h>
+#include <cctype>
 #include <SFML/System/Utf.hpp>
 #include <fstream>
 #include <map>
@@ -520,6 +521,9 @@ void Project::RemoveEventsFunctionsExtension(const gd::String& name) {
 
   eventsFunctionsExtensions.erase(eventsFunctionExtension);
 }
+void Project::ClearEventsFunctionsExtensions() {
+  eventsFunctionsExtensions.clear();
+}
 #endif
 
 void Project::UnserializeFrom(const SerializerElement& element) {
@@ -945,18 +949,16 @@ void Project::SerializeTo(SerializerElement& element) const {
 #endif
 }
 
-bool Project::ValidateObjectName(const gd::String& name) {
+bool Project::ValidateName(const gd::String& name) {
   if (name.empty()) return false;
 
+  if (isdigit(name[0])) return false;
+
   gd::String allowedCharacters =
       "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789_";
   return !(name.find_first_not_of(allowedCharacters) != gd::String::npos);
 }
 
-gd::String Project::GetBadObjectNameWarning() {
-  return _("Please use only letters, digits\nand underscores ( _ ).");
-}
-
 void Project::ExposeResources(gd::ArbitraryResourceWorker& worker) {
   // See also gd::WholeProjectRefactorer::ExposeProjectEvents for a method that
   // traverse the whole project (this time for events) and ExposeProjectEffects

Core/GDCore/Project/Project.h

@@ -8,6 +8,7 @@
 #define GDCORE_PROJECT_H
 #include <memory>
 #include <vector>
+
 #include "GDCore/Project/LoadingScreen.h"
 #include "GDCore/Project/ObjectGroupsContainer.h"
 #include "GDCore/Project/ObjectsContainer.h"
@@ -460,22 +461,27 @@ class GD_CORE_API Project : public ObjectsContainer {
   std::size_t GetLayoutsCount() const;
 
   /**
-   * \brief \brief Adds a new empty layout called "name" at the specified
+   * \brief Add a new empty layout called "name" at the specified
    * position in the layout list.
    */
   gd::Layout& InsertNewLayout(const gd::String& name, std::size_t position);
 
   /**
-   * \brief \brief Adds a new layout constructed from the layout passed as
-   * parameter. \note No pointer or reference must be kept on the layout passed
-   * as parameter. \param layout The layout that must be copied and inserted
-   * into the project \param position Insertion position. Even if the position
+   * \brief Add a new layout constructed from the layout passed as
+   * parameter.
+   * \param layout The layout that must be copied and inserted
+   * into the project
+   * \param position Insertion position. Even if the position
    * is invalid, the layout must be inserted at the end of the layout list.
+   *
+   * \note No pointer or reference must be kept on the layout passed
+   * as parameter.
+   *
    */
   gd::Layout& InsertLayout(const Layout& layout, std::size_t position);
 
   /**
-   * Must delete layout named "name".
+   * \brief Delete layout named "name".
    */
   void RemoveLayout(const gd::String& name);
 
@@ -592,7 +598,7 @@ class GD_CORE_API Project : public ObjectsContainer {
                                        std::size_t position);
 
   /**
-   * Must delete external events named "name".
+   * \brief Delete external events named "name".
    */
   void RemoveExternalEvents(const gd::String& name);
 #endif
@@ -673,7 +679,7 @@ class GD_CORE_API Project : public ObjectsContainer {
                                            std::size_t position);
 
   /**
-   * Must delete external layout named "name".
+   * \brief Delete external layout named "name".
    */
   void RemoveExternalLayout(const gd::String& name);
 
@@ -694,37 +700,37 @@ class GD_CORE_API Project : public ObjectsContainer {
 ///@{
 #if defined(GD_IDE_ONLY)
   /**
-   * Return true if events functions extension called "name" exists.
+   * \brief  Check if events functions extension called "name" exists.
    */
   bool HasEventsFunctionsExtensionNamed(const gd::String& name) const;
 
   /**
-   * Return a reference to the events functions extension called "name".
+   * \brief Return a reference to the events functions extension called "name".
    */
   EventsFunctionsExtension& GetEventsFunctionsExtension(const gd::String& name);
 
   /**
-   * Return a reference to the events functions extension called "name".
+   * \brief Return a reference to the events functions extension called "name".
    */
   const EventsFunctionsExtension& GetEventsFunctionsExtension(
       const gd::String& name) const;
 
   /**
-   * Return a reference to the events functions extension at position "index" in
-   * the list
+   * \brief Return a reference to the events functions extension at position
+   * "index" in the list
    */
   EventsFunctionsExtension& GetEventsFunctionsExtension(std::size_t index);
 
   /**
-   * Return a reference to the events functions extension at position "index" in
-   * the list
+   * \brief Return a reference to the events functions extension at position
+   * "index" in the list
    */
   const EventsFunctionsExtension& GetEventsFunctionsExtension(
       std::size_t index) const;
 
   /**
-   * Return the position of the events functions extension called "name" in the
-   * list
+   * \brief Return the position of the events functions extension called "name"
+   * in the list.
    */
   std::size_t GetEventsFunctionsExtensionPosition(const gd::String& name) const;
 
@@ -736,7 +742,7 @@ class GD_CORE_API Project : public ObjectsContainer {
   void SwapEventsFunctionsExtensions(std::size_t first, std::size_t second);
 
   /**
-   * Return the number of events functions extension.
+   * \brief Returns the number of events functions extension.
    */
   std::size_t GetEventsFunctionsExtensionsCount() const;
 
@@ -759,9 +765,14 @@ class GD_CORE_API Project : public ObjectsContainer {
       std::size_t position);
 
   /**
-   * Must delete the events functions extension named "name".
+   * \brief Delete the events functions extension named "name".
    */
   void RemoveEventsFunctionsExtension(const gd::String& name);
+
+  /**
+   * \brief Remove all the events functions extensions.
+   */
+  void ClearEventsFunctionsExtensions();
 #endif
   ///@}
 
@@ -843,21 +854,10 @@ class GD_CORE_API Project : public ObjectsContainer {
   ///@{
 
   /**
-   * Return true if \a objectName can be used as name for an object.
-   *
-   * Default implementation check if objectName is only composed of a-z,A-Z,0-9
-   * or _ characters an if does not conflict with an expression.
+   * Return true if \a name is valid (can be used safely for an object,
+   * behavior, events function name, etc...).
    */
-  static bool ValidateObjectName(const gd::String& objectName);
-
-  /**
-   * Return a message that will be displayed when an invalid object name has
-   * been entered.
-   *
-   * \note This message will be displayed by the IDE into a tooltip.
-   */
-  static gd::String GetBadObjectNameWarning();
-
+  static bool ValidateName(const gd::String& name);
 ///@}
 
 /** \name External source files

Core/GDCore/Project/ResourcesManager.cpp

@@ -99,14 +99,12 @@ std::vector<gd::String> ResourcesManager::GetAllResourceNames() const {
 }
 
 #if defined(GD_IDE_ONLY)
-std::map<gd::String, gd::PropertyDescriptor> Resource::GetProperties(
-    gd::Project& project) const {
+std::map<gd::String, gd::PropertyDescriptor> Resource::GetProperties() const {
   std::map<gd::String, gd::PropertyDescriptor> nothing;
   return nothing;
 }
 
-std::map<gd::String, gd::PropertyDescriptor> ImageResource::GetProperties(
-    gd::Project& project) const {
+std::map<gd::String, gd::PropertyDescriptor> ImageResource::GetProperties() const {
   std::map<gd::String, gd::PropertyDescriptor> properties;
   properties[_("Smooth the image")]
       .SetValue(smooth ? "true" : "false")
@@ -119,8 +117,7 @@ std::map<gd::String, gd::PropertyDescriptor> ImageResource::GetProperties(
 }
 
 bool ImageResource::UpdateProperty(const gd::String& name,
-                                   const gd::String& value,
-                                   gd::Project& project) {
+                                   const gd::String& value) {
   if (name == _("Smooth the image"))
     smooth = value == "1";
   else if (name == _("Always loaded in memory"))
@@ -563,8 +560,7 @@ void JsonResource::SerializeTo(SerializerElement& element) const {
   element.SetAttribute("disablePreload", IsPreloadDisabled());
 }
 
-std::map<gd::String, gd::PropertyDescriptor> JsonResource::GetProperties(
-    gd::Project& project) const {
+std::map<gd::String, gd::PropertyDescriptor> JsonResource::GetProperties() const {
   std::map<gd::String, gd::PropertyDescriptor> properties;
   properties["disablePreload"]
       .SetValue(disablePreload ? "true" : "false")
@@ -575,8 +571,7 @@ std::map<gd::String, gd::PropertyDescriptor> JsonResource::GetProperties(
 }
 
 bool JsonResource::UpdateProperty(const gd::String& name,
-                                  const gd::String& value,
-                                  gd::Project& project) {
+                                  const gd::String& value) {
   if (name == "disablePreload") disablePreload = value == "1";
 
   return true;

Core/GDCore/Project/ResourcesManager.h

@@ -8,6 +8,7 @@
 #include <map>
 #include <memory>
 #include <vector>
+
 #include "GDCore/String.h"
 namespace gd {
 class Project;
@@ -112,8 +113,7 @@ class GD_CORE_API Resource {
    * \return a std::map with properties names as key.
    * \see gd::PropertyDescriptor
    */
-  virtual std::map<gd::String, gd::PropertyDescriptor> GetProperties(
-      gd::Project& project) const;
+  virtual std::map<gd::String, gd::PropertyDescriptor> GetProperties() const;
 
   /**
    * \brief Called when the IDE wants to update a custom property of the
@@ -122,8 +122,7 @@ class GD_CORE_API Resource {
    * \return false if the new value cannot be set
    */
   virtual bool UpdateProperty(const gd::String& name,
-                              const gd::String& value,
-                              gd::Project& project) {
+                              const gd::String& value) {
     return false;
   };
 ///@}
@@ -178,11 +177,9 @@ class GD_CORE_API ImageResource : public Resource {
 #if defined(GD_IDE_ONLY)
   virtual bool UseFile() override { return true; }
 
-  std::map<gd::String, gd::PropertyDescriptor> GetProperties(
-      gd::Project& project) const override;
+  std::map<gd::String, gd::PropertyDescriptor> GetProperties() const override;
   bool UpdateProperty(const gd::String& name,
-                      const gd::String& value,
-                      gd::Project& project) override;
+                      const gd::String& value) override;
 
   /**
    * \brief Serialize the object
@@ -315,11 +312,9 @@ class GD_CORE_API JsonResource : public Resource {
 #if defined(GD_IDE_ONLY)
   virtual bool UseFile() override { return true; }
 
-  std::map<gd::String, gd::PropertyDescriptor> GetProperties(
-      gd::Project& project) const override;
+  std::map<gd::String, gd::PropertyDescriptor> GetProperties() const override;
   bool UpdateProperty(const gd::String& name,
-                      const gd::String& value,
-                      gd::Project& project) override;
+                      const gd::String& value) override;
 
   void SerializeTo(SerializerElement& element) const override;
 #endif

Core/GDCore/Project/Variable.cpp

@@ -5,7 +5,9 @@
  */
 
 #include "GDCore/Project/Variable.h"
+
 #include <sstream>
+
 #include "GDCore/Serialization/SerializerElement.h"
 #include "GDCore/String.h"
 #include "GDCore/TinyXml/tinyxml.h"
@@ -19,9 +21,7 @@ namespace gd {
  */
 double Variable::GetValue() const {
   if (!isNumber) {
-    stringstream ss;
-    ss << str;
-    ss >> value;
+    value = str.To<double>();
     isNumber = true;
   }
 
@@ -30,9 +30,7 @@ double Variable::GetValue() const {
 
 const gd::String& Variable::GetString() const {
   if (isNumber) {
-    stringstream s;
-    s << (value);
-    str = s.str();
+    str = gd::String::From(value);
     isNumber = false;
   }
 
@@ -76,6 +74,7 @@ const Variable& Variable::GetChild(const gd::String& name) const {
 void Variable::RemoveChild(const gd::String& name) {
   if (!isStructure) return;
   children.erase(name);
+  isStructure = !children.empty();
 }
 
 bool Variable::RenameChild(const gd::String& oldName,
@@ -190,6 +189,7 @@ void Variable::RemoveRecursively(const gd::Variable& variableToRemove) {
       it++;
     }
   }
+  isStructure = !children.empty();
 }
 
 Variable::Variable(const Variable& other)

Core/GDCore/Serialization/Serializer.cpp

@@ -95,6 +95,14 @@ void Serializer::FromXML(SerializerElement& element,
 }
 #endif
 
+gd::String Serializer::ToEscapedXMLString(const gd::String& str) {
+  return str.FindAndReplace("&", "&")
+      .FindAndReplace("'", "'")
+      .FindAndReplace("\"", """)
+      .FindAndReplace("<", "&lt;")
+      .FindAndReplace(">", "&gt;");
+}
+
 namespace {
 
 /**

Core/GDCore/Serialization/Serializer.h

@@ -27,14 +27,26 @@ class GD_CORE_API Serializer {
   static void FromXML(SerializerElement& element,
                       const TiXmlElement* xmlElement);
 #endif
+  /**
+   * \brief Escape a string for inclusion in a XML tag
+   */
+  static gd::String ToEscapedXMLString(const gd::String& str);
   ///@}
 
   /** \name JSON serialization.
    * Serialize a SerializerElement from/to JSON.
    */
   ///@{
+  /**
+   * \brief Serialize a gd::SerializerElement to a JSON string.
+   */
   static gd::String ToJSON(const SerializerElement& element);
+
   static SerializerElement FromJSON(const std::string& json);
+
+  /**
+   * \brief Parse a JSON string and returns a gd::SerializerElement for it.
+   */
   static SerializerElement FromJSON(const gd::String& json) {
     return FromJSON(json.ToUTF8());
   }

Core/GDCore/Tools/SPtrList.inl

@@ -90,7 +90,7 @@ template <typename T>
 void SPtrList<T>::Init(const gd::SPtrList<T>& other) {
   elements.clear();
   for (size_t i = 0; i < other.elements.size(); ++i)
-    elements.push_back(std::make_shared<T>(other[i]));
+    elements.push_back(CloneRememberingOriginalElement(other.elements[i]));
 }
 
 }  // namespace gd

Core/GDCore/Tools/UUID/UUID.h

@@ -0,0 +1,24 @@
+/*
+ * GDevelop Core
+ * Copyright 2008-present Florian Rival (Florian.Rival@gmail.com). All rights
+ * reserved. This project is released under the MIT License.
+ */
+
+#ifndef GDCORE_TOOLS_UUID_UUID_H
+#define GDCORE_TOOLS_UUID_UUID_H
+
+#include "GDCore/String.h"
+#include "sole.h"
+
+namespace gd {
+namespace UUID {
+
+/**
+ * Generate a random UUID v4
+ */
+inline gd::String MakeUuid4() { return gd::String::From(sole::uuid4()); }
+
+}  // namespace UUID
+}  // namespace gd
+
+#endif

Core/GDCore/Tools/UUID/sole.h

@@ -0,0 +1,249 @@
+/**
+ * Modified version of sole (https://github.com/r-lyeh-archived/sole) C++11 library
+ * to only generate UUID v4.
+ *
+ * Sole is a lightweight C++11 library to generate universally unique identificators.
+ * Sole provides interface for UUID versions 0, 1 and 4.
+ *
+ * https://github.com/r-lyeh/sole
+ * Copyright (c) 2013,2014,2015 r-lyeh. zlib/libpng licensed.
+ *
+ * Based on code by Dmitri Bouianov, Philip O'Toole, Poco C++ libraries and anonymous
+ * code found on the net. Thanks guys!
+ *
+ * Theory: (see Hoylen's answer at [1])
+ * - UUID version 1 (48-bit MAC address + 60-bit clock with a resolution of 100ns)
+ *   Clock wraps in 3603 A.D.
+ *   Up to 10000000 UUIDs per second.
+ *   MAC address revealed.
+ *
+ * - UUID Version 4 (122-bits of randomness)
+ *   See [2] or other analysis that describe how very unlikely a duplicate is.
+ *
+ * - Use v1 if you need to sort or classify UUIDs per machine.
+ *   Use v1 if you are worried about leaving it up to probabilities (e.g. your are the
+ *   type of person worried about the earth getting destroyed by a large asteroid in your
+ *   lifetime). Just use a v1 and it is guaranteed to be unique till 3603 AD.
+ *
+ * - Use v4 if you are worried about security issues and determinism. That is because
+ *   v1 UUIDs reveal the MAC address of the machine it was generated on and they can be
+ *   predictable. Use v4 if you need more than 10 million uuids per second, or if your
+ *   application wants to live past 3603 A.D.
+ * Additionally a custom UUID v0 is provided:
+ * - 16-bit PID + 48-bit MAC address + 60-bit clock with a resolution of 100ns since Unix epoch
+ * - Format is EPOCH_LOW-EPOCH_MID-VERSION(0)|EPOCH_HI-PID-MAC
+ * - Clock wraps in 3991 A.D.
+ * - Up to 10000000 UUIDs per second.
+ * - MAC address and PID revealed.
+ * References:
+ * - [1] http://stackoverflow.com/questions/1155008/how-unique-is-uuid
+ * - [2] http://en.wikipedia.org/wiki/UUID#Random%5FUUID%5Fprobability%5Fof%5Fduplicates
+ * - http://en.wikipedia.org/wiki/Universally_unique_identifier
+ * - http://en.cppreference.com/w/cpp/numeric/random/random_device
+ * - http://www.itu.int/ITU-T/asn1/uuid.html f81d4fae-7dec-11d0-a765-00a0c91e6bf6
+ * - rlyeh ~~ listening to Hedon Cries / Until The Sun Goes up
+ */
+
+//////////////////////////////////////////////////////////////////////////////////////
+
+#pragma once
+#include <stdint.h>
+#include <stdio.h>     // for size_t; should be stddef.h instead; however, clang+archlinux fails when compiling it (@Travis-Ci)
+#include <sys/types.h> // for uint32_t; should be stdint.h instead; however, GCC 5 on OSX fails when compiling it (See issue #11)
+#include <functional>
+#include <string>
+
+// public API
+
+namespace sole
+{
+    // 128-bit basic UUID type that allows comparison and sorting.
+    // Use .str() for printing and .pretty() for pretty printing.
+    // Also, ostream friendly.
+    struct uuid
+    {
+        uint64_t ab;
+        uint64_t cd;
+
+        bool operator==( const uuid &other ) const;
+        bool operator!=( const uuid &other ) const;
+        bool operator <( const uuid &other ) const;
+
+        std::string base62() const;
+        std::string str() const;
+
+        template<typename ostream>
+        inline friend ostream &operator<<( ostream &os, const uuid &self ) {
+            return os << self.str(), os;
+        }
+    };
+
+    // Generators
+    uuid uuid4(); // UUID v4, pros: anonymous, fast; con: uuids "can clash"
+
+    // Rebuilders
+    uuid rebuild( uint64_t ab, uint64_t cd );
+    uuid rebuild( const std::string &uustr );
+}
+
+#ifdef _MSC_VER
+#pragma warning(push)
+#pragma warning(disable:4127)
+#endif
+
+namespace std {
+    template<>
+    struct hash< sole::uuid > {
+    public:
+        // hash functor: hash uuid to size_t value by pseudorandomizing transform
+        size_t operator()( const sole::uuid &uuid ) const {
+            if( sizeof(size_t) > 4 ) {
+                return size_t( uuid.ab ^ uuid.cd );
+            } else {
+                uint64_t hash64 = uuid.ab ^ uuid.cd;
+                return size_t( uint32_t( hash64 >> 32 ) ^ uint32_t( hash64 ) );
+            }
+        }
+    };
+}
+
+#ifdef _MSC_VER
+#pragma warning(pop)
+#endif
+
+// implementation
+
+#include <memory.h>
+#include <stdint.h>
+#include <stdio.h>
+#include <time.h>
+
+#include <cstring>
+#include <ctime>
+
+#include <iomanip>
+#include <random>
+#include <sstream>
+#include <string>
+#include <vector>
+
+#include <unistd.h>
+
+inline bool sole::uuid::operator==( const sole::uuid &other ) const {
+    return ab == other.ab && cd == other.cd;
+}
+inline bool sole::uuid::operator!=( const sole::uuid &other ) const {
+    return !operator==(other);
+}
+inline bool sole::uuid::operator<( const sole::uuid &other ) const {
+    if( ab < other.ab ) return true;
+    if( ab > other.ab ) return false;
+    if( cd < other.cd ) return true;
+    return false;
+}
+
+namespace sole {
+
+    inline std::string uuid::str() const {
+        std::stringstream ss;
+        ss << std::hex << std::nouppercase << std::setfill('0');
+
+        uint32_t a = (ab >> 32);
+        uint32_t b = (ab & 0xFFFFFFFF);
+        uint32_t c = (cd >> 32);
+        uint32_t d = (cd & 0xFFFFFFFF);
+
+        ss << std::setw(8) << (a) << '-';
+        ss << std::setw(4) << (b >> 16) << '-';
+        ss << std::setw(4) << (b & 0xFFFF) << '-';
+        ss << std::setw(4) << (c >> 16 ) << '-';
+        ss << std::setw(4) << (c & 0xFFFF);
+        ss << std::setw(8) << d;
+
+        return ss.str();
+    }
+
+    inline std::string uuid::base62() const {
+        int base62len = 10 + 26 + 26;
+        const char base62[] =
+            "0123456789"
+            "ABCDEFGHIJKLMNOPQRSTUVWXYZ"
+            "abcdefghijklmnopqrstuvwxyz";
+        char res[24], *end = &res[24]; *(--end) = '\0';
+        uint64_t rem, AB = ab, CD = cd;
+        do {
+            rem = CD % base62len;
+            *--end = base62[int(rem)];
+            CD /= base62len;
+        } while (CD > 0);
+        *--end = '-';
+        do {
+            rem = AB % base62len;
+            *--end = base62[int(rem)];
+            AB /= base62len;
+        } while (AB > 0);
+        return end;
+    }
+
+    //////////////////////////////////////////////////////////////////////////////////////
+    // UUID implementations
+
+    inline uuid uuid4() {
+        static std::random_device rd;
+        static std::uniform_int_distribution<uint64_t> dist(0, (uint64_t)(~0));
+
+        uuid my;
+
+        my.ab = dist(rd);
+        my.cd = dist(rd);
+
+        my.ab = (my.ab & 0xFFFFFFFFFFFF0FFFULL) | 0x0000000000004000ULL;
+        my.cd = (my.cd & 0x3FFFFFFFFFFFFFFFULL) | 0x8000000000000000ULL;
+
+        return my;
+    }
+
+    inline uuid rebuild( uint64_t ab, uint64_t cd ) {
+        uuid u;
+        u.ab = ab; u.cd = cd;
+        return u;
+    }
+
+    inline uuid rebuild( const std::string &uustr ) {
+        char sep;
+        uint64_t a,b,c,d,e;
+        uuid u = { 0, 0 };
+        auto idx = uustr.find_first_of("-");
+        if( idx != std::string::npos ) {
+            // single separator, base62 notation
+            if( uustr.find_first_of("-",idx+1) == std::string::npos ) {
+                auto rebase62 = [&]( const char *input, size_t limit ) -> uint64_t {
+                    int base62len = 10 + 26 + 26;
+                    auto strpos = []( char ch ) -> size_t {
+                        if( ch >= 'a' ) return ch - 'a' + 10 + 26;
+                        if( ch >= 'A' ) return ch - 'A' + 10;
+                        return ch - '0';
+                    };
+                    uint64_t res = strpos( input[0] );
+                    for( size_t i = 1; i < limit; ++i )
+                        res = base62len * res + strpos( input[i] );
+                    return res;
+                };
+                u.ab = rebase62( &uustr[0], idx );
+                u.cd = rebase62( &uustr[idx+1], uustr.size() - (idx+1) );
+            }
+            // else classic hex notation
+            else {
+                std::stringstream ss( uustr );
+                if( ss >> std::hex >> a >> sep >> b >> sep >> c >> sep >> d >> sep >> e ) {
+                    if( ss.eof() ) {
+                        u.ab = (a << 32) | (b << 16) | c;
+                        u.cd = (d << 48) | e;
+                    }
+                }
+            }
+        }
+        return u;
+    }
+
+} // ::sole

Core/tests/ExpressionCompletionFinder.cpp

@@ -34,7 +34,7 @@ TEST_CASE("ExpressionCompletionFinder", "[common][events]") {
   SECTION("Identifier") {
     SECTION("Object or expression completions when type is string") {
       std::vector<gd::ExpressionCompletionDescription> expectedCompletions{
-          gd::ExpressionCompletionDescription::ForObject("My"),
+          gd::ExpressionCompletionDescription::ForObject("string", "My"),
           gd::ExpressionCompletionDescription::ForExpression("string", "My")};
       REQUIRE(getCompletionsFor("string", "My", 0) == expectedCompletions);
       REQUIRE(getCompletionsFor("string", "My", 1) == expectedCompletions);
@@ -42,7 +42,7 @@ TEST_CASE("ExpressionCompletionFinder", "[common][events]") {
     }
     SECTION("Object or expression completions when type is number") {
       std::vector<gd::ExpressionCompletionDescription> expectedCompletions{
-          gd::ExpressionCompletionDescription::ForObject("My"),
+          gd::ExpressionCompletionDescription::ForObject("number", "My"),
           gd::ExpressionCompletionDescription::ForExpression("number", "My")};
       REQUIRE(getCompletionsFor("number", "My", 0) == expectedCompletions);
       REQUIRE(getCompletionsFor("number", "My", 1) == expectedCompletions);
@@ -50,14 +50,17 @@ TEST_CASE("ExpressionCompletionFinder", "[common][events]") {
     }
     SECTION("Object when type is an object") {
       std::vector<gd::ExpressionCompletionDescription> expectedCompletions{
-          gd::ExpressionCompletionDescription::ForObject("My")};
+          gd::ExpressionCompletionDescription::ForObject("object", "My")};
       REQUIRE(getCompletionsFor("object", "My", 0) == expectedCompletions);
       REQUIRE(getCompletionsFor("object", "My", 1) == expectedCompletions);
       REQUIRE(getCompletionsFor("object", "My", 2) == expectedEmptyCompletions);
+    }
 
+    SECTION("Object when type is an object (alternate type)") {
       // Also test alternate types also considered as objects (but that can
-      // result
-      // in different code generation):
+      // result in different code generation):
+      std::vector<gd::ExpressionCompletionDescription> expectedCompletions{
+          gd::ExpressionCompletionDescription::ForObject("objectPtr", "My")};
       REQUIRE(getCompletionsFor("objectPtr", "My", 0) == expectedCompletions);
       REQUIRE(getCompletionsFor("objectPtr", "My", 1) == expectedCompletions);
       REQUIRE(getCompletionsFor("objectPtr", "My", 2) ==
@@ -66,7 +69,7 @@ TEST_CASE("ExpressionCompletionFinder", "[common][events]") {
   }
   SECTION("Operator (number)") {
     std::vector<gd::ExpressionCompletionDescription> expectedCompletions{
-        gd::ExpressionCompletionDescription::ForObject(""),
+        gd::ExpressionCompletionDescription::ForObject("number", ""),
         gd::ExpressionCompletionDescription::ForExpression("number", "")};
     REQUIRE(getCompletionsFor("number", "1 + ", 1) == expectedCompletions);
     REQUIRE(getCompletionsFor("number", "1 + ", 2) == expectedCompletions);
@@ -74,7 +77,7 @@ TEST_CASE("ExpressionCompletionFinder", "[common][events]") {
   }
   SECTION("Operator (string)") {
     std::vector<gd::ExpressionCompletionDescription> expectedCompletions{
-        gd::ExpressionCompletionDescription::ForObject(""),
+        gd::ExpressionCompletionDescription::ForObject("string", ""),
         gd::ExpressionCompletionDescription::ForExpression("string", "")};
     REQUIRE(getCompletionsFor("string", "\"a\" + ", 3) == expectedCompletions);
     REQUIRE(getCompletionsFor("string", "\"a\" + ", 4) == expectedCompletions);
@@ -87,10 +90,10 @@ TEST_CASE("ExpressionCompletionFinder", "[common][events]") {
           gd::ExpressionCompletionDescription::ForExpression("string",
                                                              "Function")};
       std::vector<gd::ExpressionCompletionDescription>
-          expectedInformativeCompletions{
+          expectedExactCompletions{
               gd::ExpressionCompletionDescription::ForExpression("string",
                                                                  "Function")
-                  .SetIsInformative(true)};
+                  .SetIsExact(true)};
       REQUIRE(getCompletionsFor("string", "Function(", 0) ==
               expectedCompletions);
       REQUIRE(getCompletionsFor("string", "Function(", 1) ==
@@ -98,9 +101,11 @@ TEST_CASE("ExpressionCompletionFinder", "[common][events]") {
       REQUIRE(getCompletionsFor("string", "Function(", 7) ==
               expectedCompletions);
       REQUIRE(getCompletionsFor("string", "Function(", 8) ==
-              expectedInformativeCompletions);
+              expectedExactCompletions);
       REQUIRE(getCompletionsFor("string", "Function(", 9) ==
               expectedEmptyCompletions);
+      REQUIRE(getCompletionsFor("string", "Function()", 9) ==
+              expectedExactCompletions);
     }
     SECTION("Unknown function, test with arguments") {
       REQUIRE(getCompletionsFor("string", "Function(1", 9) ==
@@ -109,7 +114,7 @@ TEST_CASE("ExpressionCompletionFinder", "[common][events]") {
               expectedEmptyCompletions);
 
       std::vector<gd::ExpressionCompletionDescription> expectedCompletions{
-          gd::ExpressionCompletionDescription::ForObject("a"),
+          gd::ExpressionCompletionDescription::ForObject("unknown", "a"),
           gd::ExpressionCompletionDescription::ForExpression("unknown", "a")};
       REQUIRE(getCompletionsFor("string", "Function(a", 9) ==
               expectedCompletions);
@@ -128,7 +133,8 @@ TEST_CASE("ExpressionCompletionFinder", "[common][events]") {
     SECTION("Test 1") {
       std::vector<gd::ExpressionCompletionDescription>
           expectedObjectCompletions{
-              gd::ExpressionCompletionDescription::ForObject("MyObject")};
+              gd::ExpressionCompletionDescription::ForObject("string",
+                                                             "MyObject")};
       std::vector<gd::ExpressionCompletionDescription>
           expectedBehaviorOrFunctionCompletions{
               gd::ExpressionCompletionDescription::ForBehavior("Func",
@@ -154,7 +160,8 @@ TEST_CASE("ExpressionCompletionFinder", "[common][events]") {
     SECTION("Test 1") {
       std::vector<gd::ExpressionCompletionDescription>
           expectedObjectCompletions{
-              gd::ExpressionCompletionDescription::ForObject("MyObject")};
+              gd::ExpressionCompletionDescription::ForObject("string",
+                                                             "MyObject")};
       std::vector<gd::ExpressionCompletionDescription>
           expectedBehaviorOrFunctionCompletions{
               gd::ExpressionCompletionDescription::ForBehavior("Func",
@@ -162,10 +169,10 @@ TEST_CASE("ExpressionCompletionFinder", "[common][events]") {
               gd::ExpressionCompletionDescription::ForExpression(
                   "string", "Func", "MyObject")};
       std::vector<gd::ExpressionCompletionDescription>
-          expectedInformativeFunctionCompletions{
+          expectedExactFunctionCompletions{
               gd::ExpressionCompletionDescription::ForExpression(
                   "string", "Func", "MyObject")
-                  .SetIsInformative(true)};
+                  .SetIsExact(true)};
       REQUIRE(getCompletionsFor("string", "MyObject.Func(", 0) ==
               expectedObjectCompletions);
       REQUIRE(getCompletionsFor("string", "MyObject.Func(", 7) ==
@@ -177,9 +184,11 @@ TEST_CASE("ExpressionCompletionFinder", "[common][events]") {
       REQUIRE(getCompletionsFor("string", "MyObject.Func(", 12) ==
               expectedBehaviorOrFunctionCompletions);
       REQUIRE(getCompletionsFor("string", "MyObject.Func(", 13) ==
-              expectedInformativeFunctionCompletions);
+              expectedExactFunctionCompletions);
       REQUIRE(getCompletionsFor("string", "MyObject.Func(", 14) ==
               expectedEmptyCompletions);
+      REQUIRE(getCompletionsFor("string", "MyObject.Func()", 14) ==
+              expectedExactFunctionCompletions);
     }
   }
 
@@ -187,7 +196,8 @@ TEST_CASE("ExpressionCompletionFinder", "[common][events]") {
     SECTION("Test 1") {
       std::vector<gd::ExpressionCompletionDescription>
           expectedObjectCompletions{
-              gd::ExpressionCompletionDescription::ForObject("MyObject")};
+              gd::ExpressionCompletionDescription::ForObject("string",
+                                                             "MyObject")};
       std::vector<gd::ExpressionCompletionDescription>
           expectedBehaviorCompletions{
               gd::ExpressionCompletionDescription::ForBehavior("MyBehavior",
@@ -218,7 +228,8 @@ TEST_CASE("ExpressionCompletionFinder", "[common][events]") {
     SECTION("Test 2") {
       std::vector<gd::ExpressionCompletionDescription>
           expectedObjectCompletions{
-              gd::ExpressionCompletionDescription::ForObject("MyObject")};
+              gd::ExpressionCompletionDescription::ForObject("string",
+                                                             "MyObject")};
       std::vector<gd::ExpressionCompletionDescription>
           expectedBehaviorCompletions{
               gd::ExpressionCompletionDescription::ForBehavior("MyBehavior",
@@ -248,7 +259,8 @@ TEST_CASE("ExpressionCompletionFinder", "[common][events]") {
     SECTION("Test 1") {
       std::vector<gd::ExpressionCompletionDescription>
           expectedObjectCompletions{
-              gd::ExpressionCompletionDescription::ForObject("MyObject")};
+              gd::ExpressionCompletionDescription::ForObject("string",
+                                                             "MyObject")};
       std::vector<gd::ExpressionCompletionDescription>
           expectedBehaviorCompletions{
               gd::ExpressionCompletionDescription::ForBehavior("MyBehavior",
@@ -258,10 +270,10 @@ TEST_CASE("ExpressionCompletionFinder", "[common][events]") {
               gd::ExpressionCompletionDescription::ForExpression(
                   "string", "Func", "MyObject", "MyBehavior")};
       std::vector<gd::ExpressionCompletionDescription>
-          expectedInformativeFunctionCompletions{
+          expectedExactFunctionCompletions{
               gd::ExpressionCompletionDescription::ForExpression(
                   "string", "Func", "MyObject", "MyBehavior")
-                  .SetIsInformative(true)};
+                  .SetIsExact(true)};
       REQUIRE(getCompletionsFor("string", "MyObject.MyBehavior::Func(", 0) ==
               expectedObjectCompletions);
       REQUIRE(getCompletionsFor("string", "MyObject.MyBehavior::Func(", 7) ==
@@ -282,6 +294,14 @@ TEST_CASE("ExpressionCompletionFinder", "[common][events]") {
               expectedFunctionCompletions);
       REQUIRE(getCompletionsFor("string", "MyObject.MyBehavior::Func(", 23) ==
               expectedFunctionCompletions);
+      REQUIRE(getCompletionsFor("string", "MyObject.MyBehavior::Func(", 24) ==
+              expectedFunctionCompletions);
+      REQUIRE(getCompletionsFor("string", "MyObject.MyBehavior::Func(", 25) ==
+              expectedExactFunctionCompletions);
+      REQUIRE(getCompletionsFor("string", "MyObject.MyBehavior::Func(", 26) ==
+              expectedEmptyCompletions);
+      REQUIRE(getCompletionsFor("string", "MyObject.MyBehavior::Func()", 26) ==
+              expectedExactFunctionCompletions);
     }
   }
 }

Core/tests/ExpressionParser2.cpp

@@ -1172,6 +1172,8 @@ TEST_CASE("ExpressionParser2", "[common][events]") {
       REQUIRE(textNode.location.GetEndPosition() == 23);
       REQUIRE(identifierNode.location.GetStartPosition() == 25);
       REQUIRE(identifierNode.location.GetEndPosition() == 30);
+      REQUIRE(functionNode.closingParenthesisLocation.GetStartPosition() == 30);
+      REQUIRE(functionNode.closingParenthesisLocation.GetEndPosition() == 31);
     }
     SECTION("Free function locations (with whitespaces)") {
       auto node = parser.ParseExpression("number",
@@ -1192,6 +1194,8 @@ TEST_CASE("ExpressionParser2", "[common][events]") {
       REQUIRE(functionNode.functionNameLocation.GetEndPosition() == 16);
       REQUIRE(functionNode.openingParenthesisLocation.GetStartPosition() == 18);
       REQUIRE(functionNode.openingParenthesisLocation.GetEndPosition() == 19);
+      REQUIRE(functionNode.closingParenthesisLocation.GetStartPosition() == 32);
+      REQUIRE(functionNode.closingParenthesisLocation.GetEndPosition() == 33);
     }
     SECTION("Object function locations") {
       auto node = parser.ParseExpression(
@@ -1231,6 +1235,8 @@ TEST_CASE("ExpressionParser2", "[common][events]") {
       REQUIRE(textNode.location.GetEndPosition() == 38);
       REQUIRE(identifierNode.location.GetStartPosition() == 40);
       REQUIRE(identifierNode.location.GetEndPosition() == 45);
+      REQUIRE(functionNode.closingParenthesisLocation.GetStartPosition() == 45);
+      REQUIRE(functionNode.closingParenthesisLocation.GetEndPosition() == 46);
     }
     SECTION("Object function name locations") {
       auto node =
@@ -1306,6 +1312,8 @@ TEST_CASE("ExpressionParser2", "[common][events]") {
       REQUIRE(functionNode.functionNameLocation.GetEndPosition() == 33);
       REQUIRE(functionNode.openingParenthesisLocation.GetStartPosition() == 34);
       REQUIRE(functionNode.openingParenthesisLocation.GetEndPosition() == 35);
+      REQUIRE(functionNode.closingParenthesisLocation.GetStartPosition() == 48);
+      REQUIRE(functionNode.closingParenthesisLocation.GetEndPosition() == 49);
     }
     SECTION("Behavior function locations") {
       auto node = parser.ParseExpression(
@@ -1350,6 +1358,8 @@ TEST_CASE("ExpressionParser2", "[common][events]") {
       REQUIRE(textNode.location.GetEndPosition() == 56);
       REQUIRE(identifierNode.location.GetStartPosition() == 58);
       REQUIRE(identifierNode.location.GetEndPosition() == 63);
+      REQUIRE(functionNode.closingParenthesisLocation.GetStartPosition() == 63);
+      REQUIRE(functionNode.closingParenthesisLocation.GetEndPosition() == 64);
     }
     SECTION("Behavior function name locations (with whitespace)") {
       auto node = parser.ParseExpression(

Extensions/AdMob/JsExtension.js

@@ -1,8 +1,9 @@
+// @flow
 /**
  * This is a declaration of an extension for GDevelop 5.
  *
- * ℹ️ Run `node import-GDJS-Runtime.js` (in newIDE/app/scripts) if you make any change
- * to this extension file or to any other *.js file that you reference inside.
+ * ℹ️ Changes in this file are watched and automatically imported if the editor
+ * is running. You can also manually run `node import-GDJS-Runtime.js` (in newIDE/app/scripts).
  *
  * The file must be named "JsExtension.js", otherwise GDevelop won't load it.
  * ⚠️ If you make a change and the extension is not loaded, open the developer console
@@ -10,8 +11,16 @@
  *
  * More information on https://github.com/4ian/GDevelop/blob/master/newIDE/README-extensions.md
  */
+
+/*::
+// Import types to allow Flow to do static type checking on this file.
+// Extensions declaration are typed using Flow (like the editor), but the files
+// for the game engine are checked with TypeScript annotations.
+import { type ObjectsRenderingService, type ObjectsEditorService } from '../JsExtensionTypes.flow.js'
+*/
+
 module.exports = {
-  createExtension: function(_, gd) {
+  createExtension: function(_/*: (string) => string */, gd/*: libGDevelop */) {
     const extension = new gd.PlatformExtension();
     extension.setExtensionInformation(
       'AdMob',
@@ -355,7 +364,7 @@ module.exports = {
 
     return extension;
   },
-  runExtensionSanityTests: function(gd, extension) {
+  runExtensionSanityTests: function(gd /*: libGDevelop */, extension /*: gdPlatformExtension*/) {
     return [];
   },
 };

Extensions/AnchorBehavior/AnchorBehavior.cpp

@@ -48,7 +48,7 @@ gd::String GetAnchorAsString(AnchorBehavior::VerticalAnchor anchor) {
 }  // namespace
 
 std::map<gd::String, gd::PropertyDescriptor> AnchorBehavior::GetProperties(
-    const gd::SerializerElement& behaviorContent, gd::Project& project) const {
+    const gd::SerializerElement& behaviorContent) const {
   std::map<gd::String, gd::PropertyDescriptor> properties;
 
   properties[_("relativeToOriginalWindowSize")]
@@ -129,8 +129,7 @@ AnchorBehavior::VerticalAnchor GetVerticalAnchorFromString(
 
 bool AnchorBehavior::UpdateProperty(gd::SerializerElement& behaviorContent,
                                     const gd::String& name,
-                                    const gd::String& value,
-                                    gd::Project& project) {
+                                    const gd::String& value) {
   if (name == _("relativeToOriginalWindowSize"))
     behaviorContent.SetAttribute("relativeToOriginalWindowSize", value == "1");
   else if (name == _("Left edge anchor"))

Extensions/AnchorBehavior/AnchorBehavior.h

@@ -38,12 +38,10 @@ class GD_EXTENSION_API AnchorBehavior : public Behavior {
 
 #if defined(GD_IDE_ONLY)
   virtual std::map<gd::String, gd::PropertyDescriptor> GetProperties(
-      const gd::SerializerElement& behaviorContent,
-      gd::Project& project) const override;
+      const gd::SerializerElement& behaviorContent) const override;
   virtual bool UpdateProperty(gd::SerializerElement& behaviorContent,
                               const gd::String& name,
-                              const gd::String& value,
-                              gd::Project& project) override;
+                              const gd::String& value) override;
 #endif
 
   virtual void InitializeContent(

Extensions/AnchorBehavior/anchorruntimebehavior.js

@@ -40,6 +40,26 @@ gdjs.AnchorRuntimeBehavior.VerticalAnchor = {
    PROPORTIONAL: 3
 };
 
+gdjs.AnchorRuntimeBehavior.prototype.updateFromBehaviorData = function(oldBehaviorData, newBehaviorData) {
+    if (oldBehaviorData.leftEdgeAnchor !== newBehaviorData.leftEdgeAnchor) {
+        this._leftEdgeAnchor = newBehaviorData.leftEdgeAnchor;
+    }
+    if (oldBehaviorData.rightEdgeAnchor !== newBehaviorData.rightEdgeAnchor) {
+        this._rightEdgeAnchor = newBehaviorData.rightEdgeAnchor;
+    }
+    if (oldBehaviorData.topEdgeAnchor !== newBehaviorData.topEdgeAnchor) {
+        this._topEdgeAnchor = newBehaviorData.topEdgeAnchor;
+    }
+    if (oldBehaviorData.bottomEdgeAnchor !== newBehaviorData.bottomEdgeAnchor) {
+        this._bottomEdgeAnchor = newBehaviorData.bottomEdgeAnchor;
+    }
+    if (oldBehaviorData.relativeToOriginalWindowSize !== newBehaviorData.relativeToOriginalWindowSize) {
+        return false;
+    }
+
+    return true;
+}
+
 gdjs.AnchorRuntimeBehavior.prototype.onActivate = function() {
     this._invalidDistances = true;
 };

Extensions/BBText/JsExtension.js

@@ -1,8 +1,9 @@
+// @flow
 /**
  * This is a declaration of an extension for GDevelop 5.
  *
- * ℹ️ Run `node import-GDJS-Runtime.js` (in newIDE/app/scripts) if you make any change
- * to this extension file or to any other *.js file that you reference inside.
+ * ℹ️ Changes in this file are watched and automatically imported if the editor
+ * is running. You can also manually run `node import-GDJS-Runtime.js` (in newIDE/app/scripts).
  *
  * The file must be named "JsExtension.js", otherwise GDevelop won't load it.
  * ⚠️ If you make a change and the extension is not loaded, open the developer console
@@ -11,8 +12,18 @@
  * More information on https://github.com/4ian/GDevelop/blob/master/newIDE/README-extensions.md
  */
 
+/*::
+// Import types to allow Flow to do static type checking on this file.
+// Extensions declaration are typed using Flow (like the editor), but the files
+// for the game engine are checked with TypeScript annotations.
+import { type ObjectsRenderingService, type ObjectsEditorService } from '../JsExtensionTypes.flow.js'
+*/
+
 module.exports = {
-  createExtension: function(_, gd) {
+  createExtension: function (
+    _ /*: (string) => string */,
+    gd /*: libGDevelop */
+  ) {
     const extension = new gd.PlatformExtension();
     extension
       .setExtensionInformation(
@@ -27,7 +38,8 @@ module.exports = {
       .setExtensionHelpPath('/objects/bbtext');
 
     var objectBBText = new gd.ObjectJsImplementation();
-    objectBBText.updateProperty = function(
+    // $FlowExpectedError
+    objectBBText.updateProperty = function (
       objectContent,
       propertyName,
       newValue
@@ -35,74 +47,69 @@ module.exports = {
       if (propertyName in objectContent) {
         if (typeof objectContent[propertyName] === 'boolean')
           objectContent[propertyName] = newValue === '1';
+        else if (typeof objectContent[propertyName] === 'number')
+          objectContent[propertyName] = parseFloat(newValue);
         else objectContent[propertyName] = newValue;
         return true;
       }
 
       return false;
     };
-    objectBBText.getProperties = function(objectContent) {
-      var objectProperties = new gd.MapStringPropertyDescriptor();
+    // $FlowExpectedError
+    objectBBText.getProperties = function (objectContent) {
+      const objectProperties = new gd.MapStringPropertyDescriptor();
 
-      objectProperties.set(
-        'text',
-        new gd.PropertyDescriptor(objectContent.text)
-          .setType('textarea')
-          .setLabel(_('BBCode text'))
-      );
+      objectProperties
+        .getOrCreate('text')
+        .setValue(objectContent.text)
+        .setType('textarea')
+        .setLabel(_('BBCode text'));
 
-      objectProperties.set(
-        'color',
-        new gd.PropertyDescriptor(objectContent.color)
-          .setType('color')
-          .setLabel(_('Base color'))
-      );
+      objectProperties
+        .getOrCreate('color')
+        .setValue(objectContent.color)
+        .setType('color')
+        .setLabel(_('Base color'));
 
-      objectProperties.set(
-        'opacity',
-        new gd.PropertyDescriptor(objectContent.opacity.toString())
-          .setType('number')
-          .setLabel(_('Opacity (0-255)'))
-      );
+      objectProperties
+        .getOrCreate('opacity')
+        .setValue(objectContent.opacity.toString())
+        .setType('number')
+        .setLabel(_('Opacity (0-255)'));
 
-      objectProperties.set(
-        'fontSize',
-        new gd.PropertyDescriptor(objectContent.fontSize)
-          .setType('number')
-          .setLabel(_('Base size'))
-      );
+      objectProperties
+        .getOrCreate('fontSize')
+        .setValue(objectContent.fontSize.toString())
+        .setType('number')
+        .setLabel(_('Base size'));
 
-      objectProperties.set(
-        'align',
-        new gd.PropertyDescriptor(objectContent.align)
-          .setType('choice')
-          .addExtraInfo('left')
-          .addExtraInfo('center')
-          .addExtraInfo('right')
-          .setLabel(_('Base alignment'))
-      );
+      objectProperties
+        .getOrCreate('align')
+        .setValue(objectContent.align)
+        .setType('choice')
+        .addExtraInfo('left')
+        .addExtraInfo('center')
+        .addExtraInfo('right')
+        .setLabel(_('Base alignment'));
 
-      objectProperties.set(
-        'fontFamily',
-        new gd.PropertyDescriptor(objectContent.fontFamily)
-          .setType('resource')
-          .addExtraInfo('font')
-          .setLabel(_('Base font family'))
-      );
+      objectProperties
+        .getOrCreate('fontFamily')
+        .setValue(objectContent.fontFamily)
+        .setType('resource')
+        .addExtraInfo('font')
+        .setLabel(_('Base font family'));
 
-      objectProperties.set(
-        'wordWrap',
-        new gd.PropertyDescriptor(objectContent.wordWrap ? 'true' : 'false')
-          .setType('boolean')
-          .setLabel(_('Word wrapping'))
-      );
+      objectProperties
+        .getOrCreate('wordWrap')
+        .setValue(objectContent.wordWrap ? 'true' : 'false')
+        .setType('boolean')
+        .setLabel(_('Word wrapping'));
 
-      objectProperties.set(
-        'visible',
-        new gd.PropertyDescriptor(objectContent.visible ? 'true' : 'false')
-          .setType('boolean')
-          .setLabel(_('Visible on start'))
-      );
+      objectProperties
+        .getOrCreate('visible')
+        .setValue(objectContent.visible ? 'true' : 'false')
+        .setType('boolean')
+        .setLabel(_('Visible on start'));
 
       return objectProperties;
     };
@@ -111,7 +118,7 @@ module.exports = {
         text:
           '[b]bold[/b] [i]italic[/i] [size=15]smaller[/size] [font=times]times[/font] font\n[spacing=12]spaced out[/spacing]\n[outline=yellow]outlined[/outline] [shadow=red]DropShadow[/shadow] ',
         opacity: 255,
-        fontSize: '20',
+        fontSize: 20,
         visible: true,
         color: '#000000',
         fontFamily: 'Arial',
@@ -120,7 +127,8 @@ module.exports = {
       })
     );
 
-    objectBBText.updateInitialInstanceProperty = function(
+    // $FlowExpectedError
+    objectBBText.updateInitialInstanceProperty = function (
       objectContent,
       instance,
       propertyName,
@@ -130,7 +138,8 @@ module.exports = {
     ) {
       return false;
     };
-    objectBBText.getInitialInstanceProperties = function(
+    // $FlowExpectedError
+    objectBBText.getInitialInstanceProperties = function (
       content,
       instance,
       project,
@@ -161,7 +170,7 @@ module.exports = {
      * Useful for setting multiple generic properties.
      */
     const addSettersAndGettersToObject = (gdObject, properties, objectName) => {
-      properties.forEach(property => {
+      properties.forEach((property) => {
         const parameterType =
           property.type === 'boolean' ? 'yesorno' : property.type;
 
@@ -173,8 +182,6 @@ module.exports = {
               property.expressionLabel,
               property.expressionDescription,
               '',
-              '',
-              property.iconPath,
               property.iconPath
             )
             .addParameter('object', objectName, objectName, false)
@@ -187,8 +194,6 @@ module.exports = {
               property.expressionLabel,
               property.expressionDescription,
               '',
-              '',
-              property.iconPath,
               property.iconPath
             )
             .addParameter('object', objectName, objectName, false)
@@ -392,13 +397,15 @@ module.exports = {
    * of your extension behaviors/objects by instanciating behaviors/objects
    * and setting the property to a given value.
    *
-   * If you don't have any tests, you can simply return an empty array like this:
-   * `runExtensionSanityTests: function(gd, extension) { return []; }`
+   * If you don't have any tests, you can simply return an empty array.
    *
    * But it is recommended to create tests for the behaviors/objects properties you created
    * to avoid mistakes.
    */
-  runExtensionSanityTests: function(gd, extension) {
+  runExtensionSanityTests: function (
+    gd /*: libGDevelop */,
+    extension /*: gdPlatformExtension*/
+  ) {
     return [];
   },
   /**
@@ -406,11 +413,13 @@ module.exports = {
    *
    * ℹ️ Run `node import-GDJS-Runtime.js` (in newIDE/app/scripts) if you make any change.
    */
-  registerEditorConfigurations: function(objectsEditorService) {
+  registerEditorConfigurations: function (
+    objectsEditorService /*: ObjectsEditorService */
+  ) {
     objectsEditorService.registerEditorConfiguration(
       'BBText::BBText',
       objectsEditorService.getDefaultObjectJsImplementationPropertiesEditor({
-        helpPagePath: '/objects/bbtext_object',
+        helpPagePath: '/objects/bbtext',
       })
     );
   },
@@ -419,7 +428,9 @@ module.exports = {
    *
    * ℹ️ Run `node import-GDJS-Runtime.js` (in newIDE/app/scripts) if you make any change.
    */
-  registerInstanceRenderers: function(objectsRenderingService) {
+  registerInstanceRenderers: function (
+    objectsRenderingService /*: ObjectsRenderingService */
+  ) {
     const RenderedInstance = objectsRenderingService.RenderedInstance;
     const PIXI = objectsRenderingService.PIXI;
     const MultiStyleText = objectsRenderingService.requireModule(
@@ -454,6 +465,7 @@ module.exports = {
 
       const bbTextStyles = {
         default: {
+          // Use a default font family the time for the resource font to be loaded.
           fontFamily: 'Arial',
           fontSize: '24px',
           fill: '#cccccc',
@@ -478,7 +490,7 @@ module.exports = {
     /**
      * Return the path to the thumbnail of the specified object.
      */
-    RenderedBBTextInstance.getThumbnail = function(
+    RenderedBBTextInstance.getThumbnail = function (
       project,
       resourcesLoader,
       object
@@ -489,66 +501,51 @@ module.exports = {
     /**
      * This is called to update the PIXI object on the scene editor
      */
-    RenderedBBTextInstance.prototype.update = function() {
-      const rawText = this._associatedObject
-        .getProperties(this.project)
-        .get('text')
-        .getValue();
+    RenderedBBTextInstance.prototype.update = function () {
+      const properties = this._associatedObject.getProperties();
+
+      const rawText = properties.get('text').getValue();
       if (rawText !== this._pixiObject.text) {
-        this._pixiObject.setText(rawText);
+        this._pixiObject.text = rawText;
       }
 
-      const opacity = this._associatedObject
-        .getProperties(this.project)
-        .get('opacity')
-        .getValue();
+      const opacity = properties.get('opacity').getValue();
       this._pixiObject.alpha = opacity / 255;
 
-      const color = this._associatedObject
-        .getProperties(this.project)
-        .get('color')
-        .getValue();
+      const color = properties.get('color').getValue();
       this._pixiObject.textStyles.default.fill = color;
 
-      const fontSize = this._associatedObject
-        .getProperties(this.project)
-        .get('fontSize')
-        .getValue();
+      const fontSize = properties.get('fontSize').getValue();
       this._pixiObject.textStyles.default.fontSize = `${fontSize}px`;
 
-      const fontResourceName = this._associatedObject
-        .getProperties(this.project)
-        .get('fontFamily')
-        .getValue();
+      const fontResourceName = properties.get('fontFamily').getValue();
 
       if (this._fontResourceName !== fontResourceName) {
         this._fontResourceName = fontResourceName;
 
         this._pixiResourcesLoader
           .loadFontFamily(this._project, fontResourceName)
-          .then(fontFamily => {
+          .then((fontFamily) => {
             // Once the font is loaded, we can use the given fontFamily.
             this._pixiObject.textStyles.default.fontFamily = fontFamily;
+            this._pixiObject.dirty = true;
           })
-          .catch(err => {
+          .catch((err) => {
             // Ignore errors
-            console.warn('Unable to load font family', err);
+            console.warn(
+              'Unable to load font family for RenderedBBTextInstance',
+              err
+            );
           });
       }
 
-      const wordWrap = this._associatedObject
-        .getProperties(this.project)
-        .get('wordWrap')
-        .getValue();
+      const wordWrap = properties.get('wordWrap').getValue() === 'true';
       if (wordWrap !== this._pixiObject._style.wordWrap) {
-        this._pixiObject._style.wordWrap = wordWrap === 'true';
+        this._pixiObject._style.wordWrap = wordWrap;
         this._pixiObject.dirty = true;
       }
 
-      const align = this._associatedObject
-        .getProperties(this.project)
-        .get('align')
-        .getValue();
+      const align = properties.get('align').getValue();
       if (align !== this._pixiObject._style.align) {
         this._pixiObject._style.align = align;
         this._pixiObject.dirty = true;
@@ -566,7 +563,7 @@ module.exports = {
         const customWidth = this._instance.getCustomWidth();
         if (
           this._pixiObject &&
-          this._pixiObject.textStyles.default.wordWrapWidth !== customWidth
+          this._pixiObject._style.wordWrapWidth !== customWidth
         ) {
           this._pixiObject._style.wordWrapWidth = customWidth;
           this._pixiObject.dirty = true;
@@ -577,14 +574,14 @@ module.exports = {
     /**
      * Return the width of the instance, when it's not resized.
      */
-    RenderedBBTextInstance.prototype.getDefaultWidth = function() {
+    RenderedBBTextInstance.prototype.getDefaultWidth = function () {
       return this._pixiObject.width;
     };
 
     /**
      * Return the height of the instance, when it's not resized.
      */
-    RenderedBBTextInstance.prototype.getDefaultHeight = function() {
+    RenderedBBTextInstance.prototype.getDefaultHeight = function () {
       return this._pixiObject.height;
     };
 

Extensions/BBText/bbtextruntimeobject-pixi-renderer.js

@@ -6,7 +6,7 @@
  * @param {gdjs.BBTextRuntimeObject} runtimeObject The object to render
  * @param {gdjs.RuntimeScene} runtimeScene The gdjs.RuntimeScene in which the object is
  */
-gdjs.BBTextRuntimeObjectPixiRenderer = function(runtimeObject, runtimeScene) {
+gdjs.BBTextRuntimeObjectPixiRenderer = function (runtimeObject, runtimeScene) {
   this._object = runtimeObject;
 
   // Load (or reset) the text
@@ -25,8 +25,6 @@ gdjs.BBTextRuntimeObjectPixiRenderer = function(runtimeObject, runtimeScene) {
         align: runtimeObject._align,
       },
     });
-
-    this._object.hidden = !runtimeObject._visible;
   } else {
     this.updateColor();
     this.updateAlignment();
@@ -48,68 +46,69 @@ gdjs.BBTextRuntimeObjectPixiRenderer = function(runtimeObject, runtimeScene) {
   this.updatePosition();
   this.updateAngle();
   this.updateOpacity();
-  this.updateVisible();
 };
 
 gdjs.BBTextRuntimeObjectRenderer = gdjs.BBTextRuntimeObjectPixiRenderer;
 
-gdjs.BBTextRuntimeObjectPixiRenderer.prototype.getRendererObject = function() {
+gdjs.BBTextRuntimeObjectPixiRenderer.prototype.getRendererObject = function () {
   return this._pixiObject;
 };
 
-gdjs.BBTextRuntimeObjectPixiRenderer.prototype.updateWordWrap = function() {
+gdjs.BBTextRuntimeObjectPixiRenderer.prototype.updateWordWrap = function () {
   this._pixiObject._style.wordWrap = this._object._wordWrap;
   this._pixiObject.dirty = true;
   this.updatePosition();
 };
 
-gdjs.BBTextRuntimeObjectPixiRenderer.prototype.updateWrappingWidth = function() {
+gdjs.BBTextRuntimeObjectPixiRenderer.prototype.updateWrappingWidth = function () {
   this._pixiObject._style.wordWrapWidth = this._object._wrappingWidth;
   this._pixiObject.dirty = true;
   this.updatePosition();
 };
 
-gdjs.BBTextRuntimeObjectPixiRenderer.prototype.updateText = function() {
-  this._pixiObject.setText(this._object._text);
+gdjs.BBTextRuntimeObjectPixiRenderer.prototype.updateText = function () {
+  this._pixiObject.text = this._object._text;
   this.updatePosition();
 };
 
-gdjs.BBTextRuntimeObjectPixiRenderer.prototype.updateColor = function() {
+gdjs.BBTextRuntimeObjectPixiRenderer.prototype.updateColor = function () {
   this._pixiObject.textStyles.default.fill = this._object._color;
+  this._pixiObject.dirty = true;
 };
 
-gdjs.BBTextRuntimeObjectPixiRenderer.prototype.updateAlignment = function() {
+gdjs.BBTextRuntimeObjectPixiRenderer.prototype.updateAlignment = function () {
   this._pixiObject._style.align = this._object._align;
   this._pixiObject.dirty = true;
 };
-gdjs.BBTextRuntimeObjectPixiRenderer.prototype.updateFontFamily = function() {
-  this._pixiObject.textStyles.default.fontFamily = this._object._fontFamily;
+gdjs.BBTextRuntimeObjectPixiRenderer.prototype.updateFontFamily = function () {
+  this._pixiObject.textStyles.default.fontFamily = this._object._runtimeScene
+    .getGame()
+    .getFontManager()
+    .getFontFamily(this._object._fontFamily);
+  this._pixiObject.dirty = true;
 };
-gdjs.BBTextRuntimeObjectPixiRenderer.prototype.updateFontSize = function() {
+gdjs.BBTextRuntimeObjectPixiRenderer.prototype.updateFontSize = function () {
   this._pixiObject.textStyles.default.fontSize = this._object._fontSize + 'px';
+  this._pixiObject.dirty = true;
 };
 
-gdjs.BBTextRuntimeObjectPixiRenderer.prototype.updatePosition = function() {
+gdjs.BBTextRuntimeObjectPixiRenderer.prototype.updatePosition = function () {
   this._pixiObject.position.x = this._object.x + this._pixiObject.width / 2;
   this._pixiObject.position.y = this._object.y + this._pixiObject.height / 2;
 };
 
-gdjs.BBTextRuntimeObjectPixiRenderer.prototype.updateVisible = function() {
-  this._pixiObject.hidden = !this._object._visible;
-};
-
-gdjs.BBTextRuntimeObjectPixiRenderer.prototype.updateAngle = function() {
+gdjs.BBTextRuntimeObjectPixiRenderer.prototype.updateAngle = function () {
   this._pixiObject.rotation = gdjs.toRad(this._object.angle);
 };
 
-gdjs.BBTextRuntimeObjectPixiRenderer.prototype.updateOpacity = function() {
+gdjs.BBTextRuntimeObjectPixiRenderer.prototype.updateOpacity = function () {
   this._pixiObject.alpha = this._object._opacity / 255;
 };
 
-gdjs.BBTextRuntimeObjectPixiRenderer.prototype.getWidth = function() {
+gdjs.BBTextRuntimeObjectPixiRenderer.prototype.getWidth = function () {
   return this._pixiObject.width;
 };
 
-gdjs.BBTextRuntimeObjectPixiRenderer.prototype.getHeight = function() {
+gdjs.BBTextRuntimeObjectPixiRenderer.prototype.getHeight = function () {
   return this._pixiObject.height;
 };

Extensions/BBText/bbtextruntimeobject.js

@@ -2,7 +2,7 @@
  * @typedef {Object} BBTextObjectDataType Base parameters for {@link gdjs.BBTextRuntimeObject}
  * @property {Object} content The base parameters of the BBText
  * @property {number} content.opacity The opacity of the BBText
- * @property {boolean} content.visible Is the text visible?
+ * @property {boolean} content.visible Deprecated - Is the text visible?
  * @property {string} content.text Content of the text
  * @property {string} content.color The color of the text
  * @property {string} content.fontFamily The font of the text
@@ -25,9 +25,8 @@ gdjs.BBTextRuntimeObject = function(runtimeScene, objectData) {
   gdjs.RuntimeObject.call(this, runtimeScene, objectData);
 
   /** @type {number} */
-  this._opacity = objectData.content.opacity;
-  /** @type {boolean} */
-  this._visible = objectData.content.visible;
+  this._opacity = parseFloat(objectData.content.opacity);
+  // parseFloat should not be required, but GDevelop 5.0 beta 92 and below were storing it as a string.
   /** @type {string} */
   this._text = objectData.content.text;
   /** @type {string} */
@@ -35,7 +34,8 @@ gdjs.BBTextRuntimeObject = function(runtimeScene, objectData) {
   /** @type {string} */
   this._fontFamily = objectData.content.fontFamily;
   /** @type {number} */
-  this._fontSize = objectData.content.fontSize;
+  this._fontSize = parseFloat(objectData.content.fontSize);
+  // parseFloat should not be required, but GDevelop 5.0 beta 92 and below were storing it as a string.
   /** @type {boolean} */
   this._wordWrap = objectData.content.wordWrap;
   /** @type {number} */
@@ -46,9 +46,12 @@ gdjs.BBTextRuntimeObject = function(runtimeScene, objectData) {
   if (this._renderer)
     gdjs.BBTextRuntimeObjectRenderer.call(this._renderer, this, runtimeScene);
   else
-    /** @type {gdjs.BBTextRuntimeObjectRenderer} */
     this._renderer = new gdjs.BBTextRuntimeObjectRenderer(this, runtimeScene);
 
+  // While this should rather be exposed as a property for all objects, honor the "visible"
+  // property that is specific to this object.
+  this.hidden = !objectData.content.visible;
+
   // *ALWAYS* call `this.onCreated()` at the very end of your object constructor.
   this.onCreated();
 };
@@ -62,14 +65,49 @@ gdjs.BBTextRuntimeObject.prototype.getRendererObject = function() {
   return this._renderer.getRendererObject();
 };
 
+/**
+ * @param {BBTextObjectDataType} oldObjectData
+ * @param {BBTextObjectDataType} newObjectData
+ */
+gdjs.BBTextRuntimeObject.prototype.updateFromObjectData = function(oldObjectData, newObjectData) {
+  if (oldObjectData.content.opacity !== newObjectData.content.opacity) {
+    this.setOpacity(newObjectData.content.opacity);
+  }
+  if (oldObjectData.content.visible !== newObjectData.content.visible) {
+    this.hide(!newObjectData.content.visible);
+  }
+  if (oldObjectData.content.text !== newObjectData.content.text) {
+    this.setBBText(newObjectData.content.text);
+  }
+  if (oldObjectData.content.color !== newObjectData.content.color) {
+    this._color = newObjectData.content.color;
+    this._renderer.updateColor();
+  }
+  if (oldObjectData.content.fontFamily !== newObjectData.content.fontFamily) {
+    this.setFontFamily(newObjectData.content.fontFamily);
+  }
+  if (oldObjectData.content.fontSize !== newObjectData.content.fontSize) {
+    this.setFontSize(newObjectData.content.fontSize);
+  }
+  if (oldObjectData.content.wordWrap !== newObjectData.content.wordWrap) {
+    this.setWordWrap(newObjectData.content.wordWrap);
+  }
+  if (oldObjectData.content.align !== newObjectData.content.align) {
+    this.setAlignment(newObjectData.content.align);
+  }
+
+  return true;
+};
+
 /**
  * Initialize the extra parameters that could be set for an instance.
  * @private
  */
 gdjs.BBTextRuntimeObject.prototype.extraInitializationFromInitialInstance = function(initialInstanceData) {
-  // The wrapping width value (this._wrappingWidth) is using the object's width as an innitial value
   if (initialInstanceData.customSize)
     this.setWrappingWidth(initialInstanceData.width);
+  else
+    this.setWrappingWidth(250); // This value is the default wrapping width of the runtime object.
 };
 
 gdjs.BBTextRuntimeObject.prototype.onDestroyFromScene = function(runtimeScene) {
@@ -77,13 +115,16 @@ gdjs.BBTextRuntimeObject.prototype.onDestroyFromScene = function(runtimeScene) {
 };
 
 /**
- * Set/Get BBText base style properties
+ * Set the markup text to display.
  */
 gdjs.BBTextRuntimeObject.prototype.setBBText = function(text) {
   this._text = text;
   this._renderer.updateText();
 };
 
+/**
+ * Get the markup text displayed by the object.
+ */
 gdjs.BBTextRuntimeObject.prototype.getBBText = function() {
   return this._text;
 };

Extensions/BBText/pixi-multistyle-text/README.md

@@ -1,9 +1,67 @@
-This extension is using release version 0.8.0 (commit 336bed0b206043e2c3e81c373b7ca02094ecabe7) of the pixi-multistyle-text library:
-https://github.com/tleunen/pixi-multistyle-text
+# pixi-multistyle-text
 
-The BBcode tag feature was especially added for Gdevelop and this extension (commit 2a7be2084598933502c76419d7a86c0e6cd11719)
+[![NPM](https://nodei.co/npm/pixi-multistyle-text.png)](https://nodei.co/npm/pixi-multistyle-text/)
 
-README:
-Add a MultiStyleText object inside pixi.js to easily create text using different styles.
+Add a `MultiStyleText` object inside [pixi.js](https://github.com/GoodBoyDigital/pixi.js) to easily create text using different styles.
 
-License: MIT
+## Example
+
+In the example below, we are defining 4 text styles.
+`default` is the default style for the text, and the others matches the tags inside the text.
+
+```js
+let text = new MultiStyleText("Let's make some <ml>multiline</ml>\nand <ms>multistyle</ms> text for\n<pixi>Pixi.js!</pixi>",
+{
+	"default": {
+		fontFamily: "Arial",
+		fontSize: "24px",
+		fill: "#cccccc",
+		align: "center"
+	},
+	"ml": {
+		fontStyle: "italic",
+		fill: "#ff8888"
+	},
+	"ms": {
+		fontStyle: "italic",
+		fill: "#4488ff"
+	},
+	"pixi": {
+		fontSize: "64px",
+		fill: "#efefef"
+	}
+});
+```
+## Build instructions
+
+```
+$ yarn install
+$ yarn build
+```
+
+## Usage
+
+### `text = new MultiStyleText(text, textStyles)`
+
+Creates a new `MultiStyleText` with the given text and styles.
+
+#### `textStyles`
+Type: `{ [key: string]: ExtendedTextStyle }`
+
+Each key of this dictionary should match with a tag in the text. Use the key `default` for the default style.
+
+Each `ExtendedTextStyle` object can have [any of the properties of a standard PIXI text style](http://pixijs.download/release/docs/PIXI.TextStyle.html), in addition to a `valign` property that allows you to specify where text is rendered relative to larger text on the same line (`"top"`, `"middle"`, or `"bottom"`).
+
+The `align`, `wordWrap`, `wordWrapWidth`, and `breakWord` properties are ignored on all styles _except for the `default` style_, which controls those properties for the entire text object.
+
+If text is rendered without any value assigned to a given parameter, Pixi's defaults are used.
+
+## Demo
+```
+$ yarn demo
+```
+
+
+## License
+
+MIT, see [LICENSE.md](http://github.com/tleunen/pixi-multistyle-text/blob/master/LICENSE.md) for details.

Extensions/DebuggerTools/JsExtension.js

@@ -0,0 +1,58 @@
+// @flow
+/**
+ * This is a declaration of an extension for GDevelop 5.
+ *
+ * ℹ️ Changes in this file are watched and automatically imported if the editor
+ * is running. You can also manually run `node import-GDJS-Runtime.js` (in newIDE/app/scripts).
+ *
+ * The file must be named "JsExtension.js", otherwise GDevelop won't load it.
+ * ⚠️ If you make a change and the extension is not loaded, open the developer console
+ * and search for any errors.
+ *
+ * More information on https://github.com/4ian/GDevelop/blob/master/newIDE/README-extensions.md
+ */
+
+/*::
+// Import types to allow Flow to do static type checking on this file.
+// Extensions declaration are typed using Flow (like the editor), but the files
+// for the game engine are checked with TypeScript annotations.
+import { type ObjectsRenderingService, type ObjectsEditorService } from '../JsExtensionTypes.flow.js'
+*/
+
+module.exports = {
+    createExtension: function(_/*: (string) => string */, gd/*: libGDevelop */) {
+      const extension = new gd.PlatformExtension();
+      extension.setExtensionInformation(
+        'DebuggerTools',
+        _('Debugger Tools'),
+        _(
+          'Allow to interact with the editor debugger from the game.'
+        ),
+        'Arthur Pacaud (arthuro555)',
+        'MIT'
+      );
+
+      extension
+      .addAction(
+        'Pause',
+        _('Pause game execution'),
+        _(
+          'This pauses the game, useful for inspecting the game state through the debugger. ' +
+          'Note that events will be still executed until the end before the game is paused.'
+        ),
+        _('Pause game execution'),
+        _('Debugger Tools'),
+        'res/actions/bug32.png',
+        'res/actions/bug32.png'
+      )
+      .addCodeOnlyParameter("currentScene", "")
+      .getCodeExtraInformation()
+      .setIncludeFile('Extensions/DebuggerTools/debuggertools.js')
+      .setFunctionName('gdjs.evtTools.debugger.pause');
+
+      return extension;
+    },
+    runExtensionSanityTests: function(gd /*: libGDevelop */, extension /*: gdPlatformExtension*/) {
+        return [];
+    },
+}

Extensions/DebuggerTools/debuggertools.js

@@ -0,0 +1,19 @@
+/**
+ * @file
+ * Tools for interacting with the debugger.
+ */
+
+
+/**
+ * The namespace containing tools to interact with the debugger.
+ * @namespace
+ */
+gdjs.evtTools.debugger = {};
+
+/**
+ * Stop the game execution.
+ * @param {gdjs.RuntimeScene} runtimeScene - The current scene.
+ */
+gdjs.evtTools.debugger.pause = function(runtimeScene) {
+    runtimeScene.getGame().pause(true);
+}

Extensions/DestroyOutsideBehavior/DestroyOutsideBehavior.cpp

@@ -18,7 +18,7 @@ void DestroyOutsideBehavior::InitializeContent(gd::SerializerElement& content) {
 #if defined(GD_IDE_ONLY)
 std::map<gd::String, gd::PropertyDescriptor>
 DestroyOutsideBehavior::GetProperties(
-    const gd::SerializerElement& behaviorContent, gd::Project& project) const {
+    const gd::SerializerElement& behaviorContent) const {
   std::map<gd::String, gd::PropertyDescriptor> properties;
 
   properties["extraBorder"]
@@ -33,8 +33,7 @@ DestroyOutsideBehavior::GetProperties(
 bool DestroyOutsideBehavior::UpdateProperty(
     gd::SerializerElement& behaviorContent,
     const gd::String& name,
-    const gd::String& value,
-    gd::Project& project) {
+    const gd::String& value) {
   if (name == "extraBorder")
     behaviorContent.SetAttribute("extraBorder", value.To<double>());
   else

Extensions/DestroyOutsideBehavior/DestroyOutsideBehavior.h

@@ -21,16 +21,14 @@ class GD_EXTENSION_API DestroyOutsideBehavior : public gd::Behavior {
  public:
   DestroyOutsideBehavior(){};
   virtual ~DestroyOutsideBehavior(){};
-  virtual Behavior* Clone() const { return new DestroyOutsideBehavior(*this); }
+  virtual Behavior* Clone() const override { return new DestroyOutsideBehavior(*this); }
 
 #if defined(GD_IDE_ONLY)
   virtual std::map<gd::String, gd::PropertyDescriptor> GetProperties(
-      const gd::SerializerElement& behaviorContent,
-      gd::Project& project) const override;
+      const gd::SerializerElement& behaviorContent) const override;
   virtual bool UpdateProperty(gd::SerializerElement& behaviorContent,
                               const gd::String& name,
-                              const gd::String& value,
-                              gd::Project& project) override;
+                              const gd::String& value) override;
 #endif
 
   virtual void InitializeContent(

Extensions/DestroyOutsideBehavior/destroyoutsideruntimebehavior.js

@@ -20,6 +20,14 @@ gdjs.DestroyOutsideRuntimeBehavior = function(runtimeScene, behaviorData, owner)
 gdjs.DestroyOutsideRuntimeBehavior.prototype = Object.create( gdjs.RuntimeBehavior.prototype );
 gdjs.registerBehavior("DestroyOutsideBehavior::DestroyOutside", gdjs.DestroyOutsideRuntimeBehavior);
 
+gdjs.DestroyOutsideRuntimeBehavior.prototype.updateFromBehaviorData = function(oldBehaviorData, newBehaviorData) {
+    if (oldBehaviorData.extraBorder !== newBehaviorData.extraBorder) {
+        this._extraBorder = newBehaviorData.extraBorder;
+    }
+
+    return true;
+}
+
 gdjs.DestroyOutsideRuntimeBehavior.prototype.doStepPostEvents = function(runtimeScene) {
 
     // TODO: This would better be done using the object AABB (getAABB), as (`getCenterX`;`getCenterY`) point

Extensions/DeviceSensors/JsExtension.js

@@ -1,17 +1,26 @@
+// @flow
 /**
  * This is a declaration of an extension for GDevelop 5.
- * 
- * ℹ️ Run `node import-GDJS-Runtime.js` (in newIDE/app/scripts) if you make any change
- * to this extension file or to any other *.js file that you reference inside.
- * 
- * The file must be named "JsExtension.js", otherwise GDevelop won't load it. 
+ *
+ * ℹ️ Changes in this file are watched and automatically imported if the editor
+ * is running. You can also manually run `node import-GDJS-Runtime.js` (in newIDE/app/scripts).
+ *
+ * The file must be named "JsExtension.js", otherwise GDevelop won't load it.
  * ⚠️ If you make a change and the extension is not loaded, open the developer console
  * and search for any errors.
- * 
+ *
  * More information on https://github.com/4ian/GDevelop/blob/master/newIDE/README-extensions.md
  */
+
+/*::
+// Import types to allow Flow to do static type checking on this file.
+// Extensions declaration are typed using Flow (like the editor), but the files
+// for the game engine are checked with TypeScript annotations.
+import { type ObjectsRenderingService, type ObjectsEditorService } from '../JsExtensionTypes.flow.js'
+*/
+
 module.exports = {
-  createExtension: function(_, gd) {
+  createExtension: function(_/*: (string) => string */, gd/*: libGDevelop */) {
     const extension = new gd.PlatformExtension();
     extension.setExtensionInformation(
       "DeviceSensors",
@@ -445,5 +454,5 @@ module.exports = {
 
     return extension;
   },
-  runExtensionSanityTests: function(gd, extension) { return []; },
+  runExtensionSanityTests: function(gd /*: libGDevelop */, extension /*: gdPlatformExtension*/) { return []; },
 };

Extensions/DeviceVibration/JsExtension.js

@@ -1,17 +1,26 @@
+// @flow
 /**
  * This is a declaration of an extension for GDevelop 5.
- * 
- * ℹ️ Run `node import-GDJS-Runtime.js` (in newIDE/app/scripts) if you make any change
- * to this extension file or to any other *.js file that you reference inside.
- * 
- * The file must be named "JsExtension.js", otherwise GDevelop won't load it. 
+ *
+ * ℹ️ Changes in this file are watched and automatically imported if the editor
+ * is running. You can also manually run `node import-GDJS-Runtime.js` (in newIDE/app/scripts).
+ *
+ * The file must be named "JsExtension.js", otherwise GDevelop won't load it.
  * ⚠️ If you make a change and the extension is not loaded, open the developer console
  * and search for any errors.
- * 
+ *
  * More information on https://github.com/4ian/GDevelop/blob/master/newIDE/README-extensions.md
  */
+
+/*::
+// Import types to allow Flow to do static type checking on this file.
+// Extensions declaration are typed using Flow (like the editor), but the files
+// for the game engine are checked with TypeScript annotations.
+import { type ObjectsRenderingService, type ObjectsEditorService } from '../JsExtensionTypes.flow.js'
+*/
+
 module.exports = {
-  createExtension: function(_, gd) {
+  createExtension: function(_/*: (string) => string */, gd/*: libGDevelop */) {
     const extension = new gd.PlatformExtension();
     extension.setExtensionInformation(
       "DeviceVibration",
@@ -75,5 +84,5 @@ module.exports = {
 
     return extension;
   },
-  runExtensionSanityTests: function(gd, extension) { return []; },
+  runExtensionSanityTests: function(gd /*: libGDevelop */, extension /*: gdPlatformExtension*/) { return []; },
 };

Extensions/DialogueTree/JsExtension.js

@@ -1,8 +1,9 @@
+// @flow
 /**
  * This is a declaration of an extension for GDevelop 5.
  *
- * ℹ️ Run `node import-GDJS-Runtime.js` (in newIDE/app/scripts) if you make any change
- * to this extension file or to any other *.js file that you reference inside.
+ * ℹ️ Changes in this file are watched and automatically imported if the editor
+ * is running. You can also manually run `node import-GDJS-Runtime.js` (in newIDE/app/scripts).
  *
  * The file must be named "JsExtension.js", otherwise GDevelop won't load it.
  * ⚠️ If you make a change and the extension is not loaded, open the developer console
@@ -10,8 +11,16 @@
  *
  * More information on https://github.com/4ian/GDevelop/blob/master/newIDE/README-extensions.md
  */
+
+/*::
+// Import types to allow Flow to do static type checking on this file.
+// Extensions declaration are typed using Flow (like the editor), but the files
+// for the game engine are checked with TypeScript annotations.
+import { type ObjectsRenderingService, type ObjectsEditorService } from '../JsExtensionTypes.flow.js'
+*/
+
 module.exports = {
-  createExtension: function(_, gd) {
+  createExtension: function(_/*: (string) => string */, gd/*: libGDevelop */) {
     const extension = new gd.PlatformExtension();
     extension
       .setExtensionInformation(
@@ -45,7 +54,7 @@ module.exports = {
       )
       .getCodeExtraInformation()
       .setIncludeFile('Extensions/DialogueTree/dialoguetools.js')
-      .addIncludeFile('Extensions/DialogueTree/bondage.min.js')
+      .addIncludeFile('Extensions/DialogueTree/bondage.js/dist/bondage.min.js')
       .setFunctionName('gdjs.dialogueTree.loadFromSceneVariable');
 
     extension
@@ -69,7 +78,7 @@ module.exports = {
       )
       .getCodeExtraInformation()
       .setIncludeFile('Extensions/DialogueTree/dialoguetools.js')
-      .addIncludeFile('Extensions/DialogueTree/bondage.min.js')
+      .addIncludeFile('Extensions/DialogueTree/bondage.js/dist/bondage.min.js')
       .setFunctionName('gdjs.dialogueTree.loadFromJsonFile');
 
     extension
@@ -168,15 +177,14 @@ module.exports = {
         _(
           'Select option by number. Use this when the dialogue line is of type "options" and the player has pressed a button to change selected option.'
         ),
-        _('Select option by number'),
+        _('Select option at index _PARAM0_'),
         _('Dialogue Tree (experimental)'),
         'JsPlatform/Extensions/yarn24.png',
         'JsPlatform/Extensions/yarn32.png'
       )
       .addParameter('expression', _('Option index number'), '', false)
-      .setDefaultValue('0')
       .getCodeExtraInformation()
-      .setFunctionName('gdjs.dialogueTree.selectPreviousOption');
+      .setFunctionName('gdjs.dialogueTree.selectOption');
 
     extension
       .addAction(
@@ -210,18 +218,52 @@ module.exports = {
 
     extension
       .addAction(
-        'SetVariable',
-        _('Set dialogue state variable'),
+        'SetStringVariable',
+        _('Set dialogue state string variable'),
         _(
-          'Set dialogue state variable. Use this to set a variable that the dialogue data is using.'
+          'Set dialogue state string variable. Use this to set a variable that the dialogue data is using.'
         ),
-        _('Set dialogue state variable _PARAM0_ to _PARAM1_'),
+        _('Set dialogue state string variable _PARAM0_ to _PARAM1_'),
         _('Dialogue Tree (experimental)'),
         'JsPlatform/Extensions/yarn24.png',
         'JsPlatform/Extensions/yarn32.png'
       )
       .addParameter('string', _('State Variable Name'), '', false)
-      .addParameter('expression', _('Variable Value'), '', false)
+      .addParameter('string', _('Variable string value'), '', false)
+      .getCodeExtraInformation()
+      .setFunctionName('gdjs.dialogueTree.setVariable');
+
+    extension
+      .addAction(
+        'SetNumberVariable',
+        _('Set dialogue state number variable'),
+        _(
+          'Set dialogue state number variable. Use this to set a variable that the dialogue data is using.'
+        ),
+        _('Set dialogue state number variable _PARAM0_ to _PARAM1_'),
+        _('Dialogue Tree (experimental)'),
+        'JsPlatform/Extensions/yarn24.png',
+        'JsPlatform/Extensions/yarn32.png'
+      )
+      .addParameter('string', _('State Variable Name'), '', false)
+      .addParameter('expression', _('Variable number value'), '', true)
+      .getCodeExtraInformation()
+      .setFunctionName('gdjs.dialogueTree.setVariable');
+
+    extension
+      .addAction(
+        'SetBooleanVariable',
+        _('Set dialogue state boolean variable'),
+        _(
+          'Set dialogue state boolean variable. Use this to set a variable that the dialogue data is using.'
+        ),
+        _('Set dialogue state boolean variable _PARAM0_ to _PARAM1_'),
+        _('Dialogue Tree (experimental)'),
+        'JsPlatform/Extensions/yarn24.png',
+        'JsPlatform/Extensions/yarn32.png'
+      )
+      .addParameter('string', _('State Variable Name'), '', false)
+      .addParameter('trueorfalse', _('Variable boolean value'), '', false)
       .getCodeExtraInformation()
       .setFunctionName('gdjs.dialogueTree.setVariable');
 
@@ -257,13 +299,27 @@ module.exports = {
       .getCodeExtraInformation()
       .setFunctionName('gdjs.dialogueTree.loadState');
 
+    extension
+      .addAction(
+        'ClearState',
+        _('Clear dialogue state'),
+        _(
+          'Clear dialogue state. This resets all dialogue state accumulated by the player choices. Useful when the player is starting a new game.'
+        ),
+        _('Clear dialogue state'),
+        _('Dialogue Tree (experimental)'),
+        'JsPlatform/Extensions/yarn24.png',
+        'JsPlatform/Extensions/yarn32.png'
+      )
+      .getCodeExtraInformation()
+      .setFunctionName('gdjs.dialogueTree.clearState');
+
     extension
       .addStrExpression(
         'LineText',
         _('Get the current dialogue line text'),
         _('Returns the current dialogue line text'),
         _('Dialogue Tree (experimental)'),
-        'JsPlatform/Extensions/yarn24.png',
         'JsPlatform/Extensions/yarn32.png'
       )
       .getCodeExtraInformation()
@@ -275,7 +331,6 @@ module.exports = {
         _('Get the number of options in an options line type'),
         _('Get the number of options in an options line type'),
         _('Dialogue Tree (experimental)'),
-        'JsPlatform/Extensions/yarn24.png',
         'JsPlatform/Extensions/yarn32.png'
       )
       .getCodeExtraInformation()
@@ -289,7 +344,6 @@ module.exports = {
           "Get the text of an option from an Options line type, using the option's Number. The numbers start from 0."
         ),
         _('Dialogue Tree (experimental)'),
-        'JsPlatform/Extensions/yarn24.png',
         'JsPlatform/Extensions/yarn32.png'
       )
       .addParameter('expression', _('Option Index Number'), '', false)
@@ -304,7 +358,6 @@ module.exports = {
           "Get the text of all available options from an Options line type as a horizontal list. You can also pass the selected option's cursor string, which by default is ->"
         ),
         _('Dialogue Tree (experimental)'),
-        'JsPlatform/Extensions/yarn24.png',
         'JsPlatform/Extensions/yarn32.png'
       )
       .addParameter('string', _('Options Selection Cursor'), '', false)
@@ -320,7 +373,6 @@ module.exports = {
           "Get the text of all available options from an Options line type as a vertical list. You can also pass the selected option's cursor string, which by default is ->"
         ),
         _('Dialogue Tree (experimental)'),
-        'JsPlatform/Extensions/yarn24.png',
         'JsPlatform/Extensions/yarn32.png'
       )
       .addParameter('string', _('Options Selection Cursor'), '', false)
@@ -336,7 +388,6 @@ module.exports = {
           'Get the number of the currently selected option. Use this to help you render the option selection marker at the right place.'
         ),
         _('Dialogue Tree (experimental)'),
-        'JsPlatform/Extensions/yarn24.png',
         'JsPlatform/Extensions/yarn32.png'
       )
       .getCodeExtraInformation()
@@ -350,7 +401,6 @@ module.exports = {
           'Get dialogue line text clipped by the typewriter effect. Use the "Scroll clipped text" action to control the typewriter effect.'
         ),
         _('Dialogue Tree (experimental)'),
-        'JsPlatform/Extensions/yarn24.png',
         'JsPlatform/Extensions/yarn32.png'
       )
       .getCodeExtraInformation()
@@ -362,7 +412,6 @@ module.exports = {
         _('Get the title of the current branch of the running dialogue'),
         _('Get the title of the current branch of the running dialogue'),
         _('Dialogue Tree (experimental)'),
-        'JsPlatform/Extensions/yarn24.png',
         'JsPlatform/Extensions/yarn32.png'
       )
       .getCodeExtraInformation()
@@ -374,7 +423,6 @@ module.exports = {
         _('Get the tags of the current branch of the running dialogue'),
         _('Get the tags of the current branch of the running dialogue'),
         _('Dialogue Tree (experimental)'),
-        'JsPlatform/Extensions/yarn24.png',
         'JsPlatform/Extensions/yarn32.png'
       )
       .getCodeExtraInformation()
@@ -386,7 +434,6 @@ module.exports = {
         _('Get a tag of the current branch of the running dialogue via its index'),
         _('Get a tag of the current branch of the running dialogue via its index'),
         _('Dialogue Tree (experimental)'),
-        'JsPlatform/Extensions/yarn24.png',
         'JsPlatform/Extensions/yarn32.png'
       )
       .addParameter('expression', _('Tag Index Number'), '', false)
@@ -401,7 +448,6 @@ module.exports = {
           'Get the parameters of a command call - <<command withParameter anotherParameter>>'
         ),
         _('Dialogue Tree (experimental)'),
-        'JsPlatform/Extensions/yarn24.png',
         'JsPlatform/Extensions/yarn32.png'
       )
       .addParameter('expression', _('parameter Index Number'), '', true)
@@ -414,7 +460,6 @@ module.exports = {
         _('Get the number of parameters in the currently passed command'),
         _('Get the number of parameters in the currently passed command'),
         _('Dialogue Tree (experimental)'),
-        'JsPlatform/Extensions/yarn24.png',
         'JsPlatform/Extensions/yarn32.png'
       )
       .getCodeExtraInformation()
@@ -430,7 +475,6 @@ module.exports = {
           'Get parameter from a Tag found by the branch contains tag condition'
         ),
         _('Dialogue Tree (experimental)'),
-        'JsPlatform/Extensions/yarn24.png',
         'JsPlatform/Extensions/yarn32.png'
       )
       .addParameter('expression', _('parameter Index Number'), '', true)
@@ -443,7 +487,6 @@ module.exports = {
         _('Get a list of all visited branches'),
         _('Get a list of all visited branches'),
         _('Dialogue Tree (experimental)'),
-        'JsPlatform/Extensions/yarn24.png',
         'JsPlatform/Extensions/yarn32.png'
       )
       .getCodeExtraInformation()
@@ -455,7 +498,6 @@ module.exports = {
         _('Get the full raw text of the current branch'),
         _('Get the full raw text of the current branch'),
         _('Dialogue Tree (experimental)'),
-        'JsPlatform/Extensions/yarn24.png',
         'JsPlatform/Extensions/yarn32.png'
       )
       .getCodeExtraInformation()
@@ -467,7 +509,6 @@ module.exports = {
         _('Get dialogue state value'),
         _('Get dialogue state value'),
         _('Dialogue Tree (experimental)'),
-        'JsPlatform/Extensions/yarn24.png',
         'JsPlatform/Extensions/yarn32.png'
       )
       .addParameter('string', _('Variable Name'), '', false)
@@ -592,9 +633,9 @@ module.exports = {
     extension
       .addCondition(
         'WasBranchVisited',
-        _('Branch title has been visited before'),
-        _('Check if the current branch has been visited before'),
-        _('Branch title _PARAM0_ has been visited before'),
+        _('Branch title has been visited'),
+        _('Check if a branch has been visited'),
+        _('Branch title _PARAM0_ has been visited'),
         _('Dialogue Tree (experimental)'),
         'JsPlatform/Extensions/yarn24.png',
         'JsPlatform/Extensions/yarn32.png'
@@ -605,12 +646,12 @@ module.exports = {
 
     extension
       .addCondition(
-        'CompareDialogueStateVariable',
-        _('Compare dialogue state variable'),
+        'CompareDialogueStateStringVariable',
+        _('Compare dialogue state string variable'),
         _(
-          'Compare dialogue state variable. Use this to trigger game events via dialogue variables.'
+          'Compare dialogue state string variable. Use this to trigger game events via dialogue variables.'
         ),
-        _('Dialogue state variable _PARAM0_ is equal to _PARAM1_'),
+        _('Dialogue state string variable _PARAM0_ is equal to _PARAM1_'),
         _('Dialogue Tree (experimental)'),
         'JsPlatform/Extensions/yarn24.png',
         'JsPlatform/Extensions/yarn32.png'
@@ -620,6 +661,40 @@ module.exports = {
       .getCodeExtraInformation()
       .setFunctionName('gdjs.dialogueTree.compareVariable');
 
+    extension
+      .addCondition(
+        'CompareDialogueStateNumberVariable',
+        _('Compare dialogue state number variable'),
+        _(
+          'Compare dialogue state number variable. Use this to trigger game events via dialogue variables.'
+        ),
+        _('Dialogue state number variable _PARAM0_ is equal to _PARAM1_'),
+        _('Dialogue Tree (experimental)'),
+        'JsPlatform/Extensions/yarn24.png',
+        'JsPlatform/Extensions/yarn32.png'
+      )
+      .addParameter('string', _('State variable'), '', false)
+      .addParameter('expression', _('Equal to'), '', false)
+      .getCodeExtraInformation()
+      .setFunctionName('gdjs.dialogueTree.compareVariable');
+
+    extension
+      .addCondition(
+        'CompareDialogueStateBooleanVariable',
+        _('Compare dialogue state boolean variable'),
+        _(
+          'Compare dialogue state variable. Use this to trigger game events via dialogue variables.'
+        ),
+        _('Dialogue state boolean variable _PARAM0_ is equal to _PARAM1_'),
+        _('Dialogue Tree (experimental)'),
+        'JsPlatform/Extensions/yarn24.png',
+        'JsPlatform/Extensions/yarn32.png'
+      )
+      .addParameter('string', _('State variable'), '', false)
+      .addParameter('trueorfalse', _('Equal to'), '', false)
+      .getCodeExtraInformation()
+      .setFunctionName('gdjs.dialogueTree.compareVariable');
+
     extension
       .addCondition(
         'HasClippedTextScrollingCompleted',
@@ -637,7 +712,7 @@ module.exports = {
 
     return extension;
   },
-  runExtensionSanityTests: function(gd, extension) {
+  runExtensionSanityTests: function(gd /*: libGDevelop */, extension /*: gdPlatformExtension*/) {
     return [];
   },
 };

Extensions/DialogueTree/bondage.js/LICENSE.txt

@@ -0,0 +1,21 @@
+The MIT License (MIT)
+
+Copyright (c) 2017 j hayley
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

Extensions/DialogueTree/bondage.js/README.md

@@ -0,0 +1,66 @@
+# bondage.js [![Build Status](https://travis-ci.org/jhayley/bondage.js.svg?branch=master)](https://travis-ci.org/jhayley/bondage.js)
+[Yarn](https://github.com/InfiniteAmmoInc/Yarn) parser for Javascript, in the same vein as [YarnSpinner](https://github.com/thesecretlab/YarnSpinner).
+
+# Usage
+
+#### As a Web Tool
+
+To run through your yarn files in your browser, go to http://hayley.zone/bondage.js, paste your yarn data in the field, then hit "compile".
+
+#### As a Command Line Tool
+Installation: `npm install -g bondage`
+
+Now you can use the `bondage` command to run through Yarn files from the command line. You can load one or multiple files at a time. If you load multiple files and a two nodes are encountered with the same name, the node will be overwritten.
+
+**Examples**
+
+* Running a single file from the default start node (named "Start"): `bondage run yarnfile.json`
+* Running a single file from the specified node name: `bondage run -s StartNode yarnfile.json`
+* Running multiple files from the specified node name: `bondage run -s StartNode yarnfile1.json yarnfile2.json ...`
+* See the compiled ast: `bondage compile --ast yarnfile.json`
+* See the tokenized input: `bondage compile --tokens yarnfile.json`
+
+#### As a Library
+
+**Web**
+
+Include [dist/bondage.min.js](https://github.com/jhayley/bondage.js/blob/master/dist/bondage.min.js) somewhere in your html, and the `bondage` variable will be added to the global scope. You can then access everything in the example below (such as `bondage.Runner`) through that variable.
+
+**Node**
+
+Installation: `npm install bondage`
+
+```javascript
+const fs = require('fs');
+const bondage = require('bondage');
+
+const runner = new bondage.Runner();
+const yarnData = JSON.parse(fs.readFileSync('yarnFile.json'));
+
+runner.load(yarnData);
+
+// Loop over the dialogue from the node titled 'Start'
+for (const result of runner.run('Start')) {
+  // Do something else with the result
+  if (result instanceof bondage.TextResult) {
+    console.log(result.text);
+  } else if (result instanceof bondage.OptionsResult) {
+    // This works for both links between nodes and shortcut options
+    console.log(result.options);
+
+    // Select based on the option's index in the array (if you don't select an option, the dialog will continue past them)
+    result.select(1);
+  } else if (result instanceof bondage.CommandResult) {
+     // If the text was inside <<here>>, it will get returned as a CommandResult string, which you can use in any way you want
+    console.log(result.text);
+  }
+}
+
+// Advance the dialogue manually from the node titled 'Start'
+const d = runner.run('Start')
+let result = d.next().value;
+let nextResult = d.next().value;
+// And so on
+```
+
+For usage of the yarn format itself, please see the [YarnSpinner Documentation](https://github.com/thesecretlab/YarnSpinner/tree/master/Documentation), everything there should carry here too (if something does not match up, please open an issue).

Extensions/DialogueTree/bondage.js/version.txt

@@ -0,0 +1,5 @@
+This extension is using bondage.js library to parse yarn syntax.
+https://github.com/hylyh/bondage.js
+
+The current build used is built from commit 3c63e21
+

Extensions/DialogueTree/dialoguetools.js

@@ -101,7 +101,20 @@ gdjs.dialogueTree.isRunning = function() {
 gdjs.dialogueTree.scrollClippedText = function() {
   if (this.pauseScrolling || !this.dialogueIsRunning) return;
 
-  if (this.dialogueText) {
+  // Autoscroll commands so the user doesnt have to press again
+  if (
+    gdjs.dialogueTree._isLineTypeCommand() &&
+    this.dialogueDataType === 'text' &&
+    this.dialogueBranchTitle === this.dialogueData.data.title &&
+    this.lineNum === this.dialogueData.lineNum &&
+    gdjs.dialogueTree.hasClippedScrollingCompleted()
+  ) {
+    gdjs.dialogueTree.goToNextDialogueLine();
+    return
+  }
+
+  // Increment scrolling of clipped text
+  if (this.dialogueText && this.dialogueDataType === 'text' && this.clipTextEnd < this.dialogueText.length) {
     this.clipTextEnd += 1;
   }
 };
@@ -110,7 +123,7 @@ gdjs.dialogueTree.scrollClippedText = function() {
  * Scroll the clipped text to its end, so the entire text is printed. This can be useful in keeping the event sheet logic simpler, while supporting more variation.
  */
 gdjs.dialogueTree.completeClippedTextScrolling = function() {
-  if (this.pauseScrolling || !this.dialogueIsRunning || !this.dialogueText)
+  if (this.pauseScrolling || !this.dialogueIsRunning || !this.dialogueText || this.dialogueDataType !== 'text')
     return;
   this.clipTextEnd = this.dialogueText.length;
 };
@@ -120,9 +133,11 @@ gdjs.dialogueTree.completeClippedTextScrolling = function() {
  * Useful to prevent the user from skipping to next line before the current one has been printed fully.
  */
 gdjs.dialogueTree.hasClippedScrollingCompleted = function() {
-  if (!this.dialogueIsRunning) return false;
-  if (this.dialogueData && this.dialogueText.length) {
-    return this.clipTextEnd >= this.dialogueText.length;
+  if (!this.dialogueIsRunning || this.dialogueDataType  === '') return false;
+  
+  if (this.dialogueData && this.dialogueText.length > 0 && this.clipTextEnd >= this.dialogueText.length) {
+    if (gdjs.dialogueTree.getVariable('debug')) console.warn('Scroll completed:', this.clipTextEnd,'/', this.dialogueText.length);
+    return true;
   }
   return false;
 };
@@ -142,7 +157,6 @@ gdjs.dialogueTree.getClippedLineText = function() {
  * Note that using this instead getClippedLineText will skip any <<wait>> commands entirely.
  */
 gdjs.dialogueTree.getLineText = function() {
-  this.completeClippedTextScrolling();
   return this.dialogueIsRunning && this.dialogueText.length
     ? this.dialogueText
     : '';
@@ -163,6 +177,7 @@ gdjs.dialogueTree.commandParametersCount = function() {
  * @param {number} paramIndex The index of the parameter to get.
  */
 gdjs.dialogueTree.getCommandParameter = function(paramIndex) {
+  if (paramIndex === -1 && this.commandParameters.length > 0) return this.commandParameters[0];
   if (
     this.commandParameters &&
     this.commandParameters.length >= paramIndex + 1
@@ -188,17 +203,20 @@ gdjs.dialogueTree.isCommandCalled = function(command) {
 
   if (this.pauseScrolling || !commandCalls) return false;
   return this.commandCalls.some(function(call, index) {
-    if (clipTextEnd < call.time) return false;
-    if (call.cmd === 'wait' && clipTextEnd !== dialogueText.length) {
+    if (clipTextEnd !== 0 && clipTextEnd < call.time) return false;
+    if (call.cmd === 'wait' && (clipTextEnd === 0 || clipTextEnd !== dialogueText.length)) {
       gdjs.dialogueTree.pauseScrolling = true;
       setTimeout(function() {
         gdjs.dialogueTree.pauseScrolling = false;
         commandCalls.splice(index, 1);
+        if (gdjs.dialogueTree.getVariable('debug')) console.info('CMD:', call);
       }, parseInt(call.params[1], 10));
     }
     if (call.cmd === command) {
       gdjs.dialogueTree.commandParameters = call.params;
       commandCalls.splice(index, 1);
+      if (gdjs.dialogueTree.getVariable('debug')) console.info('CMD:', call);
+
       return true;
     }
   });
@@ -339,7 +357,7 @@ gdjs.dialogueTree.selectOption = function(optionIndex) {
   if (!this.dialogueIsRunning) return;
   if (this.dialogueData.select) {
     this.selectedOption = gdjs.dialogueTree._normalizedOptionIndex(
-      this.selectedOption
+      optionIndex
     );
     this.selectedOptionUpdated = true;
   }
@@ -384,16 +402,21 @@ gdjs.dialogueTree.hasSelectedOptionChanged = function() {
  * @param {string} type The type you want to check for ( one of the three above )
  */
 gdjs.dialogueTree.isDialogueLineType = function(type) {
-  if (
-    this.commandCalls &&
-    this.commandCalls.some(function(call) {
-      return gdjs.dialogueTree.clipTextEnd > call.time && call.cmd === 'wait';
-    })
-  ) {
-    return !this.pauseScrolling;
+  if (!this.dialogueIsRunning) return false;
+  if (this.commandCalls && type === 'command') {
+    if (
+      this.commandCalls.some(function(call) {
+        return gdjs.dialogueTree.clipTextEnd > call.time && call.cmd === 'wait';
+      })
+    ) {
+      return !this.pauseScrolling;
+    }
+    if (this.commandCalls.length > 0 && this.commandParameters.length > 0) {
+      return true;
+    }
   }
 
-  return this.dialogueIsRunning ? this.dialogueDataType === type : false;
+  return this.dialogueDataType === type;
 };
 
 /**
@@ -420,19 +443,27 @@ gdjs.dialogueTree.startFrom = function(startDialogueNode) {
   if (!this.hasDialogueBranch(startDialogueNode)) return;
   this.optionsCount = 0;
   this.options = [];
-  this.dialogueBranchTitle = '';
-  this.dialogueBranchBody = '';
-  this.dialogueBranchTags = [];
   this.tagParameters = [];
   this.dialogue = this.runner.run(startDialogueNode);
-  this.dialogueData = null;
-  this.dialogueDataType = '';
   this.dialogueText = '';
   this.clipTextEnd = 0;
   this.commandCalls = [];
   this.commandParameters = [];
   this.pauseScrolling = false;
+
   this.dialogueData = this.dialogue.next().value;
+  this.dialogueBranchTags = this.dialogueData.data.tags;
+  this.dialogueBranchTitle = this.dialogueData.data.title;
+  this.dialogueBranchBody = this.dialogueData.data.body;
+  this.lineNum = this.dialogueData.lineNum;
+  if (gdjs.dialogueTree._isLineTypeText()){
+    this.dialogueDataType = 'text';
+  } else if (gdjs.dialogueTree._isLineTypeOptions()){
+    this.dialogueDataType = 'options';
+  } else {
+    this.dialogueDataType = 'command';
+  };
+
   this.dialogueIsRunning = true;
   gdjs.dialogueTree.goToNextDialogueLine();
 };
@@ -462,32 +493,37 @@ gdjs.dialogueTree.goToNextDialogueLine = function() {
   this.selectedOption = -1;
   this.selectedOptionUpdated = false;
 
-  if (gdjs.dialogueTree._isLineTypeText()) {
-    if (
-      this.dialogueDataType === 'options' ||
-      this.dialogueDataType === 'text' ||
-      !this.dialogueDataType
-    ) {
+  if (gdjs.dialogueTree.getVariable('debug')) console.info('parsing:', this.dialogueData);
+
+  if (!this.dialogueData) {
+    gdjs.dialogueTree.stopRunningDialogue();
+  } else if (gdjs.dialogueTree._isLineTypeText()) {
+    if (this.lineNum === this.dialogueData.lineNum && this.dialogueBranchTitle === this.dialogueData.data.title){
+      this.clipTextEnd = this.dialogueText.length - 1;
+      this.dialogueText +=
+        (this.dialogueText === '' ? '' : ' ') + this.dialogueData.text;
+    } else {
       this.clipTextEnd = 0;
       this.dialogueText = this.dialogueData.text;
-      this.commandCalls = [];
-    } else {
-      this.dialogueText += this.dialogueData.text;
     }
 
-    this.dialogueDataType = 'text';
     this.dialogueBranchTags = this.dialogueData.data.tags;
     this.dialogueBranchTitle = this.dialogueData.data.title;
     this.dialogueBranchBody = this.dialogueData.data.body;
+    this.lineNum = this.dialogueData.lineNum;
+    this.dialogueDataType = 'text';
+
     this.dialogueData = this.dialogue.next().value;
   } else if (gdjs.dialogueTree._isLineTypeOptions()) {
+    this.commandCalls = [];
     this.dialogueDataType = 'options';
+    this.dialogueText = '';
+    this.clipTextEnd = 0;
     this.optionsCount = this.dialogueData.options.length;
     this.options = this.dialogueData.options;
     this.selectedOptionUpdated = true;
   } else if (gdjs.dialogueTree._isLineTypeCommand()) {
     this.dialogueDataType = 'command';
-
     var command = this.dialogueData.text.split(' ');
     // If last command was to wait, increase time by one
     var offsetTime =
@@ -505,11 +541,6 @@ gdjs.dialogueTree.goToNextDialogueLine = function() {
   } else {
     this.dialogueDataType = 'unknown';
   }
-
-  if (gdjs.dialogueTree._isLineTypeCommand()) {
-    this.dialogueDataType = 'command';
-    gdjs.dialogueTree.goToNextDialogueLine();
-  }
 };
 
 /**
@@ -627,7 +658,7 @@ gdjs.dialogueTree.getBranchText = function() {
  */
 gdjs.dialogueTree.getVariable = function(key) {
   if (this.dialogueIsRunning && key in this.runner.variables.data) {
-    return this.runner.variables.data[key];
+    return this.runner.variables.get(key);
   }
   return '';
 };
@@ -635,11 +666,11 @@ gdjs.dialogueTree.getVariable = function(key) {
 /**
  * Check if a specific variable created by the Dialogue parses exists and is equal to a specific value.
  * @param {string} key The name of the variable you want to check the value of
- * @param {string} value The value you want to check against
+ * @param {string|boolean|number} value The value you want to check against
  */
 gdjs.dialogueTree.compareVariable = function(key, value) {
   if (this.dialogueIsRunning && key in this.runner.variables.data) {
-    return this.runner.variables.data[key].toString() === value;
+    return this.runner.variables.get(key) === value;
   }
   return false;
 };
@@ -647,11 +678,11 @@ gdjs.dialogueTree.compareVariable = function(key, value) {
 /**
  * Set a specific variable created by the Dialogue parser to a specific value.
  * @param {string} key The name of the variable you want to set the value of
- * @param {string} value The value you want to set
+ * @param {string|boolean|number} value The value you want to set
  */
 gdjs.dialogueTree.setVariable = function(key, value) {
-  if (this.dialogueIsRunning && this.runner.variables.data) {
-    this.runner.variables.data[key] = value;
+  if (this.runner.variables) {
+    this.runner.variables.set(key, value);
   }
 };
 
@@ -662,7 +693,7 @@ gdjs.dialogueTree.setVariable = function(key, value) {
  * @param {gdjs.Variable} outputVariable The variable where to store the State
  */
 gdjs.dialogueTree.saveState = function(outputVariable) {
-  const dialogueState = {
+  var dialogueState = {
     variables: gdjs.dialogueTree.runner.variables.data,
     visited: gdjs.dialogueTree.runner.visited,
   };
@@ -673,17 +704,32 @@ gdjs.dialogueTree.saveState = function(outputVariable) {
  * Load the current State of the Dialogue Parser from a specified variable.
  * Can be used to implement persistence in dialogue through your game's Load/Save function.
  * That way you can later load all the dialogue choices the player has made.
- * @param {gdjs.Variable} inputVariable The variable where to load the State from.
+ * @param {gdjs.Variable} inputVariable The structured variable where to load the State from.
  */
 gdjs.dialogueTree.loadState = function(inputVariable) {
-  const jsonData = gdjs.evtTools.network.variableStructureToJSON(inputVariable);
+  var loadedState = JSON.parse(
+    gdjs.evtTools.network.variableStructureToJSON(inputVariable)
+  );
+  if (!loadedState) {
+    console.error('Load state variable is empty:', inputVariable);
+    return
+  }
   try {
-    const loadedState = JSON.parse(
-      gdjs.evtTools.network.variableStructureToJSON(inputVariable)
-    );
     gdjs.dialogueTree.runner.visited = loadedState.visited;
-    gdjs.dialogueTree.runner.variables.data = loadedState.variables;
+    gdjs.dialogueTree.runner.variables.data = {};
+    Object.keys(loadedState.variables).forEach(function(key) {
+      var value = loadedState.variables[key];
+      gdjs.dialogueTree.runner.variables.set(key, value);
+    });
   } catch (e) {
-    console.error(e);
+    console.error('Failed to load state from variable:', inputVariable, e);
   }
 };
+
+/**
+ * Clear the current State of the Dialogue Parser.
+ */
+gdjs.dialogueTree.clearState = function() {
+  gdjs.dialogueTree.runner.visited = {};
+  gdjs.dialogueTree.runner.variables.data = {};
+};

Extensions/DraggableBehavior/draggableruntimebehavior.js

@@ -25,6 +25,11 @@ gdjs.DraggableRuntimeBehavior = function(runtimeScene, behaviorData, owner)
 gdjs.DraggableRuntimeBehavior.prototype = Object.create( gdjs.RuntimeBehavior.prototype );
 gdjs.registerBehavior("DraggableBehavior::Draggable", gdjs.DraggableRuntimeBehavior);
 
+gdjs.DraggableRuntimeBehavior.prototype.updateFromBehaviorData = function(oldBehaviorData, newBehaviorData) {
+    // Nothing to update.
+    return true;
+}
+
 gdjs.DraggableRuntimeBehavior.prototype.onDeActivate = function() {
     this._endDrag();
 };

Extensions/DraggableBehavior/tests/draggableruntimeautomatism.spec.js

@@ -1,17 +1,22 @@
-
+// @ts-check
 describe('gdjs.DraggableRuntimeBehavior', function() {
-	var runtimeGame = new gdjs.RuntimeGame({variables: [], properties: {windowWidth: 800, windowHeight: 600}});
+	var runtimeGame = new gdjs.RuntimeGame({
+		variables: [],
+		resources: {resources: []},
+		// @ts-ignore
+		properties: {windowWidth: 800, windowHeight: 600}
+	});
 	var runtimeScene = new gdjs.RuntimeScene(runtimeGame);
 	runtimeScene.loadFromScene({
-		layers:[{name:"", visibility: true}],
+		layers:[{name:"", visibility: true, effects: []}],
 		variables: [],
 		behaviorsSharedData: [],
 		objects: [],
 		instances: []
 	});
 
-	var object = new gdjs.RuntimeObject(runtimeScene, {name: "obj1", type: "", behaviors: [{type: "DraggableBehavior::Draggable"}]});
-	var object2 = new gdjs.RuntimeObject(runtimeScene, {name: "obj1", type: "", behaviors: [{type: "DraggableBehavior::Draggable"}]});
+	var object = new gdjs.RuntimeObject(runtimeScene, {name: "obj1", type: "", behaviors: [{name: "Behavior1", type: "DraggableBehavior::Draggable"}], variables: []});
+	var object2 = new gdjs.RuntimeObject(runtimeScene, {name: "obj1", type: "", behaviors: [{name: "Behavior1", type: "DraggableBehavior::Draggable"}], variables: []});
 	runtimeScene.addObject(object);
 	runtimeScene.addObject(object2);
 

Extensions/Effects/bevel-pixi-filter.js

@@ -20,10 +20,10 @@ gdjs.PixiFiltersTools.registerFilterCreator('Bevel', {
   },
   updateStringParameter: function(filter, parameterName, value) {
     if (parameterName === 'lightColor') {
-      filter.lightColor = value.replace('#', '0x');
+      filter.lightColor = gdjs.PixiFiltersTools.rgbOrHexToHexNumber(value);
     }
     if (parameterName === 'shadowColor') {
-      filter.shadowColor = value.replace('#', '0x');
+      filter.shadowColor = gdjs.PixiFiltersTools.rgbOrHexToHexNumber(value);
     }
   },
   updateBooleanParameter: function(filter, parameterName, value) {},

Extensions/Effects/blending-mode-pixi-filter.js

@@ -0,0 +1,18 @@
+gdjs.PixiFiltersTools.registerFilterCreator('BlendingMode', {
+  makePIXIFilter: function(layer, effectData) {
+    var blendingModeFilter = new PIXI.filters.AlphaFilter();
+
+    return blendingModeFilter;
+  },
+  update: function(filter, layer) {},
+  updateDoubleParameter: function(filter, parameterName, value) {
+    if (parameterName === 'alpha') {
+      filter.alpha = value;
+    }
+    if (parameterName === 'blendmode') {
+      filter.blendMode = value;
+    }
+  },
+  updateStringParameter: function(filter, parameterName, value) {},
+  updateBooleanParameter: function(filter, parameterName, value) {},
+});

Extensions/Effects/blur-pixi-filter.js

@@ -14,7 +14,7 @@ gdjs.PixiFiltersTools.registerFilterCreator('Blur', {
       return;
 
     if (parameterName === 'kernelSize') {
-      value = gdjs.PixiFiltersTools.clampKernelSize(value);
+      value = gdjs.PixiFiltersTools.clampKernelSize(value, 5, 15);
     }
 
     filter[parameterName] = value;

Extensions/Effects/bulge-pinch-pixi-filter.js

@@ -0,0 +1,27 @@
+gdjs.PixiFiltersTools.registerFilterCreator('BulgePinch', {
+  makePIXIFilter: function(layer, effectData) {
+    var bulgePinchFilter = new PIXI.filters.BulgePinchFilter();
+
+    return bulgePinchFilter;
+  },
+  update: function(filter, layer) {
+  },
+  updateDoubleParameter: function(filter, parameterName, value) {
+    if (parameterName === 'centerX') {
+      filter.center[0] = value;
+    }
+    else if (parameterName === 'centerY') {
+      filter.center[1] = value;
+    }
+    else if (parameterName === 'radius') {
+      filter.radius = value;
+    }
+    else if (parameterName === 'strength') {
+      filter.strength = gdjs.PixiFiltersTools.clampValue(value, -1, 1);
+    }
+  },
+  updateStringParameter: function(filter, parameterName, value) {
+  },
+  updateBooleanParameter: function(filter, parameterName, value) {
+  },
+});

Extensions/Effects/color-replace-pixi-filter.js

@@ -0,0 +1,22 @@
+gdjs.PixiFiltersTools.registerFilterCreator('ColorReplace', {
+  makePIXIFilter: function(layer, effectData) {
+    var colorReplaceFilter = new PIXI.filters.ColorReplaceFilter();
+
+    return colorReplaceFilter;
+  },
+  update: function(filter, layer) {},
+  updateDoubleParameter: function(filter, parameterName, value) {
+    if (parameterName === 'epsilon') {
+      filter.epsilon = value;
+    }
+  },
+  updateStringParameter: function(filter, parameterName, value) {
+      if (parameterName === 'originalColor') {
+      filter.originalColor = gdjs.PixiFiltersTools.rgbOrHexToHexNumber(value);
+    }
+    else if (parameterName === 'newColor') {
+      filter.newColor = gdjs.PixiFiltersTools.rgbOrHexToHexNumber(value);
+    }
+  },
+  updateBooleanParameter: function(filter, parameterName, value) {},
+});

Extensions/Effects/crt-pixi-filter.js

@@ -1,13 +1,20 @@
 gdjs.PixiFiltersTools.registerFilterCreator('CRT', {
   makePIXIFilter: function(layer, effectData) {
     var crtFilter = new PIXI.filters.CRTFilter();
-
+    crtFilter._animationTimer = 0;
     return crtFilter;
   },
   update: function(filter, layer) {
-    if (filter.animated) {
-      filter.time += layer.getElapsedTime() / 1000;
-      filter.seed = Math.random();
+    if (filter.animationSpeed !== 0) { 
+      // Multiply by 10 so that the default value is a sensible speed
+      filter.time += layer.getElapsedTime() / 1000 * 10 * filter.animationSpeed;
+    } 
+    if (filter.animationFrequency !== 0) { 
+      filter._animationTimer += layer.getElapsedTime() / 1000;
+      if (filter._animationTimer >= 1 / filter.animationFrequency) {
+        filter.seed = Math.random();
+        filter._animationTimer = 0;
+      }
     }
   },
   updateDoubleParameter: function(filter, parameterName, value) {
@@ -27,6 +34,10 @@ gdjs.PixiFiltersTools.registerFilterCreator('CRT', {
       filter.vignettingAlpha = value;
     } else if (parameterName === 'vignettingBlur') {
       filter.vignettingBlur = value;
+    } else if (parameterName === 'animationSpeed') {
+      filter.animationSpeed = value;
+    } else if (parameterName === 'animationFrequency') {
+      filter.animationFrequency = value;
     }
   },
   updateStringParameter: function(filter, parameterName, value) {},
@@ -34,8 +45,5 @@ gdjs.PixiFiltersTools.registerFilterCreator('CRT', {
     if (parameterName === 'verticalLine') {
       filter.verticalLine = value;
     }
-    if (parameterName === 'animated') {
-      filter.animated = value;
-    }
   },
 });

Extensions/Effects/dot-pixi-filter.js

@@ -0,0 +1,18 @@
+gdjs.PixiFiltersTools.registerFilterCreator('Dot', {
+  makePIXIFilter: function(layer, effectData) {
+    var dotFilter = new PIXI.filters.DotFilter();
+
+    return dotFilter;
+  },
+  update: function(filter, layer) {},
+  updateDoubleParameter: function(filter, parameterName, value) {
+    if (parameterName === 'scale') {
+      filter.scale = value;
+    }
+    else if (parameterName === 'angle') {
+      filter.angle = value;
+    }
+  },
+  updateStringParameter: function(filter, parameterName, value) {},
+  updateBooleanParameter: function(filter, parameterName, value) {},
+});

Extensions/Effects/drop-shadow-pixi-filter.js

@@ -20,7 +20,7 @@ gdjs.PixiFiltersTools.registerFilterCreator('DropShadow', {
   },
   updateStringParameter: function(filter, parameterName, value) {
     if (parameterName === 'color') {
-      filter.color = value.replace('#', '0x');
+      filter.color = gdjs.PixiFiltersTools.rgbOrHexToHexNumber(value);
     }
   },
   updateBooleanParameter: function(filter, parameterName, value) {

Extensions/Effects/glitch-pixi-filter.js

@@ -0,0 +1,64 @@
+gdjs.PixiFiltersTools.registerFilterCreator('Glitch', {
+  makePIXIFilter: function(layer, effectData) {
+    var glitchFilter = new PIXI.filters.GlitchFilter();
+    glitchFilter._animationTimer = 0;
+    return glitchFilter;
+  },
+  update: function(filter, layer) {
+    if (filter.animationFrequency !== 0) { 
+      filter._animationTimer += layer.getElapsedTime() / 1000;
+      if (filter._animationTimer >= 1 / filter.animationFrequency) {
+        filter.seed = Math.random();
+        filter._animationTimer = 0;
+      }
+    }
+  },
+  updateDoubleParameter: function(filter, parameterName, value) {
+    if (parameterName === 'slices') {
+      filter.slices = value;
+    }
+    else if (parameterName === 'offset') {
+      filter.offset = value;
+    }
+    else if (parameterName === 'direction') {
+      filter.direction = value;
+    }
+    else if (parameterName === 'fillMode') {
+      filter.fillMode = value;
+    }
+    else if (parameterName === 'minSize') {
+      filter.minSize = value;
+    }
+    else if (parameterName === 'sampleSize') {
+      filter.sampleSize = value;
+    }
+    else if (parameterName === 'redX') {
+      filter.red.x = value;
+    }
+    else if (parameterName === 'redY') {
+      filter.red.y = value;
+    }
+    else if (parameterName === 'greenX') {
+      filter.green.x = value;
+    }
+    else if (parameterName === 'greenY') {
+      filter.green.y = value;
+    }
+    else if (parameterName === 'blueX') {
+      filter.blue.x = value;
+    }
+    else if (parameterName === 'blueY') {
+      filter.blue.y = value;
+    }
+    else if (parameterName === 'animationFrequency') {
+      filter.animationFrequency = value;
+    }
+
+  },
+  updateStringParameter: function(filter, parameterName, value) {},
+  updateBooleanParameter: function(filter, parameterName, value) {
+    if (parameterName === 'average') {
+      filter.average = value;
+    }
+  },
+});

Extensions/Effects/glow-pixi-filter.js

@@ -14,9 +14,9 @@ gdjs.PixiFiltersTools.registerFilterCreator('Glow', {
       filter.distance = value;
     }
   },
-  updateStringParameter: function(filter, parameterName, value) {
+  updateStringParameter: function(filter, parameterName, value) {      
     if (parameterName === 'color') {
-      filter.color = value.replace('#', '0x');
+      filter.color = gdjs.PixiFiltersTools.rgbOrHexToHexNumber(value);
     }
   },
   updateBooleanParameter: function(filter, parameterName, value) {},

Extensions/Effects/godray-pixi-filter.js

@@ -5,8 +5,8 @@ gdjs.PixiFiltersTools.registerFilterCreator('Godray', {
     return godrayFilter;
   },
   update: function(filter, layer) {
-    if (filter.animated) {
-      filter.time += layer.getElapsedTime() / 1000;
+    if (filter.animationSpeed !== 0) { 
+      filter.time += layer.getElapsedTime() / 1000 * filter.animationSpeed;
     }
   },
   updateDoubleParameter: function(filter, parameterName, value) {
@@ -22,6 +22,8 @@ gdjs.PixiFiltersTools.registerFilterCreator('Godray', {
       filter.x = value;
     } else if (parameterName === 'y') {
       filter.y = value;
+    } else if (parameterName === 'animationSpeed') {
+      filter.animationSpeed = value;
     }
   },
   updateStringParameter: function(filter, parameterName, value) {},
@@ -29,8 +31,5 @@ gdjs.PixiFiltersTools.registerFilterCreator('Godray', {
     if (parameterName === 'parallel') {
       filter.parallel = value;
     }
-    if (parameterName === 'animated') {
-      filter.animated = value;
-    }
   },
 });

Extensions/Effects/old-film-pixi-filter.js

@@ -0,0 +1,50 @@
+gdjs.PixiFiltersTools.registerFilterCreator('OldFilm', {
+  makePIXIFilter: function(layer, effectData) {
+    var oldFilmFilter = new PIXI.filters.OldFilmFilter();
+    oldFilmFilter._animationTimer = 0;
+    return oldFilmFilter;
+  },  
+  update: function(filter, layer) {
+    if (filter.animationFrequency !== 0) { 
+      filter._animationTimer += layer.getElapsedTime() / 1000;
+      if (filter._animationTimer >= 1 / filter.animationFrequency) {
+        filter.seed = Math.random();
+        filter._animationTimer = 0;
+      }
+    }
+  },
+  updateDoubleParameter: function(filter, parameterName, value) {
+    if (parameterName === 'sepia') {
+      filter.sepia = value;
+    }
+    else if (parameterName === 'noise') {
+      filter.noise = value;
+    }
+    else if (parameterName === 'noiseSize') {
+      filter.noiseSize = value;
+    }
+    else if (parameterName === 'scratch') {
+      filter.scratch = value;
+    }
+    else if (parameterName === 'scratchDensity') {
+      filter.scratchDensity = value;
+    }
+    else if (parameterName === 'scratchWidth') {
+      filter.scratchWidth = value;
+    }
+    else if (parameterName === 'vignetting') {
+      filter.vignetting = value;
+    }
+    else if (parameterName === 'vignettingAlpha') {
+      filter.vignettingAlpha = value;
+    }
+    else if (parameterName === 'vignettingBlur') {
+      filter.vignettingBlur = value;
+    }
+    else if (parameterName === 'animationFrequency') {
+      filter.animationFrequency = value;
+    }
+  },
+  updateStringParameter: function(filter, parameterName, value) {},
+  updateBooleanParameter: function(filter, parameterName, value) {},
+});

Extensions/Effects/outline-pixi-filter.js

@@ -12,7 +12,7 @@ gdjs.PixiFiltersTools.registerFilterCreator('Outline', {
   },
   updateStringParameter: function(filter, parameterName, value) {
     if (parameterName === 'color') {
-      filter.color = value.replace('#', '0x');
+      filter.color = gdjs.PixiFiltersTools.rgbOrHexToHexNumber(value);
     }
   },
   updateBooleanParameter: function(filter, parameterName, value) {},

Extensions/Effects/pixi-filters/filter-adjustment.js

@@ -1,9 +1,8 @@
 /*!
- * @pixi/filter-adjustment - v2.5.0
- * Compiled Fri, 20 Dec 2019 18:59:17 UTC
+ * @pixi/filter-adjustment - v3.1.1
+ * Compiled Wed, 08 Apr 2020 11:09:37 UTC
  *
  * @pixi/filter-adjustment is licensed under the MIT License.
  * http://www.opensource.org/licenses/mit-license
  */
-!function(t,n){"object"==typeof exports&&"undefined"!=typeof module?n(exports,require("pixi.js")):"function"==typeof define&&define.amd?define(["exports","pixi.js"],n):n(t.__filters={},t.PIXI)}(this,function(t,n){"use strict";var r="attribute vec2 aVertexPosition;\nattribute vec2 aTextureCoord;\n\nuniform mat3 projectionMatrix;\n\nvarying vec2 vTextureCoord;\n\nvoid main(void)\n{\n    gl_Position = vec4((projectionMatrix * vec3(aVertexPosition, 1.0)).xy, 0.0, 1.0);\n    vTextureCoord = aTextureCoord;\n}",e="varying vec2 vTextureCoord;\nuniform sampler2D uSampler;\n\nuniform float gamma;\nuniform float contrast;\nuniform float saturation;\nuniform float brightness;\nuniform float red;\nuniform float green;\nuniform float blue;\nuniform float alpha;\n\nvoid main(void)\n{\n    vec4 c = texture2D(uSampler, vTextureCoord);\n\n    if (c.a > 0.0) {\n        c.rgb /= c.a;\n\n        vec3 rgb = pow(c.rgb, vec3(1. / gamma));\n        rgb = mix(vec3(.5), mix(vec3(dot(vec3(.2125, .7154, .0721), rgb)), rgb, saturation), contrast);\n        rgb.r *= red;\n        rgb.g *= green;\n        rgb.b *= blue;\n        c.rgb = rgb * brightness;\n\n        c.rgb *= c.a;\n    }\n\n    gl_FragColor = c * alpha;\n}\n",i=function(t){function n(n){t.call(this,r,e),Object.assign(this,{gamma:1,saturation:1,contrast:1,brightness:1,red:1,green:1,blue:1,alpha:1},n)}return t&&(n.__proto__=t),n.prototype=Object.create(t&&t.prototype),n.prototype.constructor=n,n.prototype.apply=function(t,n,r,e){this.uniforms.gamma=Math.max(this.gamma,1e-4),this.uniforms.saturation=this.saturation,this.uniforms.contrast=this.contrast,this.uniforms.brightness=this.brightness,this.uniforms.red=this.red,this.uniforms.green=this.green,this.uniforms.blue=this.blue,this.uniforms.alpha=this.alpha,t.applyFilter(this,n,r,e)},n}(n.Filter);t.AdjustmentFilter=i,Object.defineProperty(t,"__esModule",{value:!0})}),Object.assign(PIXI.filters,this?this.__filters:__filters);
-//# sourceMappingURL=filter-adjustment.js.map
+var __filters=function(t,r){"use strict";var n="attribute vec2 aVertexPosition;\nattribute vec2 aTextureCoord;\n\nuniform mat3 projectionMatrix;\n\nvarying vec2 vTextureCoord;\n\nvoid main(void)\n{\n    gl_Position = vec4((projectionMatrix * vec3(aVertexPosition, 1.0)).xy, 0.0, 1.0);\n    vTextureCoord = aTextureCoord;\n}",i="varying vec2 vTextureCoord;\nuniform sampler2D uSampler;\n\nuniform float gamma;\nuniform float contrast;\nuniform float saturation;\nuniform float brightness;\nuniform float red;\nuniform float green;\nuniform float blue;\nuniform float alpha;\n\nvoid main(void)\n{\n    vec4 c = texture2D(uSampler, vTextureCoord);\n\n    if (c.a > 0.0) {\n        c.rgb /= c.a;\n\n        vec3 rgb = pow(c.rgb, vec3(1. / gamma));\n        rgb = mix(vec3(.5), mix(vec3(dot(vec3(.2125, .7154, .0721), rgb)), rgb, saturation), contrast);\n        rgb.r *= red;\n        rgb.g *= green;\n        rgb.b *= blue;\n        c.rgb = rgb * brightness;\n\n        c.rgb *= c.a;\n    }\n\n    gl_FragColor = c * alpha;\n}\n",e=function(t){function r(r){t.call(this,n,i),Object.assign(this,{gamma:1,saturation:1,contrast:1,brightness:1,red:1,green:1,blue:1,alpha:1},r)}return t&&(r.__proto__=t),r.prototype=Object.create(t&&t.prototype),r.prototype.constructor=r,r.prototype.apply=function(t,r,n,i){this.uniforms.gamma=Math.max(this.gamma,1e-4),this.uniforms.saturation=this.saturation,this.uniforms.contrast=this.contrast,this.uniforms.brightness=this.brightness,this.uniforms.red=this.red,this.uniforms.green=this.green,this.uniforms.blue=this.blue,this.uniforms.alpha=this.alpha,t.applyFilter(this,r,n,i)},r}(r.Filter);return t.AdjustmentFilter=e,t}({},PIXI);Object.assign(PIXI.filters,__filters);

Extensions/Effects/pixi-filters/filter-advanced-bloom.js

@@ -1,9 +1,8 @@
 /*!
- * @pixi/filter-advanced-bloom - v2.6.0
- * Compiled Fri, 20 Dec 2019 18:59:17 UTC
+ * @pixi/filter-advanced-bloom - v3.1.1
+ * Compiled Wed, 08 Apr 2020 11:09:37 UTC
  *
  * @pixi/filter-advanced-bloom is licensed under the MIT License.
  * http://www.opensource.org/licenses/mit-license
  */
-!function(e,t){"object"==typeof exports&&"undefined"!=typeof module?t(exports,require("pixi.js"),require("@pixi/filter-kawase-blur")):"function"==typeof define&&define.amd?define(["exports","pixi.js","@pixi/filter-kawase-blur"],t):t(e.__filters={},e.PIXI,e.PIXI.filters)}(this,function(e,t,r){"use strict";var o="attribute vec2 aVertexPosition;\nattribute vec2 aTextureCoord;\n\nuniform mat3 projectionMatrix;\n\nvarying vec2 vTextureCoord;\n\nvoid main(void)\n{\n    gl_Position = vec4((projectionMatrix * vec3(aVertexPosition, 1.0)).xy, 0.0, 1.0);\n    vTextureCoord = aTextureCoord;\n}",i="\nuniform sampler2D uSampler;\nvarying vec2 vTextureCoord;\n\nuniform float threshold;\n\nvoid main() {\n    vec4 color = texture2D(uSampler, vTextureCoord);\n\n    // A simple & fast algorithm for getting brightness.\n    // It's inaccuracy , but good enought for this feature.\n    float _max = max(max(color.r, color.g), color.b);\n    float _min = min(min(color.r, color.g), color.b);\n    float brightness = (_max + _min) * 0.5;\n\n    if(brightness > threshold) {\n        gl_FragColor = color;\n    } else {\n        gl_FragColor = vec4(0.0, 0.0, 0.0, 0.0);\n    }\n}\n",n=function(e){function t(t){void 0===t&&(t=.5),e.call(this,o,i),this.threshold=t}e&&(t.__proto__=e),t.prototype=Object.create(e&&e.prototype),t.prototype.constructor=t;var r={threshold:{configurable:!0}};return r.threshold.get=function(){return this.uniforms.threshold},r.threshold.set=function(e){this.uniforms.threshold=e},Object.defineProperties(t.prototype,r),t}(t.Filter),l="uniform sampler2D uSampler;\nvarying vec2 vTextureCoord;\n\nuniform sampler2D bloomTexture;\nuniform float bloomScale;\nuniform float brightness;\n\nvoid main() {\n    vec4 color = texture2D(uSampler, vTextureCoord);\n    color.rgb *= brightness;\n    vec4 bloomColor = vec4(texture2D(bloomTexture, vTextureCoord).rgb, 0.0);\n    bloomColor.rgb *= bloomScale;\n    gl_FragColor = color + bloomColor;\n}\n",s=function(e){function i(i){e.call(this,o,l),"number"==typeof i&&(i={threshold:i}),i=Object.assign({threshold:.5,bloomScale:1,brightness:1,kernels:null,blur:8,quality:4,pixelSize:1,resolution:t.settings.RESOLUTION},i),this.bloomScale=i.bloomScale,this.brightness=i.brightness;var s=i.kernels,u=i.blur,a=i.quality,c=i.pixelSize,h=i.resolution;this._extractFilter=new n(i.threshold),this._extractFilter.resolution=h,this._blurFilter=s?new r.KawaseBlurFilter(s):new r.KawaseBlurFilter(u,a),this.pixelSize=c,this.resolution=h}e&&(i.__proto__=e),i.prototype=Object.create(e&&e.prototype),i.prototype.constructor=i;var s={resolution:{configurable:!0},threshold:{configurable:!0},kernels:{configurable:!0},blur:{configurable:!0},quality:{configurable:!0},pixelSize:{configurable:!0}};return i.prototype.apply=function(e,t,r,o,i){var n=e.getRenderTarget(!0);this._extractFilter.apply(e,t,n,!0,i);var l=e.getRenderTarget(!0);this._blurFilter.apply(e,n,l,!0,i),this.uniforms.bloomScale=this.bloomScale,this.uniforms.brightness=this.brightness,this.uniforms.bloomTexture=l,e.applyFilter(this,t,r,o),e.returnRenderTarget(l),e.returnRenderTarget(n)},s.resolution.get=function(){return this._resolution},s.resolution.set=function(e){this._resolution=e,this._extractFilter&&(this._extractFilter.resolution=e),this._blurFilter&&(this._blurFilter.resolution=e)},s.threshold.get=function(){return this._extractFilter.threshold},s.threshold.set=function(e){this._extractFilter.threshold=e},s.kernels.get=function(){return this._blurFilter.kernels},s.kernels.set=function(e){this._blurFilter.kernels=e},s.blur.get=function(){return this._blurFilter.blur},s.blur.set=function(e){this._blurFilter.blur=e},s.quality.get=function(){return this._blurFilter.quality},s.quality.set=function(e){this._blurFilter.quality=e},s.pixelSize.get=function(){return this._blurFilter.pixelSize},s.pixelSize.set=function(e){this._blurFilter.pixelSize=e},Object.defineProperties(i.prototype,s),i}(t.Filter);e.AdvancedBloomFilter=s,Object.defineProperty(e,"__esModule",{value:!0})}),Object.assign(PIXI.filters,this?this.__filters:__filters);
-//# sourceMappingURL=filter-advanced-bloom.js.map
+var __filters=function(t,e,r,o){"use strict";var i="attribute vec2 aVertexPosition;\nattribute vec2 aTextureCoord;\n\nuniform mat3 projectionMatrix;\n\nvarying vec2 vTextureCoord;\n\nvoid main(void)\n{\n    gl_Position = vec4((projectionMatrix * vec3(aVertexPosition, 1.0)).xy, 0.0, 1.0);\n    vTextureCoord = aTextureCoord;\n}",l="\nuniform sampler2D uSampler;\nvarying vec2 vTextureCoord;\n\nuniform float threshold;\n\nvoid main() {\n    vec4 color = texture2D(uSampler, vTextureCoord);\n\n    // A simple & fast algorithm for getting brightness.\n    // It's inaccuracy , but good enought for this feature.\n    float _max = max(max(color.r, color.g), color.b);\n    float _min = min(min(color.r, color.g), color.b);\n    float brightness = (_max + _min) * 0.5;\n\n    if(brightness > threshold) {\n        gl_FragColor = color;\n    } else {\n        gl_FragColor = vec4(0.0, 0.0, 0.0, 0.0);\n    }\n}\n",n=function(t){function e(e){void 0===e&&(e=.5),t.call(this,i,l),this.threshold=e}t&&(e.__proto__=t),e.prototype=Object.create(t&&t.prototype),e.prototype.constructor=e;var r={threshold:{configurable:!0}};return r.threshold.get=function(){return this.uniforms.threshold},r.threshold.set=function(t){this.uniforms.threshold=t},Object.defineProperties(e.prototype,r),e}(e.Filter),s="uniform sampler2D uSampler;\nvarying vec2 vTextureCoord;\n\nuniform sampler2D bloomTexture;\nuniform float bloomScale;\nuniform float brightness;\n\nvoid main() {\n    vec4 color = texture2D(uSampler, vTextureCoord);\n    color.rgb *= brightness;\n    vec4 bloomColor = vec4(texture2D(bloomTexture, vTextureCoord).rgb, 0.0);\n    bloomColor.rgb *= bloomScale;\n    gl_FragColor = color + bloomColor;\n}\n",u=function(t){function e(e){t.call(this,i,s),"number"==typeof e&&(e={threshold:e}),e=Object.assign({threshold:.5,bloomScale:1,brightness:1,kernels:null,blur:8,quality:4,pixelSize:1,resolution:o.settings.RESOLUTION},e),this.bloomScale=e.bloomScale,this.brightness=e.brightness;var l=e.kernels,u=e.blur,a=e.quality,c=e.pixelSize,h=e.resolution;this._extractFilter=new n(e.threshold),this._extractFilter.resolution=h,this._blurFilter=l?new r.KawaseBlurFilter(l):new r.KawaseBlurFilter(u,a),this.pixelSize=c,this.resolution=h}t&&(e.__proto__=t),e.prototype=Object.create(t&&t.prototype),e.prototype.constructor=e;var l={resolution:{configurable:!0},threshold:{configurable:!0},kernels:{configurable:!0},blur:{configurable:!0},quality:{configurable:!0},pixelSize:{configurable:!0}};return e.prototype.apply=function(t,e,r,o,i){var l=t.getFilterTexture();this._extractFilter.apply(t,e,l,1,i);var n=t.getFilterTexture();this._blurFilter.apply(t,l,n,1,i),this.uniforms.bloomScale=this.bloomScale,this.uniforms.brightness=this.brightness,this.uniforms.bloomTexture=n,t.applyFilter(this,e,r,o),t.returnFilterTexture(n),t.returnFilterTexture(l)},l.resolution.get=function(){return this._resolution},l.resolution.set=function(t){this._resolution=t,this._extractFilter&&(this._extractFilter.resolution=t),this._blurFilter&&(this._blurFilter.resolution=t)},l.threshold.get=function(){return this._extractFilter.threshold},l.threshold.set=function(t){this._extractFilter.threshold=t},l.kernels.get=function(){return this._blurFilter.kernels},l.kernels.set=function(t){this._blurFilter.kernels=t},l.blur.get=function(){return this._blurFilter.blur},l.blur.set=function(t){this._blurFilter.blur=t},l.quality.get=function(){return this._blurFilter.quality},l.quality.set=function(t){this._blurFilter.quality=t},l.pixelSize.get=function(){return this._blurFilter.pixelSize},l.pixelSize.set=function(t){this._blurFilter.pixelSize=t},Object.defineProperties(e.prototype,l),e}(e.Filter);return t.AdvancedBloomFilter=u,t}({},PIXI,PIXI.filters,PIXI);Object.assign(PIXI.filters,__filters);

Extensions/Effects/pixi-filters/filter-ascii.js

@@ -1,9 +1,8 @@
 /*!
- * @pixi/filter-ascii - v2.5.0
- * Compiled Fri, 20 Dec 2019 18:59:17 UTC
+ * @pixi/filter-ascii - v3.1.1
+ * Compiled Wed, 08 Apr 2020 11:09:37 UTC
  *
  * @pixi/filter-ascii is licensed under the MIT License.
  * http://www.opensource.org/licenses/mit-license
  */
-!function(e,n){"object"==typeof exports&&"undefined"!=typeof module?n(exports,require("pixi.js")):"function"==typeof define&&define.amd?define(["exports","pixi.js"],n):n(e.__filters={},e.PIXI)}(this,function(e,n){"use strict";var o="attribute vec2 aVertexPosition;\nattribute vec2 aTextureCoord;\n\nuniform mat3 projectionMatrix;\n\nvarying vec2 vTextureCoord;\n\nvoid main(void)\n{\n    gl_Position = vec4((projectionMatrix * vec3(aVertexPosition, 1.0)).xy, 0.0, 1.0);\n    vTextureCoord = aTextureCoord;\n}",r="varying vec2 vTextureCoord;\n\nuniform vec4 filterArea;\nuniform float pixelSize;\nuniform sampler2D uSampler;\n\nvec2 mapCoord( vec2 coord )\n{\n    coord *= filterArea.xy;\n    coord += filterArea.zw;\n\n    return coord;\n}\n\nvec2 unmapCoord( vec2 coord )\n{\n    coord -= filterArea.zw;\n    coord /= filterArea.xy;\n\n    return coord;\n}\n\nvec2 pixelate(vec2 coord, vec2 size)\n{\n    return floor( coord / size ) * size;\n}\n\nvec2 getMod(vec2 coord, vec2 size)\n{\n    return mod( coord , size) / size;\n}\n\nfloat character(float n, vec2 p)\n{\n    p = floor(p*vec2(4.0, -4.0) + 2.5);\n    if (clamp(p.x, 0.0, 4.0) == p.x && clamp(p.y, 0.0, 4.0) == p.y)\n    {\n        if (int(mod(n/exp2(p.x + 5.0*p.y), 2.0)) == 1) return 1.0;\n    }\n    return 0.0;\n}\n\nvoid main()\n{\n    vec2 coord = mapCoord(vTextureCoord);\n\n    // get the rounded color..\n    vec2 pixCoord = pixelate(coord, vec2(pixelSize));\n    pixCoord = unmapCoord(pixCoord);\n\n    vec4 color = texture2D(uSampler, pixCoord);\n\n    // determine the character to use\n    float gray = (color.r + color.g + color.b) / 3.0;\n\n    float n =  65536.0;             // .\n    if (gray > 0.2) n = 65600.0;    // :\n    if (gray > 0.3) n = 332772.0;   // *\n    if (gray > 0.4) n = 15255086.0; // o\n    if (gray > 0.5) n = 23385164.0; // &\n    if (gray > 0.6) n = 15252014.0; // 8\n    if (gray > 0.7) n = 13199452.0; // @\n    if (gray > 0.8) n = 11512810.0; // #\n\n    // get the mod..\n    vec2 modd = getMod(coord, vec2(pixelSize));\n\n    gl_FragColor = color * character( n, vec2(-1.0) + modd * 2.0);\n\n}",t=function(e){function n(n){void 0===n&&(n=8),e.call(this,o,r),this.size=n}e&&(n.__proto__=e),n.prototype=Object.create(e&&e.prototype),n.prototype.constructor=n;var t={size:{configurable:!0}};return t.size.get=function(){return this.uniforms.pixelSize},t.size.set=function(e){this.uniforms.pixelSize=e},Object.defineProperties(n.prototype,t),n}(n.Filter);e.AsciiFilter=t,Object.defineProperty(e,"__esModule",{value:!0})}),Object.assign(PIXI.filters,this?this.__filters:__filters);
-//# sourceMappingURL=filter-ascii.js.map
+var __filters=function(n,e){"use strict";var o="attribute vec2 aVertexPosition;\nattribute vec2 aTextureCoord;\n\nuniform mat3 projectionMatrix;\n\nvarying vec2 vTextureCoord;\n\nvoid main(void)\n{\n    gl_Position = vec4((projectionMatrix * vec3(aVertexPosition, 1.0)).xy, 0.0, 1.0);\n    vTextureCoord = aTextureCoord;\n}",r="varying vec2 vTextureCoord;\n\nuniform vec4 filterArea;\nuniform float pixelSize;\nuniform sampler2D uSampler;\n\nvec2 mapCoord( vec2 coord )\n{\n    coord *= filterArea.xy;\n    coord += filterArea.zw;\n\n    return coord;\n}\n\nvec2 unmapCoord( vec2 coord )\n{\n    coord -= filterArea.zw;\n    coord /= filterArea.xy;\n\n    return coord;\n}\n\nvec2 pixelate(vec2 coord, vec2 size)\n{\n    return floor( coord / size ) * size;\n}\n\nvec2 getMod(vec2 coord, vec2 size)\n{\n    return mod( coord , size) / size;\n}\n\nfloat character(float n, vec2 p)\n{\n    p = floor(p*vec2(4.0, -4.0) + 2.5);\n\n    if (clamp(p.x, 0.0, 4.0) == p.x)\n    {\n        if (clamp(p.y, 0.0, 4.0) == p.y)\n        {\n            if (int(mod(n/exp2(p.x + 5.0*p.y), 2.0)) == 1) return 1.0;\n        }\n    }\n    return 0.0;\n}\n\nvoid main()\n{\n    vec2 coord = mapCoord(vTextureCoord);\n\n    // get the rounded color..\n    vec2 pixCoord = pixelate(coord, vec2(pixelSize));\n    pixCoord = unmapCoord(pixCoord);\n\n    vec4 color = texture2D(uSampler, pixCoord);\n\n    // determine the character to use\n    float gray = (color.r + color.g + color.b) / 3.0;\n\n    float n =  65536.0;             // .\n    if (gray > 0.2) n = 65600.0;    // :\n    if (gray > 0.3) n = 332772.0;   // *\n    if (gray > 0.4) n = 15255086.0; // o\n    if (gray > 0.5) n = 23385164.0; // &\n    if (gray > 0.6) n = 15252014.0; // 8\n    if (gray > 0.7) n = 13199452.0; // @\n    if (gray > 0.8) n = 11512810.0; // #\n\n    // get the mod..\n    vec2 modd = getMod(coord, vec2(pixelSize));\n\n    gl_FragColor = color * character( n, vec2(-1.0) + modd * 2.0);\n\n}\n",t=function(n){function e(e){void 0===e&&(e=8),n.call(this,o,r),this.size=e}n&&(e.__proto__=n),e.prototype=Object.create(n&&n.prototype),e.prototype.constructor=e;var t={size:{configurable:!0}};return t.size.get=function(){return this.uniforms.pixelSize},t.size.set=function(n){this.uniforms.pixelSize=n},Object.defineProperties(e.prototype,t),e}(e.Filter);return n.AsciiFilter=t,n}({},PIXI);Object.assign(PIXI.filters,__filters);

Extensions/Effects/pixi-filters/filter-bevel.js

@@ -1,9 +1,8 @@
 /*!
- * @pixi/filter-bevel - v2.6.0
- * Compiled Fri, 20 Dec 2019 18:59:17 UTC
+ * @pixi/filter-bevel - v3.1.1
+ * Compiled Wed, 08 Apr 2020 11:09:37 UTC
  *
  * @pixi/filter-bevel is licensed under the MIT License.
  * http://www.opensource.org/licenses/mit-license
  */
-!function(o,t){"object"==typeof exports&&"undefined"!=typeof module?t(exports,require("pixi.js")):"function"==typeof define&&define.amd?define(["exports","pixi.js"],t):t(o.__filters={},o.PIXI)}(this,function(o,t){"use strict";var r="attribute vec2 aVertexPosition;\nattribute vec2 aTextureCoord;\n\nuniform mat3 projectionMatrix;\n\nvarying vec2 vTextureCoord;\n\nvoid main(void)\n{\n    gl_Position = vec4((projectionMatrix * vec3(aVertexPosition, 1.0)).xy, 0.0, 1.0);\n    vTextureCoord = aTextureCoord;\n}",i="precision mediump float;\n\nvarying vec2 vTextureCoord;\nuniform sampler2D uSampler;\nuniform vec4 filterArea;\n\nuniform float transformX;\nuniform float transformY;\nuniform vec3 lightColor;\nuniform float lightAlpha;\nuniform vec3 shadowColor;\nuniform float shadowAlpha;\n\nvoid main(void) {\n    vec2 transform = vec2(1.0 / filterArea) * vec2(transformX, transformY);\n    vec4 color = texture2D(uSampler, vTextureCoord);\n    float light = texture2D(uSampler, vTextureCoord - transform).a;\n    float shadow = texture2D(uSampler, vTextureCoord + transform).a;\n\n    color.rgb = mix(color.rgb, lightColor, clamp((color.a - light) * lightAlpha, 0.0, 1.0));\n    color.rgb = mix(color.rgb, shadowColor, clamp((color.a - shadow) * shadowAlpha, 0.0, 1.0));\n    gl_FragColor = vec4(color.rgb * color.a, color.a);\n}\n",n=function(o){function n(t){void 0===t&&(t={}),o.call(this,r,i),this.uniforms.lightColor=new Float32Array(3),this.uniforms.shadowColor=new Float32Array(3),t=Object.assign({rotation:45,thickness:2,lightColor:16777215,lightAlpha:.7,shadowColor:0,shadowAlpha:.7},t),this.rotation=t.rotation,this.thickness=t.thickness,this.lightColor=t.lightColor,this.lightAlpha=t.lightAlpha,this.shadowColor=t.shadowColor,this.shadowAlpha=t.shadowAlpha}o&&(n.__proto__=o),n.prototype=Object.create(o&&o.prototype),n.prototype.constructor=n;var e={rotation:{configurable:!0},thickness:{configurable:!0},lightColor:{configurable:!0},lightAlpha:{configurable:!0},shadowColor:{configurable:!0},shadowAlpha:{configurable:!0}};return n.prototype._updateTransform=function(){this.uniforms.transformX=this._thickness*Math.cos(this._angle),this.uniforms.transformY=this._thickness*Math.sin(this._angle)},e.rotation.get=function(){return this._angle/t.DEG_TO_RAD},e.rotation.set=function(o){this._angle=o*t.DEG_TO_RAD,this._updateTransform()},e.thickness.get=function(){return this._thickness},e.thickness.set=function(o){this._thickness=o,this._updateTransform()},e.lightColor.get=function(){return t.utils.rgb2hex(this.uniforms.lightColor)},e.lightColor.set=function(o){t.utils.hex2rgb(o,this.uniforms.lightColor)},e.lightAlpha.get=function(){return this.uniforms.lightAlpha},e.lightAlpha.set=function(o){this.uniforms.lightAlpha=o},e.shadowColor.get=function(){return t.utils.rgb2hex(this.uniforms.shadowColor)},e.shadowColor.set=function(o){t.utils.hex2rgb(o,this.uniforms.shadowColor)},e.shadowAlpha.get=function(){return this.uniforms.shadowAlpha},e.shadowAlpha.set=function(o){this.uniforms.shadowAlpha=o},Object.defineProperties(n.prototype,e),n}(t.Filter);o.BevelFilter=n,Object.defineProperty(o,"__esModule",{value:!0})}),Object.assign(PIXI.filters,this?this.__filters:__filters);
-//# sourceMappingURL=filter-bevel.js.map
+var __filters=function(o,t,r,i){"use strict";var n="attribute vec2 aVertexPosition;\nattribute vec2 aTextureCoord;\n\nuniform mat3 projectionMatrix;\n\nvarying vec2 vTextureCoord;\n\nvoid main(void)\n{\n    gl_Position = vec4((projectionMatrix * vec3(aVertexPosition, 1.0)).xy, 0.0, 1.0);\n    vTextureCoord = aTextureCoord;\n}",e="precision mediump float;\n\nvarying vec2 vTextureCoord;\nuniform sampler2D uSampler;\nuniform vec4 filterArea;\n\nuniform float transformX;\nuniform float transformY;\nuniform vec3 lightColor;\nuniform float lightAlpha;\nuniform vec3 shadowColor;\nuniform float shadowAlpha;\n\nvoid main(void) {\n    vec2 transform = vec2(1.0 / filterArea) * vec2(transformX, transformY);\n    vec4 color = texture2D(uSampler, vTextureCoord);\n    float light = texture2D(uSampler, vTextureCoord - transform).a;\n    float shadow = texture2D(uSampler, vTextureCoord + transform).a;\n\n    color.rgb = mix(color.rgb, lightColor, clamp((color.a - light) * lightAlpha, 0.0, 1.0));\n    color.rgb = mix(color.rgb, shadowColor, clamp((color.a - shadow) * shadowAlpha, 0.0, 1.0));\n    gl_FragColor = vec4(color.rgb * color.a, color.a);\n}\n",a=function(o){function t(t){void 0===t&&(t={}),o.call(this,n,e),this.uniforms.lightColor=new Float32Array(3),this.uniforms.shadowColor=new Float32Array(3),t=Object.assign({rotation:45,thickness:2,lightColor:16777215,lightAlpha:.7,shadowColor:0,shadowAlpha:.7},t),this.rotation=t.rotation,this.thickness=t.thickness,this.lightColor=t.lightColor,this.lightAlpha=t.lightAlpha,this.shadowColor=t.shadowColor,this.shadowAlpha=t.shadowAlpha}o&&(t.__proto__=o),t.prototype=Object.create(o&&o.prototype),t.prototype.constructor=t;var a={rotation:{configurable:!0},thickness:{configurable:!0},lightColor:{configurable:!0},lightAlpha:{configurable:!0},shadowColor:{configurable:!0},shadowAlpha:{configurable:!0}};return t.prototype._updateTransform=function(){this.uniforms.transformX=this._thickness*Math.cos(this._angle),this.uniforms.transformY=this._thickness*Math.sin(this._angle)},a.rotation.get=function(){return this._angle/r.DEG_TO_RAD},a.rotation.set=function(o){this._angle=o*r.DEG_TO_RAD,this._updateTransform()},a.thickness.get=function(){return this._thickness},a.thickness.set=function(o){this._thickness=o,this._updateTransform()},a.lightColor.get=function(){return i.rgb2hex(this.uniforms.lightColor)},a.lightColor.set=function(o){i.hex2rgb(o,this.uniforms.lightColor)},a.lightAlpha.get=function(){return this.uniforms.lightAlpha},a.lightAlpha.set=function(o){this.uniforms.lightAlpha=o},a.shadowColor.get=function(){return i.rgb2hex(this.uniforms.shadowColor)},a.shadowColor.set=function(o){i.hex2rgb(o,this.uniforms.shadowColor)},a.shadowAlpha.get=function(){return this.uniforms.shadowAlpha},a.shadowAlpha.set=function(o){this.uniforms.shadowAlpha=o},Object.defineProperties(t.prototype,a),t}(t.Filter);return o.BevelFilter=a,o}({},PIXI,PIXI,PIXI.utils);Object.assign(PIXI.filters,__filters);

Extensions/Effects/pixi-filters/filter-bulge-pinch.js

@@ -0,0 +1,8 @@
+/*!
+ * @pixi/filter-bulge-pinch - v3.1.1
+ * Compiled Wed, 08 Apr 2020 11:09:37 UTC
+ *
+ * @pixi/filter-bulge-pinch is licensed under the MIT License.
+ * http://www.opensource.org/licenses/mit-license
+ */
+var __filters=function(e,r){"use strict";var n="attribute vec2 aVertexPosition;\nattribute vec2 aTextureCoord;\n\nuniform mat3 projectionMatrix;\n\nvarying vec2 vTextureCoord;\n\nvoid main(void)\n{\n    gl_Position = vec4((projectionMatrix * vec3(aVertexPosition, 1.0)).xy, 0.0, 1.0);\n    vTextureCoord = aTextureCoord;\n}",t="uniform float radius;\nuniform float strength;\nuniform vec2 center;\nuniform sampler2D uSampler;\nvarying vec2 vTextureCoord;\n\nuniform vec4 filterArea;\nuniform vec4 filterClamp;\nuniform vec2 dimensions;\n\nvoid main()\n{\n    vec2 coord = vTextureCoord * filterArea.xy;\n    coord -= center * dimensions.xy;\n    float distance = length(coord);\n    if (distance < radius) {\n        float percent = distance / radius;\n        if (strength > 0.0) {\n            coord *= mix(1.0, smoothstep(0.0, radius / distance, percent), strength * 0.75);\n        } else {\n            coord *= mix(1.0, pow(percent, 1.0 + strength * 0.75) * radius / distance, 1.0 - percent);\n        }\n    }\n    coord += center * dimensions.xy;\n    coord /= filterArea.xy;\n    vec2 clampedCoord = clamp(coord, filterClamp.xy, filterClamp.zw);\n    vec4 color = texture2D(uSampler, clampedCoord);\n    if (coord != clampedCoord) {\n        color *= max(0.0, 1.0 - length(coord - clampedCoord));\n    }\n\n    gl_FragColor = color;\n}\n",o=function(e){function r(r){if(e.call(this,n,t),"object"!=typeof r){var o=arguments[0],i=arguments[1],s=arguments[2];r={},void 0!==o&&(r.center=o),void 0!==i&&(r.radius=i),void 0!==s&&(r.strength=s)}this.uniforms.dimensions=new Float32Array(2),Object.assign(this,{center:[.5,.5],radius:100,strength:1},r)}e&&(r.__proto__=e),r.prototype=Object.create(e&&e.prototype),r.prototype.constructor=r;var o={radius:{configurable:!0},strength:{configurable:!0},center:{configurable:!0}};return r.prototype.apply=function(e,r,n,t){this.uniforms.dimensions[0]=r.filterFrame.width,this.uniforms.dimensions[1]=r.filterFrame.height,e.applyFilter(this,r,n,t)},o.radius.get=function(){return this.uniforms.radius},o.radius.set=function(e){this.uniforms.radius=e},o.strength.get=function(){return this.uniforms.strength},o.strength.set=function(e){this.uniforms.strength=e},o.center.get=function(){return this.uniforms.center},o.center.set=function(e){this.uniforms.center=e},Object.defineProperties(r.prototype,o),r}(r.Filter);return e.BulgePinchFilter=o,e}({},PIXI);Object.assign(PIXI.filters,__filters);

Extensions/Effects/pixi-filters/filter-color-map.js

@@ -1,9 +1,8 @@
 /*!
- * @pixi/filter-color-map - v3.0.3
- * Compiled Wed, 29 May 2019 03:04:05 UTC
+ * @pixi/filter-color-map - v3.1.1
+ * Compiled Wed, 08 Apr 2020 11:09:37 UTC
  *
  * @pixi/filter-color-map is licensed under the MIT License.
  * http://www.opensource.org/licenses/mit-license
  */
 var __filters=function(e,i,t){"use strict";var o="attribute vec2 aVertexPosition;\nattribute vec2 aTextureCoord;\n\nuniform mat3 projectionMatrix;\n\nvarying vec2 vTextureCoord;\n\nvoid main(void)\n{\n    gl_Position = vec4((projectionMatrix * vec3(aVertexPosition, 1.0)).xy, 0.0, 1.0);\n    vTextureCoord = aTextureCoord;\n}",r="varying vec2 vTextureCoord;\nuniform sampler2D uSampler;\nuniform sampler2D colorMap;\nuniform float _mix;\nuniform float _size;\nuniform float _sliceSize;\nuniform float _slicePixelSize;\nuniform float _sliceInnerSize;\nvoid main() {\n    vec4 color = texture2D(uSampler, vTextureCoord.xy);\n\n    vec4 adjusted;\n    if (color.a > 0.0) {\n        color.rgb /= color.a;\n        float innerWidth = _size - 1.0;\n        float zSlice0 = min(floor(color.b * innerWidth), innerWidth);\n        float zSlice1 = min(zSlice0 + 1.0, innerWidth);\n        float xOffset = _slicePixelSize * 0.5 + color.r * _sliceInnerSize;\n        float s0 = xOffset + (zSlice0 * _sliceSize);\n        float s1 = xOffset + (zSlice1 * _sliceSize);\n        float yOffset = _sliceSize * 0.5 + color.g * (1.0 - _sliceSize);\n        vec4 slice0Color = texture2D(colorMap, vec2(s0,yOffset));\n        vec4 slice1Color = texture2D(colorMap, vec2(s1,yOffset));\n        float zOffset = fract(color.b * innerWidth);\n        adjusted = mix(slice0Color, slice1Color, zOffset);\n\n        color.rgb *= color.a;\n    }\n    gl_FragColor = vec4(mix(color, adjusted, _mix).rgb, color.a);\n\n}",s=function(e){function s(i,t,s){void 0===t&&(t=!1),void 0===s&&(s=1),e.call(this,o,r),this._size=0,this._sliceSize=0,this._slicePixelSize=0,this._sliceInnerSize=0,this._scaleMode=null,this._nearest=!1,this.nearest=t,this.mix=s,this.colorMap=i}e&&(s.__proto__=e),s.prototype=Object.create(e&&e.prototype),s.prototype.constructor=s;var n={colorSize:{configurable:!0},colorMap:{configurable:!0},nearest:{configurable:!0}};return s.prototype.apply=function(e,i,t,o){this.uniforms._mix=this.mix,e.applyFilter(this,i,t,o)},n.colorSize.get=function(){return this._size},n.colorMap.get=function(){return this._colorMap},n.colorMap.set=function(e){e instanceof i.Texture||(e=i.Texture.from(e)),e&&e.baseTexture&&(e.baseTexture.scaleMode=this._scaleMode,e.baseTexture.mipmap=!1,this._size=e.height,this._sliceSize=1/this._size,this._slicePixelSize=this._sliceSize/this._size,this._sliceInnerSize=this._slicePixelSize*(this._size-1),this.uniforms._size=this._size,this.uniforms._sliceSize=this._sliceSize,this.uniforms._slicePixelSize=this._slicePixelSize,this.uniforms._sliceInnerSize=this._sliceInnerSize,this.uniforms.colorMap=e),this._colorMap=e},n.nearest.get=function(){return this._nearest},n.nearest.set=function(e){this._nearest=e,this._scaleMode=e?t.SCALE_MODES.NEAREST:t.SCALE_MODES.LINEAR;var i=this._colorMap;i&&i.baseTexture&&(i.baseTexture._glTextures={},i.baseTexture.scaleMode=this._scaleMode,i.baseTexture.mipmap=!1,i._updateID++,i.baseTexture.emit("update",i.baseTexture))},s.prototype.updateColorMap=function(){var e=this._colorMap;e&&e.baseTexture&&(e._updateID++,e.baseTexture.emit("update",e.baseTexture),this.colorMap=e)},s.prototype.destroy=function(i){this._colorMap&&this._colorMap.destroy(i),e.prototype.destroy.call(this)},Object.defineProperties(s.prototype,n),s}(i.Filter);return e.ColorMapFilter=s,e}({},PIXI,PIXI);Object.assign(PIXI.filters,__filters);
-//# sourceMappingURL=filter-color-map.js.map

Extensions/Effects/pixi-filters/filter-color-replace.js

@@ -0,0 +1,8 @@
+/*!
+ * @pixi/filter-color-replace - v3.1.1
+ * Compiled Wed, 08 Apr 2020 11:09:37 UTC
+ *
+ * @pixi/filter-color-replace is licensed under the MIT License.
+ * http://www.opensource.org/licenses/mit-license
+ */
+var __filters=function(o,r,n){"use strict";var e="attribute vec2 aVertexPosition;\nattribute vec2 aTextureCoord;\n\nuniform mat3 projectionMatrix;\n\nvarying vec2 vTextureCoord;\n\nvoid main(void)\n{\n    gl_Position = vec4((projectionMatrix * vec3(aVertexPosition, 1.0)).xy, 0.0, 1.0);\n    vTextureCoord = aTextureCoord;\n}",i="varying vec2 vTextureCoord;\nuniform sampler2D uSampler;\nuniform vec3 originalColor;\nuniform vec3 newColor;\nuniform float epsilon;\nvoid main(void) {\n    vec4 currentColor = texture2D(uSampler, vTextureCoord);\n    vec3 colorDiff = originalColor - (currentColor.rgb / max(currentColor.a, 0.0000000001));\n    float colorDistance = length(colorDiff);\n    float doReplace = step(colorDistance, epsilon);\n    gl_FragColor = vec4(mix(currentColor.rgb, (newColor + colorDiff) * currentColor.a, doReplace), currentColor.a);\n}\n",t=function(o){function r(r,n,t){void 0===r&&(r=16711680),void 0===n&&(n=0),void 0===t&&(t=.4),o.call(this,e,i),this.uniforms.originalColor=new Float32Array(3),this.uniforms.newColor=new Float32Array(3),this.originalColor=r,this.newColor=n,this.epsilon=t}o&&(r.__proto__=o),r.prototype=Object.create(o&&o.prototype),r.prototype.constructor=r;var t={originalColor:{configurable:!0},newColor:{configurable:!0},epsilon:{configurable:!0}};return t.originalColor.set=function(o){var r=this.uniforms.originalColor;"number"==typeof o?(n.hex2rgb(o,r),this._originalColor=o):(r[0]=o[0],r[1]=o[1],r[2]=o[2],this._originalColor=n.rgb2hex(r))},t.originalColor.get=function(){return this._originalColor},t.newColor.set=function(o){var r=this.uniforms.newColor;"number"==typeof o?(n.hex2rgb(o,r),this._newColor=o):(r[0]=o[0],r[1]=o[1],r[2]=o[2],this._newColor=n.rgb2hex(r))},t.newColor.get=function(){return this._newColor},t.epsilon.set=function(o){this.uniforms.epsilon=o},t.epsilon.get=function(){return this.uniforms.epsilon},Object.defineProperties(r.prototype,t),r}(r.Filter);return o.ColorReplaceFilter=t,o}({},PIXI,PIXI.utils);Object.assign(PIXI.filters,__filters);

Extensions/Effects/pixi-filters/filter-crt.js

@@ -1,13 +1,8 @@
 /*!
- * @pixi/filter-crt - v3.0.3
- * Compiled Wed, 18 Dec 2019 19:58:07 UTC
+ * @pixi/filter-crt - v3.1.1
+ * Compiled Wed, 08 Apr 2020 11:09:37 UTC
  *
  * @pixi/filter-crt is licensed under the MIT License.
  * http://www.opensource.org/licenses/mit-license
  */
-
- /**
-  * Modified the minified file to work on pixi4 by renaming filterFrame to sourceFrame below 
-  */
-var __filters=function(n,i){"use strict";var t="attribute vec2 aVertexPosition;\nattribute vec2 aTextureCoord;\n\nuniform mat3 projectionMatrix;\n\nvarying vec2 vTextureCoord;\n\nvoid main(void)\n{\n    gl_Position = vec4((projectionMatrix * vec3(aVertexPosition, 1.0)).xy, 0.0, 1.0);\n    vTextureCoord = aTextureCoord;\n}",e="varying vec2 vTextureCoord;\nuniform sampler2D uSampler;\n\nuniform vec4 filterArea;\nuniform vec2 dimensions;\n\nconst float SQRT_2 = 1.414213;\n\nconst float light = 1.0;\n\nuniform float curvature;\nuniform float lineWidth;\nuniform float lineContrast;\nuniform bool verticalLine;\nuniform float noise;\nuniform float noiseSize;\n\nuniform float vignetting;\nuniform float vignettingAlpha;\nuniform float vignettingBlur;\n\nuniform float seed;\nuniform float time;\n\nfloat rand(vec2 co) {\n    return fract(sin(dot(co.xy, vec2(12.9898, 78.233))) * 43758.5453);\n}\n\nvoid main(void)\n{\n    vec2 pixelCoord = vTextureCoord.xy * filterArea.xy;\n    vec2 coord = pixelCoord / dimensions;\n\n    vec2 dir = vec2(coord - vec2(0.5, 0.5));\n\n    float _c = curvature > 0. ? curvature : 1.;\n    float k = curvature > 0. ?(length(dir * dir) * 0.25 * _c * _c + 0.935 * _c) : 1.;\n    vec2 uv = dir * k;\n\n    gl_FragColor = texture2D(uSampler, vTextureCoord);\n    vec3 rgb = gl_FragColor.rgb;\n\n\n    if (noise > 0.0 && noiseSize > 0.0)\n    {\n        pixelCoord.x = floor(pixelCoord.x / noiseSize);\n        pixelCoord.y = floor(pixelCoord.y / noiseSize);\n        float _noise = rand(pixelCoord * noiseSize * seed) - 0.5;\n        rgb += _noise * noise;\n    }\n\n    if (lineWidth > 0.0) {\n        float v = (verticalLine ? uv.x * dimensions.x : uv.y * dimensions.y) * min(1.0, 2.0 / lineWidth ) / _c;\n        float j = 1. + cos(v * 1.2 - time) * 0.5 * lineContrast;\n        rgb *= j;\n        float segment = verticalLine ? mod((dir.x + .5) * dimensions.x, 4.) : mod((dir.y + .5) * dimensions.y, 4.);\n        rgb *= 0.99 + ceil(segment) * 0.015;\n    }\n\n    if (vignetting > 0.0)\n    {\n        float outter = SQRT_2 - vignetting * SQRT_2;\n        float darker = clamp((outter - length(dir) * SQRT_2) / ( 0.00001 + vignettingBlur * SQRT_2), 0.0, 1.0);\n        rgb *= darker + (1.0 - darker) * (1.0 - vignettingAlpha);\n    }\n\n    gl_FragColor.rgb = rgb;\n}\n",r=function(n){function i(i){n.call(this,t,e),this.uniforms.dimensions=new Float32Array(2),this.time=0,this.seed=0,Object.assign(this,{curvature:1,lineWidth:1,lineContrast:.25,verticalLine:!1,noise:0,noiseSize:1,seed:0,vignetting:.3,vignettingAlpha:1,vignettingBlur:.3,time:0},i)}n&&(i.__proto__=n),i.prototype=Object.create(n&&n.prototype),i.prototype.constructor=i;var r={curvature:{configurable:!0},lineWidth:{configurable:!0},lineContrast:{configurable:!0},verticalLine:{configurable:!0},noise:{configurable:!0},noiseSize:{configurable:!0},vignetting:{configurable:!0},vignettingAlpha:{configurable:!0},vignettingBlur:{configurable:!0}};return i.prototype.apply=function(n,i,t,e){this.uniforms.dimensions[0]=i.sourceFrame.width,this.uniforms.dimensions[1]=i.sourceFrame.height,this.uniforms.seed=this.seed,this.uniforms.time=this.time,n.applyFilter(this,i,t,e)},r.curvature.set=function(n){this.uniforms.curvature=n},r.curvature.get=function(){return this.uniforms.curvature},r.lineWidth.set=function(n){this.uniforms.lineWidth=n},r.lineWidth.get=function(){return this.uniforms.lineWidth},r.lineContrast.set=function(n){this.uniforms.lineContrast=n},r.lineContrast.get=function(){return this.uniforms.lineContrast},r.verticalLine.set=function(n){this.uniforms.verticalLine=n},r.verticalLine.get=function(){return this.uniforms.verticalLine},r.noise.set=function(n){this.uniforms.noise=n},r.noise.get=function(){return this.uniforms.noise},r.noiseSize.set=function(n){this.uniforms.noiseSize=n},r.noiseSize.get=function(){return this.uniforms.noiseSize},r.vignetting.set=function(n){this.uniforms.vignetting=n},r.vignetting.get=function(){return this.uniforms.vignetting},r.vignettingAlpha.set=function(n){this.uniforms.vignettingAlpha=n},r.vignettingAlpha.get=function(){return this.uniforms.vignettingAlpha},r.vignettingBlur.set=function(n){this.uniforms.vignettingBlur=n},r.vignettingBlur.get=function(){return this.uniforms.vignettingBlur},Object.defineProperties(i.prototype,r),i}(i.Filter);return n.CRTFilter=r,n}({},PIXI);Object.assign(PIXI.filters,__filters);
-//# sourceMappingURL=filter-crt.js.map
+var __filters=function(n,i){"use strict";var t="attribute vec2 aVertexPosition;\nattribute vec2 aTextureCoord;\n\nuniform mat3 projectionMatrix;\n\nvarying vec2 vTextureCoord;\n\nvoid main(void)\n{\n    gl_Position = vec4((projectionMatrix * vec3(aVertexPosition, 1.0)).xy, 0.0, 1.0);\n    vTextureCoord = aTextureCoord;\n}",e="varying vec2 vTextureCoord;\nuniform sampler2D uSampler;\n\nuniform vec4 filterArea;\nuniform vec2 dimensions;\n\nconst float SQRT_2 = 1.414213;\n\nconst float light = 1.0;\n\nuniform float curvature;\nuniform float lineWidth;\nuniform float lineContrast;\nuniform bool verticalLine;\nuniform float noise;\nuniform float noiseSize;\n\nuniform float vignetting;\nuniform float vignettingAlpha;\nuniform float vignettingBlur;\n\nuniform float seed;\nuniform float time;\n\nfloat rand(vec2 co) {\n    return fract(sin(dot(co.xy, vec2(12.9898, 78.233))) * 43758.5453);\n}\n\nvoid main(void)\n{\n    vec2 pixelCoord = vTextureCoord.xy * filterArea.xy;\n    vec2 coord = pixelCoord / dimensions;\n\n    vec2 dir = vec2(coord - vec2(0.5, 0.5));\n\n    float _c = curvature > 0. ? curvature : 1.;\n    float k = curvature > 0. ?(length(dir * dir) * 0.25 * _c * _c + 0.935 * _c) : 1.;\n    vec2 uv = dir * k;\n\n    gl_FragColor = texture2D(uSampler, vTextureCoord);\n    vec3 rgb = gl_FragColor.rgb;\n\n\n    if (noise > 0.0 && noiseSize > 0.0)\n    {\n        pixelCoord.x = floor(pixelCoord.x / noiseSize);\n        pixelCoord.y = floor(pixelCoord.y / noiseSize);\n        float _noise = rand(pixelCoord * noiseSize * seed) - 0.5;\n        rgb += _noise * noise;\n    }\n\n    if (lineWidth > 0.0) {\n        float v = (verticalLine ? uv.x * dimensions.x : uv.y * dimensions.y) * min(1.0, 2.0 / lineWidth ) / _c;\n        float j = 1. + cos(v * 1.2 - time) * 0.5 * lineContrast;\n        rgb *= j;\n        float segment = verticalLine ? mod((dir.x + .5) * dimensions.x, 4.) : mod((dir.y + .5) * dimensions.y, 4.);\n        rgb *= 0.99 + ceil(segment) * 0.015;\n    }\n\n    if (vignetting > 0.0)\n    {\n        float outter = SQRT_2 - vignetting * SQRT_2;\n        float darker = clamp((outter - length(dir) * SQRT_2) / ( 0.00001 + vignettingBlur * SQRT_2), 0.0, 1.0);\n        rgb *= darker + (1.0 - darker) * (1.0 - vignettingAlpha);\n    }\n\n    gl_FragColor.rgb = rgb;\n}\n",r=function(n){function i(i){n.call(this,t,e),this.uniforms.dimensions=new Float32Array(2),this.time=0,this.seed=0,Object.assign(this,{curvature:1,lineWidth:1,lineContrast:.25,verticalLine:!1,noise:0,noiseSize:1,seed:0,vignetting:.3,vignettingAlpha:1,vignettingBlur:.3,time:0},i)}n&&(i.__proto__=n),i.prototype=Object.create(n&&n.prototype),i.prototype.constructor=i;var r={curvature:{configurable:!0},lineWidth:{configurable:!0},lineContrast:{configurable:!0},verticalLine:{configurable:!0},noise:{configurable:!0},noiseSize:{configurable:!0},vignetting:{configurable:!0},vignettingAlpha:{configurable:!0},vignettingBlur:{configurable:!0}};return i.prototype.apply=function(n,i,t,e){this.uniforms.dimensions[0]=i.filterFrame.width,this.uniforms.dimensions[1]=i.filterFrame.height,this.uniforms.seed=this.seed,this.uniforms.time=this.time,n.applyFilter(this,i,t,e)},r.curvature.set=function(n){this.uniforms.curvature=n},r.curvature.get=function(){return this.uniforms.curvature},r.lineWidth.set=function(n){this.uniforms.lineWidth=n},r.lineWidth.get=function(){return this.uniforms.lineWidth},r.lineContrast.set=function(n){this.uniforms.lineContrast=n},r.lineContrast.get=function(){return this.uniforms.lineContrast},r.verticalLine.set=function(n){this.uniforms.verticalLine=n},r.verticalLine.get=function(){return this.uniforms.verticalLine},r.noise.set=function(n){this.uniforms.noise=n},r.noise.get=function(){return this.uniforms.noise},r.noiseSize.set=function(n){this.uniforms.noiseSize=n},r.noiseSize.get=function(){return this.uniforms.noiseSize},r.vignetting.set=function(n){this.uniforms.vignetting=n},r.vignetting.get=function(){return this.uniforms.vignetting},r.vignettingAlpha.set=function(n){this.uniforms.vignettingAlpha=n},r.vignettingAlpha.get=function(){return this.uniforms.vignettingAlpha},r.vignettingBlur.set=function(n){this.uniforms.vignettingBlur=n},r.vignettingBlur.get=function(){return this.uniforms.vignettingBlur},Object.defineProperties(i.prototype,r),i}(i.Filter);return n.CRTFilter=r,n}({},PIXI);Object.assign(PIXI.filters,__filters);

Extensions/Effects/pixi-filters/filter-dot.js

@@ -0,0 +1,8 @@
+/*!
+ * @pixi/filter-dot - v3.1.1
+ * Compiled Wed, 08 Apr 2020 11:09:37 UTC
+ *
+ * @pixi/filter-dot is licensed under the MIT License.
+ * http://www.opensource.org/licenses/mit-license
+ */
+var __filters=function(e,n){"use strict";var t="attribute vec2 aVertexPosition;\nattribute vec2 aTextureCoord;\n\nuniform mat3 projectionMatrix;\n\nvarying vec2 vTextureCoord;\n\nvoid main(void)\n{\n    gl_Position = vec4((projectionMatrix * vec3(aVertexPosition, 1.0)).xy, 0.0, 1.0);\n    vTextureCoord = aTextureCoord;\n}",r="precision mediump float;\n\nvarying vec2 vTextureCoord;\nvarying vec4 vColor;\n\nuniform vec4 filterArea;\nuniform sampler2D uSampler;\n\nuniform float angle;\nuniform float scale;\n\nfloat pattern()\n{\n   float s = sin(angle), c = cos(angle);\n   vec2 tex = vTextureCoord * filterArea.xy;\n   vec2 point = vec2(\n       c * tex.x - s * tex.y,\n       s * tex.x + c * tex.y\n   ) * scale;\n   return (sin(point.x) * sin(point.y)) * 4.0;\n}\n\nvoid main()\n{\n   vec4 color = texture2D(uSampler, vTextureCoord);\n   float average = (color.r + color.g + color.b) / 3.0;\n   gl_FragColor = vec4(vec3(average * 10.0 - 5.0 + pattern()), color.a);\n}\n",o=function(e){function n(n,o){void 0===n&&(n=1),void 0===o&&(o=5),e.call(this,t,r),this.scale=n,this.angle=o}e&&(n.__proto__=e),n.prototype=Object.create(e&&e.prototype),n.prototype.constructor=n;var o={scale:{configurable:!0},angle:{configurable:!0}};return o.scale.get=function(){return this.uniforms.scale},o.scale.set=function(e){this.uniforms.scale=e},o.angle.get=function(){return this.uniforms.angle},o.angle.set=function(e){this.uniforms.angle=e},Object.defineProperties(n.prototype,o),n}(n.Filter);return e.DotFilter=o,e}({},PIXI);Object.assign(PIXI.filters,__filters);