Bump newIDE version

Add basic Debugger for GDevelop 5/GDJS games

.gitignore

@@ -65,8 +65,7 @@ Binaries/Packaging/logs
 !/scripts/libgettextlib-0-17.dll
 !/scripts/libgettextsrc-0-17.dll
 !/xgettext.exe
-!/Binaries/Output/Release_Windows/locale/libgettextlib-0-17.dll
-!/Binaries/Output/Release_Windows/locale/libgettextsrc-0-17.dll
+!/Binaries/Output/Release_Windows/locale/*.dll
 !/Binaries/Output/Release_Windows/locale/msgcat.exe
 !/Binaries/Output/Release_Windows/locale/msgfmt.exe
 !/ExtLibs/curl.exe

.travis.yml

@@ -37,6 +37,12 @@ before_install:
   - "sh -e /etc/init.d/xvfb start"
 
 install:
+#Install newIDE tests dependencies
+  - cd newIDE/app && npm install
+  - cd ../..
+#Install GDJS tests dependencies
+  - cd GDJS/tests && npm install
+  - cd ../..
 #Get the correct version of gcc/g++
   - if [ "$CXX" = "g++" ]; then export CXX="g++-${GCC_VERSION}" CC="gcc-${GCC_VERSION}"; fi
 #Compile the tests only
@@ -45,15 +51,15 @@ install:
   - cmake -DBUILD_GDJS=FALSE -DBUILD_IDE=FALSE -DBUILD_TESTS=TRUE -DNO_GUI=TRUE -DCMAKE_CXX_COMPILER=$(which $CXX) -DCMAKE_C_COMPILER=$(which $CC) ..
   - make -j 4
   - cd ..
-#Install GDJS tests dependencies
-  - cd GDJS/tests
-  - npm install
-  - cd ../..
 
 script:
-#GDJS game engine tests:
-  - cd GDJS/tests
+#newIDE tests:
+  - cd newIDE/app
   - npm test
+  - npm run flow
+  - cd ../..
+#GDJS game engine tests:
+  - cd GDJS/tests && npm test
   - cd ../..
 #GDCore and GDCpp game engine tests:
   - cd .build-tests

.vscode/c_cpp_properties.json

@@ -10,28 +10,31 @@
                 "${workspaceRoot}/Extensions",
                 "${workspaceRoot}/Core",
                 "${workspaceRoot}/ExtLibs/SFML/include",
-                "/usr/local/lib/wx/include/osx_cocoa-unicode-3.0",
-                "/usr/local/include/wx-3.0",
-                "/usr/include/machine",
                 "/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include/c++/v1",
                 "/usr/local/include",
-                "/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/lib/clang/8.0.0/include",
+                "/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/lib/clang/9.0.0/include",
                 "/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include",
-                "/usr/include"
+                "/usr/include",
+                "/usr/local/lib/wx/include/osx_cocoa-unicode-3.0",
+                "/usr/local/include/wx-3.0",
+                "${workspaceRoot}"
             ],
             "defines": [
                 "GD_IDE_ONLY",
                 "__WXMAC__",
                 "__WXOSX__",
                 "__WXOSX_COCOA__",
-                "GD_CORE_API=\" \"",
+                "GD_CORE_API=/* Macro used to export classes on Windows, please ignore */",
+                "GD_API=/* Macro used to export classes on Windows, please ignore */",
+                "GD_EXTENSION_API=/* Macro used to export classes on Windows, please ignore */",
                 "WXUSINGDLL"
             ],
+            "intelliSenseMode": "clang-x64",
             "browse": {
                 "path": [
                     "/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include/c++/v1",
                     "/usr/local/include",
-                    "/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/lib/clang/8.0.0/include",
+                    "/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/lib/clang/9.0.0/include",
                     "/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include",
                     "/usr/include",
                     "${workspaceRoot}"
@@ -39,20 +42,39 @@
                 "limitSymbolsToIncludedHeaders": true,
                 "databaseFilename": ""
             },
-            "intelliSenseMode": "clang-x64",
             "macFrameworkPath": [
                 "/System/Library/Frameworks",
                 "/Library/Frameworks"
-            ]
+            ],
+            "compilerPath": "/usr/bin/clang",
+            "cStandard": "c11",
+            "cppStandard": "c++17"
         },
         {
             "name": "Linux",
             "includePath": [
                 "${workspaceRoot}",
+                "${workspaceRoot}/IDE",
+                "${workspaceRoot}/GDCpp",
+                "${workspaceRoot}/GDJS",
+                "${workspaceRoot}/Extensions",
+                "${workspaceRoot}/Core",
+                "${workspaceRoot}/ExtLibs/SFML/include",
                 "/usr/include",
-                "/usr/local/include"
+                "/usr/local/include",
+                "${workspaceRoot}"
             ],
-            "defines": [],
+            "defines": [
+                "GD_IDE_ONLY",
+                "__WXMAC__",
+                "__WXOSX__",
+                "__WXOSX_COCOA__",
+                "GD_CORE_API=/* Macro used to export classes on Windows, please ignore */",
+                "GD_API=/* Macro used to export classes on Windows, please ignore */",
+                "GD_EXTENSION_API=/* Macro used to export classes on Windows, please ignore */",
+                "WXUSINGDLL"
+            ],
+            "intelliSenseMode": "clang-x64",
             "browse": {
                 "path": [
                     "/usr/include",
@@ -61,19 +83,34 @@
                 ],
                 "limitSymbolsToIncludedHeaders": true,
                 "databaseFilename": ""
-            },
-            "intelliSenseMode": "clang-x64"
+            }
         },
         {
             "name": "Win32",
             "includePath": [
                 "${workspaceRoot}",
-                "C:/Program Files (x86)/Microsoft Visual Studio 14.0/VC/include"
+                "${workspaceRoot}/IDE",
+                "${workspaceRoot}/GDCpp",
+                "${workspaceRoot}/GDJS",
+                "${workspaceRoot}/Extensions",
+                "${workspaceRoot}/Core",
+                "${workspaceRoot}/ExtLibs/SFML/include",
+                "C:/Program Files (x86)/Microsoft Visual Studio 14.0/VC/include",
+                "${workspaceRoot}"
             ],
             "defines": [
                 "_DEBUG",
-                "UNICODE"
+                "UNICODE",
+                "GD_IDE_ONLY",
+                "__WXMAC__",
+                "__WXOSX__",
+                "__WXOSX_COCOA__",
+                "GD_CORE_API=/* Macro used to export classes on Windows, please ignore */",
+                "GD_API=/* Macro used to export classes on Windows, please ignore */",
+                "GD_EXTENSION_API=/* Macro used to export classes on Windows, please ignore */",
+                "WXUSINGDLL"
             ],
+            "intelliSenseMode": "msvc-x64",
             "browse": {
                 "path": [
                     "C:/Program Files (x86)/Microsoft Visual Studio 14.0/VC/include/*",
@@ -81,8 +118,7 @@
                 ],
                 "limitSymbolsToIncludedHeaders": true,
                 "databaseFilename": ""
-            },
-            "intelliSenseMode": "msvc-x64"
+            }
         }
     ],
     "version": 3

.vscode/settings.json

@@ -62,7 +62,16 @@
         "__tuple": "cpp",
         "hash_map": "cpp",
         "hash_set": "cpp",
-        "system_error": "cpp"
+        "system_error": "cpp",
+        "__nullptr": "cpp",
+        "__functional_base": "cpp",
+        "__functional_base_03": "cpp",
+        "chrono": "cpp",
+        "ratio": "cpp",
+        "atomic": "cpp",
+        "locale": "cpp",
+        "string_view": "cpp",
+        "__string": "cpp"
     },
     "files.exclude": {
         "Binaries/*build*": true,
@@ -80,5 +89,6 @@
         "newIDE/electron-app/app/www": true
     },
     // Support for Flowtype:
-    "javascript.validate.enable": false
+    "javascript.validate.enable": false,
+    "flow.useNPMPackagedFlow": true
 }

Binaries/Output/Release_Windows/Examples/Particles - Explosions.gdg

@@ -1,15 +1,17 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <project firstLayout="">
-    <gdVersion build="84" major="3" minor="6" revision="0" />
-    <properties linuxExecutableFilename="" macExecutableFilename="" useExternalSourceFiles="false" winExecutableFilename="" winExecutableIconFile="">
+    <gdVersion build="97" major="4" minor="0" revision="0" />
+    <properties folderProject="false" linuxExecutableFilename="" macExecutableFilename="" orientation="default" packageName="" projectFile="C:\Users\Maciel\Programacion\gits\GD\Binaries\Output\Release_Windows\Examples\Particles - Explosions.gdg" useExternalSourceFiles="false" winExecutableFilename="" winExecutableIconFile="">
         <name>Explosions</name>
         <author></author>
         <windowWidth>800</windowWidth>
         <windowHeight>600</windowHeight>
-        <latestCompilationDirectory></latestCompilationDirectory>
+        <latestCompilationDirectory>C:\Users\Maciel\AppData\Local\Temp\GDTemporaries\JSCocosExportParticles</latestCompilationDirectory>
         <maxFPS>60</maxFPS>
         <minFPS>10</minFPS>
         <verticalSync>false</verticalSync>
+        <platformSpecificAssets />
+        <loadingScreen showGDevelopSplash="true" />
         <extensions>
             <extension name="BuiltinObject" />
             <extension name="BuiltinAudio" />
@@ -34,6 +36,7 @@
         </extensions>
         <platforms>
             <platform name="GDevelop C++ platform" />
+            <platform name="GDevelop JS platform" />
         </platforms>
         <currentPlatform>GDevelop C++ platform</currentPlatform>
     </properties>
@@ -48,40 +51,40 @@
     <variables />
     <layouts>
         <layout b="0" disableInputWhenNotFocused="true" mangledName="New_32scene" name="New scene" oglFOV="90.000000" oglZFar="500.000000" oglZNear="1.000000" r="0" standardSortMethod="true" stopSoundsOnStartup="true" title="" v="0">
-            <uiSettings associatedLayout="" grid="false" gridB="255" gridG="180" gridHeight="32" gridOffsetX="0" gridOffsetY="0" gridR="158" gridWidth="32" snap="true" windowMask="false" zoomFactor="1.000000" />
+            <uiSettings grid="false" gridB="255" gridG="180" gridHeight="32" gridOffsetX="0" gridOffsetY="0" gridR="158" gridWidth="32" snap="true" windowMask="false" zoomFactor="1.000000" />
             <objectsGroups />
             <variables />
             <instances />
             <objects>
-                <object additive="true" alphaParam="Mutable" angleParam="Random" blueParam="Mutable" destroyWhenNoParticles="true" emissionEditionSimpleMode="false" emitterAngleA="180.000000" emitterAngleB="160.000000" emitterForceMax="40.000000" emitterForceMin="5.000000" emitterXDirection="0.000000" emitterYDirection="0.000000" emitterZDirection="1.000000" flow="-1.000000" friction="2.000000" gravityEditionSimpleMode="false" greenParam="Mutable" maxParticleNb="5000" name="Explosion" particleAlpha1="204.000000" particleAlpha2="0.000000" particleAlphaRandomness1="0.000000" particleAlphaRandomness2="0.000000" particleAngle1="0.000000" particleAngle2="0.000000" particleAngleRandomness1="0.000000" particleAngleRandomness2="0.000000" particleBlue1="25.000000" particleBlue2="50.000000" particleEditionSimpleMode="false" particleGravityX="0.000000" particleGravityY="0.000000" particleGravityZ="20.000000" particleGreen1="128.000000" particleGreen2="50.000000" particleLifeTimeMax="1.500000" particleLifeTimeMin="0.700000" particleRed1="255.000000" particleRed2="50.000000" particleSize1="100.000000" particleSize2="100.000000" particleSizeRandomness1="0.000000" particleSizeRandomness2="0.000000" redParam="Mutable" rendererParam1="20.000000" rendererParam2="20.000000" rendererType="Quad" sizeParam="Random" tank="1000.000000" textureParticleName="ExplosionTexture.png" type="ParticleSystem::ParticleEmitter" zoneRadius="2.000000">
+                <object additive="true" alphaParam="Mutable" angleParam="Random" blueParam="Mutable" destroyWhenNoParticles="true" emissionEditionSimpleMode="true" emitterAngleA="0.000000" emitterAngleB="360.000000" emitterForceMax="70.000000" emitterForceMin="30.000000" emitterXDirection="0.000000" emitterYDirection="0.000000" emitterZDirection="1.000000" flow="-1.000000" friction="2.000000" gravityEditionSimpleMode="false" greenParam="Mutable" maxParticleNb="100" name="Explosion" particleAlpha1="225.000000" particleAlpha2="0.000000" particleAlphaRandomness1="0.000000" particleAlphaRandomness2="0.000000" particleAngle1="0.000000" particleAngle2="0.000000" particleAngleRandomness1="0.000000" particleAngleRandomness2="0.000000" particleBlue1="25.000000" particleBlue2="50.000000" particleEditionSimpleMode="false" particleGravityX="0.000000" particleGravityY="0.000000" particleGravityZ="20.000000" particleGreen1="128.000000" particleGreen2="50.000000" particleLifeTimeMax="1.500000" particleLifeTimeMin="0.700000" particleRed1="255.000000" particleRed2="50.000000" particleSize1="100.000000" particleSize2="100.000000" particleSizeRandomness1="0.000000" particleSizeRandomness2="0.000000" redParam="Mutable" rendererParam1="20.000000" rendererParam2="20.000000" rendererType="Quad" sizeParam="Random" tank="100.000000" textureParticleName="ExplosionTexture.png" type="ParticleSystem::ParticleEmitter" zoneRadius="2.000000">
                     <variables />
-                    <automatisms />
+                    <behaviors />
                 </object>
-                <object additive="true" alphaParam="Mutable" angleParam="Random" blueParam="Mutable" destroyWhenNoParticles="true" emissionEditionSimpleMode="false" emitterAngleA="0.000000" emitterAngleB="180.000000" emitterForceMax="130.000000" emitterForceMin="50.000000" emitterXDirection="1.000000" emitterYDirection="0.000000" emitterZDirection="1.000000" flow="-1.000000" friction="2.000000" gravityEditionSimpleMode="false" greenParam="Mutable" maxParticleNb="5000" name="Explosion2" particleAlpha1="204.000000" particleAlpha2="0.000000" particleAlphaRandomness1="0.000000" particleAlphaRandomness2="0.000000" particleAngle1="0.000000" particleAngle2="0.000000" particleAngleRandomness1="0.000000" particleAngleRandomness2="0.000000" particleBlue1="25.000000" particleBlue2="75.000000" particleEditionSimpleMode="false" particleGravityX="0.000000" particleGravityY="0.000000" particleGravityZ="30.000000" particleGreen1="76.000000" particleGreen2="180.000000" particleLifeTimeMax="1.500000" particleLifeTimeMin="0.700000" particleRed1="153.000000" particleRed2="1.000000" particleSize1="100.000000" particleSize2="100.000000" particleSizeRandomness1="0.000000" particleSizeRandomness2="0.000000" redParam="Enabled" rendererParam1="0.050000" rendererParam2="1.000000" rendererType="Line" sizeParam="Random" tank="350.000000" textureParticleName="" type="ParticleSystem::ParticleEmitter" zoneRadius="2.000000">
+                <object additive="true" alphaParam="Mutable" angleParam="Random" blueParam="Mutable" destroyWhenNoParticles="true" emissionEditionSimpleMode="true" emitterAngleA="0.000000" emitterAngleB="360.000000" emitterForceMax="130.000000" emitterForceMin="130.000000" emitterXDirection="1.000000" emitterYDirection="0.000000" emitterZDirection="1.000000" flow="-1.000000" friction="2.000000" gravityEditionSimpleMode="false" greenParam="Mutable" maxParticleNb="151" name="Explosion2" particleAlpha1="204.000000" particleAlpha2="0.000000" particleAlphaRandomness1="0.000000" particleAlphaRandomness2="0.000000" particleAngle1="0.000000" particleAngle2="0.000000" particleAngleRandomness1="0.000000" particleAngleRandomness2="0.000000" particleBlue1="25.000000" particleBlue2="75.000000" particleEditionSimpleMode="false" particleGravityX="0.000000" particleGravityY="0.000000" particleGravityZ="30.000000" particleGreen1="76.000000" particleGreen2="180.000000" particleLifeTimeMax="1.000000" particleLifeTimeMin="0.700000" particleRed1="153.000000" particleRed2="1.000000" particleSize1="100.000000" particleSize2="100.000000" particleSizeRandomness1="0.000000" particleSizeRandomness2="0.000000" redParam="Enabled" rendererParam1="3.000000" rendererParam2="6.000000" rendererType="Line" sizeParam="Random" tank="40.000000" textureParticleName="" type="ParticleSystem::ParticleEmitter" zoneRadius="2.000000">
                     <variables />
-                    <automatisms />
+                    <behaviors />
                 </object>
-                <object additive="true" alphaParam="Mutable" angleParam="Random" blueParam="Enabled" destroyWhenNoParticles="true" emissionEditionSimpleMode="false" emitterAngleA="45.000000" emitterAngleB="180.000000" emitterForceMax="10.000000" emitterForceMin="0.000000" emitterXDirection="0.000000" emitterYDirection="0.000000" emitterZDirection="1.000000" flow="400.000000" friction="2.000000" gravityEditionSimpleMode="true" greenParam="Enabled" maxParticleNb="5000" name="ExplosionSmoke" particleAlpha1="153.000000" particleAlpha2="0.000000" particleAlphaRandomness1="0.000000" particleAlphaRandomness2="0.000000" particleAngle1="0.000000" particleAngle2="0.000000" particleAngleRandomness1="0.000000" particleAngleRandomness2="0.000000" particleBlue1="25.000000" particleBlue2="0.000000" particleEditionSimpleMode="false" particleGravityX="0.000000" particleGravityY="0.000000" particleGravityZ="30.000000" particleGreen1="25.000000" particleGreen2="0.800000" particleLifeTimeMax="1.200000" particleLifeTimeMin="0.700000" particleRed1="25.000000" particleRed2="0.100000" particleSize1="100.000000" particleSize2="100.000000" particleSizeRandomness1="0.000000" particleSizeRandomness2="0.000000" redParam="Enabled" rendererParam1="20.000000" rendererParam2="20.000000" rendererType="Quad" sizeParam="Random" tank="500.000000" textureParticleName="ExplosionTexture.png" type="ParticleSystem::ParticleEmitter" zoneRadius="20.000000">
+                <object additive="true" alphaParam="Mutable" angleParam="Random" blueParam="Enabled" destroyWhenNoParticles="true" emissionEditionSimpleMode="false" emitterAngleA="45.000000" emitterAngleB="180.000000" emitterForceMax="10.000000" emitterForceMin="0.000000" emitterXDirection="0.000000" emitterYDirection="0.000000" emitterZDirection="1.000000" flow="400.000000" friction="2.000000" gravityEditionSimpleMode="true" greenParam="Enabled" maxParticleNb="50" name="ExplosionSmoke" particleAlpha1="153.000000" particleAlpha2="0.000000" particleAlphaRandomness1="0.000000" particleAlphaRandomness2="0.000000" particleAngle1="0.000000" particleAngle2="0.000000" particleAngleRandomness1="0.000000" particleAngleRandomness2="0.000000" particleBlue1="25.000000" particleBlue2="0.000000" particleEditionSimpleMode="false" particleGravityX="0.000000" particleGravityY="0.000000" particleGravityZ="30.000000" particleGreen1="25.000000" particleGreen2="0.800000" particleLifeTimeMax="2.000000" particleLifeTimeMin="0.700000" particleRed1="25.000000" particleRed2="0.100000" particleSize1="100.000000" particleSize2="100.000000" particleSizeRandomness1="0.000000" particleSizeRandomness2="0.000000" redParam="Enabled" rendererParam1="20.000000" rendererParam2="20.000000" rendererType="Quad" sizeParam="Random" tank="50.000000" textureParticleName="ExplosionTexture.png" type="ParticleSystem::ParticleEmitter" zoneRadius="20.000000">
                     <variables />
-                    <automatisms />
+                    <behaviors />
                 </object>
             </objects>
             <events>
                 <event disabled="false" folded="false">
                     <type>BuiltinCommonInstructions::Standard</type>
                     <conditions>
-                        <condition>
+                        <instruction>
                             <type inverted="false" value="Timer" />
                             <parameters>
                                 <parameter></parameter>
                                 <parameter>Random(0.3)+0.2</parameter>
                                 <parameter>&quot;Creating&quot;</parameter>
                             </parameters>
-                            <subConditions />
-                        </condition>
+                            <subInstructions />
+                        </instruction>
                     </conditions>
                     <actions>
-                        <action>
+                        <instruction>
                             <type inverted="false" value="Create" />
                             <parameters>
                                 <parameter></parameter>
@@ -90,9 +93,9 @@
                                 <parameter>Random(600)</parameter>
                                 <parameter></parameter>
                             </parameters>
-                            <subActions />
-                        </action>
-                        <action>
+                            <subInstructions />
+                        </instruction>
+                        <instruction>
                             <type inverted="false" value="Create" />
                             <parameters>
                                 <parameter></parameter>
@@ -101,9 +104,9 @@
                                 <parameter>Explosion.Y()</parameter>
                                 <parameter></parameter>
                             </parameters>
-                            <subActions />
-                        </action>
-                        <action>
+                            <subInstructions />
+                        </instruction>
+                        <instruction>
                             <type inverted="false" value="Create" />
                             <parameters>
                                 <parameter></parameter>
@@ -112,16 +115,16 @@
                                 <parameter>Explosion.Y()</parameter>
                                 <parameter></parameter>
                             </parameters>
-                            <subActions />
-                        </action>
-                        <action>
+                            <subInstructions />
+                        </instruction>
+                        <instruction>
                             <type inverted="false" value="ResetTimer" />
                             <parameters>
                                 <parameter></parameter>
                                 <parameter>&quot;Creating&quot;</parameter>
                             </parameters>
-                            <subActions />
-                        </action>
+                            <subInstructions />
+                        </instruction>
                     </actions>
                     <events />
                 </event>
@@ -131,9 +134,10 @@
                     <cameras>
                         <camera defaultSize="true" defaultViewport="true" height="0.000000" viewportBottom="1.000000" viewportLeft="0.000000" viewportRight="1.000000" viewportTop="0.000000" width="0.000000" />
                     </cameras>
+                    <effects />
                 </layer>
             </layers>
-            <automatismsSharedData />
+            <behaviorsSharedData />
         </layout>
     </layouts>
     <externalEvents />

Binaries/Output/Release_Windows/Examples/Particles - Various effects.gdg

@@ -1,15 +1,17 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <project firstLayout="">
-    <gdVersion build="84" major="3" minor="6" revision="0" />
-    <properties linuxExecutableFilename="" macExecutableFilename="" useExternalSourceFiles="false" winExecutableFilename="" winExecutableIconFile="">
+    <gdVersion build="97" major="4" minor="0" revision="0" />
+    <properties folderProject="false" linuxExecutableFilename="" macExecutableFilename="" orientation="default" packageName="" projectFile="C:\Users\Maciel\Programacion\gits\GD\Binaries\Output\Release_Windows\Examples\Particles - Various effects.gdg" useExternalSourceFiles="false" winExecutableFilename="" winExecutableIconFile="">
         <name>Project</name>
         <author></author>
         <windowWidth>800</windowWidth>
         <windowHeight>600</windowHeight>
-        <latestCompilationDirectory></latestCompilationDirectory>
+        <latestCompilationDirectory>C:\Users\Maciel\AppData\Local\Temp\GDTemporaries\JSCocosExportParticles</latestCompilationDirectory>
         <maxFPS>60</maxFPS>
         <minFPS>10</minFPS>
         <verticalSync>false</verticalSync>
+        <platformSpecificAssets />
+        <loadingScreen showGDevelopSplash="true" />
         <extensions>
             <extension name="BuiltinObject" />
             <extension name="BuiltinAudio" />
@@ -34,6 +36,7 @@
         </extensions>
         <platforms>
             <platform name="GDevelop C++ platform" />
+            <platform name="GDevelop JS platform" />
         </platforms>
         <currentPlatform>GDevelop C++ platform</currentPlatform>
     </properties>
@@ -47,8 +50,8 @@
     <objectsGroups />
     <variables />
     <layouts>
-        <layout b="0" disableInputWhenNotFocused="true" mangledName="Nouvelle_32sc_232ne" name="Nouvelle scène" oglFOV="90.000000" oglZFar="500.000000" oglZNear="1.000000" r="0" standardSortMethod="true" stopSoundsOnStartup="true" title="" v="0">
-            <uiSettings associatedLayout="" grid="false" gridB="255" gridG="180" gridHeight="32" gridOffsetX="0" gridOffsetY="0" gridR="158" gridWidth="32" snap="true" windowMask="false" zoomFactor="1.000000" />
+        <layout b="0" disableInputWhenNotFocused="true" mangledName="Scene" name="Scene" oglFOV="90.000000" oglZFar="500.000000" oglZNear="1.000000" r="0" standardSortMethod="true" stopSoundsOnStartup="true" title="" v="0">
+            <uiSettings grid="false" gridB="255" gridG="180" gridHeight="32" gridOffsetX="0" gridOffsetY="0" gridR="158" gridWidth="32" snap="true" windowMask="false" zoomFactor="1.000000" />
             <objectsGroups />
             <variables />
             <instances>
@@ -99,47 +102,47 @@
                 </instance>
             </instances>
             <objects>
-                <object additive="true" alphaParam="Mutable" angleParam="Mutable" blueParam="Random" destroyWhenNoParticles="false" emissionEditionSimpleMode="true" emitterAngleA="0.000000" emitterAngleB="180.000000" emitterForceMax="10.000000" emitterForceMin="0.000000" emitterXDirection="0.000000" emitterYDirection="1.000000" emitterZDirection="0.000000" flow="300.000000" friction="2.000000" gravityEditionSimpleMode="true" greenParam="Random" maxParticleNb="5000" name="Fire" particleAlpha1="204.000000" particleAlpha2="0.000000" particleAlphaRandomness1="0.000000" particleAlphaRandomness2="0.000000" particleAngle1="0.000000" particleAngle2="0.000000" particleAngleRandomness1="0.000000" particleAngleRandomness2="30.000000" particleBlue1="50.000000" particleBlue2="0.000000" particleEditionSimpleMode="false" particleGravityX="0.000000" particleGravityY="-100.000000" particleGravityZ="0.000000" particleGreen1="50.000000" particleGreen2="204.000000" particleLifeTimeMax="2.500000" particleLifeTimeMin="0.500000" particleRed1="240.000000" particleRed2="1.000000" particleSize1="100.000000" particleSize2="0.000000" particleSizeRandomness1="0.000000" particleSizeRandomness2="0.000000" redParam="Enabled" rendererParam1="10.000000" rendererParam2="20.000000" rendererType="Quad" sizeParam="Mutable" tank="-1.000000" textureParticleName="Fire" type="ParticleSystem::ParticleEmitter" zoneRadius="5.000000">
+                <object additive="true" alphaParam="Mutable" angleParam="Mutable" blueParam="Mutable" destroyWhenNoParticles="false" emissionEditionSimpleMode="true" emitterAngleA="0.000000" emitterAngleB="180.000000" emitterForceMax="10.000000" emitterForceMin="0.000000" emitterXDirection="0.000000" emitterYDirection="1.000000" emitterZDirection="0.000000" flow="30.000000" friction="2.000000" gravityEditionSimpleMode="true" greenParam="Mutable" maxParticleNb="200" name="Fire" particleAlpha1="204.000000" particleAlpha2="0.000000" particleAlphaRandomness1="0.000000" particleAlphaRandomness2="0.000000" particleAngle1="0.000000" particleAngle2="0.000000" particleAngleRandomness1="0.000000" particleAngleRandomness2="30.000000" particleBlue1="50.000000" particleBlue2="0.000000" particleEditionSimpleMode="true" particleGravityX="0.000000" particleGravityY="-100.000000" particleGravityZ="0.000000" particleGreen1="50.000000" particleGreen2="191.000000" particleLifeTimeMax="2.500000" particleLifeTimeMin="0.500000" particleRed1="240.000000" particleRed2="255.000000" particleSize1="100.000000" particleSize2="0.000000" particleSizeRandomness1="0.000000" particleSizeRandomness2="0.000000" redParam="Mutable" rendererParam1="10.000000" rendererParam2="20.000000" rendererType="Quad" sizeParam="Mutable" tank="-1.000000" textureParticleName="Fire" type="ParticleSystem::ParticleEmitter" zoneRadius="5.000000">
                     <variables />
-                    <automatisms />
+                    <behaviors />
                 </object>
-                <object additive="false" alphaParam="Mutable" angleParam="Random" blueParam="Enabled" destroyWhenNoParticles="false" emissionEditionSimpleMode="true" emitterAngleA="0.000000" emitterAngleB="180.000000" emitterForceMax="0.000000" emitterForceMin="0.000000" emitterXDirection="0.000000" emitterYDirection="1.000000" emitterZDirection="0.000000" flow="200.000000" friction="2.000000" gravityEditionSimpleMode="true" greenParam="Enabled" maxParticleNb="5000" name="Smoke" particleAlpha1="160.000000" particleAlpha2="0.000000" particleAlphaRandomness1="0.000000" particleAlphaRandomness2="0.000000" particleAngle1="0.000000" particleAngle2="360.000000" particleAngleRandomness1="0.000000" particleAngleRandomness2="0.000000" particleBlue1="50.000000" particleBlue2="0.000000" particleEditionSimpleMode="false" particleGravityX="0.000000" particleGravityY="-100.000000" particleGravityZ="0.000000" particleGreen1="50.000000" particleGreen2="0.800000" particleLifeTimeMax="2.500000" particleLifeTimeMin="0.500000" particleRed1="50.000000" particleRed2="1.000000" particleSize1="20.000000" particleSize2="100.000000" particleSizeRandomness1="0.000000" particleSizeRandomness2="0.000000" redParam="Enabled" rendererParam1="30.000000" rendererParam2="30.000000" rendererType="Quad" sizeParam="Mutable" tank="-1.000000" textureParticleName="Fire" type="ParticleSystem::ParticleEmitter" zoneRadius="7.000000">
+                <object additive="false" alphaParam="Mutable" angleParam="Random" blueParam="Mutable" destroyWhenNoParticles="false" emissionEditionSimpleMode="true" emitterAngleA="0.000000" emitterAngleB="360.000000" emitterForceMax="0.000000" emitterForceMin="0.000000" emitterXDirection="0.000000" emitterYDirection="1.000000" emitterZDirection="0.000000" flow="150.000000" friction="2.000000" gravityEditionSimpleMode="true" greenParam="Mutable" maxParticleNb="150" name="Smoke" particleAlpha1="160.000000" particleAlpha2="0.000000" particleAlphaRandomness1="0.000000" particleAlphaRandomness2="0.000000" particleAngle1="0.000000" particleAngle2="360.000000" particleAngleRandomness1="0.000000" particleAngleRandomness2="0.000000" particleBlue1="255.000000" particleBlue2="149.000000" particleEditionSimpleMode="true" particleGravityX="0.000000" particleGravityY="-100.000000" particleGravityZ="0.000000" particleGreen1="250.000000" particleGreen2="144.000000" particleLifeTimeMax="2.500000" particleLifeTimeMin="0.500000" particleRed1="253.000000" particleRed2="135.000000" particleSize1="20.000000" particleSize2="100.000000" particleSizeRandomness1="0.000000" particleSizeRandomness2="0.000000" redParam="Mutable" rendererParam1="30.000000" rendererParam2="30.000000" rendererType="Quad" sizeParam="Mutable" tank="-1.000000" textureParticleName="Fire" type="ParticleSystem::ParticleEmitter" zoneRadius="15.000000">
                     <variables />
-                    <automatisms />
+                    <behaviors />
                 </object>
-                <object additive="true" alphaParam="Mutable" angleParam="Random" blueParam="Random" destroyWhenNoParticles="false" emissionEditionSimpleMode="true" emitterAngleA="0.000000" emitterAngleB="180.000000" emitterForceMax="65.000000" emitterForceMin="25.000000" emitterXDirection="0.000000" emitterYDirection="1.000000" emitterZDirection="0.000000" flow="200.000000" friction="2.000000" gravityEditionSimpleMode="true" greenParam="Random" maxParticleNb="5000" name="Particles" particleAlpha1="204.000000" particleAlpha2="0.000000" particleAlphaRandomness1="0.000000" particleAlphaRandomness2="0.000000" particleAngle1="0.000000" particleAngle2="0.000000" particleAngleRandomness1="0.000000" particleAngleRandomness2="0.000000" particleBlue1="125.000000" particleBlue2="204.000000" particleEditionSimpleMode="false" particleGravityX="0.000000" particleGravityY="0.000000" particleGravityZ="250.000000" particleGreen1="125.000000" particleGreen2="204.000000" particleLifeTimeMax="2.500000" particleLifeTimeMin="0.500000" particleRed1="204.000000" particleRed2="255.000000" particleSize1="0.000000" particleSize2="0.000000" particleSizeRandomness1="0.000000" particleSizeRandomness2="0.000000" redParam="Random" rendererParam1="8.000000" rendererParam2="1.000000" rendererType="Point" sizeParam="Random" tank="-1.000000" textureParticleName="" type="ParticleSystem::ParticleEmitter" zoneRadius="2.000000">
+                <object additive="true" alphaParam="Mutable" angleParam="Random" blueParam="Random" destroyWhenNoParticles="false" emissionEditionSimpleMode="true" emitterAngleA="0.000000" emitterAngleB="180.000000" emitterForceMax="65.000000" emitterForceMin="25.000000" emitterXDirection="0.000000" emitterYDirection="1.000000" emitterZDirection="0.000000" flow="200.000000" friction="2.000000" gravityEditionSimpleMode="true" greenParam="Random" maxParticleNb="5000" name="Particles" particleAlpha1="204.000000" particleAlpha2="0.000000" particleAlphaRandomness1="0.000000" particleAlphaRandomness2="0.000000" particleAngle1="0.000000" particleAngle2="0.000000" particleAngleRandomness1="0.000000" particleAngleRandomness2="0.000000" particleBlue1="125.000000" particleBlue2="204.000000" particleEditionSimpleMode="false" particleGravityX="0.000000" particleGravityY="0.000000" particleGravityZ="250.000000" particleGreen1="125.000000" particleGreen2="204.000000" particleLifeTimeMax="2.500000" particleLifeTimeMin="0.500000" particleRed1="204.000000" particleRed2="255.000000" particleSize1="100.000000" particleSize2="100.000000" particleSizeRandomness1="0.000000" particleSizeRandomness2="0.000000" redParam="Random" rendererParam1="8.000000" rendererParam2="1.000000" rendererType="Point" sizeParam="Random" tank="-1.000000" textureParticleName="" type="ParticleSystem::ParticleEmitter" zoneRadius="2.000000">
                     <variables />
-                    <automatisms />
+                    <behaviors />
                 </object>
-                <object additive="false" alphaParam="Mutable" angleParam="Random" blueParam="Random" destroyWhenNoParticles="false" emissionEditionSimpleMode="true" emitterAngleA="0.000000" emitterAngleB="180.000000" emitterForceMax="0.000000" emitterForceMin="0.000000" emitterXDirection="0.000000" emitterYDirection="1.000000" emitterZDirection="0.000000" flow="100.000000" friction="2.000000" gravityEditionSimpleMode="true" greenParam="Random" maxParticleNb="5000" name="Beam" particleAlpha1="250.000000" particleAlpha2="0.000000" particleAlphaRandomness1="0.000000" particleAlphaRandomness2="0.000000" particleAngle1="0.000000" particleAngle2="0.000000" particleAngleRandomness1="0.000000" particleAngleRandomness2="0.000000" particleBlue1="204.000000" particleBlue2="255.000000" particleEditionSimpleMode="false" particleGravityX="0.000000" particleGravityY="0.000000" particleGravityZ="500.000000" particleGreen1="127.000000" particleGreen2="230.000000" particleLifeTimeMax="2.000000" particleLifeTimeMin="0.500000" particleRed1="153.000000" particleRed2="180.000000" particleSize1="0.000000" particleSize2="0.000000" particleSizeRandomness1="0.000000" particleSizeRandomness2="0.000000" redParam="Random" rendererParam1="3.000000" rendererParam2="1.000000" rendererType="Line" sizeParam="Random" tank="-1.000000" textureParticleName="" type="ParticleSystem::ParticleEmitter" zoneRadius="3.000000">
+                <object additive="false" alphaParam="Mutable" angleParam="Random" blueParam="Random" destroyWhenNoParticles="false" emissionEditionSimpleMode="false" emitterAngleA="-55.000000" emitterAngleB="-35.000000" emitterForceMax="5.000000" emitterForceMin="0.000000" emitterXDirection="0.000000" emitterYDirection="1.000000" emitterZDirection="0.000000" flow="100.000000" friction="2.000000" gravityEditionSimpleMode="true" greenParam="Random" maxParticleNb="151" name="Beam" particleAlpha1="250.000000" particleAlpha2="0.000000" particleAlphaRandomness1="0.000000" particleAlphaRandomness2="0.000000" particleAngle1="0.000000" particleAngle2="0.000000" particleAngleRandomness1="0.000000" particleAngleRandomness2="0.000000" particleBlue1="204.000000" particleBlue2="255.000000" particleEditionSimpleMode="false" particleGravityX="100.000000" particleGravityY="0.000000" particleGravityZ="500.000000" particleGreen1="127.000000" particleGreen2="230.000000" particleLifeTimeMax="2.000000" particleLifeTimeMin="0.500000" particleRed1="153.000000" particleRed2="180.000000" particleSize1="100.000000" particleSize2="100.000000" particleSizeRandomness1="0.000000" particleSizeRandomness2="0.000000" redParam="Random" rendererParam1="100.000000" rendererParam2="3.000000" rendererType="Line" sizeParam="Random" tank="-1.000000" textureParticleName="" type="ParticleSystem::ParticleEmitter" zoneRadius="20.000000">
                     <variables />
-                    <automatisms />
+                    <behaviors />
                 </object>
-                <object additive="true" alphaParam="Mutable" angleParam="Random" blueParam="Random" destroyWhenNoParticles="false" emissionEditionSimpleMode="true" emitterAngleA="0.000000" emitterAngleB="0.000000" emitterForceMax="65.000000" emitterForceMin="25.000000" emitterXDirection="0.000000" emitterYDirection="0.000000" emitterZDirection="0.000000" flow="300.000000" friction="2.000000" gravityEditionSimpleMode="true" greenParam="Random" maxParticleNb="5000" name="Beam2" particleAlpha1="125.000000" particleAlpha2="0.000000" particleAlphaRandomness1="0.000000" particleAlphaRandomness2="0.000000" particleAngle1="0.000000" particleAngle2="0.000000" particleAngleRandomness1="0.000000" particleAngleRandomness2="0.000000" particleBlue1="255.000000" particleBlue2="204.000000" particleEditionSimpleMode="false" particleGravityX="-500.000000" particleGravityY="0.000000" particleGravityZ="0.000000" particleGreen1="204.000000" particleGreen2="125.000000" particleLifeTimeMax="5.000000" particleLifeTimeMin="0.500000" particleRed1="127.000000" particleRed2="0.500000" particleSize1="0.000000" particleSize2="0.000000" particleSizeRandomness1="0.000000" particleSizeRandomness2="0.000000" redParam="Enabled" rendererParam1="0.500000" rendererParam2="2.000000" rendererType="Line" sizeParam="Random" tank="-1.000000" textureParticleName="" type="ParticleSystem::ParticleEmitter" zoneRadius="3.000000">
+                <object additive="true" alphaParam="Mutable" angleParam="Random" blueParam="Random" destroyWhenNoParticles="false" emissionEditionSimpleMode="true" emitterAngleA="0.000000" emitterAngleB="0.000000" emitterForceMax="65.000000" emitterForceMin="25.000000" emitterXDirection="0.000000" emitterYDirection="0.000000" emitterZDirection="0.000000" flow="50.000000" friction="2.000000" gravityEditionSimpleMode="true" greenParam="Random" maxParticleNb="5000" name="Beam2" particleAlpha1="125.000000" particleAlpha2="0.000000" particleAlphaRandomness1="0.000000" particleAlphaRandomness2="0.000000" particleAngle1="0.000000" particleAngle2="0.000000" particleAngleRandomness1="0.000000" particleAngleRandomness2="0.000000" particleBlue1="255.000000" particleBlue2="204.000000" particleEditionSimpleMode="false" particleGravityX="-500.000000" particleGravityY="0.000000" particleGravityZ="0.000000" particleGreen1="204.000000" particleGreen2="125.000000" particleLifeTimeMax="5.000000" particleLifeTimeMin="0.500000" particleRed1="127.000000" particleRed2="0.500000" particleSize1="100.000000" particleSize2="100.000000" particleSizeRandomness1="0.000000" particleSizeRandomness2="0.000000" redParam="Enabled" rendererParam1="10.000000" rendererParam2="3.000000" rendererType="Line" sizeParam="Random" tank="-1.000000" textureParticleName="" type="ParticleSystem::ParticleEmitter" zoneRadius="10.000000">
                     <variables />
-                    <automatisms />
+                    <behaviors />
                 </object>
-                <object additive="true" alphaParam="Mutable" angleParam="Random" blueParam="Random" destroyWhenNoParticles="true" emissionEditionSimpleMode="true" emitterAngleA="0.000000" emitterAngleB="180.000000" emitterForceMax="100.000000" emitterForceMin="25.000000" emitterXDirection="0.000000" emitterYDirection="0.000000" emitterZDirection="1.000000" flow="400.000000" friction="2.000000" gravityEditionSimpleMode="true" greenParam="Enabled" maxParticleNb="5000" name="Pyro" particleAlpha1="204.000000" particleAlpha2="0.000000" particleAlphaRandomness1="0.000000" particleAlphaRandomness2="0.000000" particleAngle1="0.000000" particleAngle2="0.000000" particleAngleRandomness1="0.000000" particleAngleRandomness2="0.000000" particleBlue1="204.000000" particleBlue2="255.000000" particleEditionSimpleMode="false" particleGravityX="0.000000" particleGravityY="-100.000000" particleGravityZ="0.000000" particleGreen1="127.000000" particleGreen2="1.000000" particleLifeTimeMax="1.000000" particleLifeTimeMin="0.500000" particleRed1="127.000000" particleRed2="230.000000" particleSize1="100.000000" particleSize2="1.000000" particleSizeRandomness1="0.000000" particleSizeRandomness2="0.000000" redParam="Random" rendererParam1="0.060000" rendererParam2="3.000000" rendererType="Line" sizeParam="Mutable" tank="600.000000" textureParticleName="" type="ParticleSystem::ParticleEmitter" zoneRadius="7.000000">
+                <object additive="true" alphaParam="Mutable" angleParam="Random" blueParam="Random" destroyWhenNoParticles="true" emissionEditionSimpleMode="true" emitterAngleA="0.000000" emitterAngleB="360.000000" emitterForceMax="100.000000" emitterForceMin="25.000000" emitterXDirection="0.000000" emitterYDirection="0.000000" emitterZDirection="1.000000" flow="70.000000" friction="2.000000" gravityEditionSimpleMode="true" greenParam="Enabled" maxParticleNb="151" name="Pyro" particleAlpha1="204.000000" particleAlpha2="0.000000" particleAlphaRandomness1="0.000000" particleAlphaRandomness2="0.000000" particleAngle1="0.000000" particleAngle2="0.000000" particleAngleRandomness1="0.000000" particleAngleRandomness2="0.000000" particleBlue1="204.000000" particleBlue2="255.000000" particleEditionSimpleMode="false" particleGravityX="-0.000080" particleGravityY="-200.000000" particleGravityZ="0.000000" particleGreen1="127.000000" particleGreen2="1.000000" particleLifeTimeMax="1.000000" particleLifeTimeMin="0.500000" particleRed1="127.000000" particleRed2="230.000000" particleSize1="100.000000" particleSize2="1.000000" particleSizeRandomness1="0.000000" particleSizeRandomness2="0.000000" redParam="Random" rendererParam1="8.000000" rendererParam2="8.000000" rendererType="Line" sizeParam="Mutable" tank="80.000000" textureParticleName="" type="ParticleSystem::ParticleEmitter" zoneRadius="25.000000">
                     <variables />
-                    <automatisms />
+                    <behaviors />
                 </object>
             </objects>
             <events>
                 <event disabled="false" folded="false">
                     <type>BuiltinCommonInstructions::Standard</type>
                     <conditions>
-                        <condition>
+                        <instruction>
                             <type inverted="false" value="Timer" />
                             <parameters>
                                 <parameter></parameter>
-                                <parameter>Random(0.3)+1</parameter>
+                                <parameter>1</parameter>
                                 <parameter>&quot;Creating&quot;</parameter>
                             </parameters>
-                            <subConditions />
-                        </condition>
+                            <subInstructions />
+                        </instruction>
                     </conditions>
                     <actions>
-                        <action>
+                        <instruction>
                             <type inverted="false" value="Create" />
                             <parameters>
                                 <parameter></parameter>
@@ -148,16 +151,16 @@
                                 <parameter>100+Random(300)</parameter>
                                 <parameter></parameter>
                             </parameters>
-                            <subActions />
-                        </action>
-                        <action>
+                            <subInstructions />
+                        </instruction>
+                        <instruction>
                             <type inverted="false" value="ResetTimer" />
                             <parameters>
                                 <parameter></parameter>
                                 <parameter>&quot;Creating&quot;</parameter>
                             </parameters>
-                            <subActions />
-                        </action>
+                            <subInstructions />
+                        </instruction>
                     </actions>
                     <events />
                 </event>
@@ -167,9 +170,10 @@
                     <cameras>
                         <camera defaultSize="true" defaultViewport="true" height="0.000000" viewportBottom="1.000000" viewportLeft="0.000000" viewportRight="1.000000" viewportTop="0.000000" width="0.000000" />
                     </cameras>
+                    <effects />
                 </layer>
             </layers>
-            <automatismsSharedData />
+            <behaviorsSharedData />
         </layout>
     </layouts>
     <externalEvents />

Binaries/Output/Release_Windows/Examples/skeleton_texture.json

@@ -0,0 +1 @@
+{"SubTexture":[{"frameY":0,"y":234,"frameWidth":112,"frameX":0,"frameHeight":210,"width":111,"height":209,"name":"parts/tailTip","x":456},{"width":112,"y":234,"height":86,"name":"parts/armUpperL","x":340},{"width":48,"y":859,"height":80,"name":"parts/armL","x":373},{"width":96,"y":922,"height":78,"name":"parts/handL","x":1},{"frameY":0,"y":677,"frameWidth":204,"frameX":0,"frameHeight":180,"width":203,"height":180,"name":"parts/legL","x":238},{"frameY":0,"y":397,"frameWidth":236,"frameX":0,"frameHeight":348,"width":235,"height":347,"name":"parts/body","x":1},{"width":216,"y":397,"height":278,"name":"parts/tail","x":238},{"width":208,"y":746,"height":174,"name":"parts/clothes1","x":1},{"width":124,"y":677,"height":282,"name":"parts/hair","x":443},{"frameY":0,"y":1,"frameWidth":338,"frameX":0,"frameHeight":394,"width":337,"height":394,"name":"parts/head","x":1},{"width":28,"y":961,"height":46,"name":"parts/eyeL","x":459},{"frameY":0,"y":961,"frameWidth":38,"frameX":0,"frameHeight":58,"width":37,"height":58,"name":"parts/eyeR","x":420},{"frameY":0,"y":1,"frameWidth":180,"frameX":0,"frameHeight":232,"width":180,"height":231,"name":"parts/legR","x":340},{"width":160,"y":859,"height":94,"name":"parts/armUpperR","x":211},{"frameY":0,"y":941,"frameWidth":46,"frameX":0,"frameHeight":78,"width":45,"height":77,"name":"parts/armR","x":373},{"width":98,"y":322,"height":58,"name":"parts/handR","x":340},{"frameY":0,"y":955,"frameWidth":120,"frameX":0,"frameHeight":36,"width":119,"height":36,"name":"parts/beardL","x":237},{"width":136,"y":955,"height":36,"name":"parts/beardR","x":99}],"width":1024,"height":1024,"name":"dragon","imagePath":"dragon_tex.png"}

Binaries/Packaging/PackageForWindows.bat

@@ -11,7 +11,7 @@ IF NOT EXIST "%INNOSETUP_EXE%" set INNOSETUP_EXE=C:\Program Files\Inno Setup 5\I
 IF EXIST "%INNOSETUP_EXE%" (
 	echo "Note: InnoSetup found at %INNOSETUP_EXE%"
 ) ELSE (
-	echo Warning: InnoSetup not found! Skipping installer creation.
+	echo Warning: InnoSetup Unicode not found! Skipping installer creation.
 	SET SKIPINSTALLER=1
 )
 

Binaries/Packaging/linux-extra-files/usr/share/applications/gdevelop.desktop

@@ -2,7 +2,9 @@
 Version=1.0
 Name=GDevelop
 GenericName=Game creator IDE
+GenericName[de]=Entwicklungsumgebung für Spiele
 Comment=HTML5 and native game development software
+Comment[de]=Entwicklungsumgebung für native und HTML5-Spiele
 Exec=sh -c "gdevelop %F"
 MimeType=application/x-gdevelop-project;
 Icon=GDevelop

Binaries/Releases/InnoSetupInstallerScript.iss

@@ -1,4 +1,4 @@
-; Inno Setup installation script for GDevelop.
+; Inno Setup installation script for GDevelop 4.
 
 [Setup]
 AppName=GDevelop
@@ -13,17 +13,17 @@ AllowNoIcons=yes
 LicenseFile=..\Output\Release_Windows\License-en.rtf
 InfoBeforeFile=..\Output\Release_Windows\Informations-en.rtf
 OutputDir=.\
-OutputBaseFilename=gd4090
+OutputBaseFilename=gd4097
 Compression=lzma
 SolidCompression=yes
 SetupIconFile=..\Output\Release_Windows\res\icon.ico
 VersionInfoVersion=4.0
 WizardImageFile=Setup bitmap\wizbmp.bmp
 WizardSmallImageFile=Setup bitmap/smallicon.bmp
-AppCopyright=2008-2016 Florian Rival
+AppCopyright=2008-2018 Florian Rival
 VersionInfoCompany=Florian Rival
 VersionInfoDescription=GDevelop setup
-VersionInfoCopyright=2008-2016 Florian Rival
+VersionInfoCopyright=2008-2018 Florian Rival
 VersionInfoProductName=GDevelop
 VersionInfoProductVersion=4.0
 

Core/GDCore/DocMainPage.h

@@ -78,6 +78,7 @@
  * The installation is fairly simple :<br>
  * <br>
  * - Launch the installer.<br>
+ * - Uncheck "Check for updated files on the TDM-GCC server" (otherwise you won't get TDM-GCC 4.9.2 but a more recent version that won't be compatible with wxWidgets pre-compiled binaries)
  * - Choose Create.<br>
 
  \image html compilerInstall1.png

Core/GDCore/Events/CodeGeneration/EventsCodeGenerator.cpp

@@ -500,7 +500,7 @@ gd::String EventsCodeGenerator::GenerateParameterCodes(const gd::String & parame
         gd::ExpressionParser parser(parameter);
         if ( !parser.ParseMathExpression(platform, project, scene, callbacks) )
         {
-            cout << "Error :" << parser.firstErrorStr << " in: "<< parameter << endl;
+            cout << "Error :" << parser.GetFirstError() << " in: "<< parameter << endl;
 
             argOutput = "0";
         }
@@ -514,7 +514,7 @@ gd::String EventsCodeGenerator::GenerateParameterCodes(const gd::String & parame
         gd::ExpressionParser parser(parameter);
         if ( !parser.ParseStringExpression(platform, project, scene, callbacks) )
         {
-            cout << "Error in text expression" << parser.firstErrorStr << endl;
+            cout << "Error in text expression" << parser.GetFirstError() << endl;
 
             argOutput = "\"\"";
         }

Core/GDCore/Events/CodeGeneration/ExpressionsCodeGeneration.cpp

@@ -169,8 +169,8 @@ bool CallbacksForGeneratingExpressionCode::OnSubMathExpression(const gd::Platfor
     if ( !parser.ParseMathExpression(platform, project, layout, callbacks) )
     {
         #if defined(GD_IDE_ONLY)
-        firstErrorStr = callbacks.firstErrorStr;
-        firstErrorPos = callbacks.firstErrorPos;
+        firstErrorStr = callbacks.GetFirstError();
+        firstErrorPos = callbacks.GetFirstErrorPosition();
         #endif
         return false;
     }
@@ -188,8 +188,8 @@ bool CallbacksForGeneratingExpressionCode::OnSubTextExpression(const gd::Platfor
     if ( !parser.ParseStringExpression(platform, project, layout, callbacks) )
     {
         #if defined(GD_IDE_ONLY)
-        firstErrorStr = callbacks.firstErrorStr;
-        firstErrorPos = callbacks.firstErrorPos;
+        firstErrorStr = callbacks.GetFirstError();
+        firstErrorPos = callbacks.GetFirstErrorPosition();
         #endif
         return false;
     }

Core/GDCore/Events/EventsList.h

@@ -167,7 +167,7 @@ private:
 
     /**
      * Initialize from another list of events, copying events. Used by copy-ctor and assign-op.
-     * Don't forget to update me if members were changed !
+     * Don't forget to update me if members were changed!
      */
     void Init(const gd::EventsList & other);
 };

Core/GDCore/Events/Parsers/ExpressionParser.h

@@ -31,21 +31,31 @@ public:
     virtual ~ExpressionParser() {};
 
     /**
-     * Parse the expression, calling each functor when necessary
+     * \brief Parse the expression, calling each functor when necessary
      * \return True if expression was correctly parsed.
      */
     bool ParseMathExpression(const gd::Platform & platform, const gd::Project & project, const gd::Layout & layout, gd::ParserCallbacks & callbacks);
 
     /**
-     * Parse the expression, calling each functor when necessary
+     * \brief Parse the expression, calling each functor when necessary
      * \return True if expression was correctly parsed.
      */
     bool ParseStringExpression(const gd::Platform & platform, const gd::Project & project, const gd::Layout & layout, gd::ParserCallbacks & callbacks);
 
-    gd::String firstErrorStr;
-    size_t firstErrorPos;
+    /**
+     * \brief Return the description of the error that was found
+     */
+    const gd::String & GetFirstError() { return firstErrorStr; }
+
+    /**
+     * \brief Return the position of the error that was found
+     * \return The position, or gd::String::npos if no error is found
+     */
+    size_t GetFirstErrorPosition() { return firstErrorPos; }
 
 private:
+    gd::String firstErrorStr;
+    size_t firstErrorPos;
 
     /**
      * Tool function to add a parameter
@@ -103,8 +113,21 @@ public:
     virtual bool OnSubMathExpression(const gd::Platform & platform, const gd::Project & project, const gd::Layout & layout, gd::Expression & expression) = 0;
     virtual bool OnSubTextExpression(const gd::Platform & platform, const gd::Project & project, const gd::Layout & layout, gd::Expression & expression) = 0;
 
+    /**
+     * \brief Return the description of the error that was found
+     */
+    const gd::String & GetFirstError() { return firstErrorStr; }
+
+    /**
+     * \brief Return the position of the error that was found
+     * \return The position, or gd::String::npos if no error is found
+     */
+    size_t GetFirstErrorPosition() { return firstErrorPos; }
+
+protected:
     gd::String firstErrorStr;
     size_t firstErrorPos;
+
 private:
     /**
      * \brief Set the return type of the expression: Done by ExpressionParser according to

Core/GDCore/Events/Parsers/VariableParser.h

@@ -30,7 +30,7 @@ namespace gd
 
     gd::VariableParser parser(parameter);
     if ( !parser.Parse(callbacks) )
-        cout << "Error :" << parser.firstErrorStr << " in: "<< parameter << endl;
+        cout << "Error :" << parser.GetFirstError() << " in: "<< parameter << endl;
 \endcode
  *
  * Here is the parsed grammar:   <br>
@@ -61,6 +61,17 @@ public:
      */
     bool Parse(VariableParserCallbacks & callbacks);
 
+    /**
+     * \brief Return the description of the error that was found
+     */
+    const gd::String & GetFirstError() { return firstErrorStr; }
+
+    /**
+     * \brief Return the position of the error that was found
+     * \return The position, or gd::String::npos if no error is found
+     */
+    size_t GetFirstErrorPosition() { return firstErrorPos; }
+
     gd::String firstErrorStr;
     size_t firstErrorPos;
 

Core/GDCore/Extensions/Builtin/AudioExtension.cpp

@@ -22,7 +22,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsAudioExtension(gd::Plat
     extension.AddAction("PlaySoundCanal",
                    _("Play a sound on a channel"),
                    _("Play a sound (small audio file) on a specific channel,\nso you'll be able to manipulate it."),
-                   _("Play the sound _PARAM1_ on the channel _PARAM2_"),
+                   _("Play the sound _PARAM1_ on the channel _PARAM2_, vol.: _PARAM4_, loop: _PARAM3_"),
                    _("Audio/Sounds on channels"),
                    "res/actions/son24.png",
                    "res/actions/son.png")
@@ -70,7 +70,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsAudioExtension(gd::Plat
     extension.AddAction("PlayMusicCanal",
                    _("Play a music file on a channel"),
                    _("Play a music file on a specific channel,\nso you'll be able to interact with it later."),
-                   _("Play the music _PARAM1_ on channel _PARAM2_"),
+                   _("Play the music _PARAM1_ on channel _PARAM2_, vol.: _PARAM4_, loop: _PARAM3_"),
                    _("Audio/Music on channels"),
                    "res/actions/music24.png",
                    "res/actions/music.png")
@@ -215,7 +215,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsAudioExtension(gd::Plat
     extension.AddAction("PlaySound",
                    _("Play a sound"),
                    _("Play a sound."),
-                   _("Play the sound _PARAM1_"),
+                   _("Play the sound _PARAM1_, vol.: _PARAM3_, loop: _PARAM2_)"),
                    _("Audio"),
                    "res/actions/son24.png",
                    "res/actions/son.png")
@@ -229,7 +229,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsAudioExtension(gd::Plat
     extension.AddAction("PlayMusic",
                    _("Play a music file"),
                    _("Play a music file."),
-                   _("Play the music _PARAM1_"),
+                   _("Play the music _PARAM1_, vol.: _PARAM3_, loop: _PARAM2_)"),
                    _("Audio"),
                    "res/actions/music24.png",
                    "res/actions/music.png")
@@ -337,7 +337,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsAudioExtension(gd::Plat
     extension.AddCondition("GlobalVolume",
                    _("Global volume"),
                    _("Test the global sound level. The volume is between 0 and 100."),
-                   _("The global game volume is _PARAM2_ to _PARAM1_"),
+                   _("The global game volume is _PARAM1__PARAM2_"),
                    _("Audio"),
                    "res/conditions/volume24.png",
                    "res/conditions/volume.png")

Core/GDCore/Extensions/Builtin/BaseObjectExtension.cpp

@@ -621,6 +621,18 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(gd:
         .AddParameter("objectList", _("Objects"))
         .MarkAsSimple();
 
+    obj.AddCondition("CollisionPoint",
+                   _("Point inside object"),
+                   _("Test if a point is inside the object collision masks."),
+                   _("_PARAM1_;_PARAM2_ is inside _PARAM0_"),
+                   _("Collision"),
+                   "res/conditions/collisionPoint24.png",
+                   "res/conditions/collisionPoint.png")
+        .AddParameter("object", _("Object"))
+        .AddParameter("expression", _("X position of the point"))
+        .AddParameter("expression", _("Y position of the point"))
+        .MarkAsSimple();
+
     obj.AddExpression("X", _("X position"), _("X position of the object"), _("Position"), "res/actions/position.png")
         .AddParameter("object", _("Object"));
 
@@ -848,8 +860,28 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(gd:
         .AddCodeOnlyParameter("conditionInverted", "")
         .MarkAsAdvanced();
 
+    extension.AddCondition("Raycast",
+                   _("Raycast"),
+                   _("Sends a ray from the given source position and angle, intersecting the closest object.\nThe instersected object will become the only one taken into account.\nIf the condition is inverted, the object to be intersected will be the farthest one within the ray radius."),
+                   _("Raycast _PARAM0_ from _PARAM1_;_PARAM2_, and save the result in _PARAM5_, _PARAM6_"),
+                   _("Collision"),
+                   "res/conditions/raycast24.png",
+                   "res/conditions/raycast.png")
+        .AddParameter("objectList", _("Objects to test against the ray"))
+        .AddParameter("expression", _("Ray source X position"))
+        .AddParameter("expression", _("Ray source Y position"))
+        .AddParameter("expression", _("Ray angle (in degrees)"))
+        .AddParameter("expression", _("Ray maximum distance (in pixels)"))
+        .AddParameter("scenevar", _("Variable where to store the X position of the intersection"))
+        .AddParameter("scenevar", _("Variable where to store the Y position of the intersection"))
+        .AddCodeOnlyParameter("conditionInverted", "")
+        .MarkAsAdvanced();
+
     extension.AddExpression("Count", _("Number of objects"), _("Count the number of the specified objects currently picked"), _("Objects"), "res/conditions/nbObjet.png")
         .AddParameter("objectList", _("Object"));
+
+    obj.AddStrExpression("ObjectName", _("Object name"), _("Return the name of the object"), _("Objects"), "res/conditions/text.png")
+        .AddParameter("object", _("Object"));
     #endif
 }
 

Core/GDCore/Extensions/Builtin/CameraExtension.cpp

@@ -37,7 +37,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsCameraExtension(gd::Pla
     extension.AddCondition("CameraY",
                    _("Camera center Y position"),
                    _("Compare the Y position of the center of a camera."),
-                   _("The Y position of camera _PARAM4_ is _PARAM1__PARAM2_  (layer: _PARAM3_)"),
+                   _("The Y position of camera _PARAM4_ is _PARAM1__PARAM2_ (layer: _PARAM3_)"),
                    _("Layers and cameras"),
                    "res/conditions/camera24.png",
                    "res/conditions/camera.png")

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

@@ -26,14 +26,24 @@ public:
     mutable std::vector<sf::Vector2f> edges; ///< Edges. Can be computed from vertices using ComputeEdges()
 
     /**
-     * Moves each vertices from the given amount.
+     * \brief Get the vertices composing the polygon.
+     */
+    std::vector<sf::Vector2f> & GetVertices() { return vertices; }
+
+    /**
+     * \brief Get the vertices composing the polygon.
+     */
+    const std::vector<sf::Vector2f> & GetVertices() const { return vertices; }
+
+    /**
+     * \brief Moves each vertices from the given amount.
      *
      * \note Edges are updated, there is no need to call ComputeEdges after calling Move.
      */
     void Move(float x, float y);
 
     /**
-     * Rotate the polygon.
+     * \brief Rotate the polygon.
      * \param angle Angle in radians
      *
      * \warning Rotation is made clockwise
@@ -42,18 +52,18 @@ public:
     void Rotate(float angle);
 
     /**
-     * Automatically fill edges vector using vertices.
+     * \brief Automatically fill edges vector using vertices.
      */
     void ComputeEdges() const;
 
     /**
-     * Check if the polygon is convex.
+     * \brief Check if the polygon is convex.
      * \return true if the polygon is convex
      */
     bool IsConvex() const;
 
     /**
-     * Return the position of the center of the polygon
+     * \brief Return the position of the center of the polygon
      */
     sf::Vector2f ComputeCenter() const;
 
@@ -62,7 +72,7 @@ public:
      */
     ///@{
     /**
-     * Create a rectangle
+     * \brief Create a rectangle
      */
     static Polygon2d CreateRectangle(float width, float height);
     ///@}

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

@@ -103,6 +103,7 @@ bool Sprite::SetDefaultCenterPoint(bool enabled)
 
 std::vector<Polygon2d> Sprite::GetCollisionMask() const
 {
+    //TODO(perf): Cache to avoid re-creating a mask at every call
 #if !defined(EMSCRIPTEN)
     if ( automaticCollisionMask )
     {

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

@@ -56,6 +56,16 @@ public:
      */
     std::vector<Polygon2d> GetCollisionMask() const;
 
+    /**
+     * \brief Get the custom collision mask.
+     */
+    std::vector<Polygon2d> & GetCustomCollisionMask() { return customCollisionMask; };
+
+    /**
+     * \brief Get the custom collision mask.
+     */
+    const std::vector<Polygon2d> & GetCustomCollisionMask() const { return customCollisionMask; };
+
     /**
      * \brief Set the custom collision mask.
      * Call then `SetCollisionMaskAutomatic(false)` to use it.
@@ -131,7 +141,7 @@ public:
      * \warning If the image has not been loaded (using LoadImage) and the center point is set as automatic,
      * the returned point won't be correct.
      */
-    inline Point & GetCenter() { automaticCentre = false; return centre; }
+    inline Point & GetCenter() { return centre; }
 
     /**
      * \brief Return true if the center point is automatically computed.

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

@@ -47,6 +47,7 @@ void SpriteObject::DoUnserializeFrom(gd::Project & project, const gd::Serializer
 {
     updateIfNotVisible = element.GetBoolAttribute("updateIfNotVisible", true);
 
+    RemoveAllAnimations();
     const gd::SerializerElement & animationsElement = element.GetChild("animations", 0, "Animations");
     animationsElement.ConsiderAsArrayOf("animation", "Animation");
     for (std::size_t i = 0; i < animationsElement.GetChildrenCount(); ++i)

Core/GDCore/IDE/AbstractFileSystem.cpp

@@ -147,6 +147,8 @@ std::vector<gd::String> NativeFileSystem::ReadDir(const gd::String & path, const
 
 bool NativeFileSystem::CopyFile(const gd::String & file, const gd::String & destination)
 {
+    if (file == destination) return true; //No copy needed
+
     wxLogNull noLogPlease;
     return wxCopyFile( file, destination, true );
 }

Core/GDCore/IDE/Dialogs/ChooseVariableDialog.cpp

@@ -225,13 +225,13 @@ void ChooseVariableDialog::RefreshVariable(wxTreeListItem item, const gd::String
         variablesList->SetItemText(item, 1, "(Structure)");
 
         //Add/update children
-        const std::map<gd::String, gd::Variable> & children = variable.GetAllChildren();
+        const auto & children = variable.GetAllChildren();
         wxTreeListItem currentChildItem = variablesList->GetFirstChild(item);
         wxTreeListItem lastChildItem;
-        for(std::map<gd::String, gd::Variable>::const_iterator it = children.begin();it != children.end();++it)
+        for(auto it = children.begin();it != children.end();++it)
         {
             if ( !currentChildItem.IsOk() ) currentChildItem = variablesList->AppendItem(item, it->first);
-            RefreshVariable(currentChildItem, it->first, it->second);
+            RefreshVariable(currentChildItem, it->first, *it->second);
             lastChildItem = currentChildItem;
 
             currentChildItem = variablesList->GetNextSibling(currentChildItem);
@@ -255,10 +255,11 @@ void ChooseVariableDialog::RefreshAll()
 
     for (std::size_t i = 0;i<temporaryContainer->Count();++i)
     {
-        const std::pair<gd::String, gd::Variable> & variable = temporaryContainer->Get(i);
+        const gd::String & name = temporaryContainer->GetNameAt(i);
+        const auto & variable = temporaryContainer->Get(i);
 
-    	wxTreeListItem item = variablesList->AppendItem(variablesList->GetRootItem(), variable.first);
-        RefreshVariable(item, variable.first, variable.second);
+    	wxTreeListItem item = variablesList->AppendItem(variablesList->GetRootItem(), name);
+        RefreshVariable(item, name, variable);
         variablesList->Expand(item);
     }
 
@@ -330,20 +331,11 @@ void ChooseVariableDialog::OnAddVarSelected(wxCommandEvent& event)
 void ChooseVariableDialog::OnMoveUpVarSelected(wxCommandEvent& event)
 {
     UpdateSelectedAndParentVariable();
-    for (std::size_t i = 1;i<temporaryContainer->Count();++i)
-    {
-        const std::pair<gd::String, gd::Variable> & currentVar = temporaryContainer->Get(i);
-        if ( currentVar.first == selectedVariableName)
-        {
-            const std::pair<gd::String, gd::Variable> & prevVar = temporaryContainer->Get(i-1);
-            temporaryContainer->Swap(i, i-1);
-            RefreshAll();
-
-            modificationCount++;
-            return;
-        }
-    }
+    auto position = temporaryContainer->GetPosition(selectedVariableName);
+    temporaryContainer->Move(position, position-1);
+    RefreshAll();
 
+    modificationCount++;
 }
 
 /**
@@ -352,21 +344,11 @@ void ChooseVariableDialog::OnMoveUpVarSelected(wxCommandEvent& event)
 void ChooseVariableDialog::OnMoveDownVarSelected(wxCommandEvent& event)
 {
     UpdateSelectedAndParentVariable();
-    for (std::size_t i = 0;i<temporaryContainer->Count()-1;++i)
-    {
-        const std::pair<gd::String, gd::Variable> & currentVar = temporaryContainer->Get(i);
-        if ( currentVar.first == selectedVariableName)
-        {
-            const std::pair<gd::String, gd::Variable> & nextVar = temporaryContainer->Get(i+1);
-
-            temporaryContainer->Swap(i, i+1);
-            RefreshAll();
-
-            modificationCount++;
-            return;
-        }
-    }
+    auto position = temporaryContainer->GetPosition(selectedVariableName);
+    temporaryContainer->Move(position, position+1);
+    RefreshAll();
 
+    modificationCount++;
 }
 
 /**

Core/GDCore/IDE/Dialogs/EditExpressionDialog.cpp

@@ -477,8 +477,8 @@ void EditExpressionDialog::TextModified(wxStyledTextEvent& event)
     gd::ExpressionParser expressionParser(expression);
     if ( !expressionParser.ParseMathExpression(project.GetCurrentPlatform(), project, layout, callbacks) )
     {
-        errorTxt->SetLabel(expressionParser.firstErrorStr);
-        lastErrorPos = expressionParser.firstErrorPos;
+        errorTxt->SetLabel(expressionParser.GetFirstError());
+        lastErrorPos = expressionParser.GetFirstErrorPosition();
     }
     else
     {

Core/GDCore/IDE/Dialogs/EditStrExpressionDialog.cpp

@@ -516,8 +516,8 @@ void EditStrExpressionDialog::TextModified(wxStyledTextEvent& event)
     gd::ExpressionParser expressionParser(text);
     if ( !expressionParser.ParseStringExpression(project.GetCurrentPlatform(), project, layout, callbacks) )
     {
-        errorTxt->SetLabel(expressionParser.firstErrorStr);
-        lastErrorPos = expressionParser.firstErrorPos;
+        errorTxt->SetLabel(expressionParser.GetFirstError());
+        lastErrorPos = expressionParser.GetFirstErrorPosition();
     }
     else
     {

Core/GDCore/IDE/Dialogs/LayoutEditorCanvas/LayoutEditorCanvas.cpp

@@ -1253,6 +1253,24 @@ void LayoutEditorCanvas::OnKey( wxKeyEvent& evt )
 
         eventIsOnlyForMe = true;
     }
+    else if ( evt.GetModifiers() == wxMOD_CMD ) //Ctrl-xxx
+    {
+        switch ( evt.GetKeyCode() )
+        {
+            case 89: //Ctrl-Y
+            {
+                Redo();
+                break;
+            }
+            case 90: //Ctrl-Z
+            {
+                Undo();
+                break;
+            }
+            default:
+                break;
+        }
+    }
 
     if (eventIsOnlyForMe)
         evt.StopPropagation();

Core/GDCore/IDE/Dialogs/ResourcesEditor.cpp

@@ -52,6 +52,7 @@
 #include "GDCore/Tools/Log.h"
 #include "GDCore/IDE/Dialogs/DndResourcesEditor.h"
 #include "GDCore/IDE/wxTools/TreeItemStringData.h"
+#include "GDCore/IDE/Dialogs/PropertyDescriptor.h"
 
 #ifdef __WXGTK__
 #include <gtk/gtk.h>
@@ -635,7 +636,7 @@ void ResourcesEditor::OnresourcesTreeSelectionChanged( wxTreeEvent& event )
 
 void ResourcesEditor::UpdatePropertyGrid()
 {
-    std::vector<gd::String> commonProperties; ///< The name of the properties to be displayed
+    std::map<gd::String, gd::PropertyDescriptor> commonProperties; ///< The name of the properties to be displayed
     bool aFolderIsSelected = false;
 
     //First construct the list of common properties
@@ -646,18 +647,29 @@ void ResourcesEditor::UpdatePropertyGrid()
         gd::TreeItemStringData * data = dynamic_cast<gd::TreeItemStringData*>(resourcesTree->GetItemData(selection[i]));
         if ( data && data->GetString() == "Image")
         {
-            std::vector<gd::String> properties = project.GetResourcesManager().GetResource(data->GetSecondString()).GetAllProperties(project);
+            const std::map<gd::String, gd::PropertyDescriptor> & properties =
+                project.GetResourcesManager().GetResource(data->GetSecondString()).GetProperties(project);
             if ( i == 0 )
                 commonProperties = properties;
             else
             {
-                //Keep only properties that are common to all the selected resources
-                for (std::size_t j = 0;j<commonProperties.size();)
+                // TODO: This could be factored with helpers like ObjectsPropgridHelper
+
+                //Merge custom properties
+                for(std::map<gd::String, gd::PropertyDescriptor>::const_iterator it = properties.begin();
+                    it != properties.end();++it)
                 {
-                    if ( find(properties.begin(), properties.end(), commonProperties[j]) == properties.end() )
-                        commonProperties.erase(commonProperties.begin()+j);
-                    else
-                        ++j;
+                    if ( commonProperties.find(it->first) == commonProperties.end() ) continue;
+                    if ( commonProperties[it->first].GetValue() != it->second.GetValue() )
+                        commonProperties[it->first].SetValue(_("(Multiples values)"));
+                }
+                //Also erase properties which are not in common.
+                for(std::map<gd::String, gd::PropertyDescriptor>::iterator it = commonProperties.begin();
+                    it != commonProperties.end();)
+                {
+                    if ( properties.find(it->first) == properties.end() )
+                        commonProperties.erase(it++);
+                    else ++it;
                 }
             }
         }
@@ -721,32 +733,11 @@ void ResourcesEditor::UpdatePropertyGrid()
 
         //Other properties
         if ( !commonProperties.empty() ) propertyGrid->Append( new wxPropertyCategory(_("Other properties")) );
-        for (std::size_t j = 0;j<commonProperties.size();++j)
+        for(auto & propertyIterator: commonProperties)
         {
-            wxPGProperty * property = propertyGrid->Append( new wxStringProperty("", commonProperties[j], "") );
-            wxString commonValue;
-
-            for (std::size_t i = 0;i<selection.size();++i)
-            {
-                gd::TreeItemStringData * data = dynamic_cast<gd::TreeItemStringData*>(resourcesTree->GetItemData(selection[i]));
-                if ( data && data->GetString() == "Image")
-                {
-                    //It is assumed that the description and the user friendly name
-                    //are the same for all the properties with the same name.
-                    gd::String propertyUserFriendlyName;
-                    gd::String propertyDescription;
-                    project.GetResourcesManager().GetResource(data->GetSecondString()).GetPropertyInformation(project, commonProperties[j], propertyUserFriendlyName, propertyDescription);
-                    propertyGrid->SetPropertyLabel(property, propertyUserFriendlyName);
-                    propertyGrid->SetPropertyHelpString(property, propertyDescription);
-
-                    //Values can be different though
-                    gd::String propertyValue = project.GetResourcesManager().GetResource(data->GetSecondString()).GetProperty(project, commonProperties[j]);
-                    if ( i == 0 ) commonValue = propertyValue;
-                    else if ( commonValue != propertyValue ) commonValue = _("(Multiple values)");
-                }
-            }
-
-            propertyGrid->SetPropertyValue(property, commonValue);
+            // TODO: For now, all other properties are assumed to be booleans.
+            auto & propertyName = propertyIterator.first;
+            propertyGrid->Append(new wxBoolProperty(propertyName, propertyName, propertyIterator.second.GetValue() == "true"));
         }
     }
 }
@@ -782,7 +773,7 @@ void ResourcesEditor::OnPropertyChanged(wxPropertyGridEvent& event)
                 RenameInTree(resourcesTree->GetRootItem(), renamedItemOldName, propertyNewValue, "Image");
             }
             else
-                project.GetResourcesManager().GetResource(data->GetSecondString()).ChangeProperty(project, propertyName, propertyNewValue);
+                project.GetResourcesManager().GetResource(data->GetSecondString()).UpdateProperty(propertyName, propertyNewValue, project);
 
             for ( std::size_t j = 0; j < project.GetUsedPlatforms().size();++j)
                 project.GetUsedPlatforms()[j]->GetChangesNotifier().OnResourceModified(project, data->GetSecondString());
@@ -945,7 +936,7 @@ void ResourcesEditor::Refresh()
         gd::ResourceFolder & folder = project.GetResourcesManager().GetFolder(folders[i]);
         wxTreeItemId folderItem = resourcesTree->AppendItem( resourcesTree->GetRootItem(), folders[i], -1, -1, new gd::TreeItemStringData("Folder", folders[i] ));
 
-        std::vector<gd::String> resources = folder.GetAllResourcesList();
+        std::vector<gd::String> resources = folder.GetAllResourceNames();
         for (std::size_t j=0;j<resources.size();++j)
         {
             gd::Resource & resource = folder.GetResource(resources[j]);
@@ -959,7 +950,7 @@ void ResourcesEditor::Refresh()
 
     //All images
     allImagesItem = resourcesTree->AppendItem( resourcesTree->GetRootItem(), _("All images"), -1,-1, new gd::TreeItemStringData("BaseFolder", "" ));
-    std::vector<gd::String> resources = project.GetResourcesManager().GetAllResourcesList();
+    std::vector<gd::String> resources = project.GetResourcesManager().GetAllResourceNames();
     for ( std::size_t i = 0;i <resources.size();i++ )
     {
         gd::Resource & resource = project.GetResourcesManager().GetResource(resources[i]);

Core/GDCore/IDE/Events/ExpressionsCorrectnessTesting.cpp

@@ -28,8 +28,8 @@ bool CallbacksForExpressionCorrectnessTesting::OnSubMathExpression(const gd::Pla
     if ( !parser.ParseMathExpression(platform, project, layout, callbacks) )
     {
         #if defined(GD_IDE_ONLY)
-        firstErrorStr = callbacks.firstErrorStr;
-        firstErrorPos = callbacks.firstErrorPos;
+        firstErrorStr = callbacks.GetFirstError();
+        firstErrorPos = callbacks.GetFirstErrorPosition();
         #endif
         return false;
     }
@@ -45,8 +45,8 @@ bool CallbacksForExpressionCorrectnessTesting::OnSubTextExpression(const gd::Pla
     if ( !parser.ParseStringExpression(platform, project, layout, callbacks) )
     {
         #if defined(GD_IDE_ONLY)
-        firstErrorStr = callbacks.firstErrorStr;
-        firstErrorPos = callbacks.firstErrorPos;
+        firstErrorStr = callbacks.GetFirstError();
+        firstErrorPos = callbacks.GetFirstErrorPosition();
         #endif
         return false;
     }

Core/GDCore/IDE/Events/InstructionSentenceFormatter.cpp

@@ -143,13 +143,13 @@ void InstructionSentenceFormatter::LoadTypesFormattingFromConfig()
 {
     //Load default configuration
     typesFormatting.clear();
-    typesFormatting["expression"].SetColor(99, 0, 0).SetBold();
-    typesFormatting["object"].SetColor(19, 81, 0).SetBold();
-    typesFormatting["behavior"].SetColor(19, 81, 0).SetBold();
-    typesFormatting["operator"].SetColor(64, 81, 79).SetBold();
-    typesFormatting["objectvar"].SetColor(44, 69, 99).SetBold();
-    typesFormatting["scenevar"].SetColor(44, 69, 99).SetBold();
-    typesFormatting["globalvar"].SetColor(44, 69, 99).SetBold();
+    typesFormatting["expression"].SetColor(27, 143, 1).SetBold();
+    typesFormatting["object"].SetColor(182, 97, 10).SetBold();
+    typesFormatting["behavior"].SetColor(119, 119, 119).SetBold();
+    typesFormatting["operator"].SetColor(55, 131, 211).SetBold();
+    typesFormatting["objectvar"].SetColor(131, 55, 162).SetBold();
+    typesFormatting["scenevar"].SetColor(131, 55, 162).SetBold();
+    typesFormatting["globalvar"].SetColor(131, 55, 162).SetBold();
 
     //Load any existing custom configuration
     #if !defined(GD_NO_WX_GUI)

Core/GDCore/IDE/Project/ArbitraryResourceWorker.cpp

@@ -51,7 +51,7 @@ void ArbitraryResourceWorker::ExposeResources(gd::ResourcesManager * resourcesMa
 
     resourcesManagers.push_back(resourcesManager);
 
-    std::vector<gd::String> resources = resourcesManager->GetAllResourcesList();
+    std::vector<gd::String> resources = resourcesManager->GetAllResourceNames();
     for ( std::size_t i = 0;i < resources.size() ;i++ )
     {
         if ( resourcesManager->GetResource(resources[i]).UseFile() )

Core/GDCore/IDE/Project/ProjectResourcesAdder.cpp

@@ -45,7 +45,7 @@ std::vector<gd::String> ProjectResourcesAdder::GetAllUselessImages(gd::Project &
     std::set<gd::String> & usedImages = inventorizer.GetAllUsedImages();
 
     //Search all images resources not used
-    std::vector<gd::String> resources = project.GetResourcesManager().GetAllResourcesList();
+    std::vector<gd::String> resources = project.GetResourcesManager().GetAllResourceNames();
     for (std::size_t i = 0;i < resources.size();i++)
     {
         if (project.GetResourcesManager().GetResource(resources[i]).GetKind() != "image")

Core/GDCore/IDE/Project/ProjectResourcesCopier.cpp

@@ -45,7 +45,7 @@ bool ProjectResourcesCopier::CopyAllResourcesTo(gd::Project & originalProject, A
     #endif
 
     auto projectDirectory = fs.DirNameFrom(originalProject.GetProjectFile());
-    std::cout << "Copying all ressources from " << projectDirectory << " to " << destinationDirectory;
+    std::cout << "Copying all ressources from " << projectDirectory << " to " << destinationDirectory << "..." << std::endl;
 
     //Get the resources to be copied
     gd::ResourcesMergingHelper resourcesMergingHelper(fs);
@@ -79,20 +79,17 @@ bool ProjectResourcesCopier::CopyAllResourcesTo(gd::Project & originalProject, A
             #endif
 
             //Create the destination filename
-            gd::String destinationFile(destinationDirectory + "/" + it->second);
+            gd::String destinationFile = it->second;
             fs.MakeAbsolute(destinationFile, destinationDirectory);
 
-            if ( destinationFile != it->first )
-            {
-                //Be sure the directory exists
-                gd::String dir = fs.DirNameFrom(destinationFile);
-                if ( !fs.DirExists(dir) ) fs.MkDir(dir);
+            //Be sure the directory exists
+            gd::String dir = fs.DirNameFrom(destinationFile);
+            if ( !fs.DirExists(dir) ) fs.MkDir(dir);
 
-                //We can now copy the file
-                if ( !fs.CopyFile(it->first, destinationFile) )
-                {
-                    gd::LogWarning( _( "Unable to copy \"")+it->first+_("\" to \"")+destinationFile+_("\"."));
-                }
+            //We can now copy the file
+            if ( !fs.CopyFile(it->first, destinationFile) )
+            {
+                gd::LogWarning( _( "Unable to copy \"")+it->first+_("\" to \"")+destinationFile+_("\"."));
             }
         }
 

Core/GDCore/Project/Behavior.h

@@ -68,7 +68,7 @@ public:
      * Usage example:
      \code
         std::map<gd::String, gd::PropertyDescriptor> properties;
-        properties[ToString(_("Initial speed"))].SetValue("5");
+        properties[_("Initial speed")].SetValue(gd::String::From(initialSpeed));
 
         return properties;
      \endcode

Core/GDCore/Project/BehaviorsSharedData.cpp

@@ -5,6 +5,10 @@
  */
 
 #include "GDCore/Project/BehaviorsSharedData.h"
+#if defined(GD_IDE_ONLY)
+#include <map>
+#include "GDCore/IDE/Dialogs/PropertyDescriptor.h"
+#endif
 
 namespace gd
 {
@@ -13,4 +17,12 @@ BehaviorsSharedData::~BehaviorsSharedData()
 {
 };
 
+#if defined(GD_IDE_ONLY)
+std::map<gd::String, gd::PropertyDescriptor> BehaviorsSharedData::GetProperties(gd::Project & project) const
+{
+	std::map<gd::String, gd::PropertyDescriptor> nothing;
+	return nothing;
+}
+#endif
+
 }

Core/GDCore/Project/BehaviorsSharedData.h

@@ -8,9 +8,13 @@
 #define BEHAVIORSSHAREDDATA_H
 
 #include <memory>
+#include <map>
 #include "GDCore/String.h"
 class BehaviorsRuntimeSharedData;
 namespace gd { class SerializerElement; }
+namespace gd { class PropertyDescriptor; }
+namespace gd { class Project; }
+namespace gd { class Layout; }
 
 namespace gd
 {
@@ -52,6 +56,31 @@ public:
     virtual void SetTypeName(const gd::String & type_) { type = type_; };
 
     #if defined(GD_IDE_ONLY)
+
+    /**
+     * \brief Called when the IDE wants to know about the properties of the shared data.
+     *
+     * Usage example:
+     \code
+        std::map<gd::String, gd::PropertyDescriptor> properties;
+        properties[_("Initial speed")].SetValue(gd::String::From(initialSpeed));
+
+        return properties;
+     \endcode
+     *
+     * \return a std::map with properties names as key.
+     * \see gd::PropertyDescriptor
+     */
+    virtual std::map<gd::String, gd::PropertyDescriptor> GetProperties(gd::Project & project) const;
+
+    /**
+     * \brief Called when the IDE wants to update a property of the shared data
+     *
+     * \return false if the new value cannot be set
+     * \see gd::InitialInstance
+     */
+    virtual bool UpdateProperty(const gd::String & name, const gd::String & value, gd::Project & project) {return false;};
+
     /**
      * \brief Serialize behaviors shared data.
      */

Core/GDCore/Project/ExternalEvents.h

@@ -102,7 +102,7 @@ private:
 
     /**
      * Initialize from another ExternalEvents. Used by copy-ctor and assign-op.
-     * Don't forget to update me if members were changed !
+     * Don't forget to update me if members were changed!
      */
     void Init(const ExternalEvents & externalEvents);
 };

Core/GDCore/Project/ImageManager.cpp

@@ -141,7 +141,7 @@ void ImageManager::LoadPermanentImages()
     //so as not to unload images that could be still present.
     std::map < gd::String, std::shared_ptr<SFMLTextureWrapper> > newPermanentlyLoadedImages;
 
-    std::vector<gd::String> resources = resourcesManager->GetAllResourcesList();
+    std::vector<gd::String> resources = resourcesManager->GetAllResourceNames();
     for ( std::size_t i = 0;i <resources.size();i++ )
     {
         try

Core/GDCore/Project/Layout.cpp

@@ -29,6 +29,7 @@ namespace gd
 {
 
 gd::Layer Layout::badLayer;
+gd::BehaviorsSharedData Layout::badBehaviorSharedData;
 
 Layout::Layout(const Layout & other)
 {
@@ -74,6 +75,53 @@ void Layout::SetName(const gd::String & name_)
     mangledName = gd::SceneNameMangler::GetMangledSceneName(name);
 };
 
+bool Layout::HasBehaviorSharedData(const gd::String & behaviorName)
+{
+    return behaviorsInitialSharedDatas.find(behaviorName) != behaviorsInitialSharedDatas.end();
+}
+
+std::vector <gd::String> Layout::GetAllBehaviorSharedDataNames() const
+{
+    std::vector < gd::String > allNames;
+
+    for (auto & it : behaviorsInitialSharedDatas)
+    	allNames.push_back(it.first);
+
+    return allNames;
+}
+
+const gd::BehaviorsSharedData & Layout::GetBehaviorSharedData(const gd::String & behaviorName) const
+{
+    auto it = behaviorsInitialSharedDatas.find(behaviorName);
+    if (it != behaviorsInitialSharedDatas.end())
+        return *it->second;
+
+    return badBehaviorSharedData;
+}
+
+gd::BehaviorsSharedData & Layout::GetBehaviorSharedData(const gd::String & behaviorName)
+{
+    auto it = behaviorsInitialSharedDatas.find(behaviorName);
+    if (it != behaviorsInitialSharedDatas.end())
+        return *it->second;
+
+    return badBehaviorSharedData;
+}
+
+std::shared_ptr<gd::BehaviorsSharedData> Layout::GetBehaviorSharedDataSmartPtr(const gd::String & behaviorName)
+{
+    auto it = behaviorsInitialSharedDatas.find(behaviorName);
+    if (it != behaviorsInitialSharedDatas.end())
+        return it->second;
+
+    return std::shared_ptr<gd::BehaviorsSharedData>();
+}
+
+const std::map < gd::String, std::shared_ptr<gd::BehaviorsSharedData> > & Layout::GetAllBehaviorSharedData() const
+{
+    return behaviorsInitialSharedDatas;
+}
+
 gd::Layer & Layout::GetLayer(const gd::String & name)
 {
     std::vector<gd::Layer>::iterator layer = find_if(initialLayers.begin(), initialLayers.end(), bind2nd(gd::LayerHasName(), name));
@@ -83,6 +131,7 @@ gd::Layer & Layout::GetLayer(const gd::String & name)
 
     return badLayer;
 }
+
 const gd::Layer & Layout::GetLayer(const gd::String & name) const
 {
     std::vector<gd::Layer>::const_iterator layer = find_if(initialLayers.begin(), initialLayers.end(), bind2nd(gd::LayerHasName(), name));
@@ -92,14 +141,17 @@ const gd::Layer & Layout::GetLayer(const gd::String & name) const
 
     return badLayer;
 }
+
 gd::Layer & Layout::GetLayer(std::size_t index)
 {
     return initialLayers[index];
 }
+
 const gd::Layer & Layout::GetLayer (std::size_t index) const
 {
     return initialLayers[index];
 }
+
 std::size_t Layout::GetLayersCount() const
 {
     return initialLayers.size();

Core/GDCore/Project/Layout.h

@@ -172,37 +172,37 @@ public:
 
     /** \name Layout layers management
      * Members functions related to layout layers management.
-     * TODO: This should be moved to a separate class
+     * TODO: This could be moved to a separate class
      */
     ///@{
 
     /**
-     * Must return true if the layer called "name" exists.
+     * \brief Return true if the layer called "name" exists.
      */
     bool HasLayerNamed(const gd::String & name) const;
 
     /**
-     * Must return a reference to the layer called "name".
+     * \brief Return a reference to the layer called "name".
      */
     Layer & GetLayer(const gd::String & name);
 
     /**
-     * Must return a reference to the layer called "name".
+     * \brief Return a reference to the layer called "name".
      */
     const Layer & GetLayer(const gd::String & name) const;
 
     /**
-     * Must return a reference to the layer at position "index" in the layers list
+     * \brief Return a reference to the layer at position "index" in the layers list
      */
     Layer & GetLayer(std::size_t index);
 
     /**
-     * Must return a reference to the layer at position "index" in the layers list
+     * \brief Return a reference to the layer at position "index" in the layers list
      */
-    const Layer & GetLayer (std::size_t index) const;
+    const Layer & GetLayer(std::size_t index) const;
 
     /**
-     * Must return the position of the layer called "name" in the layers list
+     * \brief Return the position of the layer called "name" in the layers list
      */
     std::size_t GetLayerPosition(const gd::String & name) const;
 
@@ -253,15 +253,45 @@ public:
     ///@}
 
     /**
-     * Make sure that the scene had an instance of shared data for
+     * This ensures that the scene had an instance of shared data for
      * every behavior of every object that can be used on the scene
-     * ( i.e. the objects of the scene and the global objects )
+     * (i.e. the objects of the scene and the global objects)
      *
      * Must be called when a behavior have been added/deleted
      * or when a scene have been added to a project.
      */
     void UpdateBehaviorsSharedData(gd::Project & project);
 
+    /**
+     * \brief Get the names of all shared data stored for behaviors
+     */
+    std::vector <gd::String> GetAllBehaviorSharedDataNames() const;
+
+    /**
+     * \brief Check if shared data are stored for a behavior
+     */
+    bool HasBehaviorSharedData(const gd::String & behaviorName);
+
+    /**
+     * \brief Get the shared data stored for a behavior
+     */
+    const gd::BehaviorsSharedData & GetBehaviorSharedData(const gd::String & behaviorName) const;
+
+    /**
+     * \brief Get the shared data stored for a behavior
+     */
+    gd::BehaviorsSharedData & GetBehaviorSharedData(const gd::String & behaviorName);
+
+    /**
+     * \brief Get a map of all shared data stored for behaviors
+     */
+    const std::map < gd::String, std::shared_ptr<gd::BehaviorsSharedData> > & GetAllBehaviorSharedData() const;
+
+    /**
+     * \brief Get the (smart pointer to the) shared data stored for a behavior.
+     */
+    std::shared_ptr<gd::BehaviorsSharedData> GetBehaviorSharedDataSmartPtr(const gd::String & behaviorName);
+
     #if defined(GD_IDE_ONLY)
     /**
      * Return the settings associated to the layout.
@@ -357,9 +387,6 @@ public:
     void UnserializeFrom(gd::Project & project, const SerializerElement & element);
     ///@}
 
-    //TODO: Send this to private part.
-    std::map < gd::String, std::shared_ptr<gd::BehaviorsSharedData> > behaviorsInitialSharedDatas; ///< Initial shared datas of behaviors
-
     //TODO: GD C++ Platform specific code below
     #if defined(GD_IDE_ONLY)
     /** \name Events compilation and bitcode management
@@ -442,6 +469,7 @@ private:
     gd::InitialInstancesContainer               initialInstances; ///< Initial instances
     std::vector < gd::Layer >                   initialLayers; ///< Initial layers
     ObjectGroupsContainer                       objectGroups; ///< Objects groups
+    std::map < gd::String, std::shared_ptr<gd::BehaviorsSharedData> > behaviorsInitialSharedDatas; ///< Initial shared datas of behaviors
     bool                                        stopSoundsOnStartup; ///< True to make the scene stop all sounds at startup.
     bool                                        standardSortMethod; ///< True to sort objects using standard sort.
     float                                       oglFOV; ///< OpenGL Field Of View value
@@ -449,6 +477,7 @@ private:
     float                                       oglZFar; ///< OpenGL Far Z position
     bool                                        disableInputWhenNotFocused; /// If set to true, the input must be disabled when the window do not have the focus.
     static gd::Layer                            badLayer; ///< Null object, returned when GetLayer can not find an appropriate layer.
+    static gd::BehaviorsSharedData              badBehaviorSharedData; ///< Null object, returned when GetBehaviorSharedData can not find the specified behavior shared data.
     #if defined(GD_IDE_ONLY)
     EventsList                                  events; ///< Scene events
     gd::LayoutEditorCanvasOptions               associatedSettings;
@@ -464,7 +493,7 @@ private:
 
     /**
      * Initialize from another layout. Used by copy-ctor and assign-op.
-     * Don't forget to update me if members were changed !
+     * Don't forget to update me if members were changed!
      */
     void Init(const gd::Layout & other);
 };

Core/GDCore/Project/LoadingScreen.cpp

@@ -0,0 +1,21 @@
+/*
+ * GDevelop Core
+ * Copyright 2008-2018 Florian Rival (Florian.Rival@gmail.com). All rights reserved.
+ * This project is released under the MIT License.
+ */
+
+#include "LoadingScreen.h"
+#include "GDCore/Serialization/SerializerElement.h"
+
+namespace gd {
+
+void LoadingScreen::SerializeTo(SerializerElement& element) const
+{
+    element.SetAttribute("showGDevelopSplash", showGDevelopSplash);
+}
+
+void LoadingScreen::UnserializeFrom(const SerializerElement& element)
+{
+    showGDevelopSplash = element.GetBoolAttribute("showGDevelopSplash", true);
+}
+}

Core/GDCore/Project/LoadingScreen.h

@@ -0,0 +1,57 @@
+/*
+ * GDevelop Core
+ * Copyright 2008-2018 Florian Rival (Florian.Rival@gmail.com). All rights reserved.
+ * This project is released under the MIT License.
+ */
+
+#ifndef GDCORE_LOADINGSCREEN_H
+#define GDCORE_LOADINGSCREEN_H
+#include "GDCore/String.h"
+namespace gd {
+class SerializerElement;
+}
+
+namespace gd {
+
+/**
+ * \brief Describe the content and set up of the loading screen
+ *
+ * \see gd::LoadingScreen
+ *
+ * \ingroup PlatformDefinition
+ */
+class GD_CORE_API LoadingScreen {
+public:
+    LoadingScreen(){};
+    virtual ~LoadingScreen(){};
+
+    /**
+    * \brief Set if the GDevelop splash should be shown while loading assets.
+    */
+    void ShowGDevelopSplash(bool show) { showGDevelopSplash = show; };
+
+    /**
+    * \brief Return true if the GDevelop splash should be shown while loading assets.
+    */
+    bool IsGDevelopSplashShown() const { return showGDevelopSplash; };
+
+    /** \name Saving and loading
+    */
+    ///@{
+    /**
+    * \brief Serialize objects groups container.
+    */
+    void SerializeTo(SerializerElement& element) const;
+
+    /**
+    * \brief Unserialize the objects groups container.
+    */
+    void UnserializeFrom(const SerializerElement& element);
+    ///@}
+
+private:
+    bool showGDevelopSplash;
+};
+}
+
+#endif // GDCORE_LOADINGSCREEN_H

Core/GDCore/Project/Object.cpp

@@ -154,6 +154,7 @@ void Object::UnserializeFrom(gd::Project & project, const SerializerElement & el
 {
     //Name and type are already loaded.
     objectVariables.UnserializeFrom(element.GetChild("variables", 0, "Variables"));
+    behaviors.clear();
 
     //Compatibility with GD <= 3.3
     if (element.HasChild("Automatism"))

Core/GDCore/Project/Object.h

@@ -321,7 +321,7 @@ protected:
 
     /**
      * Initialize object using another object. Used by copy-ctor and assign-op.
-     * Don't forget to update me if members were changed !
+     * Don't forget to update me if members were changed!
      */
     void Init(const gd::Object & object);
 };

Core/GDCore/Project/PlatformSpecificAssets.cpp

@@ -0,0 +1,58 @@
+/*
+ * GDevelop Core
+ * Copyright 2008-2018 Florian Rival (Florian.Rival@gmail.com). All rights reserved.
+ * This project is released under the MIT License.
+ */
+
+#include "PlatformSpecificAssets.h"
+#include "GDCore/Serialization/SerializerElement.h"
+#include "GDCore/IDE/Project/ArbitraryResourceWorker.h"
+
+namespace gd {
+
+gd::String PlatformSpecificAssets::badStr;
+
+bool PlatformSpecificAssets::Has(const gd::String& platform, const gd::String& name) const
+{
+    return assets.find(platform + "-" + name) != assets.end();
+}
+
+const gd::String& PlatformSpecificAssets::Get(const gd::String& platform, const gd::String& name) const
+{
+    const auto & it = assets.find(platform + "-" + name);
+    return it != assets.end() ? it->second : badStr;
+}
+
+void PlatformSpecificAssets::Remove(const gd::String& platform, const gd::String& name)
+{
+    assets.erase(platform + "-" + name);
+}
+
+void PlatformSpecificAssets::Set(const gd::String& platform, const gd::String& name, const gd::String& resourceName)
+{
+    assets[platform + "-" + name] = resourceName;
+}
+
+void PlatformSpecificAssets::SerializeTo(SerializerElement& element) const
+{
+    for (auto& it : assets) {
+        element.AddChild(it.first).SetValue(it.second);
+    }
+}
+
+void PlatformSpecificAssets::UnserializeFrom(const SerializerElement& element)
+{
+    assets.clear();
+
+    for (auto& child : element.GetAllChildren()) {
+        assets[child.first] = child.second->GetValue().GetString();
+    }
+}
+
+void PlatformSpecificAssets::ExposeResources(gd::ArbitraryResourceWorker & worker)
+{
+    for (auto& it : assets) {
+        worker.ExposeImage(it.second);
+    }
+}
+}