Comment debugging code in MainFrame

Don't show in changelog

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/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/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/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/Project.cpp

@@ -521,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) {

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
   ///@}
 

Core/GDCore/Project/Variable.cpp

@@ -76,6 +76,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 +191,7 @@ void Variable::RemoveRecursively(const gd::Variable& variableToRemove) {
       it++;
     }
   }
+  isStructure = !children.empty();
 }
 
 Variable::Variable(const Variable& other)

Extensions/BBText/JsExtension.js

@@ -35,6 +35,8 @@ 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;
       }
@@ -67,7 +69,7 @@ module.exports = {
 
       objectProperties.set(
         'fontSize',
-        new gd.PropertyDescriptor(objectContent.fontSize)
+        new gd.PropertyDescriptor(objectContent.fontSize.toString())
           .setType('number')
           .setLabel(_('Base size'))
       );
@@ -111,7 +113,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',
@@ -410,7 +412,7 @@ module.exports = {
     objectsEditorService.registerEditorConfiguration(
       'BBText::BBText',
       objectsEditorService.getDefaultObjectJsImplementationPropertiesEditor({
-        helpPagePath: '/objects/bbtext_object',
+        helpPagePath: '/objects/bbtext',
       })
     );
   },

Extensions/BBText/bbtextruntimeobject-pixi-renderer.js

@@ -76,6 +76,7 @@ gdjs.BBTextRuntimeObjectPixiRenderer.prototype.updateText = function() {
 
 gdjs.BBTextRuntimeObjectPixiRenderer.prototype.updateColor = function() {
   this._pixiObject.textStyles.default.fill = this._object._color;
+  this._pixiObject.dirty = true;
 };
 
 gdjs.BBTextRuntimeObjectPixiRenderer.prototype.updateAlignment = function() {
@@ -83,10 +84,12 @@ gdjs.BBTextRuntimeObjectPixiRenderer.prototype.updateAlignment = function() {
   this._pixiObject.dirty = true;
 };
 gdjs.BBTextRuntimeObjectPixiRenderer.prototype.updateFontFamily = function() {
-  this._pixiObject.textStyles.default.fontFamily = this._object._fontFamily;
+  this._pixiObject.textStyles.default.fontFamily = this._object._runtimeScene.getGame().getFontManager().getFontFamily(this._object._fontFamily);
+  this._pixiObject.dirty = true;
 };
 gdjs.BBTextRuntimeObjectPixiRenderer.prototype.updateFontSize = function() {
   this._pixiObject.textStyles.default.fontSize = this._object._fontSize + 'px';
+  this._pixiObject.dirty = true;
 };
 
 gdjs.BBTextRuntimeObjectPixiRenderer.prototype.updatePosition = function() {

Extensions/BBText/bbtextruntimeobject.js

@@ -25,7 +25,8 @@ gdjs.BBTextRuntimeObject = function(runtimeScene, objectData) {
   gdjs.RuntimeObject.call(this, runtimeScene, objectData);
 
   /** @type {number} */
-  this._opacity = objectData.content.opacity;
+  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 {boolean} */
   this._visible = objectData.content.visible;
   /** @type {string} */
@@ -35,7 +36,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} */

Extensions/DialogueTree/JsExtension.js

@@ -45,7 +45,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 +69,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 +168,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,21 +209,55 @@ 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');
+            
     extension
       .addAction(
         'SaveState',
@@ -592,9 +625,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 +638,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 +653,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',

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,26 +493,29 @@ gdjs.dialogueTree.goToNextDialogueLine = function() {
   this.selectedOption = -1;
   this.selectedOptionUpdated = false;
 
-  if (gdjs.dialogueTree._isLineTypeText()) {
-    if (
-      this.dialogueDataType === 'options' ||
-      this.dialogueDataType === 'text' ||
-      !this.dialogueDataType
-    ) {
-      this.clipTextEnd = 0;
-      this.dialogueText = this.dialogueData.text;
-      this.commandCalls = [];
-    } else {
+  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.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;
@@ -490,8 +524,6 @@ gdjs.dialogueTree.goToNextDialogueLine = function() {
     this.selectedOptionUpdated = true;
   } else if (gdjs.dialogueTree._isLineTypeCommand()) {
     this.dialogueDataType = 'command';
-    this.clipTextEnd = 0;
-
     var command = this.dialogueData.text.split(' ');
     // If last command was to wait, increase time by one
     var offsetTime =
@@ -509,11 +541,6 @@ gdjs.dialogueTree.goToNextDialogueLine = function() {
   } else {
     this.dialogueDataType = 'unknown';
   }
-
-  if (gdjs.dialogueTree._isLineTypeCommand()) {
-    this.dialogueDataType = 'command';
-    gdjs.dialogueTree.goToNextDialogueLine();
-  }
 };
 
 /**
@@ -631,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 '';
 };
@@ -639,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;
 };
@@ -651,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);
   }
 };
 
@@ -666,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,
   };
@@ -677,17 +704,24 @@ 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);
   }
 };

Extensions/Effects/JsExtension.js

@@ -90,6 +90,7 @@ module.exports = {
       .addEffect('AdvancedBloom')
       .setFullName(_('Advanced bloom'))
       .setDescription(_('Applies a bloom effect.'))
+      .addIncludeFile('Extensions/Effects/pixi-filters/filter-kawase-blur.js')
       .addIncludeFile(
         'Extensions/Effects/pixi-filters/filter-advanced-bloom.js'
       )

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

@@ -6,4 +6,3 @@
  * 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

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

@@ -6,4 +6,3 @@
  * 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

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

@@ -6,4 +6,3 @@
  * http://www.opensource.org/licenses/mit-license
  */
 this.PIXI=this.PIXI||{},this.PIXI.filters=this.PIXI.filters||{};var _pixi_filter_alpha=function(t,r){"use strict";var e="varying vec2 vTextureCoord;\n\nuniform sampler2D uSampler;\nuniform float uAlpha;\n\nvoid main(void)\n{\n   gl_FragColor = texture2D(uSampler, vTextureCoord) * uAlpha;\n}\n",i=function(t){function i(i){void 0===i&&(i=1),t.call(this,r.defaultVertex,e,{uAlpha:1}),this.alpha=i}t&&(i.__proto__=t),i.prototype=Object.create(t&&t.prototype),i.prototype.constructor=i;var a={alpha:{configurable:!0}};return a.alpha.get=function(){return this.uniforms.uAlpha},a.alpha.set=function(t){this.uniforms.uAlpha=t},Object.defineProperties(i.prototype,a),i}(r.Filter);return t.AlphaFilter=i,t}({},PIXI);Object.assign(this.PIXI.filters,_pixi_filter_alpha);
-//# sourceMappingURL=filter-alpha.min.js.map

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

@@ -6,4 +6,3 @@
  * 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

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

@@ -6,4 +6,3 @@
  * 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

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

@@ -6,4 +6,3 @@
  * 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=e||self).__filters={},e.PIXI)}(this,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="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 n(n,o,i){e.call(this,t,r),this.uniforms.dimensions=new Float32Array(2),this.center=n||[.5,.5],this.radius="number"==typeof o?o:100,this.strength="number"==typeof i?i:1}e&&(n.__proto__=e),n.prototype=Object.create(e&&e.prototype),n.prototype.constructor=n;var o={radius:{configurable:!0},strength:{configurable:!0},center:{configurable:!0}};return n.prototype.apply=function(e,n,t,r){this.uniforms.dimensions[0]=n.sourceFrame.width,this.uniforms.dimensions[1]=n.sourceFrame.height,e.applyFilter(this,n,t,r)},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(n.prototype,o),n}(n.Filter);e.BulgePinchFilter=o,Object.defineProperty(e,"__esModule",{value:!0})}),Object.assign(PIXI.filters,this?this.__filters:__filters);
-//# sourceMappingURL=filter-bulge-pinch.js.map

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

@@ -6,4 +6,3 @@
  * 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

@@ -6,4 +6,3 @@
  * http://www.opensource.org/licenses/mit-license
  */
 !function(o,r){"object"==typeof exports&&"undefined"!=typeof module?r(exports,require("pixi.js")):"function"==typeof define&&define.amd?define(["exports","pixi.js"],r):r((o=o||self).__filters={},o.PIXI)}(this,function(o,r){"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",n=function(o){function n(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&&(n.__proto__=o),n.prototype=Object.create(o&&o.prototype),n.prototype.constructor=n;var t={originalColor:{configurable:!0},newColor:{configurable:!0},epsilon:{configurable:!0}};return t.originalColor.set=function(o){var e=this.uniforms.originalColor;"number"==typeof o?(r.utils.hex2rgb(o,e),this._originalColor=o):(e[0]=o[0],e[1]=o[1],e[2]=o[2],this._originalColor=r.utils.rgb2hex(e))},t.originalColor.get=function(){return this._originalColor},t.newColor.set=function(o){var e=this.uniforms.newColor;"number"==typeof o?(r.utils.hex2rgb(o,e),this._newColor=o):(e[0]=o[0],e[1]=o[1],e[2]=o[2],this._newColor=r.utils.rgb2hex(e))},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(n.prototype,t),n}(r.Filter);o.ColorReplaceFilter=n,Object.defineProperty(o,"__esModule",{value:!0})}),Object.assign(PIXI.filters,this?this.__filters:__filters);
-//# sourceMappingURL=filter-color-replace.js.map

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

@@ -10,4 +10,3 @@
   * 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

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

@@ -6,4 +6,3 @@
  * 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=e||self).__filters={},e.PIXI)}(this,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}",o="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",r=function(e){function n(n,r){void 0===n&&(n=1),void 0===r&&(r=5),e.call(this,t,o),this.scale=n,this.angle=r}e&&(n.__proto__=e),n.prototype=Object.create(e&&e.prototype),n.prototype.constructor=n;var r={scale:{configurable:!0},angle:{configurable:!0}};return r.scale.get=function(){return this.uniforms.scale},r.scale.set=function(e){this.uniforms.scale=e},r.angle.get=function(){return this.uniforms.angle},r.angle.set=function(e){this.uniforms.angle=e},Object.defineProperties(n.prototype,r),n}(n.Filter);e.DotFilter=r,Object.defineProperty(e,"__esModule",{value:!0})}),Object.assign(PIXI.filters,this?this.__filters:__filters);
-//# sourceMappingURL=filter-dot.js.map

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

@@ -6,4 +6,3 @@
  * http://www.opensource.org/licenses/mit-license
  */
 !function(t,i){"object"==typeof exports&&"undefined"!=typeof module?i(exports,require("@pixi/filter-kawase-blur"),require("pixi.js")):"function"==typeof define&&define.amd?define(["exports","@pixi/filter-kawase-blur","pixi.js"],i):i(t.__filters={},t.PIXI.filters,t.PIXI)}(this,function(t,i,e){"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}",n="varying vec2 vTextureCoord;\nuniform sampler2D uSampler;\nuniform float alpha;\nuniform vec3 color;\nvoid main(void){\n    vec4 sample = texture2D(uSampler, vTextureCoord);\n\n    // Un-premultiply alpha before applying the color\n    if (sample.a > 0.0) {\n        sample.rgb /= sample.a;\n    }\n\n    // Premultiply alpha again\n    sample.rgb = color.rgb * sample.a;\n\n    // alpha user alpha\n    sample *= alpha;\n\n    gl_FragColor = sample;\n}",o=function(t){function o(o){o&&o.constructor!==Object&&(console.warn("DropShadowFilter now uses options instead of (rotation, distance, blur, color, alpha)"),o={rotation:o},void 0!==arguments[1]&&(o.distance=arguments[1]),void 0!==arguments[2]&&(o.blur=arguments[2]),void 0!==arguments[3]&&(o.color=arguments[3]),void 0!==arguments[4]&&(o.alpha=arguments[4])),o=Object.assign({rotation:45,distance:5,color:0,alpha:.5,shadowOnly:!1,kernels:null,blur:2,quality:3,pixelSize:1,resolution:e.settings.RESOLUTION},o),t.call(this);var l=o.kernels,a=o.blur,s=o.quality,u=o.pixelSize,c=o.resolution;this._tintFilter=new e.Filter(r,n),this._tintFilter.uniforms.color=new Float32Array(4),this._tintFilter.resolution=c,this._blurFilter=l?new i.KawaseBlurFilter(l):new i.KawaseBlurFilter(a,s),this.pixelSize=u,this.resolution=c,this.targetTransform=new e.Matrix;var p=o.shadowOnly,h=o.rotation,f=o.distance,d=o.alpha,g=o.color;this.shadowOnly=p,this.rotation=h,this.distance=f,this.alpha=d,this.color=g,this._updatePadding()}t&&(o.__proto__=t),o.prototype=Object.create(t&&t.prototype),o.prototype.constructor=o;var l={resolution:{configurable:!0},distance:{configurable:!0},rotation:{configurable:!0},alpha:{configurable:!0},color:{configurable:!0},kernels:{configurable:!0},blur:{configurable:!0},quality:{configurable:!0},pixelSize:{configurable:!0}};return o.prototype.apply=function(t,i,e,r){var n=t.getRenderTarget();n.transform=this.targetTransform,this._tintFilter.apply(t,i,n,!0),n.transform=null,this._blurFilter.apply(t,n,e,r),!0!==this.shadowOnly&&t.applyFilter(this,i,e,!1),t.returnRenderTarget(n)},o.prototype._updatePadding=function(){this.padding=this.distance+2*this.blur},o.prototype._updateTargetTransform=function(){this.targetTransform.tx=this.distance*Math.cos(this.angle),this.targetTransform.ty=this.distance*Math.sin(this.angle)},l.resolution.get=function(){return this._resolution},l.resolution.set=function(t){this._resolution=t,this._tintFilter&&(this._tintFilter.resolution=t),this._blurFilter&&(this._blurFilter.resolution=t)},l.distance.get=function(){return this._distance},l.distance.set=function(t){this._distance=t,this._updatePadding(),this._updateTargetTransform()},l.rotation.get=function(){return this.angle/e.DEG_TO_RAD},l.rotation.set=function(t){this.angle=t*e.DEG_TO_RAD,this._updateTargetTransform()},l.alpha.get=function(){return this._tintFilter.uniforms.alpha},l.alpha.set=function(t){this._tintFilter.uniforms.alpha=t},l.color.get=function(){return e.utils.rgb2hex(this._tintFilter.uniforms.color)},l.color.set=function(t){e.utils.hex2rgb(t,this._tintFilter.uniforms.color)},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,this._updatePadding()},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(o.prototype,l),o}(e.Filter);t.DropShadowFilter=o,Object.defineProperty(t,"__esModule",{value:!0})}),Object.assign(PIXI.filters,this?this.__filters:__filters);
-//# sourceMappingURL=filter-drop-shadow.js.map

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

@@ -6,4 +6,3 @@
  * 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 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="varying vec2 vTextureCoord;\nvarying vec4 vColor;\n\nuniform sampler2D uSampler;\n\nuniform float distance;\nuniform float outerStrength;\nuniform float innerStrength;\nuniform vec4 glowColor;\nuniform vec4 filterArea;\nuniform vec4 filterClamp;\nconst float PI = 3.14159265358979323846264;\n\nvoid main(void) {\n    vec2 px = vec2(1.0 / filterArea.x, 1.0 / filterArea.y);\n    vec4 ownColor = texture2D(uSampler, vTextureCoord);\n    vec4 curColor;\n    float totalAlpha = 0.0;\n    float maxTotalAlpha = 0.0;\n    float cosAngle;\n    float sinAngle;\n    vec2 displaced;\n    for (float angle = 0.0; angle <= PI * 2.0; angle += %QUALITY_DIST%) {\n       cosAngle = cos(angle);\n       sinAngle = sin(angle);\n       for (float curDistance = 1.0; curDistance <= %DIST%; curDistance++) {\n           displaced.x = vTextureCoord.x + cosAngle * curDistance * px.x;\n           displaced.y = vTextureCoord.y + sinAngle * curDistance * px.y;\n           curColor = texture2D(uSampler, clamp(displaced, filterClamp.xy, filterClamp.zw));\n           totalAlpha += (distance - curDistance) * curColor.a;\n           maxTotalAlpha += (distance - curDistance);\n       }\n    }\n    maxTotalAlpha = max(maxTotalAlpha, 0.0001);\n\n    ownColor.a = max(ownColor.a, 0.0001);\n    ownColor.rgb = ownColor.rgb / ownColor.a;\n    float outerGlowAlpha = (totalAlpha / maxTotalAlpha)  * outerStrength * (1. - ownColor.a);\n    float innerGlowAlpha = ((maxTotalAlpha - totalAlpha) / maxTotalAlpha) * innerStrength * ownColor.a;\n    float resultAlpha = (ownColor.a + outerGlowAlpha);\n    gl_FragColor = vec4(mix(mix(ownColor.rgb, glowColor.rgb, innerGlowAlpha / ownColor.a), glowColor.rgb, outerGlowAlpha / resultAlpha) * resultAlpha, resultAlpha);\n}\n",r=function(o){function r(t,r,i,l,a){void 0===t&&(t=10),void 0===r&&(r=4),void 0===i&&(i=0),void 0===l&&(l=16777215),void 0===a&&(a=.1),o.call(this,n,e.replace(/%QUALITY_DIST%/gi,""+(1/a/t).toFixed(7)).replace(/%DIST%/gi,""+t.toFixed(7))),this.uniforms.glowColor=new Float32Array([0,0,0,1]),this.distance=t,this.color=l,this.outerStrength=r,this.innerStrength=i}o&&(r.__proto__=o),r.prototype=Object.create(o&&o.prototype),r.prototype.constructor=r;var i={color:{configurable:!0},distance:{configurable:!0},outerStrength:{configurable:!0},innerStrength:{configurable:!0}};return i.color.get=function(){return t.utils.rgb2hex(this.uniforms.glowColor)},i.color.set=function(o){t.utils.hex2rgb(o,this.uniforms.glowColor)},i.distance.get=function(){return this.uniforms.distance},i.distance.set=function(o){this.uniforms.distance=o},i.outerStrength.get=function(){return this.uniforms.outerStrength},i.outerStrength.set=function(o){this.uniforms.outerStrength=o},i.innerStrength.get=function(){return this.uniforms.innerStrength},i.innerStrength.set=function(o){this.uniforms.innerStrength=o},Object.defineProperties(r.prototype,i),r}(t.Filter);o.GlowFilter=r,Object.defineProperty(o,"__esModule",{value:!0})}),Object.assign(PIXI.filters,this?this.__filters:__filters);
-//# sourceMappingURL=filter-glow.js.map

Extensions/Effects/pixi-filters/filter-kawase-blur.js

@@ -6,4 +6,3 @@
  * http://www.opensource.org/licenses/mit-license
  */
 !function(e,t){"object"==typeof exports&&"undefined"!=typeof module?t(exports,require("pixi.js")):"function"==typeof define&&define.amd?define(["exports","pixi.js"],t):t(e.__filters={},e.PIXI)}(this,function(e,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="\nvarying vec2 vTextureCoord;\nuniform sampler2D uSampler;\n\nuniform vec2 uOffset;\n\nvoid main(void)\n{\n    vec4 color = vec4(0.0);\n\n    // Sample top left pixel\n    color += texture2D(uSampler, vec2(vTextureCoord.x - uOffset.x, vTextureCoord.y + uOffset.y));\n\n    // Sample top right pixel\n    color += texture2D(uSampler, vec2(vTextureCoord.x + uOffset.x, vTextureCoord.y + uOffset.y));\n\n    // Sample bottom right pixel\n    color += texture2D(uSampler, vec2(vTextureCoord.x + uOffset.x, vTextureCoord.y - uOffset.y));\n\n    // Sample bottom left pixel\n    color += texture2D(uSampler, vec2(vTextureCoord.x - uOffset.x, vTextureCoord.y - uOffset.y));\n\n    // Average\n    color *= 0.25;\n\n    gl_FragColor = color;\n}",o="\nvarying vec2 vTextureCoord;\nuniform sampler2D uSampler;\n\nuniform vec2 uOffset;\nuniform vec4 filterClamp;\n\nvoid main(void)\n{\n    vec4 color = vec4(0.0);\n\n    // Sample top left pixel\n    color += texture2D(uSampler, clamp(vec2(vTextureCoord.x - uOffset.x, vTextureCoord.y + uOffset.y), filterClamp.xy, filterClamp.zw));\n\n    // Sample top right pixel\n    color += texture2D(uSampler, clamp(vec2(vTextureCoord.x + uOffset.x, vTextureCoord.y + uOffset.y), filterClamp.xy, filterClamp.zw));\n\n    // Sample bottom right pixel\n    color += texture2D(uSampler, clamp(vec2(vTextureCoord.x + uOffset.x, vTextureCoord.y - uOffset.y), filterClamp.xy, filterClamp.zw));\n\n    // Sample bottom left pixel\n    color += texture2D(uSampler, clamp(vec2(vTextureCoord.x - uOffset.x, vTextureCoord.y - uOffset.y), filterClamp.xy, filterClamp.zw));\n\n    // Average\n    color *= 0.25;\n\n    gl_FragColor = color;\n}\n",n=function(e){function n(n,l,u){void 0===n&&(n=4),void 0===l&&(l=3),void 0===u&&(u=!1),e.call(this,r,u?o:i),this.uniforms.uOffset=new Float32Array(2),this._pixelSize=new t.Point,this.pixelSize=1,this._clamp=u,this._kernels=null,Array.isArray(n)?this.kernels=n:(this._blur=n,this.quality=l)}e&&(n.__proto__=e),n.prototype=Object.create(e&&e.prototype),n.prototype.constructor=n;var l={kernels:{configurable:!0},clamp:{configurable:!0},pixelSize:{configurable:!0},quality:{configurable:!0},blur:{configurable:!0}};return n.prototype.apply=function(e,t,r,i){var o,n=this.pixelSize.x/t.size.width,l=this.pixelSize.y/t.size.height;if(1===this._quality||0===this._blur)o=this._kernels[0]+.5,this.uniforms.uOffset[0]=o*n,this.uniforms.uOffset[1]=o*l,e.applyFilter(this,t,r,i);else{for(var u,s=e.getRenderTarget(!0),f=t,a=s,p=this._quality-1,x=0;x<p;x++)o=this._kernels[x]+.5,this.uniforms.uOffset[0]=o*n,this.uniforms.uOffset[1]=o*l,e.applyFilter(this,f,a,!0),u=f,f=a,a=u;o=this._kernels[p]+.5,this.uniforms.uOffset[0]=o*n,this.uniforms.uOffset[1]=o*l,e.applyFilter(this,f,r,i),e.returnRenderTarget(s)}},n.prototype._generateKernels=function(){var e=this._blur,t=this._quality,r=[e];if(e>0)for(var i=e,o=e/t,n=1;n<t;n++)i-=o,r.push(i);this._kernels=r},l.kernels.get=function(){return this._kernels},l.kernels.set=function(e){Array.isArray(e)&&e.length>0?(this._kernels=e,this._quality=e.length,this._blur=Math.max.apply(Math,e)):(this._kernels=[0],this._quality=1)},l.clamp.get=function(){return this._clamp},l.pixelSize.set=function(e){"number"==typeof e?(this._pixelSize.x=e,this._pixelSize.y=e):Array.isArray(e)?(this._pixelSize.x=e[0],this._pixelSize.y=e[1]):e instanceof t.Point?(this._pixelSize.x=e.x,this._pixelSize.y=e.y):(this._pixelSize.x=1,this._pixelSize.y=1)},l.pixelSize.get=function(){return this._pixelSize},l.quality.get=function(){return this._quality},l.quality.set=function(e){this._quality=Math.max(1,Math.round(e)),this._generateKernels()},l.blur.get=function(){return this._blur},l.blur.set=function(e){this._blur=e,this._generateKernels()},Object.defineProperties(n.prototype,l),n}(t.Filter);e.KawaseBlurFilter=n,Object.defineProperty(e,"__esModule",{value:!0})}),Object.assign(PIXI.filters,this?this.__filters:__filters);
-//# sourceMappingURL=filter-kawase-blur.js.map

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

@@ -6,4 +6,3 @@
  * http://www.opensource.org/licenses/mit-license
  */
 !function(e,o){"object"==typeof exports&&"undefined"!=typeof module?o(exports,require("pixi.js")):"function"==typeof define&&define.amd?define(["exports","pixi.js"],o):o(e.__filters={},e.PIXI)}(this,function(e,o){"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="varying vec2 vTextureCoord;\nuniform sampler2D uSampler;\n\nuniform vec2 thickness;\nuniform vec4 outlineColor;\nuniform vec4 filterClamp;\n\nconst float DOUBLE_PI = 3.14159265358979323846264 * 2.;\n\nvoid main(void) {\n    vec4 ownColor = texture2D(uSampler, vTextureCoord);\n    vec4 curColor;\n    float maxAlpha = 0.;\n    vec2 displaced;\n    for (float angle = 0.; angle <= DOUBLE_PI; angle += ${angleStep}) {\n        displaced.x = vTextureCoord.x + thickness.x * cos(angle);\n        displaced.y = vTextureCoord.y + thickness.y * sin(angle);\n        curColor = texture2D(uSampler, clamp(displaced, filterClamp.xy, filterClamp.zw));\n        maxAlpha = max(maxAlpha, curColor.a);\n    }\n    float resultAlpha = max(maxAlpha, ownColor.a);\n    gl_FragColor = vec4((ownColor.rgb + outlineColor.rgb * (1. - ownColor.a)) * resultAlpha, resultAlpha);\n}\n",n=function(e){function n(o,i,l){void 0===o&&(o=1),void 0===i&&(i=0),void 0===l&&(l=.1);var s=Math.max(l*n.MAX_SAMPLES,n.MIN_SAMPLES),a=(2*Math.PI/s).toFixed(7);e.call(this,t,r.replace(/\$\{angleStep\}/,a)),this.uniforms.thickness=new Float32Array([0,0]),this.thickness=o,this.uniforms.outlineColor=new Float32Array([0,0,0,1]),this.color=i,this.quality=l}e&&(n.__proto__=e),n.prototype=Object.create(e&&e.prototype),n.prototype.constructor=n;var i={color:{configurable:!0}};return n.prototype.apply=function(e,o,t,r){this.uniforms.thickness[0]=this.thickness/o.size.width,this.uniforms.thickness[1]=this.thickness/o.size.height,e.applyFilter(this,o,t,r)},i.color.get=function(){return o.utils.rgb2hex(this.uniforms.outlineColor)},i.color.set=function(e){o.utils.hex2rgb(e,this.uniforms.outlineColor)},Object.defineProperties(n.prototype,i),n}(o.Filter);n.MIN_SAMPLES=1,n.MAX_SAMPLES=100,e.OutlineFilter=n,Object.defineProperty(e,"__esModule",{value:!0})}),Object.assign(PIXI.filters,this?this.__filters:__filters);
-//# sourceMappingURL=filter-outline.js.map

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

@@ -6,4 +6,3 @@
  * http://www.opensource.org/licenses/mit-license
  */
 var __filters=function(e,o){"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}",n="precision mediump float;\n\nvarying vec2 vTextureCoord;\n\nuniform vec2 size;\nuniform sampler2D uSampler;\n\nuniform vec4 filterArea;\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\treturn floor( coord / size ) * size;\n}\n\nvoid main(void)\n{\n    vec2 coord = mapCoord(vTextureCoord);\n\n    coord = pixelate(coord, size);\n\n    coord = unmapCoord(coord);\n\n    gl_FragColor = texture2D(uSampler, coord);\n}\n",t=function(e){function o(o){void 0===o&&(o=10),e.call(this,r,n),this.size=o}e&&(o.__proto__=e),o.prototype=Object.create(e&&e.prototype),o.prototype.constructor=o;var t={size:{configurable:!0}};return t.size.get=function(){return this.uniforms.size},t.size.set=function(e){"number"==typeof e&&(e=[e,e]),this.uniforms.size=e},Object.defineProperties(o.prototype,t),o}(o.Filter);return e.PixelateFilter=t,e}({},PIXI);Object.assign(PIXI.filters,__filters);
-//# sourceMappingURL=filter-pixelate.js.map

Extensions/Effects/pixi-filters/filter-radial-blur.js

@@ -6,4 +6,3 @@
  * 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=e||self).__filters={},e.PIXI)}(this,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="varying vec2 vTextureCoord;\nuniform sampler2D uSampler;\nuniform vec4 filterArea;\n\nuniform float uRadian;\nuniform vec2 uCenter;\nuniform float uRadius;\nuniform int uKernelSize;\n\nconst int MAX_KERNEL_SIZE = 2048;\n\nvoid main(void)\n{\n    vec4 color = texture2D(uSampler, vTextureCoord);\n\n    if (uKernelSize == 0)\n    {\n        gl_FragColor = color;\n        return;\n    }\n\n    float aspect = filterArea.y / filterArea.x;\n    vec2 center = uCenter.xy / filterArea.xy;\n    float gradient = uRadius / filterArea.x * 0.3;\n    float radius = uRadius / filterArea.x - gradient * 0.5;\n    int k = uKernelSize - 1;\n\n    vec2 coord = vTextureCoord;\n    vec2 dir = vec2(center - coord);\n    float dist = length(vec2(dir.x, dir.y * aspect));\n\n    float radianStep = uRadian;\n    if (radius >= 0.0 && dist > radius) {\n        float delta = dist - radius;\n        float gap = gradient;\n        float scale = 1.0 - abs(delta / gap);\n        if (scale <= 0.0) {\n            gl_FragColor = color;\n            return;\n        }\n        radianStep *= scale;\n    }\n    radianStep /= float(k);\n\n    float s = sin(radianStep);\n    float c = cos(radianStep);\n    mat2 rotationMatrix = mat2(vec2(c, -s), vec2(s, c));\n\n    for(int i = 0; i < MAX_KERNEL_SIZE - 1; i++) {\n        if (i == k) {\n            break;\n        }\n\n        coord -= center;\n        coord.y *= aspect;\n        coord = rotationMatrix * coord;\n        coord.y /= aspect;\n        coord += center;\n\n        vec4 sample = texture2D(uSampler, coord);\n\n        // switch to pre-multiplied alpha to correctly blur transparent images\n        // sample.rgb *= sample.a;\n\n        color += sample;\n    }\n\n    gl_FragColor = color / float(uKernelSize);\n}\n",i=function(e){function n(n,i,o,a){void 0===n&&(n=0),void 0===i&&(i=[0,0]),void 0===o&&(o=5),void 0===a&&(a=-1),e.call(this,t,r),this._angle=0,this.angle=n,this.center=i,this.kernelSize=o,this.radius=a}e&&(n.__proto__=e),n.prototype=Object.create(e&&e.prototype),n.prototype.constructor=n;var i={angle:{configurable:!0},center:{configurable:!0},radius:{configurable:!0}};return n.prototype.apply=function(e,n,t,r){this.uniforms.uKernelSize=0!==this._angle?this.kernelSize:0,e.applyFilter(this,n,t,r)},i.angle.set=function(e){this._angle=e,this.uniforms.uRadian=e*Math.PI/180},i.angle.get=function(){return this._angle},i.center.get=function(){return this.uniforms.uCenter},i.center.set=function(e){this.uniforms.uCenter=e},i.radius.get=function(){return this.uniforms.uRadius},i.radius.set=function(e){(e<0||e===1/0)&&(e=-1),this.uniforms.uRadius=e},Object.defineProperties(n.prototype,i),n}(n.Filter);e.RadialBlurFilter=i,Object.defineProperty(e,"__esModule",{value:!0})}),Object.assign(PIXI.filters,this?this.__filters:__filters);
-//# sourceMappingURL=filter-radial-blur.js.map

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

@@ -6,4 +6,3 @@
  * 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 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}",t="varying vec2 vTextureCoord;\nuniform sampler2D uSampler;\n\nuniform vec4 filterArea;\nuniform vec4 filterClamp;\nuniform vec2 dimensions;\n\nuniform bool mirror;\nuniform float boundary;\nuniform vec2 amplitude;\nuniform vec2 waveLength;\nuniform vec2 alpha;\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    if (coord.y < boundary) {\n        gl_FragColor = texture2D(uSampler, vTextureCoord);\n        return;\n    }\n\n    float k = (coord.y - boundary) / (1. - boundary + 0.0001);\n    float areaY = boundary * dimensions.y / filterArea.y;\n    float v = areaY + areaY - vTextureCoord.y;\n    float y = mirror ? v : vTextureCoord.y;\n\n    float _amplitude = ((amplitude.y - amplitude.x) * k + amplitude.x ) / filterArea.x;\n    float _waveLength = ((waveLength.y - waveLength.x) * k + waveLength.x) / filterArea.y;\n    float _alpha = (alpha.y - alpha.x) * k + alpha.x;\n\n    float x = vTextureCoord.x + cos(v * 6.28 / _waveLength - time) * _amplitude;\n    x = clamp(x, filterClamp.x, filterClamp.z);\n\n    vec4 color = texture2D(uSampler, vec2(x, y));\n\n    gl_FragColor = color * _alpha;\n}\n",o=function(e){function n(n){e.call(this,r,t),Object.assign(this,{mirror:!0,boundary:.5,amplitude:[0,20],waveLength:[30,100],alpha:[1,1],time:0},n)}e&&(n.__proto__=e),n.prototype=Object.create(e&&e.prototype),n.prototype.constructor=n;var o={mirror:{configurable:!0},boundary:{configurable:!0},amplitude:{configurable:!0},waveLength:{configurable:!0},alpha:{configurable:!0}};return n.prototype.apply=function(e,n,r,t){this.uniforms.dimensions[0]=n.sourceFrame.width,this.uniforms.dimensions[1]=n.sourceFrame.height,this.uniforms.time=this.time,e.applyFilter(this,n,r,t)},o.mirror.set=function(e){this.uniforms.mirror=e},o.mirror.get=function(){return this.uniforms.mirror},o.boundary.set=function(e){this.uniforms.boundary=e},o.boundary.get=function(){return this.uniforms.boundary},o.amplitude.set=function(e){this.uniforms.amplitude[0]=e[0],this.uniforms.amplitude[1]=e[1]},o.amplitude.get=function(){return this.uniforms.amplitude},o.waveLength.set=function(e){this.uniforms.waveLength[0]=e[0],this.uniforms.waveLength[1]=e[1]},o.waveLength.get=function(){return this.uniforms.waveLength},o.alpha.set=function(e){this.uniforms.alpha[0]=e[0],this.uniforms.alpha[1]=e[1]},o.alpha.get=function(){return this.uniforms.alpha},Object.defineProperties(n.prototype,o),n}(n.Filter);e.ReflectionFilter=o,Object.defineProperty(e,"__esModule",{value:!0})}),Object.assign(PIXI.filters,this.__filters);
-//# sourceMappingURL=filter-reflection.js.map

Extensions/Effects/pixi-filters/filter-rgb-split.js

@@ -6,4 +6,3 @@
  * http://www.opensource.org/licenses/mit-license
  */
 !function(e,r){"object"==typeof exports&&"undefined"!=typeof module?r(exports,require("pixi.js")):"function"==typeof define&&define.amd?define(["exports","pixi.js"],r):r(e.__filters={},e.PIXI)}(this,function(e,r){"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}",n="precision mediump float;\n\nvarying vec2 vTextureCoord;\n\nuniform sampler2D uSampler;\nuniform vec4 filterArea;\nuniform vec2 red;\nuniform vec2 green;\nuniform vec2 blue;\n\nvoid main(void)\n{\n   gl_FragColor.r = texture2D(uSampler, vTextureCoord + red/filterArea.xy).r;\n   gl_FragColor.g = texture2D(uSampler, vTextureCoord + green/filterArea.xy).g;\n   gl_FragColor.b = texture2D(uSampler, vTextureCoord + blue/filterArea.xy).b;\n   gl_FragColor.a = texture2D(uSampler, vTextureCoord).a;\n}\n",o=function(e){function r(r,o,i){void 0===r&&(r=[-10,0]),void 0===o&&(o=[0,10]),void 0===i&&(i=[0,0]),e.call(this,t,n),this.red=r,this.green=o,this.blue=i}e&&(r.__proto__=e),r.prototype=Object.create(e&&e.prototype),r.prototype.constructor=r;var o={red:{configurable:!0},green:{configurable:!0},blue:{configurable:!0}};return o.red.get=function(){return this.uniforms.red},o.red.set=function(e){this.uniforms.red=e},o.green.get=function(){return this.uniforms.green},o.green.set=function(e){this.uniforms.green=e},o.blue.get=function(){return this.uniforms.blue},o.blue.set=function(e){this.uniforms.blue=e},Object.defineProperties(r.prototype,o),r}(r.Filter);e.RGBSplitFilter=o,Object.defineProperty(e,"__esModule",{value:!0})}),Object.assign(PIXI.filters,this?this.__filters:__filters);
-//# sourceMappingURL=filter-rgb-split.js.map

Extensions/Effects/pixi-filters/filter-tilt-shift.js

@@ -6,4 +6,3 @@
  * http://www.opensource.org/licenses/mit-license
  */
 !function(t,e){"object"==typeof exports&&"undefined"!=typeof module?e(exports,require("pixi.js")):"function"==typeof define&&define.amd?define(["exports","pixi.js"],e):e(t.__filters={},t.PIXI)}(this,function(t,e){"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}",r="varying vec2 vTextureCoord;\n\nuniform sampler2D uSampler;\nuniform float blur;\nuniform float gradientBlur;\nuniform vec2 start;\nuniform vec2 end;\nuniform vec2 delta;\nuniform vec2 texSize;\n\nfloat random(vec3 scale, float seed)\n{\n    return fract(sin(dot(gl_FragCoord.xyz + seed, scale)) * 43758.5453 + seed);\n}\n\nvoid main(void)\n{\n    vec4 color = vec4(0.0);\n    float total = 0.0;\n\n    float offset = random(vec3(12.9898, 78.233, 151.7182), 0.0);\n    vec2 normal = normalize(vec2(start.y - end.y, end.x - start.x));\n    float radius = smoothstep(0.0, 1.0, abs(dot(vTextureCoord * texSize - start, normal)) / gradientBlur) * blur;\n\n    for (float t = -30.0; t <= 30.0; t++)\n    {\n        float percent = (t + offset - 0.5) / 30.0;\n        float weight = 1.0 - abs(percent);\n        vec4 sample = texture2D(uSampler, vTextureCoord + delta / texSize * percent * radius);\n        sample.rgb *= sample.a;\n        color += sample * weight;\n        total += weight;\n    }\n\n    color /= total;\n    color.rgb /= color.a + 0.00001;\n\n    gl_FragColor = color;\n}\n",n=function(t){function n(n,o,s,l){void 0===n&&(n=100),void 0===o&&(o=600),void 0===s&&(s=null),void 0===l&&(l=null),t.call(this,i,r),this.uniforms.blur=n,this.uniforms.gradientBlur=o,this.uniforms.start=s||new e.Point(0,window.innerHeight/2),this.uniforms.end=l||new e.Point(600,window.innerHeight/2),this.uniforms.delta=new e.Point(30,30),this.uniforms.texSize=new e.Point(window.innerWidth,window.innerHeight),this.updateDelta()}t&&(n.__proto__=t),n.prototype=Object.create(t&&t.prototype),n.prototype.constructor=n;var o={blur:{configurable:!0},gradientBlur:{configurable:!0},start:{configurable:!0},end:{configurable:!0}};return n.prototype.updateDelta=function(){this.uniforms.delta.x=0,this.uniforms.delta.y=0},o.blur.get=function(){return this.uniforms.blur},o.blur.set=function(t){this.uniforms.blur=t},o.gradientBlur.get=function(){return this.uniforms.gradientBlur},o.gradientBlur.set=function(t){this.uniforms.gradientBlur=t},o.start.get=function(){return this.uniforms.start},o.start.set=function(t){this.uniforms.start=t,this.updateDelta()},o.end.get=function(){return this.uniforms.end},o.end.set=function(t){this.uniforms.end=t,this.updateDelta()},Object.defineProperties(n.prototype,o),n}(e.Filter),o=function(t){function e(){t.apply(this,arguments)}return t&&(e.__proto__=t),e.prototype=Object.create(t&&t.prototype),e.prototype.constructor=e,e.prototype.updateDelta=function(){var t=this.uniforms.end.x-this.uniforms.start.x,e=this.uniforms.end.y-this.uniforms.start.y,i=Math.sqrt(t*t+e*e);this.uniforms.delta.x=t/i,this.uniforms.delta.y=e/i},e}(n),s=function(t){function e(){t.apply(this,arguments)}return t&&(e.__proto__=t),e.prototype=Object.create(t&&t.prototype),e.prototype.constructor=e,e.prototype.updateDelta=function(){var t=this.uniforms.end.x-this.uniforms.start.x,e=this.uniforms.end.y-this.uniforms.start.y,i=Math.sqrt(t*t+e*e);this.uniforms.delta.x=-e/i,this.uniforms.delta.y=t/i},e}(n),l=function(t){function e(e,i,r,n){void 0===e&&(e=100),void 0===i&&(i=600),void 0===r&&(r=null),void 0===n&&(n=null),t.call(this),this.tiltShiftXFilter=new o(e,i,r,n),this.tiltShiftYFilter=new s(e,i,r,n)}t&&(e.__proto__=t),e.prototype=Object.create(t&&t.prototype),e.prototype.constructor=e;var i={blur:{configurable:!0},gradientBlur:{configurable:!0},start:{configurable:!0},end:{configurable:!0}};return e.prototype.apply=function(t,e,i){var r=t.getRenderTarget(!0);this.tiltShiftXFilter.apply(t,e,r),this.tiltShiftYFilter.apply(t,r,i),t.returnRenderTarget(r)},i.blur.get=function(){return this.tiltShiftXFilter.blur},i.blur.set=function(t){this.tiltShiftXFilter.blur=this.tiltShiftYFilter.blur=t},i.gradientBlur.get=function(){return this.tiltShiftXFilter.gradientBlur},i.gradientBlur.set=function(t){this.tiltShiftXFilter.gradientBlur=this.tiltShiftYFilter.gradientBlur=t},i.start.get=function(){return this.tiltShiftXFilter.start},i.start.set=function(t){this.tiltShiftXFilter.start=this.tiltShiftYFilter.start=t},i.end.get=function(){return this.tiltShiftXFilter.end},i.end.set=function(t){this.tiltShiftXFilter.end=this.tiltShiftYFilter.end=t},Object.defineProperties(e.prototype,i),e}(e.Filter);t.TiltShiftFilter=l,t.TiltShiftXFilter=o,t.TiltShiftYFilter=s,t.TiltShiftAxisFilter=n,Object.defineProperty(t,"__esModule",{value:!0})}),Object.assign(PIXI.filters,this?this.__filters:__filters);
-//# sourceMappingURL=filter-tilt-shift.js.map

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

@@ -6,4 +6,3 @@
  * http://www.opensource.org/licenses/mit-license
  */
 !function(o,n){"object"==typeof exports&&"undefined"!=typeof module?n(exports,require("pixi.js")):"function"==typeof define&&define.amd?define(["exports","pixi.js"],n):n((o=o||self).__filters={},o.PIXI)}(this,function(o,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;\n\nuniform sampler2D uSampler;\nuniform float radius;\nuniform float angle;\nuniform vec2 offset;\nuniform vec4 filterArea;\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 twist(vec2 coord)\n{\n    coord -= offset;\n\n    float dist = length(coord);\n\n    if (dist < radius)\n    {\n        float ratioDist = (radius - dist) / radius;\n        float angleMod = ratioDist * ratioDist * angle;\n        float s = sin(angleMod);\n        float c = cos(angleMod);\n        coord = vec2(coord.x * c - coord.y * s, coord.x * s + coord.y * c);\n    }\n\n    coord += offset;\n\n    return coord;\n}\n\nvoid main(void)\n{\n\n    vec2 coord = mapCoord(vTextureCoord);\n\n    coord = twist(coord);\n\n    coord = unmapCoord(coord);\n\n    gl_FragColor = texture2D(uSampler, coord );\n\n}\n",t=function(o){function n(n,t,i){void 0===n&&(n=200),void 0===t&&(t=4),void 0===i&&(i=20),o.call(this,r,e),this.radius=n,this.angle=t,this.padding=i}o&&(n.__proto__=o),n.prototype=Object.create(o&&o.prototype),n.prototype.constructor=n;var t={offset:{configurable:!0},radius:{configurable:!0},angle:{configurable:!0}};return t.offset.get=function(){return this.uniforms.offset},t.offset.set=function(o){this.uniforms.offset=o},t.radius.get=function(){return this.uniforms.radius},t.radius.set=function(o){this.uniforms.radius=o},t.angle.get=function(){return this.uniforms.angle},t.angle.set=function(o){this.uniforms.angle=o},Object.defineProperties(n.prototype,t),n}(n.Filter);o.TwistFilter=t,Object.defineProperty(o,"__esModule",{value:!0})}),Object.assign(PIXI.filters,this?this.__filters:__filters);
-//# sourceMappingURL=filter-twist.js.map

Extensions/Effects/pixi-filters/filter-zoom-blur.js

@@ -6,4 +6,3 @@
  * http://www.opensource.org/licenses/mit-license
  */
 !function(n,e){"object"==typeof exports&&"undefined"!=typeof module?e(exports,require("pixi.js")):"function"==typeof define&&define.amd?define(["exports","pixi.js"],e):e(n.__filters={},n.PIXI)}(this,function(n,e){"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="varying vec2 vTextureCoord;\nuniform sampler2D uSampler;\nuniform vec4 filterArea;\n\nuniform vec2 uCenter;\nuniform float uStrength;\nuniform float uInnerRadius;\nuniform float uRadius;\n\nconst float MAX_KERNEL_SIZE = 32.0;\n\nfloat random(vec3 scale, float seed) {\n    // use the fragment position for a different seed per-pixel\n    return fract(sin(dot(gl_FragCoord.xyz + seed, scale)) * 43758.5453 + seed);\n}\n\nvoid main() {\n\n    float minGradient = uInnerRadius * 0.3;\n    float innerRadius = (uInnerRadius + minGradient * 0.5) / filterArea.x;\n\n    float gradient = uRadius * 0.3;\n    float radius = (uRadius - gradient * 0.5) / filterArea.x;\n\n    float countLimit = MAX_KERNEL_SIZE;\n\n    vec2 dir = vec2(uCenter.xy / filterArea.xy - vTextureCoord);\n    float dist = length(vec2(dir.x, dir.y * filterArea.y / filterArea.x));\n\n    float strength = uStrength;\n\n    float delta = 0.0;\n    float gap;\n    if (dist < innerRadius) {\n        delta = innerRadius - dist;\n        gap = minGradient;\n    } else if (radius >= 0.0 && dist > radius) { // radius < 0 means it's infinity\n        delta = dist - radius;\n        gap = gradient;\n    }\n\n    if (delta > 0.0) {\n        float normalCount = gap / filterArea.x;\n        delta = (normalCount - delta) / normalCount;\n        countLimit *= delta;\n        strength *= delta;\n        if (countLimit < 1.0)\n        {\n            gl_FragColor = texture2D(uSampler, vTextureCoord);\n            return;\n        }\n    }\n\n    // randomize the lookup values to hide the fixed number of samples\n    float offset = random(vec3(12.9898, 78.233, 151.7182), 0.0);\n\n    float total = 0.0;\n    vec4 color = vec4(0.0);\n\n    dir *= strength;\n\n    for (float t = 0.0; t < MAX_KERNEL_SIZE; t++) {\n        float percent = (t + offset) / MAX_KERNEL_SIZE;\n        float weight = 4.0 * (percent - percent * percent);\n        vec2 p = vTextureCoord + dir * percent;\n        vec4 sample = texture2D(uSampler, p);\n\n        // switch to pre-multiplied alpha to correctly blur transparent images\n        // sample.rgb *= sample.a;\n\n        color += sample * weight;\n        total += weight;\n\n        if (t > countLimit){\n            break;\n        }\n    }\n\n    color /= total;\n    // switch back from pre-multiplied alpha\n    color.rgb /= color.a + 0.00001;\n\n    gl_FragColor = color;\n}\n",i=function(n){function e(e,i,o,a){void 0===e&&(e=.1),void 0===i&&(i=[0,0]),void 0===o&&(o=0),void 0===a&&(a=-1),n.call(this,t,r),this.center=i,this.strength=e,this.innerRadius=o,this.radius=a}n&&(e.__proto__=n),e.prototype=Object.create(n&&n.prototype),e.prototype.constructor=e;var i={center:{configurable:!0},strength:{configurable:!0},innerRadius:{configurable:!0},radius:{configurable:!0}};return i.center.get=function(){return this.uniforms.uCenter},i.center.set=function(n){this.uniforms.uCenter=n},i.strength.get=function(){return this.uniforms.uStrength},i.strength.set=function(n){this.uniforms.uStrength=n},i.innerRadius.get=function(){return this.uniforms.uInnerRadius},i.innerRadius.set=function(n){this.uniforms.uInnerRadius=n},i.radius.get=function(){return this.uniforms.uRadius},i.radius.set=function(n){(n<0||n===1/0)&&(n=-1),this.uniforms.uRadius=n},Object.defineProperties(e.prototype,i),e}(e.Filter);n.ZoomBlurFilter=i,Object.defineProperty(n,"__esModule",{value:!0})}),Object.assign(PIXI.filters,this?this.__filters:__filters);
-//# sourceMappingURL=filter-zoom-blur.js.map

Extensions/FileSystem/JsExtension.js

@@ -385,6 +385,19 @@ module.exports = {
       .setIncludeFile('Extensions/FileSystem/filesystemtools.js')
       .setFunctionName('gdjs.fileSystem.getUserdataPath');
 
+    extension
+      .addStrExpression(
+        'UserHomePath',
+        _('User\'s Home folder'),
+        _('Get the path to the user home folder.'),
+        _('Filesystem/Windows, Linux, MacOS'),
+        'JsPlatform/Extensions/filesystem_folder24.png',
+        'JsPlatform/Extensions/filesystem_folder32.png'
+      )
+      .getCodeExtraInformation()
+      .setIncludeFile('Extensions/FileSystem/filesystemtools.js')
+      .setFunctionName('gdjs.fileSystem.getUserHomePath');
+
     extension
       .addStrExpression(
         'TempPath',

Extensions/FileSystem/filesystemtools.js

@@ -97,6 +97,23 @@ gdjs.fileSystem.getUserdataPath = function(runtimeScene) {
   }
 };
 
+/**
+ * Get the path to the user's home folder (on Windows `C:\Users\<USERNAME>\` for example).
+ * @return {string} The path to user's "home" folder
+ */
+gdjs.fileSystem.getUserHomePath = function() {
+  const electron = runtimeScene
+    .getGame()
+    .getRenderer()
+    .getElectron();
+
+  if (electron) {
+    return electron.remote.app.getPath('home') || '';
+  } else {
+    return '';
+  }
+};
+
 /**
  * Get the path to 'Temp' folder.
  * @param {gdjs.RuntimeScene} runtimeScene The current scene

Extensions/PanelSpriteObject/panelspriteruntimeobject-pixi-renderer.js

@@ -245,7 +245,7 @@ gdjs.PanelSpriteRuntimeObjectPixiRenderer.prototype.setTexture = function(
     texture,
     makeInsideTexture(
       new PIXI.Rectangle(
-        this._borderSprites[1].width - obj._rBorder,
+        texture.width - obj._rBorder,
         0,
         obj._rBorder,
         obj._tBorder
@@ -261,7 +261,7 @@ gdjs.PanelSpriteRuntimeObjectPixiRenderer.prototype.setTexture = function(
     makeInsideTexture(
       new PIXI.Rectangle(
         0,
-        this._borderSprites[5].height - obj._bBorder,
+        texture.height - obj._bBorder,
         obj._lBorder,
         obj._bBorder
       )
@@ -271,8 +271,8 @@ gdjs.PanelSpriteRuntimeObjectPixiRenderer.prototype.setTexture = function(
     texture,
     makeInsideTexture(
       new PIXI.Rectangle(
-        this._borderSprites[7].width - obj._rBorder,
-        this._borderSprites[7].height - obj._bBorder,
+        texture.width - obj._rBorder,
+        texture.height - obj._bBorder,
         obj._rBorder,
         obj._bBorder
       )

Extensions/PlatformBehavior/Extension.cpp

@@ -303,6 +303,31 @@ void DeclarePlatformBehaviorExtension(gd::PlatformExtension& extension) {
         .SetGetter("GetJumpSpeed")
         .SetIncludeFile("PlatformBehavior/PlatformerObjectRuntimeBehavior.h");
 
+    aut.AddCondition(
+           "JumpSustainTime",
+           _("Jump sustain time"),
+           _("Compare the jump sustain time of the object (in seconds)."),
+           _("the jump sustain time"),
+           _("Options"),
+           "CppPlatform/Extensions/platformerobjecticon24.png",
+           "CppPlatform/Extensions/platformerobjecticon16.png")
+        .AddParameter("object", _("Object"))
+        .AddParameter("behavior", _("Behavior"), "PlatformerObjectBehavior")
+        .UseStandardRelationalOperatorParameters("number")
+        .MarkAsAdvanced();
+
+    aut.AddAction(
+           "JumpSustainTime",
+           _("Jump sustain time"),
+           _("Change the jump sustain time of an object (in seconds)."),
+           _("the jump sustain time"),
+           _("Options"),
+           "CppPlatform/Extensions/platformerobjecticon24.png",
+           "CppPlatform/Extensions/platformerobjecticon16.png")
+        .AddParameter("object", _("Object"))
+        .AddParameter("behavior", _("Behavior"), "PlatformerObjectBehavior")
+        .UseStandardOperatorParameters("number");
+
     aut.AddAction(
            "SetCanJump",
            _("Allow again jumping"),
@@ -502,6 +527,14 @@ void DeclarePlatformBehaviorExtension(gd::PlatformExtension& extension) {
         .AddParameter("behavior", _("Behavior"), "PlatformerObjectBehavior")
         .SetFunctionName("GetJumpSpeed")
         .SetIncludeFile("PlatformBehavior/PlatformerObjectRuntimeBehavior.h");
+
+    aut.AddExpression("JumpSustainTime",
+                      _("Jump sustain time"),
+                      _("The time during which keeping the jump button held allow the initial jump speed to be maintained."),
+                      _("Options"),
+                      "CppPlatform/Extensions/platformerobjecticon16.png")
+        .AddParameter("object", _("Object"))
+        .AddParameter("behavior", _("Behavior"), "PlatformerObjectBehavior");
 #endif
   }
   {

Extensions/PlatformBehavior/JsExtension.cpp

@@ -92,6 +92,12 @@ class PlatformBehaviorJsExtension : public gd::PlatformExtension {
           .SetFunctionName("setJumpSpeed")
           .SetGetter("getJumpSpeed");
       autExpressions["JumpSpeed"].SetFunctionName("getJumpSpeed");
+      autConditions["PlatformBehavior::JumpSustainTime"].SetFunctionName(
+          "getJumpSustainTime");
+      autActions["PlatformBehavior::JumpSustainTime"]
+          .SetFunctionName("setJumpSustainTime")
+          .SetGetter("getJumpSustainTime");
+      autExpressions["JumpSustainTime"].SetFunctionName("getJumpSustainTime");
 
       autActions["PlatformBehavior::SetCanJump"].SetFunctionName("setCanJump");
       autActions["PlatformBehavior::SimulateLeftKey"].SetFunctionName(

Extensions/PlatformBehavior/PlatformerObjectBehavior.cpp

@@ -6,11 +6,13 @@ This project is released under the MIT License.
 */
 
 #include "PlatformerObjectBehavior.h"
+
 #include <SFML/Window.hpp>
 #include <algorithm>
 #include <cmath>
 #include <iostream>
 #include <memory>
+
 #include "GDCore/Tools/Localization.h"
 #include "GDCpp/Runtime/CommonTools.h"
 #include "GDCpp/Runtime/Project/Layout.h"
@@ -22,6 +24,7 @@ This project is released under the MIT License.
 #if defined(GD_IDE_ONLY)
 #include <iostream>
 #include <map>
+
 #include "GDCore/Project/PropertyDescriptor.h"
 #endif
 
@@ -34,6 +37,7 @@ void PlatformerObjectBehavior::InitializeContent(
   behaviorContent.SetAttribute("deceleration", 1500);
   behaviorContent.SetAttribute("maxSpeed", 250);
   behaviorContent.SetAttribute("jumpSpeed", 600);
+  behaviorContent.SetAttribute("jumpSustainTime", 0.2);
   behaviorContent.SetAttribute("ignoreDefaultControls", false);
   behaviorContent.SetAttribute("slopeMaxAngle", 60);
   behaviorContent.SetAttribute("canGrabPlatforms", false);
@@ -51,6 +55,14 @@ PlatformerObjectBehavior::GetProperties(
       gd::String::From(behaviorContent.GetDoubleAttribute("gravity")));
   properties[_("Jump speed")].SetValue(
       gd::String::From(behaviorContent.GetDoubleAttribute("jumpSpeed")));
+  properties[_("jumpSustainTime")]
+      .SetValue(gd::String::From(
+          behaviorContent.GetDoubleAttribute("jumpSustainTime", 0)))
+      .SetLabel(_("Jump sustain time"))
+      .SetDescription(
+          _("Maximum time (in seconds) during which the jump strength is "
+            "sustained if the jump key is held - allowing variable height "
+            "jumps."));
   properties[_("Max. falling speed")].SetValue(
       gd::String::From(behaviorContent.GetDoubleAttribute("maxFallingSpeed")));
   properties[_("Acceleration")].SetValue(
@@ -91,7 +103,7 @@ bool PlatformerObjectBehavior::UpdateProperty(
     gd::Project& project) {
   if (name == _("Default controls"))
     behaviorContent.SetAttribute("ignoreDefaultControls", (value == "0"));
-  if (name == _("Round coordinates"))
+  else if (name == _("Round coordinates"))
     behaviorContent.SetAttribute("roundCoordinates", (value == "1"));
   else if (name == _("Can grab platform ledges"))
     behaviorContent.SetAttribute("canGrabPlatforms", (value == "1"));
@@ -112,6 +124,8 @@ bool PlatformerObjectBehavior::UpdateProperty(
       behaviorContent.SetAttribute("maxSpeed", value.To<double>());
     else if (name == _("Jump speed"))
       behaviorContent.SetAttribute("jumpSpeed", value.To<double>());
+    else if (name == _("jumpSustainTime"))
+      behaviorContent.SetAttribute("jumpSustainTime", value.To<double>());
     else if (name == _("Slope max. angle")) {
       double newMaxAngle = value.To<double>();
       if (newMaxAngle < 0 || newMaxAngle >= 90) return false;

Extensions/PlatformBehavior/PlatformerObjectRuntimeBehavior.cpp

@@ -323,6 +323,7 @@ void PlatformerObjectRuntimeBehavior::DoStepPreEvents(RuntimeScene& scene) {
   }
 
   if (jumping) {
+    // TODO: Port the jump sustain feature
     requestedDeltaY -= currentJumpSpeed * timeDelta;
     currentJumpSpeed -= gravity * timeDelta;
     if (currentJumpSpeed < 0) {

Extensions/PlatformBehavior/platformerobjectruntimebehavior.js

@@ -38,6 +38,7 @@ gdjs.PlatformerObjectRuntimeBehavior = function(
   this._canGrabPlatforms = behaviorData.canGrabPlatforms || false;
   this._yGrabOffset = behaviorData.yGrabOffset || 0;
   this._xGrabTolerance = behaviorData.xGrabTolerance || 10;
+  this._jumpSustainTime = behaviorData.jumpSustainTime || 0;
   this._isOnFloor = false;
   this._isOnLadder = false;
   this._floorPlatform = null;
@@ -45,6 +46,8 @@ gdjs.PlatformerObjectRuntimeBehavior = function(
   this._currentSpeed = 0;
   this._jumping = false;
   this._currentJumpSpeed = 0;
+  this._timeSinceCurrentJumpStart = 0;
+  this._jumpKeyHeldSinceJumpStart = false;
   this._canJump = false;
   this._isGrabbingPlatform = false;
   this._grabbedPlatform = null;
@@ -367,6 +370,8 @@ gdjs.PlatformerObjectRuntimeBehavior.prototype.doStepPreEvents = function(
   if (this._canJump && this._jumpKey) {
     this._jumping = true;
     this._canJump = false;
+    this._timeSinceCurrentJumpStart = 0;
+    this._jumpKeyHeldSinceJumpStart = true;
     //this._isOnFloor = false; If floor is a very steep slope, the object could go into it.
     this._isOnLadder = false;
     this._currentJumpSpeed = this._jumpSpeed;
@@ -375,9 +380,22 @@ gdjs.PlatformerObjectRuntimeBehavior.prototype.doStepPreEvents = function(
     //object.setY(object.getY()-1); //Useless and dangerous
   }
 
+  // Check if the jump key is continuously held since
+  // the beginning of the jump.
+  if (!this._jumpKey) this._jumpKeyHeldSinceJumpStart = false;
+
   if (this._jumping) {
+    this._timeSinceCurrentJumpStart += timeDelta;
     requestedDeltaY -= this._currentJumpSpeed * timeDelta;
-    this._currentJumpSpeed -= this._gravity * timeDelta;
+
+    // Decrease jump speed after the (optional) jump sustain time is over.
+    var sustainJumpSpeed =
+      this._jumpKeyHeldSinceJumpStart &&
+      this._timeSinceCurrentJumpStart < this._jumpSustainTime;
+    if (!sustainJumpSpeed) {
+      this._currentJumpSpeed -= this._gravity * timeDelta;
+    }
+
     if (this._currentJumpSpeed < 0) {
       this._currentJumpSpeed = 0;
       this._jumping = false;
@@ -898,6 +916,14 @@ gdjs.PlatformerObjectRuntimeBehavior.prototype.getJumpSpeed = function() {
   return this._jumpSpeed;
 };
 
+/**
+ * Get the jump sustain time of the Platformer Object.
+ * @returns {number} The jump sustain time.
+ */
+gdjs.PlatformerObjectRuntimeBehavior.prototype.getJumpSustainTime = function() {
+  return this._jumpSustainTime;
+};
+
 /**
  * Set the gravity of the Platformer Object.
  * @param {number} gravity The new gravity.
@@ -956,6 +982,16 @@ gdjs.PlatformerObjectRuntimeBehavior.prototype.setJumpSpeed = function(
   this._jumpSpeed = jumpSpeed;
 };
 
+/**
+ * Set the jump sustain time of the Platformer Object.
+ * @param {number} jumpSpeed The new jump sustain time.
+ */
+gdjs.PlatformerObjectRuntimeBehavior.prototype.setJumpSustainTime = function(
+  jumpSustainTime
+) {
+  this._jumpSustainTime = jumpSustainTime;
+};
+
 /**
  * Set the maximum slope angle of the Platformer Object.
  * @param {number} slopeMaxAngle The new maximum slope angle.

Extensions/PlatformBehavior/tests/platformerobjectruntimebehavior.spec.js

@@ -1,282 +1,480 @@
+const makeTestRuntimeScene = () => {
+  const runtimeGame = new gdjs.RuntimeGame({
+    variables: [],
+    properties: { windowWidth: 800, windowHeight: 600 },
+  });
+  const runtimeScene = new gdjs.RuntimeScene(runtimeGame);
+  runtimeScene.loadFromScene({
+    layers: [{ name: '', visibility: true }],
+    variables: [],
+    behaviorsSharedData: [],
+    objects: [],
+    instances: [],
+  });
+  runtimeScene._timeManager.getElapsedTime = function() {
+    return (1 / 60) * 1000;
+  };
+  return runtimeScene;
+};
+
+const addPlatformObject = runtimeScene => {
+  var platform = new gdjs.RuntimeObject(runtimeScene, {
+    name: 'obj2',
+    type: '',
+    behaviors: [
+      {
+        type: 'PlatformBehavior::PlatformBehavior',
+        canBeGrabbed: true,
+      },
+    ],
+  });
+  platform.getWidth = function() {
+    return 60;
+  };
+  platform.getHeight = function() {
+    return 32;
+  };
+  runtimeScene.addObject(platform);
+
+  return platform;
+};
+
 describe('gdjs.PlatformerObjectRuntimeBehavior', function() {
-	var runtimeGame = new gdjs.RuntimeGame({variables: [], properties: {windowWidth: 800, windowHeight: 600}});
-	var runtimeScene = new gdjs.RuntimeScene(runtimeGame);
-	runtimeScene.loadFromScene({
-		layers: [{name: "", visibility: true}],
-		variables: [],
-		behaviorsSharedData: [],
-		objects: [],
-		instances: []
-	});
-	runtimeScene._timeManager.getElapsedTime = function() { return 1 / 60 * 1000; };
+  const runtimeScene = makeTestRuntimeScene();
 
-	//Put a platformer object in the air.
-	var object = new gdjs.RuntimeObject(runtimeScene, {name: "obj1", type: "", behaviors: [{
-		type: "PlatformBehavior::PlatformerObjectBehavior",
-		name: "auto1",
-		gravity: 900,
-		maxFallingSpeed: 1500,
-		acceleration: 500,
-		deceleration: 1500,
-		maxSpeed: 500,
-		jumpSpeed: 1500,
-		canGrabPlatforms: true,
-		ignoreDefaultControls: true,
-		slopeMaxAngle: 60
-	}]});
-	object.getWidth = function() { return 10; };
-	object.getHeight = function() { return 20; };
-	runtimeScene.addObject(object);
-	object.setPosition(0, -100);
+  //Put a platformer object in the air.
+  var object = new gdjs.RuntimeObject(runtimeScene, {
+    name: 'obj1',
+    type: '',
+    behaviors: [
+      {
+        type: 'PlatformBehavior::PlatformerObjectBehavior',
+        name: 'auto1',
+        gravity: 900,
+        maxFallingSpeed: 1500,
+        acceleration: 500,
+        deceleration: 1500,
+        maxSpeed: 500,
+        jumpSpeed: 1500,
+        canGrabPlatforms: true,
+        ignoreDefaultControls: true,
+        slopeMaxAngle: 60,
+      },
+    ],
+  });
+  object.getWidth = function() {
+    return 10;
+  };
+  object.getHeight = function() {
+    return 20;
+  };
+  runtimeScene.addObject(object);
+  object.setPosition(0, -100);
 
-	//Put a platform
-	var platform = new gdjs.RuntimeObject(runtimeScene, {name: "obj2", type: "", behaviors: [{
-		type: "PlatformBehavior::PlatformBehavior",
-		canBeGrabbed: true,
-	}]});
-	platform.getWidth = function() { return 60; };
-	platform.getHeight = function() { return 32; };
-	runtimeScene.addObject(platform);
-	platform.setPosition(0, -10);
+  //Put a platform
+  const platform = addPlatformObject(runtimeScene);
+  platform.setPosition(0, -10);
 
-	it('can fall when in the air', function() {
-		for(var i = 0; i<30; ++i) {
-			runtimeScene.renderAndStep();
-			if (i < 10) expect(object.getBehavior("auto1").isFalling()).to.be(true);
-		}
+  it('can fall when in the air', function() {
+    for (var i = 0; i < 30; ++i) {
+      runtimeScene.renderAndStep();
+      if (i < 10) expect(object.getBehavior('auto1').isFalling()).to.be(true);
+    }
 
-		//Check the platform stopped the platformer object.
-		expect(object.getY()).to.be(-30); // -30 = -10 (platform y) + -20 (object height)
-		expect(object.getBehavior("auto1").isFalling()).to.be(false);
-		expect(object.getBehavior("auto1").isMoving()).to.be(false);
+    //Check the platform stopped the platformer object.
+    expect(object.getY()).to.be(-30); // -30 = -10 (platform y) + -20 (object height)
+    expect(object.getBehavior('auto1').isFalling()).to.be(false);
+    expect(object.getBehavior('auto1').isMoving()).to.be(false);
 
-		for(var i = 0; i<35; ++i) { //Check that the platformer object can fall.
-			object.getBehavior("auto1").simulateRightKey();
-			runtimeScene.renderAndStep();
-		}
-		expect(object.getX()).to.be.within(87.50, 87.51);
-		expect(object.getY()).to.be(-24.75);
-		expect(object.getBehavior("auto1").isFalling()).to.be(true);
+    for (var i = 0; i < 35; ++i) {
+      //Check that the platformer object can fall.
+      object.getBehavior('auto1').simulateRightKey();
+      runtimeScene.renderAndStep();
+    }
+    expect(object.getX()).to.be.within(87.5, 87.51);
+    expect(object.getY()).to.be(-24.75);
+    expect(object.getBehavior('auto1').isFalling()).to.be(true);
 
-		for(var i = 0; i<100; ++i) { //Let the speed on X axis go back to 0.
-			runtimeScene.renderAndStep();
-		}
-	});
+    for (var i = 0; i < 100; ++i) {
+      //Let the speed on X axis go back to 0.
+      runtimeScene.renderAndStep();
+    }
+  });
 
-	it('can grab, and release, a platform', function() {
-		//Put the object near the right ledge of the platform.
-		object.setPosition(platform.getX() + platform.getWidth() + 2, platform.getY() - 10);
+  it('can grab, and release, a platform', function() {
+    //Put the object near the right ledge of the platform.
+    object.setPosition(
+      platform.getX() + platform.getWidth() + 2,
+      platform.getY() - 10
+    );
 
-		for(var i = 0; i<35; ++i) {
-			object.getBehavior("auto1").simulateLeftKey();
-			runtimeScene.renderAndStep();
-		}
+    for (var i = 0; i < 35; ++i) {
+      object.getBehavior('auto1').simulateLeftKey();
+      runtimeScene.renderAndStep();
+    }
 
-		//Check that the object grabbed the platform
-		expect(object.getX()).to.be.within(
-			platform.getX() + platform.getWidth() + 1,
-			platform.getX() + platform.getWidth() + 2
-		);
-		expect(object.getY()).to.be(platform.getY());
+    //Check that the object grabbed the platform
+    expect(object.getX()).to.be.within(
+      platform.getX() + platform.getWidth() + 1,
+      platform.getX() + platform.getWidth() + 2
+    );
+    expect(object.getY()).to.be(platform.getY());
 
-		object.getBehavior("auto1").simulateReleaseKey();
-		for(var i = 0; i<10; ++i) {
-			runtimeScene.renderAndStep();
-		}
+    object.getBehavior('auto1').simulateReleaseKey();
+    for (var i = 0; i < 10; ++i) {
+      runtimeScene.renderAndStep();
+    }
 
-		//Check that the object is falling
-		expect(object.getY()).to.be(1.25);
-	});
+    //Check that the object is falling
+    expect(object.getY()).to.be(1.25);
+  });
 
-	it('can track object height changes', function() {
-		//Put the object near the right ledge of the platform.
-		object.setPosition(platform.getX() + 10, platform.getY() - object.getHeight() - 1);
+  it('can track object height changes', function() {
+    //Put the object near the right ledge of the platform.
+    object.setPosition(
+      platform.getX() + 10,
+      platform.getY() - object.getHeight() - 1
+    );
 
-		for(var i = 0; i<15; ++i) {
-			runtimeScene.renderAndStep();
-		}
+    for (var i = 0; i < 15; ++i) {
+      runtimeScene.renderAndStep();
+    }
 
-		expect(object.getBehavior("auto1").isFalling()).to.be(false);
-		expect(object.getX()).to.be(10);
-		expect(object.getY()).to.be(-30); // -30 = -10 (platform y) + -20 (object height)
+    expect(object.getBehavior('auto1').isFalling()).to.be(false);
+    expect(object.getX()).to.be(10);
+    expect(object.getY()).to.be(-30); // -30 = -10 (platform y) + -20 (object height)
 
-		object.getHeight = function() { return 9; }
-		runtimeScene.renderAndStep();
-		expect(object.getBehavior("auto1").isFalling()).to.be(false);
-		expect(object.getY()).to.be(-19); // -19 = -10 (platform y) + -9 (object height)
+    object.getHeight = function() {
+      return 9;
+    };
+    runtimeScene.renderAndStep();
+    expect(object.getBehavior('auto1').isFalling()).to.be(false);
+    expect(object.getY()).to.be(-19); // -19 = -10 (platform y) + -9 (object height)
 
-		for(var i = 0; i<10; ++i) {
-			object.getBehavior("auto1").simulateRightKey();
-			runtimeScene.renderAndStep();
-			expect(object.getBehavior("auto1").isFalling()).to.be(false);
-		}
-		expect(object.getY()).to.be(-19);
-		expect(object.getX()).to.be.within(17.638, 17.639);
+    for (var i = 0; i < 10; ++i) {
+      object.getBehavior('auto1').simulateRightKey();
+      runtimeScene.renderAndStep();
+      expect(object.getBehavior('auto1').isFalling()).to.be(false);
+    }
+    expect(object.getY()).to.be(-19);
+    expect(object.getX()).to.be.within(17.638, 17.639);
 
-		object.getHeight = function() { return 20; }
-		runtimeScene.renderAndStep();
-		expect(object.getY()).to.be(-30); // -30 = -10 (platform y) + -20 (object height)
-	});
+    object.getHeight = function() {
+      return 20;
+    };
+    runtimeScene.renderAndStep();
+    expect(object.getY()).to.be(-30); // -30 = -10 (platform y) + -20 (object height)
+  });
+});
+
+describe('gdjs.PlatformerObjectRuntimeBehavior, jump and jump sustain (round coordinates on)', function() {
+  const runtimeScene = makeTestRuntimeScene();
+
+  //Put a platformer object on a platform
+  var object = new gdjs.RuntimeObject(runtimeScene, {
+    name: 'obj1',
+    type: '',
+    behaviors: [
+      {
+        type: 'PlatformBehavior::PlatformerObjectBehavior',
+        name: 'auto1',
+        gravity: 1500,
+        maxFallingSpeed: 1500,
+        acceleration: 500,
+        deceleration: 1500,
+        maxSpeed: 500,
+        jumpSpeed: 900,
+        canGrabPlatforms: true,
+        ignoreDefaultControls: true,
+        slopeMaxAngle: 60,
+        jumpSustainTime: 0.2,
+        roundCoordinates: true,
+      },
+    ],
+  });
+  object.getWidth = function() {
+    return 10;
+  };
+  object.getHeight = function() {
+    return 20;
+  };
+  runtimeScene.addObject(object);
+  object.setPosition(0, -32);
+
+  //Put a platform
+  const platform = addPlatformObject(runtimeScene);
+  platform.setPosition(0, -10);
+
+  it('can jump', function() {
+    // Ensure the object falls on the platform
+    for (var i = 0; i < 10; ++i) {
+      runtimeScene.renderAndStep();
+    }
+
+    //Check the object is on the platform
+    expect(object.getY()).to.be(-30); // -30 = -10 (platform y) + -20 (object height)
+    expect(object.getBehavior('auto1').isFalling()).to.be(false);
+    expect(object.getBehavior('auto1').isMoving()).to.be(false);
+
+    // Jump without sustaining
+    object.getBehavior('auto1').simulateJumpKey();
+    for (var i = 0; i < 18; ++i) {
+      runtimeScene.renderAndStep();
+	}
+
+    // Check that we reached the maximum height
+    expect(object.getY()).to.be.within(-180, -179);
+    runtimeScene.renderAndStep();
+    expect(object.getY()).to.be(-180);
+    runtimeScene.renderAndStep();
+    expect(object.getY()).to.be.within(-180, -179);
+
+    // Then let the object fall
+    for (var i = 0; i < 60; ++i) {
+      runtimeScene.renderAndStep();
+    }
+    expect(object.getY()).to.be(-30);
+  });
+
+  it('can jump, sustaining the jump', function() {
+    //Check the object is on the platform
+    expect(object.getY()).to.be(-30); // -30 = -10 (platform y) + -20 (object height)
+    expect(object.getBehavior('auto1').isFalling()).to.be(false);
+    expect(object.getBehavior('auto1').isMoving()).to.be(false);
+
+	// Jump with sustaining as much as possible, and
+	// even more (18 frames at 60fps is greater than 0.2s)
+    for (var i = 0; i < 18; ++i) {
+      object.getBehavior('auto1').simulateJumpKey();
+      runtimeScene.renderAndStep();
+    }
+
+    // Check the height reached
+    expect(object.getY()).to.be(-230);
+    runtimeScene.renderAndStep();
+    expect(object.getY()).to.be(-235);
+    for (var i = 0; i < 5; ++i) {
+      // Verify that pressing the jump key does not change anything
+      object.getBehavior('auto1').simulateJumpKey();
+      runtimeScene.renderAndStep();
+    }
+
+    // Check that we reached the maximum height
+    expect(object.getY()).to.be(-247.5);
+    runtimeScene.renderAndStep();
+    expect(object.getY()).to.be(-247.5);
+    runtimeScene.renderAndStep();
+    expect(object.getY()).to.be.within(-247, -246);
+
+    // Then let the object fall
+    for (var i = 0; i < 60; ++i) {
+      runtimeScene.renderAndStep();
+    }
+    expect(object.getY()).to.be(-30);
+  });
+
+  it('can jump, and only sustain the jump while key held', function() {
+    //Check the object is on the platform
+    expect(object.getY()).to.be(-30); // -30 = -10 (platform y) + -20 (object height)
+    expect(object.getBehavior('auto1').isFalling()).to.be(false);
+    expect(object.getBehavior('auto1').isMoving()).to.be(false);
+
+	// Jump with sustaining a bit (5 frames at 60fps = 0.08s), then stop
+    for (var i = 0; i < 5; ++i) {
+      object.getBehavior('auto1').simulateJumpKey();
+      runtimeScene.renderAndStep();
+    }
+	expect(object.getY()).to.be.within(-101, -100);
+
+	// Stop holding the jump key
+	runtimeScene.renderAndStep();
+
+    for (var i = 0; i < 13; ++i) {
+	  // then hold it again (but it's too late, jump sustain is gone for this jump)
+      object.getBehavior('auto1').simulateJumpKey();
+      runtimeScene.renderAndStep();
+    }
+
+    // Check that we reached the maximum height
+    expect(object.getY()).to.be.within(-206, -205);
+    runtimeScene.renderAndStep();
+    expect(object.getY()).to.be.within(-208, -207);
+    runtimeScene.renderAndStep();
+    expect(object.getY()).to.be.within(-208, -207);
+    runtimeScene.renderAndStep();
+    expect(object.getY()).to.be.within(-208, -207);
+    runtimeScene.renderAndStep();
+    expect(object.getY()).to.be.within(-206, -205);
+    runtimeScene.renderAndStep();
+
+    // Then let the object fall
+    for (var i = 0; i < 60; ++i) {
+      runtimeScene.renderAndStep();
+    }
+    expect(object.getY()).to.be(-30);
+  });
 });
 
 describe('gdjs.PlatformerObjectRuntimeBehavior, jumpthru', function() {
-	var runtimeGame = new gdjs.RuntimeGame({variables: [], properties: {windowWidth: 800, windowHeight: 600}});
-	var runtimeScene = new gdjs.RuntimeScene(runtimeGame);
-	runtimeScene.loadFromScene({
-		layers: [{name: "", visibility: true}],
-		variables: [],
-		behaviorsSharedData: [],
-		objects: [],
-		instances: []
-	});
-	runtimeScene._timeManager.getElapsedTime = function() { return 1 / 60 * 1000; };
+  const runtimeScene = makeTestRuntimeScene();
 
-	//Put a platformer object in a platform.
-	var object = new gdjs.RuntimeObject(runtimeScene, {name: "obj1", type: "", behaviors: [{
-		type: "PlatformBehavior::PlatformerObjectBehavior",
-		name: "auto1",
-		roundCoordinates: true,
-		gravity: 900,
-		maxFallingSpeed: 1500,
-		acceleration: 500,
-		deceleration: 1500,
-		maxSpeed: 500,
-		jumpSpeed: 500,
-		canGrabPlatforms: true,
-		ignoreDefaultControls: true,
-		slopeMaxAngle: 60
-	}]});
-	object.getWidth = function() { return 10; };
-	object.getHeight = function() { return 20; };
-	runtimeScene.addObject(object);
-	object.setPosition(0, -30);
+  //Put a platformer object in a platform.
+  var object = new gdjs.RuntimeObject(runtimeScene, {
+    name: 'obj1',
+    type: '',
+    behaviors: [
+      {
+        type: 'PlatformBehavior::PlatformerObjectBehavior',
+        name: 'auto1',
+        roundCoordinates: true,
+        gravity: 900,
+        maxFallingSpeed: 1500,
+        acceleration: 500,
+        deceleration: 1500,
+        maxSpeed: 500,
+        jumpSpeed: 500,
+        canGrabPlatforms: true,
+        ignoreDefaultControls: true,
+        slopeMaxAngle: 60,
+      },
+    ],
+  });
+  object.getWidth = function() {
+    return 10;
+  };
+  object.getHeight = function() {
+    return 20;
+  };
+  runtimeScene.addObject(object);
+  object.setPosition(0, -30);
 
-	//Put a platform
-	var platform = new gdjs.RuntimeObject(runtimeScene, {name: "obj2", type: "", behaviors: [{
-		type: "PlatformBehavior::PlatformBehavior",
-		canBeGrabbed: true,
-		platformType: "Platform",
-	}]});
-	platform.getWidth = function() { return 60; };
-	platform.getHeight = function() { return 32; };
-	runtimeScene.addObject(platform);
-	platform.setPosition(0, -10);
+  //Put a platform
+  const platform = addPlatformObject(runtimeScene);
+  platform.setPosition(0, -10);
 
-	// Put a jump thru, higher than the platform so that the object jump from under it
-	// and will land on it at the end of the jump.
-	var jumpthru = new gdjs.RuntimeObject(runtimeScene, {name: "obj2", type: "", behaviors: [{
-		type: "PlatformBehavior::PlatformBehavior",
-		canBeGrabbed: true,
-		platformType: "Jumpthru",
-	}]});
-	jumpthru.getWidth = function() { return 60; };
-	jumpthru.getHeight = function() { return 5; };
-	runtimeScene.addObject(jumpthru);
-	jumpthru.setPosition(0, -33);
+  // Put a jump thru, higher than the platform so that the object jump from under it
+  // and will land on it at the end of the jump.
+  var jumpthru = new gdjs.RuntimeObject(runtimeScene, {
+    name: 'obj2',
+    type: '',
+    behaviors: [
+      {
+        type: 'PlatformBehavior::PlatformBehavior',
+        canBeGrabbed: true,
+        platformType: 'Jumpthru',
+      },
+    ],
+  });
+  jumpthru.getWidth = function() {
+    return 60;
+  };
+  jumpthru.getHeight = function() {
+    return 5;
+  };
+  runtimeScene.addObject(jumpthru);
+  jumpthru.setPosition(0, -33);
 
-	it('can jump through the jumpthru', function() {
-		//Check the platform stopped the platformer object.
-		for(var i = 0; i<5; ++i) {
-			runtimeScene.renderAndStep();
-		}
-		expect(object.getY()).to.be(-30); // -30 = -10 (platform y) + -20 (object height)
-		expect(object.getBehavior("auto1").isFalling()).to.be(false);
-		expect(object.getBehavior("auto1").isMoving()).to.be(false);
+  it('can jump through the jumpthru', function() {
+    //Check the platform stopped the platformer object.
+    for (var i = 0; i < 5; ++i) {
+      runtimeScene.renderAndStep();
+    }
+    expect(object.getY()).to.be(-30); // -30 = -10 (platform y) + -20 (object height)
+    expect(object.getBehavior('auto1').isFalling()).to.be(false);
+    expect(object.getBehavior('auto1').isMoving()).to.be(false);
 
-		// Check that the jump starts properly, and is not stopped on the jumpthru
-		object.getBehavior("auto1").simulateJumpKey();
-		runtimeScene.renderAndStep();
-		expect(object.getY()).to.be.within(-39, -38);
-		runtimeScene.renderAndStep();
-		expect(object.getY()).to.be.within(-47, -46);
-		runtimeScene.renderAndStep();
-		// At this step, the object is almost on the jumpthru (-53 + 20 (object height) = -33 (jump thru Y position)),
-		// but the object should not stop.
-		expect(object.getY()).to.be.within(-54, -53);
-		runtimeScene.renderAndStep();
-		expect(object.getY()).to.be.within(-61, -60);
-		runtimeScene.renderAndStep();
-		expect(object.getY()).to.be.within(-67, -66);
-		expect(object.getBehavior("auto1").isJumping()).to.be(true);
+    // Check that the jump starts properly, and is not stopped on the jumpthru
+    object.getBehavior('auto1').simulateJumpKey();
+    runtimeScene.renderAndStep();
+    expect(object.getY()).to.be.within(-39, -38);
+    runtimeScene.renderAndStep();
+    expect(object.getY()).to.be.within(-47, -46);
+    runtimeScene.renderAndStep();
+    // At this step, the object is almost on the jumpthru (-53 + 20 (object height) = -33 (jump thru Y position)),
+    // but the object should not stop.
+    expect(object.getY()).to.be.within(-54, -53);
+    runtimeScene.renderAndStep();
+    expect(object.getY()).to.be.within(-61, -60);
+    runtimeScene.renderAndStep();
+    expect(object.getY()).to.be.within(-67, -66);
+    expect(object.getBehavior('auto1').isJumping()).to.be(true);
 
-		// Continue the simulation and check that position is correct in the middle of the jump
-		for(var i = 0; i<20; ++i) {
-			runtimeScene.renderAndStep();
-		}
-		expect(object.getY()).to.be.within(-89, -88);
+    // Continue the simulation and check that position is correct in the middle of the jump
+    for (var i = 0; i < 20; ++i) {
+      runtimeScene.renderAndStep();
+    }
+    expect(object.getY()).to.be.within(-89, -88);
 
-		// Continue simulation and check that we arrive on the jumpthru
-		for(var i = 0; i<10; ++i) {
-			runtimeScene.renderAndStep();
-		}
-		expect(object.getY()).to.be.within(jumpthru.getY() - object.getHeight(), jumpthru.getY() - object.getHeight() + 1);
-		expect(object.getBehavior("auto1").isFalling()).to.be(false);
-	});
+    // Continue simulation and check that we arrive on the jumpthru
+    for (var i = 0; i < 10; ++i) {
+      runtimeScene.renderAndStep();
+    }
+    expect(object.getY()).to.be.within(
+      jumpthru.getY() - object.getHeight(),
+      jumpthru.getY() - object.getHeight() + 1
+    );
+    expect(object.getBehavior('auto1').isFalling()).to.be(false);
+  });
 });
 
 describe('gdjs.PlatformerObjectRuntimeBehavior, rounded coordinates (moving platforms)', function() {
-	var runtimeGame = new gdjs.RuntimeGame({variables: [], properties: {windowWidth: 800, windowHeight: 600}});
-	var runtimeScene = new gdjs.RuntimeScene(runtimeGame);
-	runtimeScene.loadFromScene({
-		layers: [{name: "", visibility: true}],
-		variables: [],
-		behaviorsSharedData: [],
-		objects: [],
-		instances: []
-	});
-	runtimeScene._timeManager.getElapsedTime = function() { return 1 / 60 * 1000; };
+  const runtimeScene = makeTestRuntimeScene();
 
-	//Put a platformer object on a platform.
-	var object = new gdjs.RuntimeObject(runtimeScene, {name: "obj1", type: "", behaviors: [{
-		type: "PlatformBehavior::PlatformerObjectBehavior",
-		name: "auto1",
-		roundCoordinates: true,
-		gravity: 900,
-		maxFallingSpeed: 1500,
-		acceleration: 500,
-		deceleration: 1500,
-		maxSpeed: 500,
-		jumpSpeed: 1500,
-		canGrabPlatforms: true,
-		ignoreDefaultControls: true,
-		slopeMaxAngle: 60
-	}]});
-	object.getWidth = function() { return 10; };
-	object.getHeight = function() { return 20; };
-	runtimeScene.addObject(object);
-	object.setPosition(0, -30);
+  //Put a platformer object on a platform.
+  var object = new gdjs.RuntimeObject(runtimeScene, {
+    name: 'obj1',
+    type: '',
+    behaviors: [
+      {
+        type: 'PlatformBehavior::PlatformerObjectBehavior',
+        name: 'auto1',
+        roundCoordinates: true,
+        gravity: 900,
+        maxFallingSpeed: 1500,
+        acceleration: 500,
+        deceleration: 1500,
+        maxSpeed: 500,
+        jumpSpeed: 1500,
+        canGrabPlatforms: true,
+        ignoreDefaultControls: true,
+        slopeMaxAngle: 60,
+      },
+    ],
+  });
+  object.getWidth = function() {
+    return 10;
+  };
+  object.getHeight = function() {
+    return 20;
+  };
+  runtimeScene.addObject(object);
+  object.setPosition(0, -30);
 
-	//Put a platform
-	var platform = new gdjs.RuntimeObject(runtimeScene, {name: "obj2", type: "", behaviors: [{
-		type: "PlatformBehavior::PlatformBehavior",
-		canBeGrabbed: true,
-	}]});
-	platform.getWidth = function() { return 60; };
-	platform.getHeight = function() { return 32; };
-	runtimeScene.addObject(platform);
-	platform.setPosition(0, -10);
+  //Put a platform
+  const platform = addPlatformObject(runtimeScene);
+  platform.setPosition(0, -10);
 
-	it('follows the platform', function() {
-		for(var i = 0; i<30; ++i) {
-			runtimeScene.renderAndStep();
-		}
+  it('follows the platform', function() {
+    for (var i = 0; i < 30; ++i) {
+      runtimeScene.renderAndStep();
+    }
 
-		// Check the object has not moved.
-		expect(object.getY()).to.be(-30);
-		expect(object.getX()).to.be(0);
-		expect(object.getBehavior("auto1").isOnFloor()).to.be(true);
-		expect(object.getBehavior("auto1").isFalling()).to.be(false);
-		expect(object.getBehavior("auto1").isMoving()).to.be(false);
+    // Check the object has not moved.
+    expect(object.getY()).to.be(-30);
+    expect(object.getX()).to.be(0);
+    expect(object.getBehavior('auto1').isOnFloor()).to.be(true);
+    expect(object.getBehavior('auto1').isFalling()).to.be(false);
+    expect(object.getBehavior('auto1').isMoving()).to.be(false);
 
-		// Check that the object follow the platform, even if the
-		// movement is less than one pixel.
-		platform.setX(platform.getX()+0.12);
-		runtimeScene.renderAndStep();
-		platform.setX(platform.getX()+0.12);
-		runtimeScene.renderAndStep();
-		platform.setX(platform.getX()+0.12);
-		runtimeScene.renderAndStep();
+    // Check that the object follow the platform, even if the
+    // movement is less than one pixel.
+    platform.setX(platform.getX() + 0.12);
+    runtimeScene.renderAndStep();
+    platform.setX(platform.getX() + 0.12);
+    runtimeScene.renderAndStep();
+    platform.setX(platform.getX() + 0.12);
+    runtimeScene.renderAndStep();
 
-		expect(object.getX()).to.be(0.36);
-	});
+    expect(object.getX()).to.be(0.36);
+  });
 });

GDJS/GDJS/Events/Builtin/JsCodeEvent.cpp

@@ -18,9 +18,32 @@ using namespace std;
 
 namespace gdjs {
 
+vector<pair<gd::Expression*, gd::ParameterMetadata> >
+    JsCodeEvent::GetAllExpressionsWithMetadata() {
+  vector<pair<gd::Expression*, gd::ParameterMetadata> >
+      allExpressionsWithMetadata;
+  auto metadata = gd::ParameterMetadata().SetType("object");
+  allExpressionsWithMetadata.push_back(
+      std::make_pair(&parameterObjects, metadata));
+
+  return allExpressionsWithMetadata;
+}
+
+vector<pair<const gd::Expression*, const gd::ParameterMetadata> >
+    JsCodeEvent::GetAllExpressionsWithMetadata() const {
+  vector<pair<const gd::Expression*, const gd::ParameterMetadata> >
+      allExpressionsWithMetadata;
+  auto metadata = gd::ParameterMetadata().SetType("object");
+  allExpressionsWithMetadata.push_back(
+      std::make_pair(&parameterObjects, metadata));
+
+  return allExpressionsWithMetadata;
+}
+
 void JsCodeEvent::SerializeTo(gd::SerializerElement& element) const {
   element.AddChild("inlineCode").SetValue(inlineCode);
-  element.AddChild("parameterObjects").SetValue(parameterObjects);
+  element.AddChild("parameterObjects")
+      .SetValue(parameterObjects.GetPlainString());
   element.AddChild("useStrict").SetValue(useStrict);
 }
 
@@ -28,7 +51,9 @@ void JsCodeEvent::UnserializeFrom(gd::Project& project,
                                   const gd::SerializerElement& element) {
   inlineCode = element.GetChild("inlineCode").GetValue().GetString();
   parameterObjects =
-      element.GetChild("parameterObjects").GetValue().GetString();
+      gd::Expression(element.GetChild("parameterObjects")
+                         .GetValue()
+                         .GetString());
 
   if (!element.HasChild("useStrict")) {
     // Compatibility with GD <= 5.0.0-beta68

GDJS/GDJS/Events/Builtin/JsCodeEvent.h

@@ -6,6 +6,7 @@
 #ifndef JSCODEEVENT_H
 #define JSCODEEVENT_H
 #include "GDCore/Events/Event.h"
+#include "GDCore/Events/Expression.h"
 namespace gd {
 class Instruction;
 class Project;
@@ -31,11 +32,16 @@ class JsCodeEvent : public gd::BaseEvent {
   const gd::String& GetInlineCode() const { return inlineCode; };
   void SetInlineCode(const gd::String& code) { inlineCode = code; };
 
-  const gd::String& GetParameterObjects() const { return parameterObjects; };
+  const gd::String& GetParameterObjects() const { return parameterObjects.GetPlainString(); };
   void SetParameterObjects(const gd::String& objectName) {
-    parameterObjects = objectName;
+    parameterObjects = gd::Expression(objectName);
   };
 
+  virtual std::vector<std::pair<gd::Expression*, gd::ParameterMetadata> >
+      GetAllExpressionsWithMetadata();
+  virtual std::vector<std::pair<const gd::Expression*, const gd::ParameterMetadata> >
+      GetAllExpressionsWithMetadata() const;
+
   virtual void SerializeTo(gd::SerializerElement& element) const;
   virtual void UnserializeFrom(gd::Project& project,
                                const gd::SerializerElement& element);
@@ -44,9 +50,9 @@ class JsCodeEvent : public gd::BaseEvent {
  private:
   void Init(const JsCodeEvent& event);
 
-  gd::String inlineCode;        ///< Contains the Javacript code of the event.
-  gd::String parameterObjects;  ///< Name of the (group of) objects to pass as
-                                ///< parameter.
+  gd::String inlineCode;            ///< Contains the Javacript code of the event.
+  gd::Expression parameterObjects;  ///< Name of the (group of) objects to pass as
+                                    ///< parameter.
   bool useStrict;  ///< Should the generated JS function have "use strict". true
                    ///< by default. Should be removed once all the game engine
                    ///< is using "use strict".

GDJS/GDJS/Events/CodeGeneration/EventsCodeGenerator.cpp

@@ -4,7 +4,9 @@
  * reserved. This project is released under the MIT License.
  */
 #include "GDCore/Events/CodeGeneration/EventsCodeGenerator.h"
+
 #include <algorithm>
+
 #include "GDCore/CommonTools.h"
 #include "GDCore/Events/CodeGeneration/EventsCodeGenerationContext.h"
 #include "GDCore/Events/Tools/EventsCodeNameMangler.h"
@@ -898,24 +900,25 @@ gd::String EventsCodeGenerator::GenerateObject(
   //(references to) objects lists. We statically declare and construct them to
   // avoid re-creating them at runtime. Arrays are passed as reference in JS and
   // we always use the same static arrays, making this possible.
-  auto declareMapOfObjects = [this](
-      const std::vector<gd::String>& objects,
-      const gd::EventsCodeGenerationContext& context) {
-    gd::String objectsMapName = GetCodeNamespaceAccessor() + "mapOf";
-    gd::String mapDeclaration;
-    for (auto& objectName : objects) {
-      // The map name must be unique for each set of objects lists.
-      objectsMapName += ManObjListName(GetObjectListName(objectName, context));
+  auto declareMapOfObjects =
+      [this](const std::vector<gd::String>& objects,
+             const gd::EventsCodeGenerationContext& context) {
+        gd::String objectsMapName = GetCodeNamespaceAccessor() + "mapOf";
+        gd::String mapDeclaration;
+        for (auto& objectName : objects) {
+          // The map name must be unique for each set of objects lists.
+          objectsMapName +=
+              ManObjListName(GetObjectListName(objectName, context));
 
-      if (!mapDeclaration.empty()) mapDeclaration += ", ";
-      mapDeclaration += "\"" + ConvertToString(objectName) +
-                        "\": " + GetObjectListName(objectName, context);
-    }
+          if (!mapDeclaration.empty()) mapDeclaration += ", ";
+          mapDeclaration += "\"" + ConvertToString(objectName) +
+                            "\": " + GetObjectListName(objectName, context);
+        }
 
-    AddCustomCodeOutsideMain(objectsMapName + " = Hashtable.newFrom({" +
-                             mapDeclaration + "});");
-    return objectsMapName;
-  };
+        AddCustomCodeOutsideMain(objectsMapName + " = Hashtable.newFrom({" +
+                                 mapDeclaration + "});");
+        return objectsMapName;
+      };
 
   gd::String output;
   if (type == "objectList") {
@@ -1026,15 +1029,13 @@ gd::String EventsCodeGenerator::GenerateReferenceToUpperScopeBoolean(
     const gd::String& referenceName,
     const gd::String& referencedBoolean,
     gd::EventsCodeGenerationContext& context) {
-  if (context.GetParentContext() == NULL) return "";
+  if (context.GetCurrentConditionDepth() <= 0)
+    return "/* Code generation error: the referenced boolean can't exist as "
+           "the context has a condition depth of 0. */";
 
-  // FIXME: Using context.GetParentContext() generates the wrong boolean name in
-  // case a condition with a custom code generator is used inside another
-  // condition (i.e: as a subinstructions).
   return GenerateBooleanFullName(referenceName, context) + " = " +
-         GenerateBooleanFullName(referencedBoolean,
-                                 *context.GetParentContext()) +
-         ";\n";
+         GetCodeNamespaceAccessor() + referencedBoolean + "_" +
+         gd::String::From(context.GetCurrentConditionDepth() - 1) + ";\n";
 }
 
 gd::String EventsCodeGenerator::GenerateBooleanInitializationToFalse(

GDJS/Runtime/Electron/main.js

@@ -17,6 +17,12 @@ function createWindow() {
     useContentSize: true,
     title: "GDJS_GAME_NAME",
     backgroundColor: '#000000'
+    // To be added once upgraded to Electron 8+
+    // (or custom events to be written for each usage of electron
+    // in the game engine):
+    // ,webPreferences: {
+    //   nodeIntegration: true,
+    // }
   });
 
   // Open external link in the OS default browser

GDJS/Runtime/events-tools/commontools.js

@@ -5,15 +5,16 @@
  */
 
 /**
- * @memberof gdjs.evtTools
- * @class common
+ * @namespace common
  * @static
  * @private
  */
 gdjs.evtTools.common = gdjs.evtTools.common || {};
 
 /**
- * Get the value of a variable. Equivalent of variable.getAsNumber().
+ * Get the value of a variable. Equivalent to `variable.getAsNumber()`.
+ * @param {gdjs.Variable} variable Variable.
+ * @returns {number} The content of the variable, as a number.
  * @private
  */
 gdjs.evtTools.common.getVariableNumber = function(variable) {
@@ -21,7 +22,9 @@ gdjs.evtTools.common.getVariableNumber = function(variable) {
 };
 
 /**
- * Get the string of a variable. Equivalent of variable.getAsString().
+ * Get the string of a variable. Equivalent to `variable.getAsString()`.
+ * @param {gdjs.Variable} variable Variable.
+ * @returns {string} The content of the variable, as a string.
  * @private
  */
 gdjs.evtTools.common.getVariableString = function(variable) {
@@ -29,29 +32,32 @@ gdjs.evtTools.common.getVariableString = function(variable) {
 };
 
 /**
+ * Check if a scene variable exists.
+ * @param {gdjs.RuntimeScene} runtimeScene The scene.
+ * @param {string} variableName Name of the scene variable.
+ * @returns {boolean} true if the scene variable exits, false otherwise.
  * @private
  */
-gdjs.evtTools.common.sceneVariableExists = function(
-  runtimeScene,
-  variableName
-) {
+gdjs.evtTools.common.sceneVariableExists = function(runtimeScene, variableName) {
   return runtimeScene.getVariables().has(variableName);
 };
 
 /**
+ * Check if a global variable exists.
+ * @param {gdjs.RuntimeScene} runtimeScene The scene.
+ * @param {string} variableName Name of the global variable.
+ * @returns {boolean} true if the global variable exits, false otherwise.
  * @private
  */
-gdjs.evtTools.common.globalVariableExists = function(
-  runtimeScene,
-  variableName
-) {
-  return runtimeScene
-    .getGame()
-    .getVariables()
-    .has(variableName);
+gdjs.evtTools.common.globalVariableExists = function(runtimeScene, variableName) {
+  return runtimeScene.getGame().getVariables().has(variableName);
 };
 
 /**
+ * Check if a child exists in a variable.
+ * @param {gdjs.Variable} variable Variable.
+ * @param {string} childName Name of the child.
+ * @returns {boolean} true if child exist in the variable, false otherwise.
  * @private
  */
 gdjs.evtTools.common.variableChildExists = function(variable, childName) {
@@ -59,6 +65,10 @@ gdjs.evtTools.common.variableChildExists = function(variable, childName) {
 };
 
 /**
+ * Remove the child with the given name in a variable.
+ * @param {gdjs.Variable} variable Variable.
+ * @param {string} childName Name of the child.
+ * @returns {gdjs.Variable} The new variable, with the child removed.
  * @private
  */
 gdjs.evtTools.common.variableRemoveChild = function(variable, childName) {
@@ -66,6 +76,8 @@ gdjs.evtTools.common.variableRemoveChild = function(variable, childName) {
 };
 
 /**
+ * Clear the children in a variable.
+ * @param {gdjs.Variable} variable Variable.
  * @private
  */
 gdjs.evtTools.common.variableClearChildren = function(variable) {
@@ -73,6 +85,9 @@ gdjs.evtTools.common.variableClearChildren = function(variable) {
 };
 
 /**
+ * Get the number of children in a variable.
+ * @param {gdjs.Variable} variable Variable.
+ * @returns {number} The number of children in the variable.
  * @private
  */
 gdjs.evtTools.common.getVariableChildCount = function(variable) {
@@ -81,7 +96,9 @@ gdjs.evtTools.common.getVariableChildCount = function(variable) {
 };
 
 /**
- * Convert a string to a float.
+ * Convert a string to a number.
+ * @param {boolean} str String to convert.
+ * @returns {number} The parsed number, or NaN if invalid.
  * @private
  */
 gdjs.evtTools.common.toNumber = function(str) {
@@ -90,6 +107,8 @@ gdjs.evtTools.common.toNumber = function(str) {
 
 /**
  * Convert a number to a string.
+ * @param {number} num Value to convert to a string.
+ * @returns {string} The value as a string.
  * @private
  */
 gdjs.evtTools.common.toString = function(num) {
@@ -100,97 +119,196 @@ gdjs.evtTools.common.toString = function(num) {
 
 /**
  * Negate the boolean.
+ * @param {boolean} bool The boolean to negate.
+ * @returns {boolean} The negated value.
  * @private
  */
 gdjs.evtTools.common.logicalNegation = function(bool) {
   return !bool;
 };
 
+/**
+ * Limit a value to a range.
+ * @param {number} x Value.
+ * @param {number} min The minimum value.
+ * @param {number} max The  maximum value.
+ * @returns {number} The new value.
+ */
 gdjs.evtTools.common.clamp = function(x, min, max) {
   return Math.min(Math.max(x, min), max);
 };
 
+/**
+ * Hyperbolic arc-cosine
+ * @param {number} arg Value.
+ * @returns {number} The hyperbolic arc-cosine for the value.
+ */
 gdjs.evtTools.common.acosh = function(arg) {
   // http://kevin.vanzonneveld.net
   // +   original by: Onno Marsman
   return Math.log(arg + Math.sqrt(arg * arg - 1));
 };
 
+/**
+ * Hyperbolic arcsine
+ * @param {number} arg Value.
+ * @returns {number} The hyperbolic arcsine for the value.
+ */
 gdjs.evtTools.common.asinh = function(arg) {
   // http://kevin.vanzonneveld.net
   // +   original by: Onno Marsman
   return Math.log(arg + Math.sqrt(arg * arg + 1));
 };
 
+/**
+ * Hyperbolic arctangent
+ * @param {number} arg Value.
+ * @returns {number} The hyperbolic arctangent for the value.
+ */
 gdjs.evtTools.common.atanh = function(arg) {
   // http://kevin.vanzonneveld.net
   // +   original by: Onno Marsman
   return 0.5 * Math.log((1 + arg) / (1 - arg));
 };
 
+/**
+ * Hyperbolic cosine
+ * @param {number} arg Value.
+ * @returns {number} The hyperbolic cosine for the value.
+ */
 gdjs.evtTools.common.cosh = function(arg) {
   return (Math.exp(arg) + Math.exp(-arg)) / 2;
 };
 
+/**
+ * Hyperbolic sine
+ * @param {number} arg Value.
+ * @returns {number} The hyperbolic sine for the value.
+ */
 gdjs.evtTools.common.sinh = function(arg) {
   return (Math.exp(arg) - Math.exp(-arg)) / 2;
 };
 
+/**
+ * Hyperbolic tangent
+ * @param {number} arg Value.
+ * @returns {number} The hyperbolic tangent for the value.
+ */
 gdjs.evtTools.common.tanh = function(arg) {
   return (Math.exp(arg) - Math.exp(-arg)) / (Math.exp(arg) + Math.exp(-arg));
 };
 
+/**
+ * Cotangent
+ * @param {number} arg Value.
+ * @returns {number} The cotangent for the value.
+ */
 gdjs.evtTools.common.cot = function(arg) {
   return 1 / Math.tan(arg);
 };
 
+/**
+ * Cosecant
+ * @param {number} arg Value.
+ * @returns {number} The cosecant for the value.
+ */
 gdjs.evtTools.common.csc = function(arg) {
   return 1 / Math.sin(arg);
 };
 
+/**
+ * Secant
+ * @param {number} arg Value.
+ * @returns {number} The secant for the value.
+ */
 gdjs.evtTools.common.sec = function(arg) {
   return 1 / Math.cos(arg);
 };
 
+/**
+ * Base-10 logarithm
+ * @param {number} arg Value.
+ * @returns {number} The base-10 logarithm for the value.
+ */
 gdjs.evtTools.common.log10 = function(arg) {
   return Math.log(arg) / Math.LN10;
 };
 
+/**
+ * Base-2 logarithm
+ * @param {number} arg Value.
+ * @returns {number} The base-2 logarithm for the value.
+ */
 gdjs.evtTools.common.log2 = function(arg) {
   return Math.log(arg) / Math.LN2;
 };
 
+/**
+ * Returns the sign of the number. This checks if the value is positive, negative or zero.
+ * @param {number} arg Value.
+ * @returns {number} Return the sign for the value (1, -1 or 0).
+ */
 gdjs.evtTools.common.sign = function(arg) {
   if (arg === 0) return 0;
 
   return arg > 0 ? +1 : -1;
 };
 
+/**
+ * Cube root
+ * @param {number} x Value.
+ * @returns {number} Return the cube root for the value.
+ */
 gdjs.evtTools.common.cbrt = function(x) {
   return Math.pow(x, 1 / 3);
 };
 
+/**
+ * N-th root
+ * @param {number} x Base value.
+ * @param {number} n Exponent value.
+ * @returns {number} Return the n-th root for the value.
+ */
 gdjs.evtTools.common.nthroot = function(x, n) {
   return Math.pow(x, 1 / n);
 };
 
+/**
+ * Modulo operation (the remainder after dividing one number by another)
+ * @param {number} x Dividend value.
+ * @param {number} y Divisor value.
+ * @returns {number} Return the remainder for the values.
+ */
 gdjs.evtTools.common.mod = function(x, y) {
   return x - y * Math.floor(x / y);
 };
 
+/**
+ * Returns the difference between two angles, in degrees.
+ * @param {number} angle1 First angle, in degrees.
+ * @param {number} angle2 Second angle, in degrees.
+ * @returns {number} Return the difference of the angles, in degrees.
+ */
 gdjs.evtTools.common.angleDifference = function(angle1, angle2) {
-  return (
-    gdjs.evtTools.common.mod(
-      gdjs.evtTools.common.mod(angle1 - angle2, 360.0) + 180.0,
-      360.0
-    ) - 180.0
-  );
+  return gdjs.evtTools.common.mod(gdjs.evtTools.common.mod(angle1 - angle2, 360.0) + 180.0, 360.0) - 180.0;
 };
 
+/**
+ * Runs a linear interpolation between a and b.
+ * @param {number} a Start value.
+ * @param {number} b End value.
+ * @param {number} x The interpolation value between 0 and 1.
+ * @returns {number} The interpolated value, now between a and b.
+ */
 gdjs.evtTools.common.lerp = function(a, b, x) {
   return a + (b - a) * x;
 };
 
+/**
+ * Truncate a number.
+ * @param {number} x Value.
+ * @returns {number} Return the value with all decimal places dropped.
+ */
 gdjs.evtTools.common.trunc = function(x) {
   return x | 0;
 };

GDJS/Runtime/gd.js

@@ -13,7 +13,7 @@ window.gdjs = {
   behaviorsTypes: new Hashtable(),
   /**
    * Contains functions used by events (this is a convention only, functions can actually
-   * by anywhere).
+   * be anywhere).
    * @namespace
    * @memberOf gdjs
    */

GDJS/Runtime/runtimescene.js

@@ -508,12 +508,22 @@ gdjs.RuntimeScene.prototype._updateObjectsPostEvents = function() {
 };
 
 /**
- * Change the background color
+ * Change the background color, by setting the RGB components.
+ * Internally, the color is stored as an hexadecimal number.
+ *
+ * @param {number} r The color red component (0-255).
+ * @param {number} g The color green component (0-255).
+ * @param {number} b The color blue component (0-255).
  */
 gdjs.RuntimeScene.prototype.setBackgroundColor = function(r,g,b) {
     this._backgroundColor = parseInt(gdjs.rgbToHex(r,g,b),16);
 };
 
+
+/**
+ * Get the background color, as an hexadecimal number.
+ * @returns {number} The current background color.
+ */
 gdjs.RuntimeScene.prototype.getBackgroundColor = function() {
     return this._backgroundColor;
 }

GDJS/Runtime/websocket-debugger-client/websocket-debugger-client.js

@@ -1,59 +1,54 @@
+/// @ts-check
 /**
  * An client side implementation of the Debugger
  * @interface
  */
-gdjs.DebuggerClient = function() {} // Necessary for Interface definition 
+gdjs.IDebuggerClient = function() {}
 
 /**
  * Update a value, specified by a path starting from the {@link RuntimeGame} instance.
- * @function
- * @name gdjs.DebuggerClient#set
  * @param {Array<string>} path - The path of the property to modify, starting from the RuntimeGame.
  * @param {any} newValue - The new value.
  */
+gdjs.IDebuggerClient.prototype.set = function(path, newValue) {}
 
 /**
  * Call a method, specified by a path starting from the {@link RuntimeGame} instance.
- * @function
- * @name gdjs.DebuggerClient#call
  * @param {Array<string>} path - The path to the method, starting from the RuntimeGame.
  * @param {Array<any>} args - The arguments to pass the method.
  */
+gdjs.IDebuggerClient.prototype.call = function(path, args) {}
 
 /**
  * Dump all the relevant data from the {@link RuntimeGame} instance and send it to the server.
- * @function
- * @name gdjs.DebuggerClient#sendRuntimeGameDump
  */
+gdjs.IDebuggerClient.prototype.sendRuntimeGameDump = function() {}
 
 /**
  * Start profiling.
- * @function
- * @name gdjs.DebuggerClient#sendProfilerStarted
  */
+gdjs.IDebuggerClient.prototype.sendProfilerStrated = function() {}
 
 /**
  * Stop profiling.
- * @function
- * @name gdjs.DebuggerClient#sendProfilerStopped
  */
+gdjs.IDebuggerClient.prototype.sendProfilerStopped = function() {}
 
 /**
  * Send profiling results.
- * @function
  * @param {any} framesAverageMeasures The measures made for each frames.
  * @param {any} stats Other measures done during the profiler run.
- * @name gdjs.DebuggerClient#sendProfilerOutput
  */
+gdjs.IDebuggerClient.prototype.sendProfilerOutput = function(framesAverageMeasures, stats) {}
 
 
 /**
- * This {@link DebuggerClient} connects to a websocket server, can dump
+ * This {@link IDebuggerClient} connects to a websocket server, can dump
  * the data of the current game, and receive message to change a field or
  * call a function, specified by a path from the {@link RuntimeGame}.
  *
  * @memberof gdjs
- * @implements {gdjs.DebuggerClient}
+ * @implements {gdjs.IDebuggerClient}
  * @class WebsocketDebuggerClient
  * @param {gdjs.RuntimeGame} runtimeGame -  The `gdjs.RuntimeGame` to be debugged
  */
@@ -98,9 +93,9 @@ gdjs.WebsocketDebuggerClient = function(runtimeGame) {
 
     if (data && data.command) {
       if (data.command === 'play') {
-        runtimegame.pause(false);
+        runtimeGame.pause(false);
       } else if (data.command === 'pause') {
-        runtimegame.pause(true);
+        runtimeGame.pause(true);
         that.sendRuntimeGameDump();
       } else if (data.command === 'refresh') {
         that.sendRuntimeGameDump();
@@ -109,7 +104,7 @@ gdjs.WebsocketDebuggerClient = function(runtimeGame) {
       } else if (data.command === 'call') {
         that.call(data.path, data.args);
       } else if (data.command === 'profiler.start') {
-        runtimegame.startCurrentSceneProfiler(function(stoppedProfiler) {
+        runtimeGame.startCurrentSceneProfiler(function(stoppedProfiler) {
           that.sendProfilerOutput(
             stoppedProfiler.getFramesAverageMeasures(),
             stoppedProfiler.getStats()
@@ -118,7 +113,7 @@ gdjs.WebsocketDebuggerClient = function(runtimeGame) {
         });
         that.sendProfilerStarted();
       } else if (data.command === 'profiler.stop') {
-        runtimegame.stopCurrentSceneProfiler();
+        runtimeGame.stopCurrentSceneProfiler();
       } else {
         console.info(
           'Unknown command "' + data.command + '" received by the debugger.'
@@ -128,6 +123,7 @@ gdjs.WebsocketDebuggerClient = function(runtimeGame) {
       console.info('Debugger received a message with badly formatted data.');
     }
   };
+  return;
 };
 
 gdjs.DebuggerClient = gdjs.WebsocketDebuggerClient; //Register the class to let the engine use it.
@@ -347,6 +343,7 @@ gdjs.WebsocketDebuggerClient.prototype._circularSafeStringify = function(
 ) {
   return JSON.stringify(
     obj,
+      // @ts-ignore
     this._depthLimitedSerializer(replacer, cycleReplacer, maxDepth),
     spaces
   );
@@ -367,7 +364,7 @@ gdjs.WebsocketDebuggerClient.prototype._depthLimitedSerializer = function(
   var stack = [],
     keys = [];
 
-  if (cycleReplacer == null)
+  if (cycleReplacer === undefined || cycleReplacer === null)
     cycleReplacer = function(key, value) {
       if (stack[0] === value) return '[Circular ~]';
       return (
@@ -384,6 +381,7 @@ gdjs.WebsocketDebuggerClient.prototype._depthLimitedSerializer = function(
       if (maxDepth != null && thisPos > maxDepth) {
         return '[Max depth reached]';
       } else if (~stack.indexOf(value))
+      // @ts-ignore
         value = cycleReplacer.call(this, key, value);
     } else stack.push(value);
 

GDJS/docs/Readme.md

@@ -4,22 +4,20 @@
 
 ## How to generate the documentation
 
-- Install [Doxygen](www.doxygen.org) and [JSDoc](http://usejsdoc.org/).
-
 - To generate the GDJS Runtime (game engine) documentation:
 
   ```bash
-  cd GDJS
-  jsdoc -c docs/jsdoc.conf.json -t docs/jaguarjs-jsdoc docs/DocMainPage.md
+  cd <GDevelop repository>/GDJS
+  npm run generate-doc
   ```
 
-  Output will be in `docs/GDJS Documentation` in the GDevelop repository root.
+  Output will be in `<GDevelop repository>/docs/GDJS Documentation`.
 
-- To generate the GDJS Platform documentation for the IDE:
+- To generate the GDJS Platform documentation for the IDE, install [Doxygen](www.doxygen.org). Then:
 
   ```bash
-  cd GDJS/docs
+  cd <GDevelop repository>/GDJS/docs
   doxygen
   ```
 
-  Output will be in `docs/GDJS Runtime Documentation` in the GDevelop repository root.
+  Output will be in `<GDevelop repository>/docs/GDJS Runtime Documentation`.

GDJS/docs/jsdoc.conf.json

@@ -50,6 +50,7 @@
     "recurse": true,
     "private": false,
     "lenient": true,
+    "template": "docs/jaguarjs-jsdoc",
     "destination": "../docs/GDJS Runtime Documentation"
   }
 }

GDJS/package-lock.json

@@ -4,6 +4,12 @@
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
+    "@babel/parser": {
+      "version": "7.9.4",
+      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.9.4.tgz",
+      "integrity": "sha512-bC49otXX6N0/VYhgOMh4gnP26E9xnDZK3TmbNpxYzzz9BQLBosQwfyOe9/cXUU3txYhTzLCbcqd5c8y/OmCjHA==",
+      "dev": true
+    },
     "@types/expect.js": {
       "version": "0.3.29",
       "resolved": "https://registry.npmjs.org/@types/expect.js/-/expect.js-0.3.29.tgz",
@@ -16,6 +22,79 @@
       "integrity": "sha512-NYrtPht0wGzhwe9+/idPaBB+TqkY9AhTvOLMkThm0IoEfLaiVQZwBwyJ5puCkO3AUCWrmcoePjp2mbFocKy4SQ==",
       "dev": true
     },
+    "argparse": {
+      "version": "1.0.10",
+      "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz",
+      "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==",
+      "dev": true,
+      "requires": {
+        "sprintf-js": "~1.0.2"
+      }
+    },
+    "bluebird": {
+      "version": "3.7.2",
+      "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.7.2.tgz",
+      "integrity": "sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg==",
+      "dev": true
+    },
+    "catharsis": {
+      "version": "0.8.11",
+      "resolved": "https://registry.npmjs.org/catharsis/-/catharsis-0.8.11.tgz",
+      "integrity": "sha512-a+xUyMV7hD1BrDQA/3iPV7oc+6W26BgVJO05PGEoatMyIuPScQKsde6i3YorWX1qs+AZjnJ18NqdKoCtKiNh1g==",
+      "dev": true,
+      "requires": {
+        "lodash": "^4.17.14"
+      }
+    },
+    "entities": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/entities/-/entities-2.0.0.tgz",
+      "integrity": "sha512-D9f7V0JSRwIxlRI2mjMqufDrRDnx8p+eEOz7aUM9SuvF8gsBzra0/6tbjl1m8eQHrZlYj6PxqE00hZ1SAIKPLw==",
+      "dev": true
+    },
+    "escape-string-regexp": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-2.0.0.tgz",
+      "integrity": "sha512-UpzcLCXolUWcNu5HtVMHYdXJjArjsF9C0aNnquZYY4uW/Vu0miy5YoWvbV345HauVvcAUnpRuhMMcqTcGOY2+w==",
+      "dev": true
+    },
+    "graceful-fs": {
+      "version": "4.2.3",
+      "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.3.tgz",
+      "integrity": "sha512-a30VEBm4PEdx1dRB7MFK7BejejvCvBronbLjht+sHuGYj8PHs7M/5Z+rt5lw551vZ7yfTCj4Vuyy3mSJytDWRQ==",
+      "dev": true
+    },
+    "js2xmlparser": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/js2xmlparser/-/js2xmlparser-4.0.1.tgz",
+      "integrity": "sha512-KrPTolcw6RocpYjdC7pL7v62e55q7qOMHvLX1UCLc5AAS8qeJ6nukarEJAF2KL2PZxlbGueEbINqZR2bDe/gUw==",
+      "dev": true,
+      "requires": {
+        "xmlcreate": "^2.0.3"
+      }
+    },
+    "jsdoc": {
+      "version": "3.6.4",
+      "resolved": "https://registry.npmjs.org/jsdoc/-/jsdoc-3.6.4.tgz",
+      "integrity": "sha512-3G9d37VHv7MFdheviDCjUfQoIjdv4TC5zTTf5G9VODLtOnVS6La1eoYBDlbWfsRT3/Xo+j2MIqki2EV12BZfwA==",
+      "dev": true,
+      "requires": {
+        "@babel/parser": "^7.9.4",
+        "bluebird": "^3.7.2",
+        "catharsis": "^0.8.11",
+        "escape-string-regexp": "^2.0.0",
+        "js2xmlparser": "^4.0.1",
+        "klaw": "^3.0.0",
+        "markdown-it": "^10.0.0",
+        "markdown-it-anchor": "^5.2.7",
+        "marked": "^0.8.2",
+        "mkdirp": "^1.0.4",
+        "requizzle": "^0.2.3",
+        "strip-json-comments": "^3.1.0",
+        "taffydb": "2.6.2",
+        "underscore": "~1.10.2"
+      }
+    },
     "jsdoc-autoprivate": {
       "version": "0.0.1",
       "resolved": "https://registry.npmjs.org/jsdoc-autoprivate/-/jsdoc-autoprivate-0.0.1.tgz",
@@ -27,11 +106,117 @@
       "integrity": "sha512-lqCE44zM2wPv6PjAgzPM/dlrPFUiCVE5DrvntHVvHw5MFObkV+oDYwmO/3TXX7YsD+IdOPbsR4fIx/i+LETgNw==",
       "dev": true
     },
+    "klaw": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/klaw/-/klaw-3.0.0.tgz",
+      "integrity": "sha512-0Fo5oir+O9jnXu5EefYbVK+mHMBeEVEy2cmctR1O1NECcCkPRreJKrS6Qt/j3KC2C148Dfo9i3pCmCMsdqGr0g==",
+      "dev": true,
+      "requires": {
+        "graceful-fs": "^4.1.9"
+      }
+    },
+    "linkify-it": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/linkify-it/-/linkify-it-2.2.0.tgz",
+      "integrity": "sha512-GnAl/knGn+i1U/wjBz3akz2stz+HrHLsxMwHQGofCDfPvlf+gDKN58UtfmUquTY4/MXeE2x7k19KQmeoZi94Iw==",
+      "dev": true,
+      "requires": {
+        "uc.micro": "^1.0.1"
+      }
+    },
+    "lodash": {
+      "version": "4.17.15",
+      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.15.tgz",
+      "integrity": "sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A==",
+      "dev": true
+    },
+    "markdown-it": {
+      "version": "10.0.0",
+      "resolved": "https://registry.npmjs.org/markdown-it/-/markdown-it-10.0.0.tgz",
+      "integrity": "sha512-YWOP1j7UbDNz+TumYP1kpwnP0aEa711cJjrAQrzd0UXlbJfc5aAq0F/PZHjiioqDC1NKgvIMX+o+9Bk7yuM2dg==",
+      "dev": true,
+      "requires": {
+        "argparse": "^1.0.7",
+        "entities": "~2.0.0",
+        "linkify-it": "^2.0.0",
+        "mdurl": "^1.0.1",
+        "uc.micro": "^1.0.5"
+      }
+    },
+    "markdown-it-anchor": {
+      "version": "5.2.7",
+      "resolved": "https://registry.npmjs.org/markdown-it-anchor/-/markdown-it-anchor-5.2.7.tgz",
+      "integrity": "sha512-REFmIaSS6szaD1bye80DMbp7ePwsPNvLTR5HunsUcZ0SG0rWJQ+Pz24R4UlTKtjKBPhxo0v0tOBDYjZQQknW8Q==",
+      "dev": true
+    },
+    "marked": {
+      "version": "0.8.2",
+      "resolved": "https://registry.npmjs.org/marked/-/marked-0.8.2.tgz",
+      "integrity": "sha512-EGwzEeCcLniFX51DhTpmTom+dSA/MG/OBUDjnWtHbEnjAH180VzUeAw+oE4+Zv+CoYBWyRlYOTR0N8SO9R1PVw==",
+      "dev": true
+    },
+    "mdurl": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/mdurl/-/mdurl-1.0.1.tgz",
+      "integrity": "sha1-/oWy7HWlkDfyrf7BAP1sYBdhFS4=",
+      "dev": true
+    },
+    "mkdirp": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz",
+      "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==",
+      "dev": true
+    },
+    "requizzle": {
+      "version": "0.2.3",
+      "resolved": "https://registry.npmjs.org/requizzle/-/requizzle-0.2.3.tgz",
+      "integrity": "sha512-YanoyJjykPxGHii0fZP0uUPEXpvqfBDxWV7s6GKAiiOsiqhX6vHNyW3Qzdmqp/iq/ExbhaGbVrjB4ruEVSM4GQ==",
+      "dev": true,
+      "requires": {
+        "lodash": "^4.17.14"
+      }
+    },
+    "sprintf-js": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz",
+      "integrity": "sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=",
+      "dev": true
+    },
+    "strip-json-comments": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.0.tgz",
+      "integrity": "sha512-e6/d0eBu7gHtdCqFt0xJr642LdToM5/cN4Qb9DbHjVx1CP5RyeM+zH7pbecEmDv/lBqb0QH+6Uqq75rxFPkM0w==",
+      "dev": true
+    },
+    "taffydb": {
+      "version": "2.6.2",
+      "resolved": "https://registry.npmjs.org/taffydb/-/taffydb-2.6.2.tgz",
+      "integrity": "sha1-fLy2S1oUG2ou/CxdLGe04VCyomg=",
+      "dev": true
+    },
     "typescript": {
       "version": "3.6.4",
       "resolved": "https://registry.npmjs.org/typescript/-/typescript-3.6.4.tgz",
       "integrity": "sha512-unoCll1+l+YK4i4F8f22TaNVPRHcD9PA3yCuZ8g5e0qGqlVlJ/8FSateOLLSagn+Yg5+ZwuPkL8LFUc0Jcvksg==",
       "dev": true
+    },
+    "uc.micro": {
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/uc.micro/-/uc.micro-1.0.6.tgz",
+      "integrity": "sha512-8Y75pvTYkLJW2hWQHXxoqRgV7qb9B+9vFEtidML+7koHUFapnVJAZ6cKs+Qjz5Aw3aZWHMC6u0wJE3At+nSGwA==",
+      "dev": true
+    },
+    "underscore": {
+      "version": "1.10.2",
+      "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.10.2.tgz",
+      "integrity": "sha512-N4P+Q/BuyuEKFJ43B9gYuOj4TQUHXX+j2FqguVOpjkssLUUrnJofCcBccJSCoeturDoZU6GorDTHSvUDlSQbTg==",
+      "dev": true
+    },
+    "xmlcreate": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/xmlcreate/-/xmlcreate-2.0.3.tgz",
+      "integrity": "sha512-HgS+X6zAztGa9zIK3Y3LXuJes33Lz9x+YyTxgrkIdabu2vqcGOWwdfCpf1hWLRrd553wd4QCDf6BBO6FfdsRiQ==",
+      "dev": true
     }
   }
 }

GDJS/package.json

@@ -7,6 +7,7 @@
   "devDependencies": {
     "@types/expect.js": "^0.3.29",
     "@types/mocha": "^5.2.7",
+    "jsdoc": "^3.6.4",
     "jsdoc-plugin-intersection": "^1.0.2",
     "typescript": "3.6.4"
   },
@@ -14,6 +15,7 @@
     "jsdoc-autoprivate": "0.0.1"
   },
   "scripts": {
-    "check-types": "tsc"
+    "check-types": "tsc",
+    "generate-doc": "jsdoc -c docs/jsdoc.conf.json docs/DocMainPage.md"
   }
 }

GDevelop.js/__tests__/GDJSCodeGenerationIntegrationTests.js

@@ -0,0 +1,295 @@
+const initializeGDevelopJs = require('../../Binaries/embuild/GDevelop.js/libGD.js');
+
+describe('libGD.js - GDJS Code Generation integration tests', function () {
+  let gd = null;
+  beforeAll((done) =>
+    initializeGDevelopJs().then((module) => {
+      gd = module;
+      done();
+    })
+  );
+
+  it('generates a working function for While event', function () {
+    // Create nested events using And and StrEqual conditions
+    const serializerElement = gd.Serializer.fromJSON(
+      JSON.stringify([
+        {
+          disabled: false,
+          folded: false,
+          type: 'BuiltinCommonInstructions::Standard',
+          conditions: [],
+          actions: [
+            {
+              type: { inverted: false, value: 'ModVarScene' },
+              parameters: ['Counter', '=', '0'],
+              subInstructions: [],
+            },
+          ],
+          events: [],
+        },
+        {
+          disabled: false,
+          folded: false,
+          infiniteLoopWarning: true,
+          type: 'BuiltinCommonInstructions::While',
+          whileConditions: [
+            {
+              type: { inverted: false, value: 'VarScene' },
+              parameters: ['Counter', '<', '4'],
+              subInstructions: [],
+            },
+          ],
+          conditions: [],
+          actions: [
+            {
+              type: { inverted: false, value: 'ModVarScene' },
+              parameters: ['Counter', '+', '1'],
+              subInstructions: [],
+            },
+          ],
+          events: [],
+        },
+      ])
+    );
+
+    var runCompiledEvents = generateCompiledEvents(gd, serializerElement);
+
+    const { gdjs, runtimeScene } = makeMinimalGDJSMock();
+    runCompiledEvents(gdjs, runtimeScene);
+
+    expect(runtimeScene.getVariables().has('Counter')).toBe(true);
+    expect(runtimeScene.getVariables().get('Counter').getAsNumber()).toBe(4);
+  });
+
+  it('generates a working function with nested Or and StrEqual', function () {
+    // Create nested events using Or and StrEqual conditions
+    const serializerElement = gd.Serializer.fromJSON(
+      JSON.stringify([
+        {
+          disabled: false,
+          folded: false,
+          type: 'BuiltinCommonInstructions::Standard',
+          conditions: [
+            {
+              type: {
+                inverted: false,
+                value: 'BuiltinCommonInstructions::Or',
+              },
+              parameters: [],
+              subInstructions: [
+                {
+                  type: { inverted: false, value: 'Egal' },
+                  parameters: ['1', '=', '2'],
+                  subInstructions: [],
+                },
+                {
+                  type: {
+                    inverted: false,
+                    value: 'BuiltinCommonInstructions::Or',
+                  },
+                  parameters: [],
+                  subInstructions: [
+                    // This should be true and make the entire conditions true.
+                    {
+                      type: { inverted: false, value: 'StrEqual' },
+                      parameters: ['"1"', '=', '"1"'],
+                      subInstructions: [],
+                    },
+                  ],
+                },
+                {
+                  type: { inverted: false, value: 'StrEqual' },
+                  parameters: ['"1"', '=', '"2"'],
+                  subInstructions: [],
+                },
+              ],
+            },
+          ],
+          actions: [
+            {
+              type: { inverted: false, value: 'ModVarScene' },
+              parameters: ['SuccessVariable', '=', '1'],
+              subInstructions: [],
+            },
+          ],
+          events: [],
+        },
+      ])
+    );
+
+    var runCompiledEvents = generateCompiledEvents(gd, serializerElement);
+
+    const { gdjs, runtimeScene } = makeMinimalGDJSMock();
+    runCompiledEvents(gdjs, runtimeScene);
+
+    expect(runtimeScene.getVariables().has('SuccessVariable')).toBe(true);
+    expect(
+      runtimeScene.getVariables().get('SuccessVariable').getAsNumber()
+    ).toBe(1);
+  });
+
+  it('generates a working function with nested And and StrEqual', function () {
+    // Create nested events using And and StrEqual conditions
+    const serializerElement = gd.Serializer.fromJSON(
+      JSON.stringify([
+        {
+          disabled: false,
+          folded: false,
+          type: 'BuiltinCommonInstructions::Standard',
+          conditions: [
+            {
+              type: {
+                inverted: false,
+                value: 'BuiltinCommonInstructions::And',
+              },
+              parameters: [],
+              subInstructions: [
+                {
+                  type: { inverted: false, value: 'Egal' },
+                  parameters: ['1', '=', '1'],
+                  subInstructions: [],
+                },
+                {
+                  type: {
+                    inverted: false,
+                    value: 'BuiltinCommonInstructions::And',
+                  },
+                  parameters: [],
+                  subInstructions: [
+                    {
+                      type: { inverted: false, value: 'Egal' },
+                      parameters: ['1', '=', '1'],
+                      subInstructions: [],
+                    },
+                    {
+                      type: {
+                        inverted: false,
+                        value: 'BuiltinCommonInstructions::And',
+                      },
+                      parameters: [],
+                      subInstructions: [
+                        {
+                          type: { inverted: false, value: 'Egal' },
+                          parameters: ['1', '=', '1'],
+                          subInstructions: [],
+                        },
+                        {
+                          type: { inverted: false, value: 'StrEqual' },
+                          parameters: ['"1"', '=', '"1"'],
+                          subInstructions: [],
+                        },
+                      ],
+                    },
+                    {
+                      type: { inverted: false, value: 'StrEqual' },
+                      parameters: ['"1"', '=', '"1"'],
+                      subInstructions: [],
+                    },
+                  ],
+                },
+                {
+                  type: { inverted: false, value: 'StrEqual' },
+                  parameters: ['"1"', '=', '"1"'],
+                  subInstructions: [],
+                },
+              ],
+            },
+          ],
+          actions: [
+            {
+              type: { inverted: false, value: 'ModVarScene' },
+              parameters: ['SuccessVariable', '=', '1'],
+              subInstructions: [],
+            },
+          ],
+          events: [],
+        },
+      ])
+    );
+
+    var runCompiledEvents = generateCompiledEvents(gd, serializerElement);
+
+    const { gdjs, runtimeScene } = makeMinimalGDJSMock();
+    runCompiledEvents(gdjs, runtimeScene);
+
+    expect(runtimeScene.getVariables().has('SuccessVariable')).toBe(true);
+    expect(
+      runtimeScene.getVariables().get('SuccessVariable').getAsNumber()
+    ).toBe(1);
+  });
+});
+
+/**
+ * Generate the code from events (using GDJS platform)
+ * and create a JavaScript function that runs it.
+ *
+ * The JavaScript function must be called with the `runtimeScene` to be used.
+ * In this context, GDJS game engine does not exist, so you must pass a mock
+ * to it to validate that the events are working properly.
+ */
+function generateCompiledEvents(gd, eventsSerializerElement) {
+  const project = new gd.ProjectHelper.createNewGDJSProject();
+  const includeFiles = new gd.SetString();
+  const eventsFunction = new gd.EventsFunction();
+
+  eventsFunction.getEvents().unserializeFrom(project, eventsSerializerElement);
+
+  const namespace = 'functionNamespace';
+  const eventsFunctionsExtensionCodeGenerator = new gd.EventsFunctionsExtensionCodeGenerator(
+    project
+  );
+  const code = eventsFunctionsExtensionCodeGenerator.generateFreeEventsFunctionCompleteCode(
+    eventsFunction,
+    namespace,
+    includeFiles,
+    true
+  );
+
+  // Create a function with the generated code.
+  const runCompiledEvents = new Function(
+    'gdjs',
+    'runtimeScene',
+    `${code}
+return functionNamespace.func(runtimeScene, runtimeScene);`
+  );
+
+  eventsFunctionsExtensionCodeGenerator.delete();
+  eventsFunction.delete();
+  includeFiles.delete();
+  project.delete();
+
+  return runCompiledEvents;
+}
+
+/**
+ * Create a minimal mock of GDJS with a RuntimeScene (`gdjs.RuntimeScene`),
+ * supporting setting a variable (just enough to validate events logic).
+ */
+function makeMinimalGDJSMock() {
+  const runtimeSceneVariables = {};
+
+  return {
+    gdjs: {
+      evtTools: {
+        common: { getVariableNumber: (variable) => variable.getAsNumber() },
+      },
+    },
+    // A minimal implementation of `gdjs.RuntimeScene` and variables for testing:
+    runtimeScene: {
+      getVariables: () => ({
+        get: (variableName) => ({
+          add: (value) => {
+            runtimeSceneVariables[variableName] += value;
+          },
+          setNumber: (value) => {
+            runtimeSceneVariables[variableName] = value;
+          },
+          getAsNumber: () => {
+            return runtimeSceneVariables[variableName];
+          },
+        }),
+        has: (variableName) => !!runtimeSceneVariables[variableName],
+      }),
+    },
+  };
+}

newIDE/README.md

@@ -127,10 +127,10 @@ This will build and package the Electron app for Windows, macOS and Linux (accor
 To build artifacts for all platforms and publish to a draft GitHub release:
 
 ```
-GH_TOKEN=xxx yarn build --mac --win --linux tar.gz --publish always
+GH_TOKEN=xxx yarn build --mac --win --linux AppImage --publish always
 ```
 
-> To build beta versions, you can create archives: `yarn build --mac zip --win zip --linux tar.gz`.
+> To build beta versions, you can create archives: `yarn build --mac zip --win zip --linux AppImage`.
 
 ### Webapp version
 

newIDE/app/package-lock.json

@@ -1361,9 +1361,9 @@
       }
     },
     "@emotion/hash": {
-      "version": "0.7.4",
-      "resolved": "https://registry.npmjs.org/@emotion/hash/-/hash-0.7.4.tgz",
-      "integrity": "sha512-fxfMSBMX3tlIbKUdtGKxqB1fyrH6gVrX39Gsv3y8lRYKUqlgDt3UMqQyGnR1bQMa2B8aGnhLZokZgg8vT0Le+A=="
+      "version": "0.8.0",
+      "resolved": "https://registry.npmjs.org/@emotion/hash/-/hash-0.8.0.tgz",
+      "integrity": "sha512-kBJtf7PH6aWwZ6fka3zQ0p6SBYzx4fl1LoZXE2RrnYST9Xljm7WfKJrU4g/Xr3Beg72MLrp1AWNUmuYJTL7Cow=="
     },
     "@emotion/is-prop-valid": {
       "version": "0.8.8",
@@ -2334,21 +2334,19 @@
       }
     },
     "@material-ui/core": {
-      "version": "4.9.0",
-      "resolved": "https://registry.npmjs.org/@material-ui/core/-/core-4.9.0.tgz",
-      "integrity": "sha512-zrrr8mPU5DDBYaVil4uJYauW41PjSn5otn7cqGsmWOY0t90fypr9nNgM7rRJaPz2AP6oRSDx1kBQt2igf5uelg==",
+      "version": "4.9.10",
+      "resolved": "https://registry.npmjs.org/@material-ui/core/-/core-4.9.10.tgz",
+      "integrity": "sha512-CQuZU9Y10RkwSdxjn785kw2EPcXhv5GKauuVQufR9LlD37kjfn21Im1yvr6wsUzn81oLhEvVPz727UWC0gbqxg==",
       "requires": {
         "@babel/runtime": "^7.4.4",
-        "@material-ui/styles": "^4.9.0",
-        "@material-ui/system": "^4.7.1",
-        "@material-ui/types": "^5.0.0",
-        "@material-ui/utils": "^4.7.1",
+        "@material-ui/styles": "^4.9.10",
+        "@material-ui/system": "^4.9.10",
+        "@material-ui/types": "^5.0.1",
+        "@material-ui/utils": "^4.9.6",
         "@types/react-transition-group": "^4.2.0",
-        "clsx": "^1.0.2",
-        "convert-css-length": "^2.0.1",
-        "hoist-non-react-statics": "^3.2.1",
-        "normalize-scroll-left": "^0.2.0",
-        "popper.js": "^1.14.1",
+        "clsx": "^1.0.4",
+        "hoist-non-react-statics": "^3.3.2",
+        "popper.js": "^1.16.1-lts",
         "prop-types": "^15.7.2",
         "react-is": "^16.8.0",
         "react-transition-group": "^4.3.0"
@@ -2373,29 +2371,29 @@
       }
     },
     "@material-ui/lab": {
-      "version": "4.0.0-alpha.43",
-      "resolved": "https://registry.npmjs.org/@material-ui/lab/-/lab-4.0.0-alpha.43.tgz",
-      "integrity": "sha512-UxsQggLpwr5HEZU+YRZkRVtpt5Cp27VwfYZz1InyGNWrtx9WovAYxEyR1xDvp/cmKhnSPCecVnqmb3dtLTpDqQ==",
+      "version": "4.0.0-alpha.49",
+      "resolved": "https://registry.npmjs.org/@material-ui/lab/-/lab-4.0.0-alpha.49.tgz",
+      "integrity": "sha512-Shx+wktDCj7YDlNSkgMeFhijTyqWT0CGn7wDBMck36kZlh3GQhNwaj1y5p219sCYJY44SPgnrDaCxBStlzj8KQ==",
       "requires": {
         "@babel/runtime": "^7.4.4",
-        "@material-ui/utils": "^4.7.1",
+        "@material-ui/utils": "^4.9.6",
         "clsx": "^1.0.4",
         "prop-types": "^15.7.2",
         "react-is": "^16.8.0"
       }
     },
     "@material-ui/styles": {
-      "version": "4.9.0",
-      "resolved": "https://registry.npmjs.org/@material-ui/styles/-/styles-4.9.0.tgz",
-      "integrity": "sha512-nJHum4RqYBPWsjL/9JET8Z02FZ9gSizlg/7LWVFpIthNzpK6OQ5OSRR4T4x9/p+wK3t1qNn3b1uI4XpnZaPxOA==",
+      "version": "4.9.10",
+      "resolved": "https://registry.npmjs.org/@material-ui/styles/-/styles-4.9.10.tgz",
+      "integrity": "sha512-EXIXlqVyFDnjXF6tj72y6ZxiSy+mHtrsCo3Srkm3XUeu3Z01aftDBy7ZSr3TQ02gXHTvDSBvegp3Le6p/tl7eA==",
       "requires": {
         "@babel/runtime": "^7.4.4",
-        "@emotion/hash": "^0.7.4",
-        "@material-ui/types": "^5.0.0",
-        "@material-ui/utils": "^4.7.1",
+        "@emotion/hash": "^0.8.0",
+        "@material-ui/types": "^5.0.1",
+        "@material-ui/utils": "^4.9.6",
         "clsx": "^1.0.2",
         "csstype": "^2.5.2",
-        "hoist-non-react-statics": "^3.2.1",
+        "hoist-non-react-statics": "^3.3.2",
         "jss": "^10.0.3",
         "jss-plugin-camel-case": "^10.0.3",
         "jss-plugin-default-unit": "^10.0.3",
@@ -2418,24 +2416,24 @@
       }
     },
     "@material-ui/system": {
-      "version": "4.9.3",
-      "resolved": "https://registry.npmjs.org/@material-ui/system/-/system-4.9.3.tgz",
-      "integrity": "sha512-DBGsTKYrLlFpHG8BUp0X6ZpvaOzef+GhSwn/8DwVTXUdHitphaPQoL9xucrI8X9MTBo//El+7nylko7lo7eJIw==",
+      "version": "4.9.10",
+      "resolved": "https://registry.npmjs.org/@material-ui/system/-/system-4.9.10.tgz",
+      "integrity": "sha512-E+t0baX2TBZk6ALm8twG6objpsxLdMM4MDm1++LMt2m7CetCAEc3aIAfDaprk4+tm5hFT1Cah5dRWk8EeIFQYw==",
       "requires": {
         "@babel/runtime": "^7.4.4",
-        "@material-ui/utils": "^4.7.1",
+        "@material-ui/utils": "^4.9.6",
         "prop-types": "^15.7.2"
       }
     },
     "@material-ui/types": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/@material-ui/types/-/types-5.0.0.tgz",
-      "integrity": "sha512-UeH2BuKkwDndtMSS0qgx1kCzSMw+ydtj0xx/XbFtxNSTlXydKwzs5gVW5ZKsFlAkwoOOQ9TIsyoCC8hq18tOwg=="
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/@material-ui/types/-/types-5.0.1.tgz",
+      "integrity": "sha512-wURPSY7/3+MAtng3i26g+WKwwNE3HEeqa/trDBR5+zWKmcjO+u9t7Npu/J1r+3dmIa/OeziN9D/18IrBKvKffw=="
     },
     "@material-ui/utils": {
-      "version": "4.7.1",
-      "resolved": "https://registry.npmjs.org/@material-ui/utils/-/utils-4.7.1.tgz",
-      "integrity": "sha512-+ux0SlLdlehvzCk2zdQ3KiS3/ylWvuo/JwAGhvb8dFVvwR21K28z0PU9OQW2PGogrMEdvX3miEI5tGxTwwWiwQ==",
+      "version": "4.9.6",
+      "resolved": "https://registry.npmjs.org/@material-ui/utils/-/utils-4.9.6.tgz",
+      "integrity": "sha512-gqlBn0JPPTUZeAktn1rgMcy9Iczrr74ecx31tyZLVGdBGGzsxzM6PP6zeS7FuoLS6vG4hoZP7hWnOoHtkR0Kvw==",
       "requires": {
         "@babel/runtime": "^7.4.4",
         "prop-types": "^15.7.2",
@@ -6858,11 +6856,6 @@
       "integrity": "sha512-hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA==",
       "dev": true
     },
-    "convert-css-length": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/convert-css-length/-/convert-css-length-2.0.1.tgz",
-      "integrity": "sha512-iGpbcvhLPRKUbBc0Quxx7w/bV14AC3ItuBEGMahA5WTYqB8lq9jH0kTXFheCBASsYnqeMFZhiTruNxr1N59Axg=="
-    },
     "convert-source-map": {
       "version": "1.7.0",
       "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.7.0.tgz",
@@ -7224,11 +7217,11 @@
       }
     },
     "css-vendor": {
-      "version": "2.0.7",
-      "resolved": "https://registry.npmjs.org/css-vendor/-/css-vendor-2.0.7.tgz",
-      "integrity": "sha512-VS9Rjt79+p7M0WkPqcAza4Yq1ZHrsHrwf7hPL/bjQB+c1lwmAI+1FXxYTYt818D/50fFVflw0XKleiBN5RITkg==",
+      "version": "2.0.8",
+      "resolved": "https://registry.npmjs.org/css-vendor/-/css-vendor-2.0.8.tgz",
+      "integrity": "sha512-x9Aq0XTInxrkuFeHKbYC7zWY8ai7qJ04Kxd9MnvbC1uO5DagxoHQjm4JvG+vCdXOoFtCjbL2XSZfxmoYa9uQVQ==",
       "requires": {
-        "@babel/runtime": "^7.6.2",
+        "@babel/runtime": "^7.8.3",
         "is-in-browser": "^1.0.2"
       }
     },
@@ -7800,11 +7793,11 @@
       }
     },
     "dom-helpers": {
-      "version": "5.1.3",
-      "resolved": "https://registry.npmjs.org/dom-helpers/-/dom-helpers-5.1.3.tgz",
-      "integrity": "sha512-nZD1OtwfWGRBWlpANxacBEZrEuLa16o1nh7YopFWeoF68Zt8GGEmzHu6Xv4F3XaFIC+YXtTLrzgqKxFgLEe4jw==",
+      "version": "5.1.4",
+      "resolved": "https://registry.npmjs.org/dom-helpers/-/dom-helpers-5.1.4.tgz",
+      "integrity": "sha512-TjMyeVUvNEnOnhzs6uAn9Ya47GmMo3qq7m+Lr/3ON0Rs5kHvb8I+SQYjLUSYn7qhEm0QjW0yrBkvz9yOrwwz1A==",
       "requires": {
-        "@babel/runtime": "^7.6.3",
+        "@babel/runtime": "^7.8.7",
         "csstype": "^2.6.7"
       }
     },
@@ -15896,11 +15889,6 @@
       "integrity": "sha1-LRDAa9/TEuqXd2laTShDlFa3WUI=",
       "dev": true
     },
-    "normalize-scroll-left": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/normalize-scroll-left/-/normalize-scroll-left-0.2.0.tgz",
-      "integrity": "sha512-t5oCENZJl8TGusJKoCJm7+asaSsPuNmK6+iEjrZ5TyBj2f02brCRsd4c83hwtu+e5d4LCSBZ0uoDlMjBo+A8yA=="
-    },
     "normalize-url": {
       "version": "1.9.1",
       "resolved": "https://registry.npmjs.org/normalize-url/-/normalize-url-1.9.1.tgz",
@@ -19078,13 +19066,14 @@
       }
     },
     "react-measure": {
-      "version": "1.4.7",
-      "resolved": "https://registry.npmjs.org/react-measure/-/react-measure-1.4.7.tgz",
-      "integrity": "sha1-odLKDc/vBJeLesJjp2XctqCTb9s=",
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/react-measure/-/react-measure-2.3.0.tgz",
+      "integrity": "sha512-dwAvmiOeblj5Dvpnk8Jm7Q8B4THF/f1l1HtKVi0XDecsG6LXwGvzV5R1H32kq3TW6RW64OAf5aoQxpIgLa4z8A==",
       "requires": {
-        "get-node-dimensions": "^1.2.0",
-        "prop-types": "^15.5.4",
-        "resize-observer-polyfill": "^1.4.1"
+        "@babel/runtime": "^7.2.0",
+        "get-node-dimensions": "^1.2.1",
+        "prop-types": "^15.6.2",
+        "resize-observer-polyfill": "^1.5.0"
       }
     },
     "react-monaco-editor": {

newIDE/app/package.json

@@ -31,9 +31,9 @@
     "@blueprintjs/core": "file:src/Utils/BlueprintJsPlaceholder",
     "@blueprintjs/icons": "file:src/Utils/BlueprintJsPlaceholder",
     "@lingui/react": "git://github.com/4ian/lingui-react.git#master",
-    "@material-ui/core": "4.9.0",
+    "@material-ui/core": "4.9.10",
     "@material-ui/icons": "4.2.1",
-    "@material-ui/lab": "4.0.0-alpha.43",
+    "@material-ui/lab": "4.0.0-alpha.49",
     "algoliasearch": "3.33.0",
     "axios": "^0.18.1",
     "blueimp-md5": "^2.10.0",
@@ -61,7 +61,7 @@
     "react-error-boundary": "^1.2.0",
     "react-json-view": "^1.16.1",
     "react-markdown": "^4.0.6",
-    "react-measure": "1.4.7",
+    "react-measure": "2.3.0",
     "react-monaco-editor": "^0.18.0",
     "react-mosaic-component": "git://github.com/4ian/react-mosaic#v3.1.0",
     "react-sortable-hoc": "1.5.0",

newIDE/app/public/external/utils/path-editor.js

@@ -228,12 +228,14 @@ const selectBaseFolderPath = headerObject => {
   }
   const selectedDirPath = selectedDir[0];
   if (!selectedDirPath.startsWith(state.projectBasePath)) {
-    alert(
-      'Please select a folder inside your project path!\n' +
+    dialog.showMessageBoxSync(remote.getCurrentWindow(), {
+      message:
+        'Please select a folder inside your project path!\n' +
         state.projectBasePath +
         '\n\nSelected:\n' +
-        selectedDirPath
-    );
+        selectedDirPath,
+      buttons: ['OK'],
+    });
     return;
   }
   state.folderPath = selectedDirPath;

newIDE/app/public/index.html

@@ -22,6 +22,17 @@
         background-position: center center;
         overscroll-behavior: none;
       }
+
+      @keyframes text-focus-in {
+        0% {
+          -webkit-filter: blur(12px); filter: blur(12px);
+          opacity: 0;
+        }
+        100% {
+          -webkit-filter: blur(0px); filter: blur(0px);
+          opacity: 1;
+        }
+      }
     </style>
 
     <!-- Progressive Web App support -->
@@ -36,14 +47,6 @@
       window["GD_STARTUP_TIMES"] = [["indexHtmlFirstScriptStarted", performance.now()]];
     </script>
 
-    <!-- GDevelop.js core -->
-    <script src="%PUBLIC_URL%/libGD.js"></script>
-
-    <script>
-      window["GD_STARTUP_TIMES"] = window["GD_STARTUP_TIMES"] || [];
-      window["GD_STARTUP_TIMES"].push(["libGDLoadedTime", performance.now()]);
-    </script>
-
     <!-- Monaco Editor support -->
     <script>
       // Monaco editor is using amd require. Save the Node.js require if it exists (Electron)

newIDE/app/resources/examples/dialogue-tree-with-yarn/dialogue-tree-with-yarn.json

@@ -8,6 +8,7 @@
   },
   "properties": {
     "adMobAppId": "",
+    "adaptGameResolutionAtRuntime": false,
     "folderProject": false,
     "linuxExecutableFilename": "",
     "macExecutableFilename": "",
@@ -805,6 +806,15 @@
         "smoothed": true,
         "userAdded": false
       },
+      {
+        "alwaysLoaded": false,
+        "file": "other/grasshopper-idle-4.png",
+        "kind": "image",
+        "metadata": "",
+        "name": "other/grasshopper-idle-4.png",
+        "smoothed": true,
+        "userAdded": true
+      },
       {
         "disablePreload": false,
         "file": "dialogueData/npcs.json",
@@ -826,6 +836,10 @@
     {
       "name": "optionIndex",
       "value": "0"
+    },
+    {
+      "name": "yarnState",
+      "value": ""
     }
   ],
   "layouts": [
@@ -934,6 +948,10 @@
         {
           "name": "Score",
           "value": "0"
+        },
+        {
+          "name": "debugYarn",
+          "value": "true"
         }
       ],
       "instances": [
@@ -945,8 +963,8 @@
           "locked": false,
           "name": "Player",
           "width": 0,
-          "x": 21,
-          "y": 221,
+          "x": 159,
+          "y": 519,
           "zOrder": 1,
           "numberProperties": [],
           "stringProperties": [],
@@ -1035,8 +1053,8 @@
           "locked": false,
           "name": "PlayerHitBox",
           "width": 45,
-          "x": 155,
-          "y": 390,
+          "x": 183,
+          "y": 523,
           "zOrder": 1,
           "numberProperties": [],
           "stringProperties": [],
@@ -1976,6 +1994,51 @@
           "numberProperties": [],
           "stringProperties": [],
           "initialVariables": []
+        },
+        {
+          "angle": 0,
+          "customSize": false,
+          "height": 0,
+          "layer": "GUI",
+          "locked": false,
+          "name": "commandsDebug",
+          "width": 0,
+          "x": 5,
+          "y": 10,
+          "zOrder": 48,
+          "numberProperties": [],
+          "stringProperties": [],
+          "initialVariables": []
+        },
+        {
+          "angle": 0,
+          "customSize": false,
+          "height": 0,
+          "layer": "GUI",
+          "locked": false,
+          "name": "fullTextDebug",
+          "width": 0,
+          "x": 353,
+          "y": 10,
+          "zOrder": 49,
+          "numberProperties": [],
+          "stringProperties": [],
+          "initialVariables": []
+        },
+        {
+          "angle": 0,
+          "customSize": false,
+          "height": 0,
+          "layer": "",
+          "locked": false,
+          "name": "enemy2",
+          "width": 0,
+          "x": -268,
+          "y": 390,
+          "zOrder": 50,
+          "numberProperties": [],
+          "stringProperties": [],
+          "initialVariables": []
         }
       ],
       "objects": [
@@ -3257,6 +3320,10 @@
             {
               "name": "GoingLeft",
               "value": "0"
+            },
+            {
+              "name": "dialogueBranch",
+              "value": "cricket"
             }
           ],
           "behaviors": [],
@@ -5311,6 +5378,35 @@
                   ]
                 }
               ]
+            },
+            {
+              "name": "cricket",
+              "useMultipleDirections": false,
+              "directions": [
+                {
+                  "looping": false,
+                  "timeBetweenFrames": 0.08,
+                  "sprites": [
+                    {
+                      "hasCustomCollisionMask": false,
+                      "image": "other/grasshopper-idle-4.png",
+                      "points": [],
+                      "originPoint": {
+                        "name": "origine",
+                        "x": 0,
+                        "y": 0
+                      },
+                      "centerPoint": {
+                        "automatic": true,
+                        "name": "centre",
+                        "x": 0,
+                        "y": 0
+                      },
+                      "customCollisionMask": []
+                    }
+                  ]
+                }
+              ]
             }
           ]
         },
@@ -5374,6 +5470,42 @@
             "align": "left",
             "wordWrap": true
           }
+        },
+        {
+          "bold": false,
+          "italic": false,
+          "name": "commandsDebug",
+          "smoothed": true,
+          "tags": "",
+          "type": "TextObject::Text",
+          "underlined": false,
+          "variables": [],
+          "behaviors": [],
+          "string": "",
+          "font": "",
+          "characterSize": 20,
+          "color": {
+            "b": 219,
+            "g": 0,
+            "r": 160
+          }
+        },
+        {
+          "name": "fullTextDebug",
+          "tags": "",
+          "type": "BBText::BBText",
+          "variables": [],
+          "behaviors": [],
+          "content": {
+            "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",
+            "visible": false,
+            "color": "#000000",
+            "fontFamily": "Arial",
+            "align": "left",
+            "wordWrap": true
+          }
         }
       ],
       "events": [
@@ -5409,137 +5541,13 @@
             }
           ]
         },
-        {
-          "disabled": false,
-          "folded": false,
-          "type": "BuiltinCommonInstructions::Comment",
-          "color": {
-            "b": 109,
-            "g": 230,
-            "r": 255,
-            "textB": 0,
-            "textG": 0,
-            "textR": 0
-          },
-          "comment": "Trigger sign text on collision",
-          "comment2": ""
-        },
-        {
-          "disabled": false,
-          "folded": true,
-          "type": "BuiltinCommonInstructions::Standard",
-          "conditions": [
-            {
-              "type": {
-                "inverted": false,
-                "value": "VarObjetTxt"
-              },
-              "parameters": [
-                "NPC",
-                "state",
-                "=",
-                "\"sign\""
-              ],
-              "subInstructions": []
-            },
-            {
-              "type": {
-                "inverted": false,
-                "value": "CollisionNP"
-              },
-              "parameters": [
-                "Player",
-                "NPC",
-                "",
-                "",
-                "yes"
-              ],
-              "subInstructions": []
-            },
-            {
-              "type": {
-                "inverted": false,
-                "value": "PlatformBehavior::IsOnFloor"
-              },
-              "parameters": [
-                "PlayerHitBox",
-                "PlatformerObject"
-              ],
-              "subInstructions": []
-            },
-            {
-              "type": {
-                "inverted": false,
-                "value": "BuiltinCommonInstructions::Once"
-              },
-              "parameters": [],
-              "subInstructions": []
-            }
-          ],
-          "actions": [
-            {
-              "type": {
-                "inverted": false,
-                "value": "DialogueTree::StartDialogueFromBranch"
-              },
-              "parameters": [
-                "NPC.VariableString(dialogueBranch)"
-              ],
-              "subInstructions": []
-            },
-            {
-              "type": {
-                "inverted": false,
-                "value": "DialogueTree::CompleteClippedTextScrolling"
-              },
-              "parameters": [],
-              "subInstructions": []
-            }
-          ],
-          "events": [
-            {
-              "disabled": false,
-              "folded": false,
-              "type": "BuiltinCommonInstructions::Standard",
-              "conditions": [],
-              "actions": [
-                {
-                  "type": {
-                    "inverted": false,
-                    "value": "ModVarObjetTxt"
-                  },
-                  "parameters": [
-                    "NPC",
-                    "state",
-                    "=",
-                    "\"talking\""
-                  ],
-                  "subInstructions": []
-                },
-                {
-                  "type": {
-                    "inverted": false,
-                    "value": "ChangeAnimation"
-                  },
-                  "parameters": [
-                    "Player",
-                    "=",
-                    "0"
-                  ],
-                  "subInstructions": []
-                }
-              ],
-              "events": []
-            }
-          ]
-        },
         {
           "colorB": 228,
           "colorG": 176,
           "colorR": 74,
           "creationTime": 0,
           "disabled": false,
-          "folded": false,
+          "folded": true,
           "name": "Other gameplay mechanics",
           "source": "",
           "type": "BuiltinCommonInstructions::Group",
@@ -5584,20 +5592,6 @@
                   ],
                   "subInstructions": []
                 },
-                {
-                  "type": {
-                    "inverted": false,
-                    "value": "PlayMusic"
-                  },
-                  "parameters": [
-                    "",
-                    "other\\sounds\\the_valley.ogg",
-                    "yes",
-                    "100",
-                    "1"
-                  ],
-                  "subInstructions": []
-                },
                 {
                   "type": {
                     "inverted": false,
@@ -5731,7 +5725,7 @@
             },
             {
               "disabled": false,
-              "folded": false,
+              "folded": true,
               "type": "BuiltinCommonInstructions::Standard",
               "conditions": [
                 {
@@ -6523,6 +6517,21 @@
           "events": [
             {
               "disabled": false,
+              "folded": false,
+              "type": "BuiltinCommonInstructions::Comment",
+              "color": {
+                "b": 109,
+                "g": 230,
+                "r": 255,
+                "textB": 0,
+                "textG": 0,
+                "textR": 0
+              },
+              "comment": "Enable this to stresstest the DialogueTree extension for regressions",
+              "comment2": ""
+            },
+            {
+              "disabled": true,
               "folded": true,
               "type": "BuiltinCommonInstructions::Standard",
               "conditions": [
@@ -6537,6 +6546,73 @@
                   "subInstructions": []
                 }
               ],
+              "actions": [
+                {
+                  "type": {
+                    "inverted": false,
+                    "value": "DialogueTree::SetBooleanVariable"
+                  },
+                  "parameters": [
+                    "\"debug\"",
+                    "True"
+                  ],
+                  "subInstructions": []
+                }
+              ],
+              "events": [
+                {
+                  "disabled": false,
+                  "folded": false,
+                  "type": "BuiltinCommonInstructions::Standard",
+                  "conditions": [],
+                  "actions": [
+                    {
+                      "type": {
+                        "inverted": false,
+                        "value": "DialogueTree::SetBooleanVariable"
+                      },
+                      "parameters": [
+                        "\"debugLinks\"",
+                        "True"
+                      ],
+                      "subInstructions": []
+                    }
+                  ],
+                  "events": []
+                }
+              ]
+            },
+            {
+              "disabled": false,
+              "folded": false,
+              "type": "BuiltinCommonInstructions::Comment",
+              "color": {
+                "b": 109,
+                "g": 230,
+                "r": 255,
+                "textB": 0,
+                "textG": 0,
+                "textR": 0
+              },
+              "comment": "Innitiate your dialogue data by loading it from a yarn json file",
+              "comment2": ""
+            },
+            {
+              "disabled": false,
+              "folded": false,
+              "type": "BuiltinCommonInstructions::Standard",
+              "conditions": [
+                {
+                  "type": {
+                    "inverted": false,
+                    "value": "DepartScene"
+                  },
+                  "parameters": [
+                    ""
+                  ],
+                  "subInstructions": []
+                }
+              ],
               "actions": [
                 {
                   "type": {
@@ -6558,6 +6634,185 @@
                     "textHud"
                   ],
                   "subInstructions": []
+                },
+                {
+                  "type": {
+                    "inverted": false,
+                    "value": "ResetTimer"
+                  },
+                  "parameters": [
+                    "",
+                    "\"endedChat\""
+                  ],
+                  "subInstructions": []
+                },
+                {
+                  "type": {
+                    "inverted": false,
+                    "value": "Cache"
+                  },
+                  "parameters": [
+                    "commandsDebug"
+                  ],
+                  "subInstructions": []
+                }
+              ],
+              "events": []
+            },
+            {
+              "disabled": false,
+              "folded": false,
+              "type": "BuiltinCommonInstructions::Standard",
+              "conditions": [
+                {
+                  "type": {
+                    "inverted": false,
+                    "value": "DialogueTree::WasBranchVisited"
+                  },
+                  "parameters": [
+                    "\"ant\""
+                  ],
+                  "subInstructions": []
+                },
+                {
+                  "type": {
+                    "inverted": false,
+                    "value": "BuiltinCommonInstructions::Once"
+                  },
+                  "parameters": [],
+                  "subInstructions": []
+                }
+              ],
+              "actions": [
+                {
+                  "type": {
+                    "inverted": false,
+                    "value": "Montre"
+                  },
+                  "parameters": [
+                    "crumb",
+                    ""
+                  ],
+                  "subInstructions": []
+                }
+              ],
+              "events": []
+            },
+            {
+              "disabled": false,
+              "folded": false,
+              "type": "BuiltinCommonInstructions::Standard",
+              "conditions": [
+                {
+                  "type": {
+                    "inverted": true,
+                    "value": "DialogueTree::WasBranchVisited"
+                  },
+                  "parameters": [
+                    "\"ant\""
+                  ],
+                  "subInstructions": []
+                },
+                {
+                  "type": {
+                    "inverted": false,
+                    "value": "BuiltinCommonInstructions::Once"
+                  },
+                  "parameters": [],
+                  "subInstructions": []
+                }
+              ],
+              "actions": [
+                {
+                  "type": {
+                    "inverted": false,
+                    "value": "Cache"
+                  },
+                  "parameters": [
+                    "crumb"
+                  ],
+                  "subInstructions": []
+                }
+              ],
+              "events": []
+            },
+            {
+              "disabled": false,
+              "folded": false,
+              "type": "BuiltinCommonInstructions::Comment",
+              "color": {
+                "b": 109,
+                "g": 230,
+                "r": 255,
+                "textB": 0,
+                "textG": 0,
+                "textR": 0
+              },
+              "comment": "Trigger sign text on collision",
+              "comment2": ""
+            },
+            {
+              "disabled": false,
+              "folded": false,
+              "type": "BuiltinCommonInstructions::Standard",
+              "conditions": [
+                {
+                  "type": {
+                    "inverted": false,
+                    "value": "VarObjetTxt"
+                  },
+                  "parameters": [
+                    "NPC",
+                    "state",
+                    "=",
+                    "\"sign\""
+                  ],
+                  "subInstructions": []
+                },
+                {
+                  "type": {
+                    "inverted": false,
+                    "value": "CollisionNP"
+                  },
+                  "parameters": [
+                    "Player",
+                    "NPC",
+                    "",
+                    "",
+                    "yes"
+                  ],
+                  "subInstructions": []
+                },
+                {
+                  "type": {
+                    "inverted": false,
+                    "value": "PlatformBehavior::IsOnFloor"
+                  },
+                  "parameters": [
+                    "PlayerHitBox",
+                    "PlatformerObject"
+                  ],
+                  "subInstructions": []
+                },
+                {
+                  "type": {
+                    "inverted": false,
+                    "value": "BuiltinCommonInstructions::Once"
+                  },
+                  "parameters": [],
+                  "subInstructions": []
+                }
+              ],
+              "actions": [
+                {
+                  "type": {
+                    "inverted": false,
+                    "value": "DialogueTree::StartDialogueFromBranch"
+                  },
+                  "parameters": [
+                    "NPC.VariableString(dialogueBranch)"
+                  ],
+                  "subInstructions": []
                 }
               ],
               "events": [
@@ -6570,13 +6825,99 @@
                     {
                       "type": {
                         "inverted": false,
-                        "value": "ResetTimer"
+                        "value": "ModVarObjetTxt"
                       },
                       "parameters": [
-                        "",
-                        "\"endedChat\""
+                        "NPC",
+                        "state",
+                        "=",
+                        "\"talking\""
                       ],
                       "subInstructions": []
+                    },
+                    {
+                      "type": {
+                        "inverted": false,
+                        "value": "ChangeAnimation"
+                      },
+                      "parameters": [
+                        "Player",
+                        "=",
+                        "0"
+                      ],
+                      "subInstructions": []
+                    }
+                  ],
+                  "events": []
+                },
+                {
+                  "disabled": false,
+                  "folded": false,
+                  "type": "BuiltinCommonInstructions::Standard",
+                  "conditions": [
+                    {
+                      "type": {
+                        "inverted": false,
+                        "value": "DialogueTree::CompareDialogueStateBooleanVariable"
+                      },
+                      "parameters": [
+                        "\"debug\"",
+                        "True"
+                      ],
+                      "subInstructions": []
+                    }
+                  ],
+                  "actions": [
+                    {
+                      "type": {
+                        "inverted": false,
+                        "value": "TextObject::String"
+                      },
+                      "parameters": [
+                        "commandsDebug",
+                        "=",
+                        "\"Yarn is in debug mode\""
+                      ],
+                      "subInstructions": []
+                    },
+                    {
+                      "type": {
+                        "inverted": false,
+                        "value": "Montre"
+                      },
+                      "parameters": [
+                        "fullTextDebug",
+                        ""
+                      ],
+                      "subInstructions": []
+                    },
+                    {
+                      "type": {
+                        "inverted": false,
+                        "value": "Montre"
+                      },
+                      "parameters": [
+                        "commandsDebug",
+                        ""
+                      ],
+                      "subInstructions": []
+                    }
+                  ],
+                  "events": []
+                },
+                {
+                  "disabled": false,
+                  "folded": false,
+                  "type": "BuiltinCommonInstructions::Standard",
+                  "conditions": [],
+                  "actions": [
+                    {
+                      "type": {
+                        "inverted": false,
+                        "value": "DialogueTree::CompleteClippedTextScrolling"
+                      },
+                      "parameters": [],
+                      "subInstructions": []
                     }
                   ],
                   "events": []
@@ -7091,6 +7432,39 @@
                     }
                   ],
                   "events": []
+                },
+                {
+                  "disabled": false,
+                  "folded": false,
+                  "type": "BuiltinCommonInstructions::Standard",
+                  "conditions": [
+                    {
+                      "type": {
+                        "inverted": false,
+                        "value": "DialogueTree::CompareDialogueStateBooleanVariable"
+                      },
+                      "parameters": [
+                        "\"debug\"",
+                        "True"
+                      ],
+                      "subInstructions": []
+                    }
+                  ],
+                  "actions": [
+                    {
+                      "type": {
+                        "inverted": false,
+                        "value": "BBText::SetBBText"
+                      },
+                      "parameters": [
+                        "fullTextDebug",
+                        "=",
+                        "\"+\"+DialogueTree::LineText()"
+                      ],
+                      "subInstructions": []
+                    }
+                  ],
+                  "events": []
                 }
               ]
             },
@@ -7300,9 +7674,59 @@
                 "textG": 0,
                 "textR": 0
               },
-              "comment": "The <<COMMAND>> type can be used to trigger game events - such as changing an avatar picture to happen",
+              "comment": "The <<COMMAND>> type can be used to trigger game events - such as changing an avatar picture to happen,parameter -1 is the name of the command where it came from, from there on it starts from 0",
               "comment2": ""
             },
+            {
+              "disabled": false,
+              "folded": false,
+              "type": "BuiltinCommonInstructions::Standard",
+              "conditions": [
+                {
+                  "type": {
+                    "inverted": false,
+                    "value": "DialogueTree::IsDialogueLineType"
+                  },
+                  "parameters": [
+                    "\"command\""
+                  ],
+                  "subInstructions": []
+                },
+                {
+                  "type": {
+                    "inverted": false,
+                    "value": "Visible"
+                  },
+                  "parameters": [
+                    "commandsDebug"
+                  ],
+                  "subInstructions": []
+                },
+                {
+                  "type": {
+                    "inverted": false,
+                    "value": "BuiltinCommonInstructions::Once"
+                  },
+                  "parameters": [],
+                  "subInstructions": []
+                }
+              ],
+              "actions": [
+                {
+                  "type": {
+                    "inverted": false,
+                    "value": "TextObject::String"
+                  },
+                  "parameters": [
+                    "commandsDebug",
+                    "+",
+                    "\"<<\"+DialogueTree::CommandParameter(-1)+\">>\""
+                  ],
+                  "subInstructions": []
+                }
+              ],
+              "events": []
+            },
             {
               "disabled": false,
               "folded": false,
@@ -7333,6 +7757,81 @@
                 }
               ],
               "events": []
+            },
+            {
+              "disabled": false,
+              "folded": false,
+              "type": "BuiltinCommonInstructions::Comment",
+              "color": {
+                "b": 109,
+                "g": 230,
+                "r": 255,
+                "textB": 0,
+                "textG": 0,
+                "textR": 0
+              },
+              "comment": "Example of loading/saving yarn's dialogue state from/to a gdevelop variable (use for load/save in your games)",
+              "comment2": ""
+            },
+            {
+              "disabled": false,
+              "folded": false,
+              "type": "BuiltinCommonInstructions::Standard",
+              "conditions": [
+                {
+                  "type": {
+                    "inverted": false,
+                    "value": "DialogueTree::IsCommandCalled"
+                  },
+                  "parameters": [
+                    "\"loadGame\""
+                  ],
+                  "subInstructions": []
+                }
+              ],
+              "actions": [
+                {
+                  "type": {
+                    "inverted": false,
+                    "value": "DialogueTree::LoadState"
+                  },
+                  "parameters": [
+                    "yarnState"
+                  ],
+                  "subInstructions": []
+                }
+              ],
+              "events": []
+            },
+            {
+              "disabled": false,
+              "folded": false,
+              "type": "BuiltinCommonInstructions::Standard",
+              "conditions": [
+                {
+                  "type": {
+                    "inverted": false,
+                    "value": "DialogueTree::IsCommandCalled"
+                  },
+                  "parameters": [
+                    "\"saveGame\""
+                  ],
+                  "subInstructions": []
+                }
+              ],
+              "actions": [
+                {
+                  "type": {
+                    "inverted": false,
+                    "value": "DialogueTree::SaveState"
+                  },
+                  "parameters": [
+                    "yarnState"
+                  ],
+                  "subInstructions": []
+                }
+              ],
+              "events": []
             }
           ],
           "parameters": []
@@ -7399,7 +7898,7 @@
   "externalEvents": [
     {
       "associatedLayout": "New scene",
-      "lastChangeTimeStamp": 1383154438,
+      "lastChangeTimeStamp": 1383154432,
       "name": "EnemiesManagement",
       "events": [
         {
@@ -7939,7 +8438,7 @@
     },
     {
       "associatedLayout": "New scene",
-      "lastChangeTimeStamp": 1383151997,
+      "lastChangeTimeStamp": 1383152000,
       "name": "ObjectsManagement",
       "events": [
         {
@@ -8098,7 +8597,7 @@
     },
     {
       "associatedLayout": "New scene",
-      "lastChangeTimeStamp": 1383151997,
+      "lastChangeTimeStamp": 1383152000,
       "name": "GUIManagement",
       "events": [
         {

newIDE/app/resources/examples/dialogue-tree-with-yarn/dialogueData/npcs.json

@@ -1,21 +1,21 @@
 [
-	{
-		"title": "Start",
-		"tags": "",
-		"body": "<<avatar sign>> [color=#e90b0b]Press Z[/color] to interact with the tree critters 🐜🐛🐞 [color=#07a9b0]Spacebar[/color] to jump.\nAnd welcome to yarn's example GD project!",
-		"position": {
-			"x": -2144,
-			"y": 468
-		},
-		"colorID": 0
-	},
 	{
 		"title": "ant",
 		"tags": "",
 		"body": "<<avatar ant>>[b]Please don't bug me now[/b]... <<wait 1000>>  I am [i]quite[/i] busy at the moment.\nHave you seen my crumb?\n[[ yes |antcrumbyes ]] [[ no |antcrumbno ]] ",
 		"position": {
-			"x": -1878,
-			"y": 470
+			"x": 7566,
+			"y": 10185
+		},
+		"colorID": 0
+	},
+	{
+		"title": "antcrumbno",
+		"tags": "",
+		"body": "Then [b]scram[/b]!\nI don't have time for you...",
+		"position": {
+			"x": 7370,
+			"y": 10460
 		},
 		"colorID": 0
 	},
@@ -24,48 +24,128 @@
 		"tags": "",
 		"body": "<<if $seenCrumb == true>>\nOh yeah? You saw it on a branch?\nDid you taste it?...\n<<else>>\nOh ha-ha! I can see that you are lying.\n<<endif>>",
 		"position": {
-			"x": -2086,
-			"y": 752
+			"x": 7671,
+			"y": 10487
 		},
 		"colorID": 3
 	},
-	{
-		"title": "antcrumbno",
-		"tags": "",
-		"body": "Then [b]scram[/b]!\nI don't have time for you...",
-		"position": {
-			"x": -1694,
-			"y": 744
-		},
-		"colorID": 0
-	},
 	{
 		"title": "crumb",
 		"tags": "",
 		"body": "<<avatar crumb>> <<set $seenCrumb to true >> You stumbled on a giant crumb.\nWhat would you like to do with it?\n[[ taste it | eatCrumb]] [[ take it| takeCrumb]] [[ nothing |null ]] ",
 		"position": {
-			"x": -1891,
-			"y": 974
+			"x": 7400,
+			"y": 10721
 		},
 		"colorID": 6
 	},
+	{
+		"title": "debug",
+		"tags": "",
+		"body": "0I am another weird node problem to test||<\n<<df>>\n [[Answer:debug|debug0]]",
+		"position": {
+			"x": 8208,
+			"y": 10166
+		},
+		"colorID": 0
+	},
+	{
+		"title": "debug0",
+		"tags": "",
+		"body": "]<<avatar sign>> >1[color=#e90b0b]Press Z[/color] to interact with the tree critters 🐜🐛🐞 [color=#07a9b0]Spacebar[/color] to jump.wait test .<<wait 1000>>.<<wait 1000>>.<<wait 1000>>||<<wait 2000>> \n2And welcome to yarn's example GD project!>||\n [[Answer:debug|debug1]]",
+		"position": {
+			"x": 8473,
+			"y": 10165
+		},
+		"colorID": 0
+	},
+	{
+		"title": "debug1",
+		"tags": "",
+		"body": "<<avatar ant>>\n>3Now scram!||<\n<<test>>\n\n[[ answer: |debug2 ]] ",
+		"position": {
+			"x": 8713,
+			"y": 10169
+		},
+		"colorID": 0
+	},
+	{
+		"title": "debug2",
+		"tags": "",
+		"body": "<<err>> >4 text with < <<avatar crumb>> >command in the middle ||\n5This is my tree|| <\n\n6||< <<avatar ant>>\n\n>7and my crumb||\n[[ answer: |debug3 ]] ",
+		"position": {
+			"x": 8967,
+			"y": 10172
+		},
+		"colorID": 0
+	},
+	{
+		"title": "debug3",
+		"tags": "",
+		"body": "<<only command>>\n[[ answer: |debug4 ]] ",
+		"position": {
+			"x": 9224,
+			"y": 10176
+		},
+		"colorID": 0
+	},
+	{
+		"title": "debug4",
+		"tags": "",
+		"body": "one last text",
+		"position": {
+			"x": 9466,
+			"y": 10180
+		},
+		"colorID": 0
+	},
 	{
 		"title": "eatCrumb",
 		"tags": "",
 		"body": "Let see <<wait 1000>>.<<wait 200>>.<<wait 200>> .<<wait 200>>these 🥨 are making you thirsty...",
 		"position": {
-			"x": -2105,
-			"y": 1225
+			"x": 7337,
+			"y": 11180
 		},
 		"colorID": 0
 	},
 	{
-		"title": "takeCrumb",
+		"title": "Node1",
 		"tags": "",
-		"body": "The thing is way too heavy 😬 ....",
+		"body": "node1= Once upon a time you<<command>>  pressed SPACE to progress to the next node. [[Answer:Node2|Node2]]",
 		"position": {
-			"x": -1670,
-			"y": 1212
+			"x": 8210,
+			"y": 10419
+		},
+		"colorID": 0
+	},
+	{
+		"title": "Node2",
+		"tags": "",
+		"body": "node2= <<big_boi>>2 But suddenly the small boi black box started to move! [[Answer:Node3|Node3]]",
+		"position": {
+			"x": 8459,
+			"y": 10411
+		},
+		"colorID": 0
+	},
+	{
+		"title": "Node3",
+		"tags": "",
+		"body": "<<not_a_registered_command>> node3= But something horrible happened! All the text merged to the single text box, this is Node3. Press Space... [[Answer:Node4|Node4]]",
+		"position": {
+			"x": 8693,
+			"y": 10407
+		},
+		"colorID": 0
+	},
+	{
+		"title": "Node4",
+		"tags": "",
+		"body": "node4 I am Node4 and I didn't get merged as I don't have a command!",
+		"position": {
+			"x": 8917,
+			"y": 10402
 		},
 		"colorID": 0
 	},
@@ -74,8 +154,68 @@
 		"tags": "",
 		"body": "<<wait 100>> ",
 		"position": {
-			"x": -1590,
-			"y": 975
+			"x": 7149,
+			"y": 10728
+		},
+		"colorID": 0
+	},
+	{
+		"title": "Start",
+		"tags": "",
+		"body": "<<if $debug == true>>\n\n<<if $debugLinks == true>> \n[[ answer: |Node1 ]] \n<<else>> \n[[ debug|debug ]] \n<<endif>>\n\n<<else>>\n[[ start|Start1 ]] \n<<endif>>",
+		"position": {
+			"x": 7937,
+			"y": 10183
+		},
+		"colorID": 0
+	},
+	{
+		"title": "Start1",
+		"tags": "",
+		"body": "<<avatar sign>>[color=#e90b0b]Press Z[/color] to interact with the tree critters 🐜🐛🐞 [color=#07a9b0]Spacebar[/color] to jump.\nAnd welcome to yarn's example GD project!\n",
+		"position": {
+			"x": 7928,
+			"y": 10489
+		},
+		"colorID": 0
+	},
+	{
+		"title": "takeCrumb",
+		"tags": "",
+		"body": "The thing is way too heavy 😬 ....",
+		"position": {
+			"x": 7662,
+			"y": 10962
+		},
+		"colorID": 0
+	},
+	{
+		"title": "cricket",
+		"tags": "",
+		"body": "<<avatar cricket>> \nI am a cricket.\nWould you like to me to load/save the state\n\n[[ save it |saveState ]] \n[[ load it |loadState ]] \n[[ cancel |null ]] ",
+		"position": {
+			"x": 7017,
+			"y": 10159
+		},
+		"colorID": 0
+	},
+	{
+		"title": "saveState",
+		"tags": "",
+		"body": "<<saveGame>>\nGame stored to a GD variable",
+		"position": {
+			"x": 6678,
+			"y": 10466
+		},
+		"colorID": 0
+	},
+	{
+		"title": "loadState",
+		"tags": "",
+		"body": "<<loadGame>> \ngame loaded from GD variable",
+		"position": {
+			"x": 6930,
+			"y": 10468
 		},
 		"colorID": 0
 	}

newIDE/app/resources/examples/platformer/platformer.json

@@ -2594,6 +2594,8 @@
           "variables": [],
           "behaviors": [
             {
+              "jumpSpeed": 800,
+              "jumpSustainTime": 0.4,
               "name": "PlatformerObject",
               "type": "PlatformBehavior::PlatformerObjectBehavior",
               "acceleration": 1500,
@@ -2601,7 +2603,6 @@
               "deceleration": 1500,
               "gravity": 1300,
               "ignoreDefaultControls": false,
-              "jumpSpeed": 1000,
               "maxFallingSpeed": 1000,
               "maxSpeed": 250,
               "roundCoordinates": true,
@@ -4511,7 +4512,7 @@
   "externalEvents": [
     {
       "associatedLayout": "New scene",
-      "lastChangeTimeStamp": 1383154438,
+      "lastChangeTimeStamp": 1383154432,
       "name": "EnemiesManagement",
       "events": [
         {
@@ -5065,7 +5066,7 @@
     },
     {
       "associatedLayout": "New scene",
-      "lastChangeTimeStamp": 1383151997,
+      "lastChangeTimeStamp": 1383152000,
       "name": "ObjectsManagement",
       "events": [
         {
@@ -5224,7 +5225,7 @@
     },
     {
       "associatedLayout": "New scene",
-      "lastChangeTimeStamp": 1383151997,
+      "lastChangeTimeStamp": 1383152000,
       "name": "GUIManagement",
       "events": [
         {

newIDE/app/scripts/extract-changelog.js

@@ -0,0 +1,192 @@
+/**
+ * This is a simple script getting the commits since the last tag (which
+ * corresponds to a GitHub release). Each commit is filtered to:
+ * - hide trivial stuff
+ * - hide those containing "Don't mention in changelog"/"Don't show in changelog".
+ * - categorize as fix or improvement
+ *
+ * Authors nickname are fetched from GitHub.
+ */
+
+const shell = require('shelljs');
+const child = require('child_process');
+const axios = require('axios');
+
+const extractCommitsFromGit = () => {
+  const lastTag = child
+    .execSync(`git describe --tags --abbrev=0`)
+    .toString('utf-8')
+    .trim();
+  shell.echo(`ℹ️ Last tag is ${lastTag}`);
+
+  const output = child
+    .execSync(
+      `git log ${lastTag}..HEAD --format=%B---DELIMITER---%ae---DELIMITER---%H---COMMITDELIMITER---`
+    )
+    .toString('utf-8');
+
+  return (
+    output
+      .split('---COMMITDELIMITER---\n')
+      .map(commit => {
+        const [message, authorEmail, sha] = commit.split('---DELIMITER---');
+
+        return { sha, message, authorEmail };
+      })
+      // Clean commits
+      .filter(commit => Boolean(commit.sha))
+      .map(commit => ({
+        message: commit.message.trim(),
+        authorEmail: commit.authorEmail.trim(),
+      }))
+      // Categorize commits
+      .map(commit => {
+        const lowerCaseMessage = commit.message.toLowerCase();
+        const shouldHide =
+          lowerCaseMessage.includes('bump newide version') ||
+          lowerCaseMessage.includes('run code formatting') ||
+          lowerCaseMessage.includes('fix formatting') ||
+          lowerCaseMessage.includes('fix warning') ||
+          lowerCaseMessage.includes('package-lock.json');
+        const forceHide =
+          lowerCaseMessage.includes("don't mention in changelog") ||
+          lowerCaseMessage.includes("don't show in changelog");
+        const isFix = lowerCaseMessage.indexOf('fix') === 0;
+
+        return {
+          message: commit.message.trim(),
+          authorEmail: commit.authorEmail.trim(),
+          authorNickname: '',
+          isFix,
+          hidden:
+            forceHide ||
+            (commit.authorEmail === 'Florian.Rival@gmail.com' && shouldHide),
+        };
+      })
+  );
+};
+
+const findAuthorNicknameInCommits = async commits => {
+  let authorEmailsToNicknames = {};
+  let lastGithubCall = 0;
+  function delayGithubCall() {
+    return new Promise(resolve => {
+      setTimeout(() => {
+        lastGithubCall = Date.now();
+        resolve();
+      }, Math.max(0, lastGithubCall + 500 - Date.now()));
+    });
+  }
+
+  const findAuthorNicknameFromAuthorEmail = async authorEmail => {
+    const cachedNickname = authorEmailsToNicknames[authorEmail];
+    if (cachedNickname !== undefined) return cachedNickname;
+
+    if (authorEmail.includes('@users.noreply.github.com')) {
+      return authorEmail
+        .replace(/@users\.noreply\.github\.com/, '')
+        .replace(/^[0-9]*\+/, '');
+    }
+
+    try {
+      await delayGithubCall();
+      console.log(
+        `ℹ️ Calling https://api.github.com/search/users?q=${authorEmail}+in:email`
+      );
+      const response = await axios.get(
+        `https://api.github.com/search/users?q=${authorEmail}+in:email`
+      );
+      const data = response.data;
+      const login =
+        data && data.items && data.items[0] ? data.items[0].login : '';
+      authorEmailsToNicknames[authorEmail] = login;
+      if (login) {
+        shell.echo(`ℹ️ Found nickname for email: ${authorEmail}:` + login);
+      } else {
+        shell.echo(`ℹ️ No nickname found for email: ${authorEmail}:` + login);
+      }
+
+      return login;
+    } catch (error) {
+      shell.echo(
+        `⚠️ Unable to fetch a user info (email: ${authorEmail})` + error
+      );
+      return '';
+    }
+  };
+
+  const outputCommits = [];
+  for (let index in commits) {
+    const commit = commits[index];
+    const authorNickname = await findAuthorNicknameFromAuthorEmail(
+      commit.authorEmail
+    );
+
+    outputCommits.push({
+      ...commit,
+      authorNickname,
+    });
+  }
+  return outputCommits;
+};
+
+const formatCommitMessage = commit => {
+  const includeAuthor = commit.authorNickname !== '4ian';
+  const author = includeAuthor
+    ? `(Thanks ${
+        commit.authorNickname
+          ? '@' + commit.authorNickname
+          : 'TODO:' + commit.authorEmail
+      }!)`
+    : '';
+  const prNumberCleanedMessage = commit.message.replace(
+    /(\(#[1-9][0-9]*\))/,
+    ''
+  );
+
+  const indentedMessage = prNumberCleanedMessage
+    .split('\n')
+    .map((line, index) =>
+      index === 0
+        ? '* ' + line.trimRight() + ' ' + author
+        : '  ' + line.trimRight()
+    )
+    .filter(line => line.trim() !== '')
+    .join('\n');
+
+  return indentedMessage;
+};
+
+const formatHiddenCommitMessage = commit => {
+  const trimmedMessage = commit.message.replace(/\n/g, ' ').trim();
+  return (
+    '* ' +
+    (trimmedMessage.length > 50
+      ? trimmedMessage.substr(0, 50) + ' [...]'
+      : trimmedMessage)
+  );
+};
+
+(async () => {
+  const commits = extractCommitsFromGit();
+  const commitsWithAuthors = await findAuthorNicknameInCommits(commits);
+
+  const hiddenCommits = commitsWithAuthors.filter(commit => commit.hidden);
+  const displayedCommits = commitsWithAuthors.filter(commit => !commit.hidden);
+  const fixCommits = displayedCommits.filter(commit => commit.isFix);
+  const improvementsCommits = displayedCommits.filter(commit => !commit.isFix);
+
+  shell.echo(
+    `ℹ️ Hidden these commits: \n${hiddenCommits
+      .map(formatHiddenCommitMessage)
+      .join('\n')}`
+  );
+
+  shell.echo(`\n✅ The generated changelog is:\n`);
+
+  shell.echo(`\n## 💝 Improvements\n`);
+  shell.echo(improvementsCommits.map(formatCommitMessage).join('\n'));
+
+  shell.echo(`\n## 🐛 Bug fixes\n`);
+  shell.echo(fixCommits.map(formatCommitMessage).join('\n'));
+})();

newIDE/app/scripts/make-version-metadata.js

@@ -1,6 +1,10 @@
 /**
- * Launch this script to re-generate the files containing the list of extensions
- * being used by each example.
+ * Launch this script to re-generate VersionMetadata.js, used by the IDE
+ * to know about the current version number.
+ *
+ * The version is read from `newIDE/electron-app/app/package.json`. It must
+ * always be the source of truth and the only place to update when the version
+ * is changed.
  */
 const fs = require('fs');
 var shell = require('shelljs');

newIDE/app/src/BehaviorsEditor/Editors/BehaviorPropertiesEditor.js

@@ -32,7 +32,7 @@ export default class BehaviorPropertiesEditor extends React.Component<Props> {
     );
 
     return (
-      <Column>
+      <Column expand>
         {propertiesSchema.length ? (
           <PropertiesEditor
             schema={propertiesSchema}

newIDE/app/src/BehaviorsEditor/Editors/Physics2Editor/PolygonEditor.js

@@ -136,7 +136,7 @@ export default class PolygonEditor extends React.Component<Props> {
                       />
                     </TableRowColumn>
                     <TableRowColumn>
-                      <IconButton onClick={() => onRemove(index)}>
+                      <IconButton size="small" onClick={() => onRemove(index)}>
                         <Delete />
                       </IconButton>
                     </TableRowColumn>

newIDE/app/src/BehaviorsEditor/Editors/Physics2Editor/index.js

@@ -103,7 +103,7 @@ export default class Physics2Editor extends React.Component<Props, State> {
     const masksValues = parseInt(properties.get('masks').getValue(), 10);
 
     return (
-      <Column>
+      <Column expand>
         <Line>
           <SelectField
             key={'bodyType'}

newIDE/app/src/BehaviorsEditor/index.js

@@ -13,6 +13,7 @@ import NewBehaviorDialog from './NewBehaviorDialog';
 import { getBehaviorHelpPagePath } from './BehaviorsHelpPagePaths';
 import BehaviorsEditorService from './BehaviorsEditorService';
 import { isNullPtr } from '../Utils/IsNullPtr';
+import Window from '../Utils/Window';
 import { Column, Line } from '../UI/Grid';
 import RaisedButton from '../UI/RaisedButton';
 const gd = global.gd;
@@ -24,7 +25,6 @@ const AddBehaviorLine = ({ onAdd }) => (
         label={<Trans>Add a behavior to the object</Trans>}
         primary
         onClick={onAdd}
-        labelPosition="before"
         icon={<Add />}
       />
     </Line>
@@ -76,8 +76,7 @@ export default class BehaviorsEditor extends Component {
       },
       () => {
         if (this._hasBehaviorWithType(type)) {
-          //eslint-disable-next-line
-          const answer = confirm(
+          const answer = Window.showConfirmDialog(
             "There is already a behavior of this type attached to the object. It's possible to add again this behavior but it's unusual and may not be always supported properly. Are you sure you want to add again this behavior?"
           );
 
@@ -111,8 +110,7 @@ export default class BehaviorsEditor extends Component {
 
   _onRemoveBehavior = behaviorName => {
     const { object } = this.props;
-    //eslint-disable-next-line
-    const answer = confirm(
+    const answer = Window.showConfirmDialog(
       "Are you sure you want to remove this behavior? This can't be undone."
     );
 
@@ -191,14 +189,16 @@ export default class BehaviorsEditor extends Component {
                   </IconButton>
                   <HelpIcon helpPagePath={getBehaviorHelpPagePath(behavior)} />
                 </MiniToolbar>
-                <BehaviorComponent
-                  behavior={behavior}
-                  behaviorContent={behaviorContent}
-                  project={project}
-                  resourceSources={this.props.resourceSources}
-                  onChooseResource={this.props.onChooseResource}
-                  resourceExternalEditors={this.props.resourceExternalEditors}
-                />
+                <Line>
+                  <BehaviorComponent
+                    behavior={behavior}
+                    behaviorContent={behaviorContent}
+                    project={project}
+                    resourceSources={this.props.resourceSources}
+                    onChooseResource={this.props.onChooseResource}
+                    resourceExternalEditors={this.props.resourceExternalEditors}
+                  />
+                </Line>
               </div>
             );
           })

newIDE/app/src/BrowserApp.js

@@ -55,8 +55,7 @@ export const create = (authentification: Authentification) => {
           defaultStorageProvider={InternalFileStorageProvider}
         >
           {({
-            currentStorageProviderOperations,
-            useStorageProvider,
+            getStorageProviderOperations,
             storageProviders,
             initialFileMetadataToOpen,
           }) => (
@@ -86,8 +85,7 @@ export const create = (authentification: Authentification) => {
                   )}
                   introDialog={<BrowserIntroDialog />}
                   storageProviders={storageProviders}
-                  useStorageProvider={useStorageProvider}
-                  storageProviderOperations={currentStorageProviderOperations}
+                  getStorageProviderOperations={getStorageProviderOperations}
                   resourceSources={browserResourceSources}
                   resourceExternalEditors={browserResourceExternalEditors}
                   extensionsLoader={makeExtensionsLoader({

newIDE/app/src/Debugger/DebuggerContent.js

@@ -23,6 +23,9 @@ import FlashOff from '@material-ui/icons/FlashOff';
 import HelpButton from '../UI/HelpButton';
 import Profiler from './Profiler';
 import { type ProfilerOutput } from '.';
+import PreferencesContext from '../MainFrame/Preferences/PreferencesContext';
+import MiniToolbar from '../UI/MiniToolbar';
+import ScrollView from '../UI/ScrollView';
 
 type Props = {|
   gameData: ?any,
@@ -43,6 +46,18 @@ type State = {|
   rawMode: boolean,
 |};
 
+const initialMosaicEditorNodes = {
+  direction: 'column',
+  first: {
+    direction: 'row',
+    first: 'inspectors',
+    second: 'selected-inspector',
+    splitPercentage: 25,
+  },
+  second: 'profiler',
+  splitPercentage: 65,
+};
+
 /**
  * The debugger interface: show the list of inspectors for a game, along with the
  * currently selected inspector.
@@ -57,7 +72,7 @@ export default class DebuggerContent extends React.Component<Props, State> {
   _editors: ?EditorMosaic = null;
 
   openProfiler = () => {
-    if (this._editors) this._editors.openEditor('profiler', 'end', 75);
+    if (this._editors) this._editors.openEditor('profiler', 'end', 75, 'row');
   };
 
   render() {
@@ -77,46 +92,45 @@ export default class DebuggerContent extends React.Component<Props, State> {
       rawMode,
     } = this.state;
 
-    return (
-      <EditorMosaic
-        ref={editors => (this._editors = editors)}
-        editors={{
-          inspectors: {
-            type: 'primary',
-            title: t`Inspectors`,
-            toolbarControls: [],
-            renderEditor: () => (
-              <Background>
-                <Column expand noMargin useMaxHeight>
-                  <Line justifyContent="center">
-                    <RaisedButton
-                      label={<Trans>Refresh</Trans>}
-                      onClick={onRefresh}
-                      primary
-                    />
-                  </Line>
-                  <InspectorsList
-                    gameData={gameData}
-                    getInspectorDescriptions={getInspectorDescriptions}
-                    onChooseInspector={(
-                      selectedInspector,
-                      selectedInspectorFullPath
-                    ) =>
-                      this.setState({
-                        selectedInspector,
-                        selectedInspectorFullPath,
-                      })
-                    }
-                  />
-                </Column>
-              </Background>
-            ),
-          },
-          'selected-inspector': {
-            type: 'primary',
-            noTitleBar: true,
-            renderEditor: () => (
-              <Column expand noMargin>
+    const editors = {
+      inspectors: {
+        type: 'primary',
+        title: t`Inspectors`,
+        toolbarControls: [],
+        renderEditor: () => (
+          <Background>
+            <Column expand noMargin useMaxHeight>
+              <Line justifyContent="center">
+                <RaisedButton
+                  label={<Trans>Refresh</Trans>}
+                  onClick={onRefresh}
+                  primary
+                />
+              </Line>
+              <InspectorsList
+                gameData={gameData}
+                getInspectorDescriptions={getInspectorDescriptions}
+                onChooseInspector={(
+                  selectedInspector,
+                  selectedInspectorFullPath
+                ) =>
+                  this.setState({
+                    selectedInspector,
+                    selectedInspectorFullPath,
+                  })
+                }
+              />
+            </Column>
+          </Background>
+        ),
+      },
+      'selected-inspector': {
+        type: 'primary',
+        noTitleBar: true,
+        renderEditor: () => (
+          <Background>
+            <ScrollView>
+              <Column>
                 {selectedInspector ? (
                   rawMode ? (
                     <RawContentInspector
@@ -158,51 +172,57 @@ export default class DebuggerContent extends React.Component<Props, State> {
                     )}
                   </EmptyMessage>
                 )}
-                <Column>
-                  <Line justifyContent="space-between" alignItems="center">
-                    <HelpButton helpPagePath="/interface/debugger" />
-                    <div>
-                      <Checkbox
-                        checkedIcon={<Flash />}
-                        uncheckedIcon={<FlashOff />}
-                        checked={rawMode}
-                        onCheck={(e, enabled) =>
-                          this.setState({
-                            rawMode: enabled,
-                          })
-                        }
-                      />
-                    </div>
-                  </Line>
-                </Column>
               </Column>
-            ),
-          },
-          profiler: {
-            type: 'secondary',
-            title: t`Profiler`,
-            renderEditor: () => (
-              <Profiler
-                onStart={onStartProfiler}
-                onStop={onStopProfiler}
-                profilerOutput={profilerOutput}
-                profilingInProgress={profilingInProgress}
-              />
-            ),
-          },
-        }}
-        initialNodes={{
-          direction: 'column',
-          first: {
-            direction: 'row',
-            first: 'inspectors',
-            second: 'selected-inspector',
-            splitPercentage: 25,
-          },
-          second: 'profiler',
-          splitPercentage: 65,
-        }}
-      />
+            </ScrollView>
+            <MiniToolbar>
+              <Line justifyContent="space-between" alignItems="center" noMargin>
+                <HelpButton helpPagePath="/interface/debugger" />
+                <div>
+                  <Checkbox
+                    checkedIcon={<Flash />}
+                    uncheckedIcon={<FlashOff />}
+                    checked={rawMode}
+                    onCheck={(e, enabled) =>
+                      this.setState({
+                        rawMode: enabled,
+                      })
+                    }
+                  />
+                </div>
+              </Line>
+            </MiniToolbar>
+          </Background>
+        ),
+      },
+      profiler: {
+        type: 'secondary',
+        title: t`Profiler`,
+        renderEditor: () => (
+          <Profiler
+            onStart={onStartProfiler}
+            onStop={onStopProfiler}
+            profilerOutput={profilerOutput}
+            profilingInProgress={profilingInProgress}
+          />
+        ),
+      },
+    };
+
+    return (
+      <PreferencesContext.Consumer>
+        {({ getDefaultEditorMosaicNode, setDefaultEditorMosaicNode }) => (
+          <EditorMosaic
+            ref={editors => (this._editors = editors)}
+            editors={editors}
+            initialNodes={
+              getDefaultEditorMosaicNode('debugger') || initialMosaicEditorNodes
+            }
+            onPersistNodes={node =>
+              setDefaultEditorMosaicNode('debugger', node)
+            }
+          />
+        )}
+      </PreferencesContext.Consumer>
     );
   }
 }

newIDE/app/src/Debugger/DebuggerSelector.js

@@ -3,7 +3,6 @@ import { t } from '@lingui/macro';
 import * as React from 'react';
 import SelectField from '../UI/SelectField';
 import SelectOption from '../UI/SelectOption';
-import { Column } from '../UI/Grid';
 import { type DebuggerId } from '.';
 
 type Props = {|
@@ -16,30 +15,28 @@ export default class DebuggerSelector extends React.Component<Props, void> {
   render() {
     const hasDebuggers = !!this.props.debuggerIds.length;
     return (
-      <Column>
-        <SelectField
-          fullWidth
-          value={hasDebuggers ? this.props.selectedId : 0}
-          onChange={(e, i, value) =>
-            this.props.onChooseDebugger(parseInt(value, 10) || 0)
-          }
-          disabled={!hasDebuggers}
-        >
-          {this.props.debuggerIds.map(id => (
-            <SelectOption
-              value={id}
-              key={id}
-              primaryText={t`Game preview #${id}`}
-            />
-          ))}
-          {!hasDebuggers && (
-            <SelectOption
-              value={0}
-              primaryText={t`No preview running. Run a preview and you will be able to inspect it with the debugger`}
-            />
-          )}
-        </SelectField>
-      </Column>
+      <SelectField
+        fullWidth
+        value={hasDebuggers ? this.props.selectedId : 0}
+        onChange={(e, i, value) =>
+          this.props.onChooseDebugger(parseInt(value, 10) || 0)
+        }
+        disabled={!hasDebuggers}
+      >
+        {this.props.debuggerIds.map(id => (
+          <SelectOption
+            value={id}
+            key={id}
+            primaryText={t`Game preview #${id}`}
+          />
+        ))}
+        {!hasDebuggers && (
+          <SelectOption
+            value={0}
+            primaryText={t`No preview running. Run a preview and you will be able to inspect it with the debugger`}
+          />
+        )}
+      </SelectField>
     );
   }
 }

newIDE/app/src/Debugger/Inspectors/RawContentInspector.js

@@ -11,19 +11,12 @@ type Props = {|
   onEdit: (path: Array<string>, newValue: any) => boolean,
 |};
 
-const styles = {
-  container: {
-    flex: 1,
-    overflowY: 'scroll',
-  },
-};
-
 /**
  * A very simple inspector that display the raw information given by the gameData
  * object.
  */
 export default ({ gameData, onEdit }: Props) => (
-  <div style={styles.container}>
+  <React.Fragment>
     <EmptyMessage>
       <Trans>
         You are in raw mode. You can edit the fields, but be aware that this can
@@ -40,5 +33,5 @@ export default ({ gameData, onEdit }: Props) => (
       groupArraysAfterLength={50}
       theme="monokai"
     />
-  </div>
+  </React.Fragment>
 );

newIDE/app/src/Debugger/Inspectors/RuntimeObjectInspector.js

@@ -17,13 +17,6 @@ type Props = {|
   onEdit: EditFunction,
 |};
 
-const styles = {
-  container: {
-    flex: 1,
-    overflowY: 'scroll',
-  },
-};
-
 const transform = runtimeObject => {
   if (!runtimeObject) return null;
   return {
@@ -55,7 +48,7 @@ const handleEdit = (edit, { onCall, onEdit }: Props) => {
 };
 
 export default (props: Props) => (
-  <div style={styles.container}>
+  <React.Fragment>
     <Text>
       <Trans>General:</Trans>
     </Text>
@@ -84,5 +77,5 @@ export default (props: Props) => (
       }
       onCall={(path, args) => props.onCall(['_variables'].concat(path), args)}
     />
-  </div>
+  </React.Fragment>
 );

newIDE/app/src/Debugger/Inspectors/RuntimeSceneInspector.js

@@ -25,13 +25,6 @@ type State = {|
   newObjectName: string,
 |};
 
-const styles = {
-  container: {
-    flex: 1,
-    overflowY: 'scroll',
-  },
-};
-
 const transformLayer = layer => {
   if (!layer) return null;
   return {
@@ -113,7 +106,7 @@ export default class RuntimeSceneInspector extends React.Component<
     if (!runtimeScene) return null;
 
     return (
-      <div style={styles.container}>
+      <React.Fragment>
         <Text>
           <Trans>Layers:</Trans>
         </Text>
@@ -167,7 +160,7 @@ export default class RuntimeSceneInspector extends React.Component<
             )}
           />
         )}
-      </div>
+      </React.Fragment>
     );
   }
 }

newIDE/app/src/Debugger/Inspectors/VariablesContainerInspector.js

@@ -14,13 +14,6 @@ type Props = {|
   onEdit: EditFunction,
 |};
 
-const styles = {
-  container: {
-    flex: 1,
-    overflowY: 'scroll',
-  },
-};
-
 const transformVariable = variable => {
   if (!variable) return null;
 
@@ -66,19 +59,15 @@ const handleEdit = (edit, { onCall, onEdit }: Props) => {
 };
 
 export default (props: Props) => (
-  <div style={styles.container}>
-    <ReactJsonView
-      collapsed={false}
-      name={false}
-      src={
-        props.variablesContainer ? transform(props.variablesContainer) : null
-      }
-      enableClipboard={false}
-      displayDataTypes={false}
-      displayObjectSize={false}
-      onEdit={edit => handleEdit(edit, props)}
-      groupArraysAfterLength={50}
-      theme="monokai"
-    />
-  </div>
+  <ReactJsonView
+    collapsed={false}
+    name={false}
+    src={props.variablesContainer ? transform(props.variablesContainer) : null}
+    enableClipboard={false}
+    displayDataTypes={false}
+    displayObjectSize={false}
+    onEdit={edit => handleEdit(edit, props)}
+    groupArraysAfterLength={50}
+    theme="monokai"
+  />
 );

newIDE/app/src/EffectsList/index.js

@@ -201,7 +201,7 @@ export default function EffectsList(props: Props) {
                         { type: 'separator' },
                         {
                           type: 'checkbox',
-                          label: 'Show Parameter Names',
+                          label: i18n._(t`Show Parameter Names`),
                           checked: showEffectParameterNames,
                           click: () =>
                             setShowEffectParameterNames(
@@ -258,7 +258,6 @@ export default function EffectsList(props: Props) {
                   primary
                   label={<Trans>Add an effect</Trans>}
                   onClick={addEffect}
-                  labelPosition="before"
                   icon={<Add />}
                 />
               </Line>

newIDE/app/src/EventsBasedBehaviorEditor/EventsBasedBehaviorPropertiesEditor.js

@@ -21,6 +21,7 @@ import InlineCheckbox from '../UI/InlineCheckbox';
 import Visibility from '@material-ui/icons/Visibility';
 import VisibilityOff from '@material-ui/icons/VisibilityOff';
 import Add from '@material-ui/icons/Add';
+import { ResponsiveLineStackLayout, ColumnStackLayout } from '../UI/Layout';
 
 const gd = global.gd;
 
@@ -191,79 +192,77 @@ export default class EventsBasedBehaviorPropertiesEditor extends React.Component
                           ]}
                         />
                       </MiniToolbar>
-                      <Line expand noMargin>
-                        <Column expand>
-                          <SelectField
-                            floatingLabelText={<Trans>Type</Trans>}
-                            value={property.getType()}
-                            onChange={(e, i, value: string) => {
-                              property.setType(value);
-                              this.forceUpdate();
-                              this.props.onPropertiesUpdated();
-                            }}
-                            fullWidth
-                          >
-                            <SelectOption
-                              value="Number"
-                              primaryText={t`Number`}
-                            />
-                            <SelectOption
-                              value="String"
-                              primaryText={t`String`}
-                            />
-                            <SelectOption
-                              value="Boolean"
-                              primaryText={t`Boolean (checkbox)`}
-                            />
-                          </SelectField>
-                        </Column>
-                        <Column expand>
-                          {(property.getType() === 'String' ||
-                            property.getType() === 'Number') && (
-                            <SemiControlledTextField
-                              commitOnBlur
-                              floatingLabelText={<Trans>Default value</Trans>}
-                              hintText={
-                                property.getType() === 'Number' ? '123' : 'ABC'
-                              }
-                              value={property.getValue()}
-                              onChange={newValue => {
-                                property.setValue(newValue);
-                                this.forceUpdate();
-                                this.props.onPropertiesUpdated();
-                              }}
-                              fullWidth
-                            />
-                          )}
-                          {property.getType() === 'Boolean' && (
+                      <Line>
+                        <ColumnStackLayout expand>
+                          <ResponsiveLineStackLayout noMargin>
                             <SelectField
-                              floatingLabelText={<Trans>Default value</Trans>}
-                              value={
-                                property.getValue() === 'true'
-                                  ? 'true'
-                                  : 'false'
-                              }
-                              onChange={(e, i, value) => {
-                                property.setValue(value);
+                              floatingLabelText={<Trans>Type</Trans>}
+                              value={property.getType()}
+                              onChange={(e, i, value: string) => {
+                                property.setType(value);
                                 this.forceUpdate();
                                 this.props.onPropertiesUpdated();
                               }}
                               fullWidth
                             >
                               <SelectOption
-                                value="true"
-                                primaryText={t`True (checked)`}
+                                value="Number"
+                                primaryText={t`Number`}
                               />
                               <SelectOption
-                                value="false"
-                                primaryText={t`False (not checked)`}
+                                value="String"
+                                primaryText={t`String`}
+                              />
+                              <SelectOption
+                                value="Boolean"
+                                primaryText={t`Boolean (checkbox)`}
                               />
                             </SelectField>
-                          )}
-                        </Column>
-                      </Line>
-                      <Line expand noMargin>
-                        <Column expand>
+                            {(property.getType() === 'String' ||
+                              property.getType() === 'Number') && (
+                              <SemiControlledTextField
+                                commitOnBlur
+                                floatingLabelText={<Trans>Default value</Trans>}
+                                hintText={
+                                  property.getType() === 'Number'
+                                    ? '123'
+                                    : 'ABC'
+                                }
+                                value={property.getValue()}
+                                onChange={newValue => {
+                                  property.setValue(newValue);
+                                  this.forceUpdate();
+                                  this.props.onPropertiesUpdated();
+                                }}
+                                fullWidth
+                              />
+                            )}
+                            {property.getType() === 'Boolean' && (
+                              <SelectField
+                                floatingLabelText={<Trans>Default value</Trans>}
+                                value={
+                                  property.getValue() === 'true'
+                                    ? 'true'
+                                    : 'false'
+                                }
+                                onChange={(e, i, value) => {
+                                  property.setValue(value);
+                                  this.forceUpdate();
+                                  this.props.onPropertiesUpdated();
+                                }}
+                                fullWidth
+                              >
+                                <SelectOption
+                                  value="true"
+                                  primaryText={t`True (checked)`}
+                                />
+                                <SelectOption
+                                  value="false"
+                                  primaryText={t`False (not checked)`}
+                                />
+                              </SelectField>
+                            )}
+                          </ResponsiveLineStackLayout>
                           <SemiControlledTextField
                             commitOnBlur
                             floatingLabelText={
@@ -278,7 +277,7 @@ export default class EventsBasedBehaviorPropertiesEditor extends React.Component
                             }}
                             fullWidth
                           />
-                        </Column>
+                        </ColumnStackLayout>
                       </Line>
                     </React.Fragment>
                   )
@@ -298,7 +297,6 @@ export default class EventsBasedBehaviorPropertiesEditor extends React.Component
                       primary
                       label={<Trans>Add a property</Trans>}
                       onClick={this._addProperty}
-                      labelPosition="before"
                       icon={<Add />}
                     />
                   </Line>