Bump newIDE version

Add support for icons when exporting to Android/iOS

.clang_complete

@@ -0,0 +1,26 @@
+-DGDJS_EXPORTS
+-DGD_API=
+-DGD_CORE_API=
+-DGD_EXTENSION_API=
+-DGD_IDE_ONLY
+-DMACOS
+-DRELEASE
+-DWXUSINGDLL
+-D_FILE_OFFSET_BITS=64
+-D__WXMAC__
+-D__WXOSX_COCOA__
+-D__WXOSX__
+-DwxDEBUG_LEVEL=0
+-D_WCHAR_H_CPLUSPLUS_98_CONFORMANCE_
+-Wno-potentially-evaluated-expression
+-std=gnu++11
+-I/usr/local/Cellar/wxmac/3.0.2/include/wx-3.0
+-DNDEBUG
+-fPIC
+-I/Users/florian/Projects/F/GD/ExtLibs/SFML/include
+-I/Users/florian/Projects/F/GD/Core
+-I/usr/local/Cellar/wxmac/3.0.2/lib/wx/include/osx_cocoa-unicode-3.0
+-I/usr/local/Cellar/wxmac/3.0.2/include/wx-3.0
+-I/Users/florian/Projects/F/GD/GDCpp/.
+-I/Users/florian/Projects/F/GD/GDJS/.
+-F/Users/florian/Projects/F/GD/ExtLibs/SFML/extlibs/libs-osx/Frameworks

.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,19 +51,18 @@ 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
-# - export LD_LIBRARY_PATH=$PWD/Binaries/Output/Release_Linux:$PWD/.build-tests/ExtLibs/SFML/lib:$LD_LIBRARY_PATH
   - Core/GDCore_tests
   - GDCpp/GDCpp_tests
   - Extensions/PathfindingBehavior/PathfindingBehavior_Runtime_tests

.vscode/c_cpp_properties.json

@@ -0,0 +1,120 @@
+{
+    "configurations": [
+        {
+            "name": "Mac",
+            "includePath": [
+                "${workspaceRoot}",
+                "${workspaceRoot}/IDE",
+                "${workspaceRoot}/GDCpp",
+                "${workspaceRoot}/GDJS",
+                "${workspaceRoot}/Extensions",
+                "${workspaceRoot}/Core",
+                "${workspaceRoot}/ExtLibs/SFML/include",
+                "/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/9.0.0/include",
+                "/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include",
+                "/usr/include",
+                "${workspaceRoot}"
+            ],
+            "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": [
+                    "/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/9.0.0/include",
+                    "/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include",
+                    "/usr/include",
+                    "${workspaceRoot}"
+                ],
+                "limitSymbolsToIncludedHeaders": true,
+                "databaseFilename": ""
+            },
+            "macFrameworkPath": [
+                "/System/Library/Frameworks",
+                "/Library/Frameworks"
+            ]
+        },
+        {
+            "name": "Linux",
+            "includePath": [
+                "${workspaceRoot}",
+                "${workspaceRoot}/IDE",
+                "${workspaceRoot}/GDCpp",
+                "${workspaceRoot}/GDJS",
+                "${workspaceRoot}/Extensions",
+                "${workspaceRoot}/Core",
+                "${workspaceRoot}/ExtLibs/SFML/include",
+                "/usr/include",
+                "/usr/local/include",
+                "${workspaceRoot}"
+            ],
+            "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",
+                    "/usr/local/include",
+                    "${workspaceRoot}"
+                ],
+                "limitSymbolsToIncludedHeaders": true,
+                "databaseFilename": ""
+            }
+        },
+        {
+            "name": "Win32",
+            "includePath": [
+                "${workspaceRoot}",
+                "${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",
+                "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/*",
+                    "${workspaceRoot}"
+                ],
+                "limitSymbolsToIncludedHeaders": true,
+                "databaseFilename": ""
+            }
+        }
+    ],
+    "version": 3
+}

.vscode/settings.json

@@ -0,0 +1,93 @@
+// Place your settings in this file to overwrite default and user settings.
+{
+    "files.associations": {
+        "*.idl": "java",
+        "iosfwd": "cpp",
+        "functional": "cpp",
+        "type_traits": "cpp",
+        "utility": "cpp",
+        "algorithm": "cpp",
+        "random": "cpp",
+        "__config": "cpp",
+        "cstddef": "cpp",
+        "exception": "cpp",
+        "initializer_list": "cpp",
+        "new": "cpp",
+        "stdexcept": "cpp",
+        "typeinfo": "cpp",
+        "*.tcc": "cpp",
+        "cctype": "cpp",
+        "clocale": "cpp",
+        "cmath": "cpp",
+        "complex": "cpp",
+        "cstdarg": "cpp",
+        "cstdio": "cpp",
+        "cstdlib": "cpp",
+        "ctime": "cpp",
+        "cwchar": "cpp",
+        "cwctype": "cpp",
+        "istream": "cpp",
+        "limits": "cpp",
+        "memory": "cpp",
+        "ostream": "cpp",
+        "sstream": "cpp",
+        "streambuf": "cpp",
+        "hashtable": "cpp",
+        "tuple": "cpp",
+        "unordered_map": "cpp",
+        "unordered_set": "cpp",
+        "__split_buffer": "cpp",
+        "deque": "cpp",
+        "iterator": "cpp",
+        "list": "cpp",
+        "map": "cpp",
+        "queue": "cpp",
+        "regex": "cpp",
+        "set": "cpp",
+        "stack": "cpp",
+        "string": "cpp",
+        "vector": "cpp",
+        "iostream": "cpp",
+        "__functional_03": "cpp",
+        "__hash_table": "cpp",
+        "__tree": "cpp",
+        "bitset": "cpp",
+        "__bit_reference": "cpp",
+        "__mutex_base": "cpp",
+        "fstream": "cpp",
+        "ios": "cpp",
+        "__locale": "cpp",
+        "valarray": "cpp",
+        "freeglut_spaceball.c": "cpp",
+        "__tuple": "cpp",
+        "hash_map": "cpp",
+        "hash_set": "cpp",
+        "system_error": "cpp",
+        "__nullptr": "cpp",
+        "__functional_base": "cpp",
+        "__functional_base_03": "cpp",
+        "chrono": "cpp",
+        "ratio": "cpp",
+        "atomic": "cpp",
+        "locale": "cpp",
+        "string_view": "cpp",
+        "__string": "cpp"
+    },
+    "files.exclude": {
+        "Binaries/*build*": true,
+        "Binaries/Output": true,
+        "Binaries/Packaging/GDevelop.app": true,
+        "ExtLibs/SFML": true,
+        "docs": true,
+        "GDJS/docs": true,
+        "GDCpp/docs": true,
+        "Core/docs": true,
+        "Extensions/CommonDialogs/dlib-18.16": true,
+        "newIDE/electron-app/dist": true,
+        "newIDE/app/build": true,
+        "newIDE/app/resources/GDJS": true,
+        "newIDE/electron-app/app/www": true
+    },
+    // Support for Flowtype:
+    "javascript.validate.enable": false
+}

Binaries/Output/Release_Windows/Examples/Copy_Variables.gdg

@@ -0,0 +1,748 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<project firstLayout="">
+    <gdVersion build="95" major="4" minor="0" revision="8" />
+    <properties folderProject="false" linuxExecutableFilename="" macExecutableFilename="" packageName="com.example.gamename" projectFile="C:\Users\Maciel\Programacion\gits\GD\Binaries\Output\Release_Windows\Examples\Copy_Variables.gdg" useExternalSourceFiles="false" winExecutableFilename="" winExecutableIconFile="">
+        <name>Project</name>
+        <author></author>
+        <windowWidth>800</windowWidth>
+        <windowHeight>600</windowHeight>
+        <latestCompilationDirectory></latestCompilationDirectory>
+        <maxFPS>60</maxFPS>
+        <minFPS>10</minFPS>
+        <verticalSync>false</verticalSync>
+        <extensions>
+            <extension name="BuiltinObject" />
+            <extension name="BuiltinAudio" />
+            <extension name="BuiltinVariables" />
+            <extension name="BuiltinTime" />
+            <extension name="BuiltinMouse" />
+            <extension name="BuiltinKeyboard" />
+            <extension name="BuiltinJoystick" />
+            <extension name="BuiltinCamera" />
+            <extension name="BuiltinWindow" />
+            <extension name="BuiltinFile" />
+            <extension name="BuiltinNetwork" />
+            <extension name="BuiltinScene" />
+            <extension name="BuiltinAdvanced" />
+            <extension name="Sprite" />
+            <extension name="BuiltinCommonInstructions" />
+            <extension name="BuiltinCommonConversions" />
+            <extension name="BuiltinStringInstructions" />
+            <extension name="BuiltinMathematicalTools" />
+            <extension name="BuiltinExternalLayouts" />
+            <extension name="TextObject" />
+        </extensions>
+        <platforms>
+            <platform name="GDevelop C++ platform" />
+            <platform name="GDevelop JS platform" />
+        </platforms>
+        <currentPlatform>GDevelop C++ platform</currentPlatform>
+    </properties>
+    <resources>
+        <resources />
+        <resourceFolders />
+    </resources>
+    <objects />
+    <objectsGroups />
+    <variables />
+    <layouts>
+        <layout b="30" disableInputWhenNotFocused="true" mangledName="Scene" name="Scene" oglFOV="90.000000" oglZFar="500.000000" oglZNear="1.000000" r="30" standardSortMethod="false" stopSoundsOnStartup="true" title="" v="30">
+            <uiSettings grid="false" gridB="80" gridG="80" gridHeight="32" gridOffsetX="0" gridOffsetY="0" gridR="80" gridWidth="32" snap="true" windowMask="false" zoomFactor="0.701632" />
+            <objectsGroups />
+            <variables>
+                <variable name="Scene">
+                    <children>
+                        <variable name="A" value="5" />
+                        <variable name="B">
+                            <children>
+                                <variable name="alpha">
+                                    <children>
+                                        <variable name="x" value="5.5" />
+                                        <variable name="y" value="-8" />
+                                    </children>
+                                </variable>
+                                <variable name="beta" value="150;255;150" />
+                                <variable name="gamma" value="Apples" />
+                            </children>
+                        </variable>
+                    </children>
+                </variable>
+            </variables>
+            <instances>
+                <instance angle="0.000000" customSize="false" height="0.000000" layer="" locked="false" name="DebugText" width="0.000000" x="400.000000" y="300.000000" zOrder="1">
+                    <numberProperties />
+                    <stringProperties />
+                    <initialVariables>
+                        <variable name="ID" value="3" />
+                    </initialVariables>
+                </instance>
+                <instance angle="0.000000" customSize="false" height="0.000000" layer="" locked="false" name="DebugText" width="0.000000" x="20.000000" y="20.000000" zOrder="1">
+                    <numberProperties />
+                    <stringProperties />
+                    <initialVariables>
+                        <variable name="ID" value="0" />
+                    </initialVariables>
+                </instance>
+                <instance angle="0.000000" customSize="false" height="0.000000" layer="" locked="false" name="DebugText" width="0.000000" x="400.000000" y="20.000000" zOrder="1">
+                    <numberProperties />
+                    <stringProperties />
+                    <initialVariables>
+                        <variable name="ID" value="1" />
+                    </initialVariables>
+                </instance>
+                <instance angle="0.000000" customSize="false" height="0.000000" layer="" locked="false" name="DebugText" width="0.000000" x="20.000000" y="300.000000" zOrder="1">
+                    <numberProperties />
+                    <stringProperties />
+                    <initialVariables>
+                        <variable name="ID" value="2" />
+                    </initialVariables>
+                </instance>
+            </instances>
+            <objects>
+                <object bold="false" italic="false" name="DebugText" smoothed="true" type="TextObject::Text" underlined="false">
+                    <variables />
+                    <behaviors />
+                    <string>DebugText</string>
+                    <font></font>
+                    <characterSize>24</characterSize>
+                    <color b="220" g="220" r="220" />
+                </object>
+            </objects>
+            <events>
+                <event disabled="false" folded="false">
+                    <type>BuiltinCommonInstructions::Comment</type>
+                    <color b="128" g="255" r="128" textB="0" textG="0" textR="0" />
+                    <comment>Update debug text at the beginning (only Scene variable will be drawn because others haven&apos;t childrend)</comment>
+                    <comment2></comment2>
+                </event>
+                <event disabled="false" folded="false">
+                    <type>BuiltinCommonInstructions::Standard</type>
+                    <conditions>
+                        <condition>
+                            <type inverted="false" value="DepartScene" />
+                            <parameters>
+                                <parameter></parameter>
+                            </parameters>
+                            <subConditions />
+                        </condition>
+                    </conditions>
+                    <actions>
+                        <action>
+                            <type inverted="false" value="ModVarScene" />
+                            <parameters>
+                                <parameter>Update</parameter>
+                                <parameter>=</parameter>
+                                <parameter>1</parameter>
+                            </parameters>
+                            <subActions />
+                        </action>
+                    </actions>
+                    <events />
+                </event>
+                <event disabled="false" folded="false">
+                    <type>BuiltinCommonInstructions::Comment</type>
+                    <color b="128" g="255" r="128" textB="0" textG="0" textR="0" />
+                    <comment>If &quot;A&quot; key is pressed, convert the Scene variable into JSON and parse it into a Global variable, then randomize a child from the Global structure, to identify it</comment>
+                    <comment2></comment2>
+                </event>
+                <event disabled="false" folded="false">
+                    <type>BuiltinCommonInstructions::Standard</type>
+                    <conditions>
+                        <condition>
+                            <type inverted="false" value="KeyPressed" />
+                            <parameters>
+                                <parameter></parameter>
+                                <parameter>a</parameter>
+                            </parameters>
+                            <subConditions />
+                        </condition>
+                        <condition>
+                            <type inverted="false" value="BuiltinCommonInstructions::Once" />
+                            <parameters />
+                            <subConditions />
+                        </condition>
+                    </conditions>
+                    <actions>
+                        <action>
+                            <type inverted="false" value="JSONToGlobalVariableStructure" />
+                            <parameters>
+                                <parameter>ToJSON(Scene)</parameter>
+                                <parameter>Global</parameter>
+                            </parameters>
+                            <subActions />
+                        </action>
+                        <action>
+                            <type inverted="false" value="ModVarGlobal" />
+                            <parameters>
+                                <parameter>Global.B.alpha.x</parameter>
+                                <parameter>=</parameter>
+                                <parameter>Random(1000)</parameter>
+                            </parameters>
+                            <subActions />
+                        </action>
+                        <action>
+                            <type inverted="false" value="ModVarScene" />
+                            <parameters>
+                                <parameter>Update</parameter>
+                                <parameter>=</parameter>
+                                <parameter>1</parameter>
+                            </parameters>
+                            <subActions />
+                        </action>
+                    </actions>
+                    <events />
+                </event>
+                <event disabled="false" folded="false">
+                    <type>BuiltinCommonInstructions::Comment</type>
+                    <color b="128" g="255" r="128" textB="0" textG="0" textR="0" />
+                    <comment>If &quot;S&quot; key is pressed, convert the Global variable into JSON and parse it into an Object variable, then randomize another child from the Object structure, to identify it</comment>
+                    <comment2></comment2>
+                </event>
+                <event disabled="false" folded="false">
+                    <type>BuiltinCommonInstructions::Standard</type>
+                    <conditions>
+                        <condition>
+                            <type inverted="false" value="KeyPressed" />
+                            <parameters>
+                                <parameter></parameter>
+                                <parameter>s</parameter>
+                            </parameters>
+                            <subConditions />
+                        </condition>
+                        <condition>
+                            <type inverted="false" value="VarObjet" />
+                            <parameters>
+                                <parameter>DebugText</parameter>
+                                <parameter>ID</parameter>
+                                <parameter>=</parameter>
+                                <parameter>2</parameter>
+                            </parameters>
+                            <subConditions />
+                        </condition>
+                        <condition>
+                            <type inverted="false" value="BuiltinCommonInstructions::Once" />
+                            <parameters />
+                            <subConditions />
+                        </condition>
+                    </conditions>
+                    <actions>
+                        <action>
+                            <type inverted="false" value="JSONToObjectVariableStructure" />
+                            <parameters>
+                                <parameter>GlobalVarToJSON(Global)</parameter>
+                                <parameter>DebugText</parameter>
+                                <parameter>Object</parameter>
+                            </parameters>
+                            <subActions />
+                        </action>
+                        <action>
+                            <type inverted="false" value="ModVarObjet" />
+                            <parameters>
+                                <parameter>DebugText</parameter>
+                                <parameter>Object.B.alpha.y</parameter>
+                                <parameter>=</parameter>
+                                <parameter>Random(1000)</parameter>
+                            </parameters>
+                            <subActions />
+                        </action>
+                        <action>
+                            <type inverted="false" value="ModVarScene" />
+                            <parameters>
+                                <parameter>Update</parameter>
+                                <parameter>=</parameter>
+                                <parameter>1</parameter>
+                            </parameters>
+                            <subActions />
+                        </action>
+                    </actions>
+                    <events />
+                </event>
+                <event disabled="false" folded="false">
+                    <type>BuiltinCommonInstructions::Comment</type>
+                    <color b="128" g="255" r="128" textB="0" textG="0" textR="0" />
+                    <comment>If &quot;D&quot; key is pressed, convert the Object variable into JSON (note there are no whitespaces after the &quot;,&quot; before the variable name in the ObjectVarToJSON) and parse it into another scene variable Scene_2</comment>
+                    <comment2></comment2>
+                </event>
+                <event disabled="false" folded="false">
+                    <type>BuiltinCommonInstructions::Standard</type>
+                    <conditions>
+                        <condition>
+                            <type inverted="false" value="KeyPressed" />
+                            <parameters>
+                                <parameter></parameter>
+                                <parameter>d</parameter>
+                            </parameters>
+                            <subConditions />
+                        </condition>
+                        <condition>
+                            <type inverted="false" value="VarObjet" />
+                            <parameters>
+                                <parameter>DebugText</parameter>
+                                <parameter>ID</parameter>
+                                <parameter>=</parameter>
+                                <parameter>2</parameter>
+                            </parameters>
+                            <subConditions />
+                        </condition>
+                        <condition>
+                            <type inverted="false" value="BuiltinCommonInstructions::Once" />
+                            <parameters />
+                            <subConditions />
+                        </condition>
+                    </conditions>
+                    <actions>
+                        <action>
+                            <type inverted="false" value="JSONToVariableStructure" />
+                            <parameters>
+                                <parameter>ObjectVarToJSON(DebugText,Object)</parameter>
+                                <parameter>Scene_2</parameter>
+                            </parameters>
+                            <subActions />
+                        </action>
+                        <action>
+                            <type inverted="false" value="ModVarScene" />
+                            <parameters>
+                                <parameter>Update</parameter>
+                                <parameter>=</parameter>
+                                <parameter>1</parameter>
+                            </parameters>
+                            <subActions />
+                        </action>
+                    </actions>
+                    <events />
+                </event>
+                <event disabled="false" folded="false">
+                    <type>BuiltinCommonInstructions::Comment</type>
+                    <color b="128" g="255" r="128" textB="0" textG="0" textR="0" />
+                    <comment>Time to update the debug text objects, set Update = 0 to update it only once, and start a counter &quot;i&quot; = 0</comment>
+                    <comment2></comment2>
+                </event>
+                <event disabled="false" folded="false">
+                    <type>BuiltinCommonInstructions::Standard</type>
+                    <conditions>
+                        <condition>
+                            <type inverted="false" value="VarScene" />
+                            <parameters>
+                                <parameter>Update</parameter>
+                                <parameter>=</parameter>
+                                <parameter>1</parameter>
+                            </parameters>
+                            <subConditions />
+                        </condition>
+                    </conditions>
+                    <actions>
+                        <action>
+                            <type inverted="false" value="ModVarScene" />
+                            <parameters>
+                                <parameter>Update</parameter>
+                                <parameter>=</parameter>
+                                <parameter>0</parameter>
+                            </parameters>
+                            <subActions />
+                        </action>
+                        <action>
+                            <type inverted="false" value="ModVarScene" />
+                            <parameters>
+                                <parameter>i</parameter>
+                                <parameter>=</parameter>
+                                <parameter>0</parameter>
+                            </parameters>
+                            <subActions />
+                        </action>
+                    </actions>
+                    <events>
+                        <event disabled="false" folded="false">
+                            <type>BuiltinCommonInstructions::Comment</type>
+                            <color b="128" g="255" r="128" textB="0" textG="0" textR="0" />
+                            <comment>Repeat 4 times because there are 4 debug objects, in each repeat select the object with ID = i (counter variable)&#x0A;Update the counter variable (i + 1)&#x0A;Clear the temporal variable Temp, otherwise children are kept from one update to another, messing up the test</comment>
+                            <comment2></comment2>
+                        </event>
+                        <event disabled="false" folded="false">
+                            <type>BuiltinCommonInstructions::Repeat</type>
+                            <repeatExpression>4</repeatExpression>
+                            <conditions>
+                                <condition>
+                                    <type inverted="false" value="VarObjet" />
+                                    <parameters>
+                                        <parameter>DebugText</parameter>
+                                        <parameter>ID</parameter>
+                                        <parameter>=</parameter>
+                                        <parameter>Variable(i)</parameter>
+                                    </parameters>
+                                    <subConditions />
+                                </condition>
+                            </conditions>
+                            <actions>
+                                <action>
+                                    <type inverted="false" value="ModVarScene" />
+                                    <parameters>
+                                        <parameter>i</parameter>
+                                        <parameter>+</parameter>
+                                        <parameter>1</parameter>
+                                    </parameters>
+                                    <subActions />
+                                </action>
+                                <action>
+                                    <type inverted="false" value="VariableClearChildren" />
+                                    <parameters>
+                                        <parameter>Temp</parameter>
+                                    </parameters>
+                                    <subActions />
+                                </action>
+                            </actions>
+                            <events>
+                                <event disabled="false" folded="false">
+                                    <type>BuiltinCommonInstructions::Comment</type>
+                                    <color b="128" g="255" r="128" textB="0" textG="0" textR="0" />
+                                    <comment>Set starting title in function of the debug object ID, and copy the testing variables into the variable Temp (this way Temp will be equal to one of the variables under test)</comment>
+                                    <comment2></comment2>
+                                </event>
+                                <event disabled="false" folded="false">
+                                    <type>BuiltinCommonInstructions::Standard</type>
+                                    <conditions>
+                                        <condition>
+                                            <type inverted="false" value="VarObjet" />
+                                            <parameters>
+                                                <parameter>DebugText</parameter>
+                                                <parameter>ID</parameter>
+                                                <parameter>=</parameter>
+                                                <parameter>0</parameter>
+                                            </parameters>
+                                            <subConditions />
+                                        </condition>
+                                    </conditions>
+                                    <actions>
+                                        <action>
+                                            <type inverted="false" value="TextObject::String" />
+                                            <parameters>
+                                                <parameter>DebugText</parameter>
+                                                <parameter>=</parameter>
+                                                <parameter>&quot;Scene&quot; + NewLine()</parameter>
+                                            </parameters>
+                                            <subActions />
+                                        </action>
+                                        <action>
+                                            <type inverted="false" value="JSONToVariableStructure" />
+                                            <parameters>
+                                                <parameter>ToJSON(Scene)</parameter>
+                                                <parameter>Temp</parameter>
+                                            </parameters>
+                                            <subActions />
+                                        </action>
+                                    </actions>
+                                    <events />
+                                </event>
+                                <event disabled="false" folded="false">
+                                    <type>BuiltinCommonInstructions::Standard</type>
+                                    <conditions>
+                                        <condition>
+                                            <type inverted="false" value="VarObjet" />
+                                            <parameters>
+                                                <parameter>DebugText</parameter>
+                                                <parameter>ID</parameter>
+                                                <parameter>=</parameter>
+                                                <parameter>1</parameter>
+                                            </parameters>
+                                            <subConditions />
+                                        </condition>
+                                    </conditions>
+                                    <actions>
+                                        <action>
+                                            <type inverted="false" value="TextObject::String" />
+                                            <parameters>
+                                                <parameter>DebugText</parameter>
+                                                <parameter>=</parameter>
+                                                <parameter>&quot;Global&quot; + NewLine()</parameter>
+                                            </parameters>
+                                            <subActions />
+                                        </action>
+                                        <action>
+                                            <type inverted="false" value="JSONToVariableStructure" />
+                                            <parameters>
+                                                <parameter>GlobalVarToJSON(Global)</parameter>
+                                                <parameter>Temp</parameter>
+                                            </parameters>
+                                            <subActions />
+                                        </action>
+                                    </actions>
+                                    <events />
+                                </event>
+                                <event disabled="false" folded="false">
+                                    <type>BuiltinCommonInstructions::Standard</type>
+                                    <conditions>
+                                        <condition>
+                                            <type inverted="false" value="VarObjet" />
+                                            <parameters>
+                                                <parameter>DebugText</parameter>
+                                                <parameter>ID</parameter>
+                                                <parameter>=</parameter>
+                                                <parameter>2</parameter>
+                                            </parameters>
+                                            <subConditions />
+                                        </condition>
+                                    </conditions>
+                                    <actions>
+                                        <action>
+                                            <type inverted="false" value="TextObject::String" />
+                                            <parameters>
+                                                <parameter>DebugText</parameter>
+                                                <parameter>=</parameter>
+                                                <parameter>&quot;Object&quot; + NewLine()</parameter>
+                                            </parameters>
+                                            <subActions />
+                                        </action>
+                                        <action>
+                                            <type inverted="false" value="JSONToVariableStructure" />
+                                            <parameters>
+                                                <parameter>ObjectVarToJSON(DebugText,Object)</parameter>
+                                                <parameter>Temp</parameter>
+                                            </parameters>
+                                            <subActions />
+                                        </action>
+                                    </actions>
+                                    <events />
+                                </event>
+                                <event disabled="false" folded="false">
+                                    <type>BuiltinCommonInstructions::Standard</type>
+                                    <conditions>
+                                        <condition>
+                                            <type inverted="false" value="VarObjet" />
+                                            <parameters>
+                                                <parameter>DebugText</parameter>
+                                                <parameter>ID</parameter>
+                                                <parameter>=</parameter>
+                                                <parameter>3</parameter>
+                                            </parameters>
+                                            <subConditions />
+                                        </condition>
+                                    </conditions>
+                                    <actions>
+                                        <action>
+                                            <type inverted="false" value="TextObject::String" />
+                                            <parameters>
+                                                <parameter>DebugText</parameter>
+                                                <parameter>=</parameter>
+                                                <parameter>&quot;Scene_2&quot; + NewLine()</parameter>
+                                            </parameters>
+                                            <subActions />
+                                        </action>
+                                        <action>
+                                            <type inverted="false" value="JSONToVariableStructure" />
+                                            <parameters>
+                                                <parameter>ToJSON(Scene_2)</parameter>
+                                                <parameter>Temp</parameter>
+                                            </parameters>
+                                            <subActions />
+                                        </action>
+                                    </actions>
+                                    <events />
+                                </event>
+                                <event disabled="false" folded="false">
+                                    <type>BuiltinCommonInstructions::Comment</type>
+                                    <color b="128" g="255" r="128" textB="0" textG="0" textR="0" />
+                                    <comment>Copy values from variable Test in the debug object, to draw it, one debug object is selected at each iteration and one variable is copy into Temp variable</comment>
+                                    <comment2></comment2>
+                                </event>
+                                <event disabled="false" folded="false">
+                                    <type>BuiltinCommonInstructions::Standard</type>
+                                    <conditions>
+                                        <condition>
+                                            <type inverted="false" value="VariableChildExists" />
+                                            <parameters>
+                                                <parameter>Temp</parameter>
+                                                <parameter>&quot;A&quot;</parameter>
+                                            </parameters>
+                                            <subConditions />
+                                        </condition>
+                                    </conditions>
+                                    <actions>
+                                        <action>
+                                            <type inverted="false" value="TextObject::String" />
+                                            <parameters>
+                                                <parameter>DebugText</parameter>
+                                                <parameter>+</parameter>
+                                                <parameter>&quot;____A = &quot; + VariableString(Temp.A) + NewLine()</parameter>
+                                            </parameters>
+                                            <subActions />
+                                        </action>
+                                    </actions>
+                                    <events />
+                                </event>
+                                <event disabled="false" folded="false">
+                                    <type>BuiltinCommonInstructions::Standard</type>
+                                    <conditions>
+                                        <condition>
+                                            <type inverted="false" value="VariableChildExists" />
+                                            <parameters>
+                                                <parameter>Temp</parameter>
+                                                <parameter>&quot;B&quot;</parameter>
+                                            </parameters>
+                                            <subConditions />
+                                        </condition>
+                                    </conditions>
+                                    <actions>
+                                        <action>
+                                            <type inverted="false" value="TextObject::String" />
+                                            <parameters>
+                                                <parameter>DebugText</parameter>
+                                                <parameter>+</parameter>
+                                                <parameter>&quot;____B&quot; + NewLine()</parameter>
+                                            </parameters>
+                                            <subActions />
+                                        </action>
+                                    </actions>
+                                    <events>
+                                        <event disabled="false" folded="false">
+                                            <type>BuiltinCommonInstructions::Standard</type>
+                                            <conditions>
+                                                <condition>
+                                                    <type inverted="false" value="VariableChildExists" />
+                                                    <parameters>
+                                                        <parameter>Temp.B</parameter>
+                                                        <parameter>&quot;alpha&quot;</parameter>
+                                                    </parameters>
+                                                    <subConditions />
+                                                </condition>
+                                            </conditions>
+                                            <actions>
+                                                <action>
+                                                    <type inverted="false" value="TextObject::String" />
+                                                    <parameters>
+                                                        <parameter>DebugText</parameter>
+                                                        <parameter>+</parameter>
+                                                        <parameter>&quot;________alpha&quot; + NewLine()</parameter>
+                                                    </parameters>
+                                                    <subActions />
+                                                </action>
+                                            </actions>
+                                            <events>
+                                                <event disabled="false" folded="false">
+                                                    <type>BuiltinCommonInstructions::Standard</type>
+                                                    <conditions>
+                                                        <condition>
+                                                            <type inverted="false" value="VariableChildExists" />
+                                                            <parameters>
+                                                                <parameter>Temp.B.alpha</parameter>
+                                                                <parameter>&quot;x&quot;</parameter>
+                                                            </parameters>
+                                                            <subConditions />
+                                                        </condition>
+                                                    </conditions>
+                                                    <actions>
+                                                        <action>
+                                                            <type inverted="false" value="TextObject::String" />
+                                                            <parameters>
+                                                                <parameter>DebugText</parameter>
+                                                                <parameter>+</parameter>
+                                                                <parameter>&quot;____________x = &quot; + VariableString(Temp.B.alpha.x) + NewLine()</parameter>
+                                                            </parameters>
+                                                            <subActions />
+                                                        </action>
+                                                    </actions>
+                                                    <events />
+                                                </event>
+                                                <event disabled="false" folded="false">
+                                                    <type>BuiltinCommonInstructions::Standard</type>
+                                                    <conditions>
+                                                        <condition>
+                                                            <type inverted="false" value="VariableChildExists" />
+                                                            <parameters>
+                                                                <parameter>Temp.B.alpha</parameter>
+                                                                <parameter>&quot;y&quot;</parameter>
+                                                            </parameters>
+                                                            <subConditions />
+                                                        </condition>
+                                                    </conditions>
+                                                    <actions>
+                                                        <action>
+                                                            <type inverted="false" value="TextObject::String" />
+                                                            <parameters>
+                                                                <parameter>DebugText</parameter>
+                                                                <parameter>+</parameter>
+                                                                <parameter>&quot;____________y = &quot; + VariableString(Temp.B.alpha.y) + NewLine()</parameter>
+                                                            </parameters>
+                                                            <subActions />
+                                                        </action>
+                                                    </actions>
+                                                    <events />
+                                                </event>
+                                            </events>
+                                        </event>
+                                        <event disabled="false" folded="false">
+                                            <type>BuiltinCommonInstructions::Standard</type>
+                                            <conditions>
+                                                <condition>
+                                                    <type inverted="false" value="VariableChildExists" />
+                                                    <parameters>
+                                                        <parameter>Temp.B</parameter>
+                                                        <parameter>&quot;beta&quot;</parameter>
+                                                    </parameters>
+                                                    <subConditions />
+                                                </condition>
+                                            </conditions>
+                                            <actions>
+                                                <action>
+                                                    <type inverted="false" value="TextObject::String" />
+                                                    <parameters>
+                                                        <parameter>DebugText</parameter>
+                                                        <parameter>+</parameter>
+                                                        <parameter>&quot;________beta = &quot; + VariableString(Temp.B.beta) + NewLine()</parameter>
+                                                    </parameters>
+                                                    <subActions />
+                                                </action>
+                                            </actions>
+                                            <events />
+                                        </event>
+                                        <event disabled="false" folded="false">
+                                            <type>BuiltinCommonInstructions::Standard</type>
+                                            <conditions>
+                                                <condition>
+                                                    <type inverted="false" value="VariableChildExists" />
+                                                    <parameters>
+                                                        <parameter>Temp.B</parameter>
+                                                        <parameter>&quot;gamma&quot;</parameter>
+                                                    </parameters>
+                                                    <subConditions />
+                                                </condition>
+                                            </conditions>
+                                            <actions>
+                                                <action>
+                                                    <type inverted="false" value="TextObject::String" />
+                                                    <parameters>
+                                                        <parameter>DebugText</parameter>
+                                                        <parameter>+</parameter>
+                                                        <parameter>&quot;________gamma = &quot; + VariableString(Temp.B.gamma)</parameter>
+                                                    </parameters>
+                                                    <subActions />
+                                                </action>
+                                            </actions>
+                                            <events />
+                                        </event>
+                                    </events>
+                                </event>
+                            </events>
+                        </event>
+                    </events>
+                </event>
+            </events>
+            <layers>
+                <layer name="New layer" visibility="true">
+                    <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>
+                <layer name="" visibility="true">
+                    <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>
+            <behaviorsSharedData />
+        </layout>
+    </layouts>
+    <externalEvents />
+    <externalLayouts />
+    <externalSourceFiles />
+</project>

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,14 +13,14 @@ AllowNoIcons=yes
 LicenseFile=..\Output\Release_Windows\License-en.rtf
 InfoBeforeFile=..\Output\Release_Windows\Informations-en.rtf
 OutputDir=.\
-OutputBaseFilename=gd4090
+OutputBaseFilename=gd4096
 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-2017 Florian Rival
 VersionInfoCompany=Florian Rival
 VersionInfoDescription=GDevelop setup
 VersionInfoCopyright=2008-2016 Florian Rival

Core/GDCore/Events/Builtin/CommentEvent.h

@@ -29,6 +29,19 @@ public:
     virtual ~CommentEvent() {};
     virtual gd::CommentEvent * Clone() const { return new CommentEvent(*this);}
 
+    int GetBackgroundColorRed() const { return r; }
+    int GetBackgroundColorGreen() const { return v; }
+    int GetBackgroundColorBlue() const { return b; }
+    void SetBackgroundColor(int r_, int g_, int b_) { r = r_; v = g_; b = b_; }
+
+    int GetTextColorRed() const { return textR; }
+    int GetTextColorGreen() const { return textG; }
+    int GetTextColorBlue() const { return textB; }
+    void SetTextColor(int r_, int g_, int b_) { textR = r_; textG = g_; textB = b_; }
+
+    const gd::String & GetComment() const { return com1; }
+    void SetComment(const gd::String & comment) { com1 = comment; }
+
     virtual void SerializeTo(SerializerElement & element) const;
     virtual void UnserializeFrom(gd::Project & project, const SerializerElement & element);
 
@@ -40,8 +53,8 @@ public:
     int textG; ///< Text color Green component
     int textB; ///< Text color Blue component
 
-    gd::String com1; ///< Comment gd::String
-    gd::String com2; ///< Optional second comment gd::String
+    gd::String com1; ///< Comment
+    gd::String com2; ///< Optional second column comment, deprecated
 
     /**
      * Called by event editor to draw the event.

Core/GDCore/Events/Builtin/ForEachEvent.cpp

@@ -80,16 +80,16 @@ vector < const gd::Expression* > ForEachEvent::GetAllExpressions() const
 void ForEachEvent::SerializeTo(SerializerElement & element) const
 {
     element.AddChild("object").SetValue(objectsToPick.GetPlainString());
-    gd::EventsListSerialization::SaveConditions(conditions, element.AddChild("conditions"));
-    gd::EventsListSerialization::SaveActions(actions, element.AddChild("actions"));
+    gd::EventsListSerialization::SerializeInstructionsTo(conditions, element.AddChild("conditions"));
+    gd::EventsListSerialization::SerializeInstructionsTo(actions, element.AddChild("actions"));
     gd::EventsListSerialization::SerializeEventsTo(events, element.AddChild("events"));
 }
 
 void ForEachEvent::UnserializeFrom(gd::Project & project, const SerializerElement & element)
 {
     objectsToPick = gd::Expression(element.GetChild("object", 0, "Object").GetValue().GetString());
-    gd::EventsListSerialization::OpenConditions(project, conditions, element.GetChild("conditions", 0, "Conditions"));
-    gd::EventsListSerialization::OpenActions(project, actions, element.GetChild("actions", 0, "Actions"));
+    gd::EventsListSerialization::UnserializeInstructionsFrom(project, conditions, element.GetChild("conditions", 0, "Conditions"));
+    gd::EventsListSerialization::UnserializeInstructionsFrom(project, actions, element.GetChild("actions", 0, "Actions"));
     gd::EventsListSerialization::UnserializeEventsFrom(project, events, element.GetChild("events", 0, "Events"));
 }
 

Core/GDCore/Events/Builtin/RepeatEvent.cpp

@@ -79,16 +79,16 @@ vector < const gd::Expression* > RepeatEvent::GetAllExpressions() const
 void RepeatEvent::SerializeTo(SerializerElement & element) const
 {
     element.AddChild("repeatExpression").SetValue(repeatNumberExpression.GetPlainString());
-    gd::EventsListSerialization::SaveConditions(conditions, element.AddChild("conditions"));
-    gd::EventsListSerialization::SaveActions(actions, element.AddChild("actions"));
+    gd::EventsListSerialization::SerializeInstructionsTo(conditions, element.AddChild("conditions"));
+    gd::EventsListSerialization::SerializeInstructionsTo(actions, element.AddChild("actions"));
     gd::EventsListSerialization::SerializeEventsTo(events, element.AddChild("events"));
 }
 
 void RepeatEvent::UnserializeFrom(gd::Project & project, const SerializerElement & element)
 {
     repeatNumberExpression = gd::Expression(element.GetChild("repeatExpression", 0, "RepeatExpression").GetValue().GetString());
-    gd::EventsListSerialization::OpenConditions(project, conditions, element.GetChild("conditions", 0, "Conditions"));
-    gd::EventsListSerialization::OpenActions(project, actions, element.GetChild("actions", 0, "Actions"));
+    gd::EventsListSerialization::UnserializeInstructionsFrom(project, conditions, element.GetChild("conditions", 0, "Conditions"));
+    gd::EventsListSerialization::UnserializeInstructionsFrom(project, actions, element.GetChild("actions", 0, "Actions"));
     gd::EventsListSerialization::UnserializeEventsFrom(project, events, element.GetChild("events", 0, "Events"));
 }
 

Core/GDCore/Events/Builtin/StandardEvent.cpp

@@ -62,15 +62,15 @@ vector < gd::InstructionsList* > StandardEvent::GetAllActionsVectors()
 
 void StandardEvent::SerializeTo(SerializerElement & element) const
 {
-    gd::EventsListSerialization::SaveConditions(conditions, element.AddChild("conditions"));
-    gd::EventsListSerialization::SaveActions(actions, element.AddChild("actions"));
+    gd::EventsListSerialization::SerializeInstructionsTo(conditions, element.AddChild("conditions"));
+    gd::EventsListSerialization::SerializeInstructionsTo(actions, element.AddChild("actions"));
     gd::EventsListSerialization::SerializeEventsTo(events, element.AddChild("events"));
 }
 
 void StandardEvent::UnserializeFrom(gd::Project & project, const SerializerElement & element)
 {
-    gd::EventsListSerialization::OpenConditions(project, conditions, element.GetChild("conditions", 0, "Conditions"));
-    gd::EventsListSerialization::OpenActions(project, actions, element.GetChild("actions", 0, "Actions"));
+    gd::EventsListSerialization::UnserializeInstructionsFrom(project, conditions, element.GetChild("conditions", 0, "Conditions"));
+    gd::EventsListSerialization::UnserializeInstructionsFrom(project, actions, element.GetChild("actions", 0, "Actions"));
     gd::EventsListSerialization::UnserializeEventsFrom(project, events, element.GetChild("events", 0, "Events"));
 }
 

Core/GDCore/Events/Builtin/WhileEvent.cpp

@@ -62,9 +62,9 @@ vector < const gd::InstructionsList* > WhileEvent::GetAllActionsVectors() const
 void WhileEvent::SerializeTo(SerializerElement & element) const
 {
     element.SetAttribute("infiniteLoopWarning", infiniteLoopWarning);
-    gd::EventsListSerialization::SaveConditions(whileConditions, element.AddChild("whileConditions"));
-    gd::EventsListSerialization::SaveConditions(conditions, element.AddChild("conditions"));
-    gd::EventsListSerialization::SaveActions(actions, element.AddChild("actions"));
+    gd::EventsListSerialization::SerializeInstructionsTo(whileConditions, element.AddChild("whileConditions"));
+    gd::EventsListSerialization::SerializeInstructionsTo(conditions, element.AddChild("conditions"));
+    gd::EventsListSerialization::SerializeInstructionsTo(actions, element.AddChild("actions"));
     gd::EventsListSerialization::SerializeEventsTo(events, element.AddChild("events"));
 }
 
@@ -72,9 +72,9 @@ void WhileEvent::UnserializeFrom(gd::Project & project, const SerializerElement
 {
     justCreatedByTheUser = false;
     infiniteLoopWarning = element.GetBoolAttribute("infiniteLoopWarning");
-    gd::EventsListSerialization::OpenConditions(project, whileConditions, element.GetChild("whileConditions", 0, "WhileConditions"));
-    gd::EventsListSerialization::OpenConditions(project, conditions, element.GetChild("conditions", 0, "Conditions"));
-    gd::EventsListSerialization::OpenActions(project, actions, element.GetChild("actions", 0, "Actions"));
+    gd::EventsListSerialization::UnserializeInstructionsFrom(project, whileConditions, element.GetChild("whileConditions", 0, "WhileConditions"));
+    gd::EventsListSerialization::UnserializeInstructionsFrom(project, conditions, element.GetChild("conditions", 0, "Conditions"));
+    gd::EventsListSerialization::UnserializeInstructionsFrom(project, actions, element.GetChild("actions", 0, "Actions"));
     gd::EventsListSerialization::UnserializeEventsFrom(project, events, element.GetChild("events", 0, "Events"));
 }
 

Core/GDCore/Events/CodeGeneration/EventsCodeGenerator.cpp

@@ -258,8 +258,8 @@ gd::String EventsCodeGenerator::GenerateConditionCode(gd::Instruction & conditio
             gd::String objectInParameter = condition.GetParameter(pNb).GetPlainString();
 
             if ( !scene.HasObjectNamed(objectInParameter) && !project.HasObjectNamed(objectInParameter)
-                 && find_if(scene.GetObjectGroups().begin(), scene.GetObjectGroups().end(), bind2nd(gd::GroupHasTheSameName(), objectInParameter) ) == scene.GetObjectGroups().end()
-                 && find_if(project.GetObjectGroups().begin(), project.GetObjectGroups().end(), bind2nd(gd::GroupHasTheSameName(), objectInParameter) ) == project.GetObjectGroups().end() )
+                 && !scene.GetObjectGroups().Has(objectInParameter)
+                 && !project.GetObjectGroups().Has(objectInParameter))
             {
                 condition.SetParameter(pNb, gd::Expression(""));
                 condition.SetType("");
@@ -398,8 +398,8 @@ gd::String EventsCodeGenerator::GenerateActionCode(gd::Instruction & action, Eve
         {
             gd::String objectInParameter = action.GetParameter(pNb).GetPlainString();
             if ( !scene.HasObjectNamed(objectInParameter) && !project.HasObjectNamed(objectInParameter)
-                 && find_if(scene.GetObjectGroups().begin(), scene.GetObjectGroups().end(), bind2nd(gd::GroupHasTheSameName(), objectInParameter) ) == scene.GetObjectGroups().end()
-                 && find_if(project.GetObjectGroups().begin(), project.GetObjectGroups().end(), bind2nd(gd::GroupHasTheSameName(), objectInParameter) ) == project.GetObjectGroups().end() )
+                 && !scene.GetObjectGroups().Has(objectInParameter)
+                 && !project.GetObjectGroups().Has(objectInParameter))
             {
                 action.SetParameter(pNb, gd::Expression(""));
                 action.SetType("");
@@ -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 = "\"\"";
         }
@@ -742,17 +742,10 @@ gd::String EventsCodeGenerator::ConvertToStringExplicit(gd::String plainString)
 std::vector<gd::String> EventsCodeGenerator::ExpandObjectsName(const gd::String & objectName, const EventsCodeGenerationContext & context) const
 {
     std::vector<gd::String> realObjects;
-    vector< gd::ObjectGroup >::const_iterator globalGroup = find_if(project.GetObjectGroups().begin(),
-                                                                    project.GetObjectGroups().end(),
-                                                                    bind2nd(gd::GroupHasTheSameName(), objectName));
-    vector< gd::ObjectGroup >::const_iterator sceneGroup = find_if(scene.GetObjectGroups().begin(),
-                                                                   scene.GetObjectGroups().end(),
-                                                                   bind2nd(gd::GroupHasTheSameName(), objectName));
-
-    if ( globalGroup != project.GetObjectGroups().end() )
-        realObjects = (*globalGroup).GetAllObjectsNames();
-    else if ( sceneGroup != scene.GetObjectGroups().end() )
-        realObjects = (*sceneGroup).GetAllObjectsNames();
+    if (project.GetObjectGroups().Has(objectName))
+        realObjects = project.GetObjectGroups().Get(objectName).GetAllObjectsNames();
+    else if (scene.GetObjectGroups().Has(objectName))
+        realObjects = scene.GetObjectGroups().Get(objectName).GetAllObjectsNames();
     else
         realObjects.push_back(objectName);
 

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

@@ -14,6 +14,8 @@ namespace gd
 {
 
 EventsList BaseEvent::badSubEvents;
+std::vector< gd::String > BaseEvent::emptyDependencies;
+gd::String BaseEvent::emptySourceFile;
 
 BaseEvent::BaseEvent() :
     eventHeightNeedUpdate(true),

Core/GDCore/Events/Event.h

@@ -111,6 +111,19 @@ public:
     virtual std::vector < gd::Expression* > GetAllExpressions() { std::vector < gd::Expression* > noExpr; return noExpr;};
     virtual std::vector < const gd::Expression* > GetAllExpressions() const { std::vector < const gd::Expression* > noExpr; return noExpr;};
 
+    /**
+     * \brief Returns the dependencies on source files of the project.
+     * \note Default implementation returns an empty list of dependencies. This is fine for most events that
+     * are not related to adding custom user source code.
+     */
+    virtual const std::vector<gd::String> & GetSourceFileDependencies() const { return emptyDependencies; };
+
+    /**
+     * \brief Returns the name of the source file associated with the event
+     * \note Default implementation returns an empty string. This is fine for most events that
+     * are not related to adding custom user source code.
+     */
+    virtual const gd::String & GetAssociatedGDManagedSourceFile(gd::Project & project) const { return emptySourceFile; };
     ///@}
 
     /** \name Code generation
@@ -263,11 +276,13 @@ protected:
     mutable unsigned int    renderedHeight;
 
 private:
-    bool            folded; ///< True if the subevents should be hidden in the events editor
+    bool            folded; ///< True if the subevents should be hidden in the events editor
     bool            disabled; ///<True if the event is disabled and must not be executed
     gd::String      type; ///<Type of the event. Must be assigned at the creation. Used for saving the event for instance.
 
     static gd::EventsList badSubEvents;
+    static std::vector< gd::String > emptyDependencies;
+    static gd::String emptySourceFile;
 };
 
 /**

Core/GDCore/Events/EventsList.h

@@ -150,13 +150,13 @@ public:
      */
     ///@{
     /**
-     * \brief Save the objects to xml
+     * \brief Serialize the events to the specified element
      * \see EventsListSerialization
      */
     void SerializeTo(SerializerElement & element) const;
 
     /**
-     * \brief Load the objects from xml
+     * \brief Load the events from the specified element
      * \see EventsListSerialization
      */
     void UnserializeFrom(gd::Project & project, const SerializerElement & element);

Core/GDCore/Events/Instruction.h

@@ -8,17 +8,12 @@
 #include "GDCore/String.h"
 #include <vector>
 #include "GDCore/Events/Expression.h"
-#include "GDCore/Tools/SPtrList.h"
+#include "GDCore/Events/InstructionsList.h"
 #include "GDCore/String.h"
 
 namespace gd
 {
 
-class Instruction;
-
-template<typename T> class SPtrList;
-typedef SPtrList<Instruction> InstructionsList;
-
 /**
  * \brief An instruction is a member of an event: It can be a condition or an action.
  *

Core/GDCore/Events/InstructionsList.cpp

@@ -0,0 +1,42 @@
+/*
+ * GDevelop Core
+ * Copyright 2008-2016 Florian Rival (Florian.Rival@gmail.com). All rights reserved.
+ * This project is released under the MIT License.
+ */
+
+#include "InstructionsList.h"
+#include "GDCore/Project/Project.h"
+#include "GDCore/Events/Instruction.h"
+#include "Serialization.h"
+
+namespace gd
+{
+
+void InstructionsList::InsertInstructions(const InstructionsList & list, size_t begin, size_t end, size_t position)
+{
+	if (begin >= list.size()) return;
+	if (end < begin) return;
+	if (end >= list.size()) end = list.size()-1;
+
+	for (std::size_t insertPos = 0;insertPos <= (end-begin);insertPos++)
+	{
+		const Instruction & instruction = *list.elements[begin+insertPos];
+		std::shared_ptr<Instruction> copiedInstruction = std::make_shared<Instruction>(instruction);
+		if (position != (size_t)-1 && position+insertPos < elements.size())
+			elements.insert(elements.begin()+position+insertPos, copiedInstruction);
+		else
+			elements.push_back(copiedInstruction);
+	}
+}
+
+void InstructionsList::SerializeTo(SerializerElement & element) const
+{
+	EventsListSerialization::SerializeInstructionsTo(*this, element);
+}
+
+void InstructionsList::UnserializeFrom(gd::Project & project, const SerializerElement & element)
+{
+	EventsListSerialization::UnserializeInstructionsFrom(project, *this, element);
+}
+
+}

Core/GDCore/Events/InstructionsList.h

@@ -6,17 +6,37 @@
 
 #ifndef GDCORE_INSTRUCTIONSLIST_H
 #define GDCORE_INSTRUCTIONSLIST_H
-
 #include <memory>
 #include <vector>
-
-#include "GDCore/Events/Instruction.h"
 #include "GDCore/Tools/SPtrList.h"
+namespace gd { class Instruction; }
+namespace gd { class Project; }
+namespace gd { class SerializerElement; }
 
 namespace gd
 {
 
-typedef SPtrList<gd::Instruction> InstructionsList;
+class InstructionsList : public SPtrList<gd::Instruction> {
+public:
+
+    void InsertInstructions(const InstructionsList & list, size_t begin, size_t end, size_t position = (size_t)-1);
+
+    /** \name Serialization
+     */
+    ///@{
+    /**
+     * \brief Serialize the instructions to the specified element
+     * \see EventsListSerialization
+     */
+    void SerializeTo(gd::SerializerElement & element) const;
+
+    /**
+     * \brief Load the instructions from the specified element
+     * \see EventsListSerialization
+     */
+    void UnserializeFrom(gd::Project & project, const gd::SerializerElement & element);
+    ///@}
+};
 
 }
 

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/Events/Serialization.cpp

@@ -6,6 +6,7 @@
 #include "GDCore/Project/Project.h"
 #include "GDCore/Extensions/Platform.h"
 #include "GDCore/Extensions/Metadata/InstructionMetadata.h"
+#include "GDCore/Events/InstructionsList.h"
 #include "GDCore/Events/EventsList.h"
 #include "GDCore/Events/Event.h"
 #include "GDCore/Events/Serialization.h"
@@ -21,7 +22,7 @@ using namespace std;
 namespace gd
 {
 
-void EventsListSerialization::UpdateInstructionsFromGD31x(gd::Project & project, gd::InstructionsList & list, bool instructionsAreActions)
+void EventsListSerialization::UpdateInstructionsFromGD31x(gd::Project & project, gd::InstructionsList & list)
 {
     for (std::size_t i = 0;i<list.size();++i)
     {
@@ -47,8 +48,6 @@ void EventsListSerialization::UpdateInstructionsFromGD31x(gd::Project & project,
         {
             instr.SetParameter(1, gd::Expression("\""+instr.GetParameter(1).GetPlainString()+"\""));
         }
-
-        //UpdateInstructionsFromGD31x(project, instr.GetSubInstructions(), instructionsAreActions);
     }
 }
 
@@ -201,79 +200,39 @@ void EventsListSerialization::SerializeEventsTo(const EventsList & list, Seriali
 
 using namespace std;
 
-void gd::EventsListSerialization::OpenConditions(gd::Project & project, gd::InstructionsList & conditions, const SerializerElement & elem)
+void gd::EventsListSerialization::UnserializeInstructionsFrom(gd::Project & project, gd::InstructionsList & instructions, const SerializerElement & elem)
 {
-    elem.ConsiderAsArrayOf("condition", "Condition");
+    elem.ConsiderAsArrayOf("instruction");
+    //Compatibility with GD <= 4.0.95
+    if (elem.HasChild("condition", "Condition"))
+        elem.ConsiderAsArrayOf("condition", "Condition");
+    else if (elem.HasChild("action", "Action"))
+        elem.ConsiderAsArrayOf("action", "Action");
+    //end of compatibility code
+
     for(std::size_t i = 0; i<elem.GetChildrenCount(); ++i)
     {
         gd::Instruction instruction;
-        const SerializerElement & conditionElem = elem.GetChild(i);
+        const SerializerElement & instrElement = elem.GetChild(i);
 
-        instruction.SetType(conditionElem.GetChild("type", 0, "Type").GetStringAttribute("value")
-                .FindAndReplace("Automatism", "Behavior")); //Compatibility with GD <= 4
-        instruction.SetInverted(conditionElem.GetChild("type", 0, "Type").GetBoolAttribute("inverted", false, "Contraire"));
-
-        //Read parameters
-        vector < gd::Expression > parameters;
-
-        //Compatibility with GD <= 3.3
-        if (conditionElem.HasChild("Parametre")) {
-
-            for (std::size_t j = 0;j<conditionElem.GetChildrenCount("Parametre");++j)
-                parameters.push_back(gd::Expression(conditionElem.GetChild("Parametre", j).GetValue().GetString()));
-
-        }
-        //end of compatibility code
-        else
-        {
-            const SerializerElement & parametersElem = conditionElem.GetChild("parameters");
-            parametersElem.ConsiderAsArrayOf("parameter");
-            for (std::size_t j = 0;j<parametersElem.GetChildrenCount();++j)
-                parameters.push_back(gd::Expression(parametersElem.GetChild(j).GetValue().GetString()));
-        }
-
-        instruction.SetParameters( parameters );
-
-        //Read sub conditions
-        if ( conditionElem.HasChild("subConditions", "SubConditions") )
-            OpenConditions(project, instruction.GetSubInstructions(), conditionElem.GetChild("subConditions", 0, "SubConditions" ));
-
-        conditions.Insert( instruction );
-    }
-
-    if ( project.GetLastSaveGDMajorVersion() < 3 ||
-         (project.GetLastSaveGDMajorVersion() == 3 && project.GetLastSaveGDMinorVersion() <= 1 ) )
-        UpdateInstructionsFromGD31x(project, conditions, false);
-
-    if ( project.GetLastSaveGDMajorVersion() < 3 )
-        UpdateInstructionsFromGD2x(project, conditions, false);
-}
-
-void gd::EventsListSerialization::OpenActions(gd::Project & project, gd::InstructionsList & actions, const SerializerElement & elem)
-{
-    elem.ConsiderAsArrayOf("action", "Action");
-    for(std::size_t i = 0; i<elem.GetChildrenCount(); ++i)
-    {
-        gd::Instruction instruction;
-        const SerializerElement & actionElem = elem.GetChild(i);
-
-        instruction.SetType(actionElem.GetChild("type", 0, "Type").GetStringAttribute("value")
+        instruction.SetType(instrElement.GetChild("type", 0, "Type").GetStringAttribute("value")
             .FindAndReplace("Automatism", "Behavior")); //Compatibility with GD <= 4
+        instruction.SetInverted(instrElement.GetChild("type", 0, "Type").GetBoolAttribute("inverted", false, "Contraire"));
 
         //Read parameters
         vector < gd::Expression > parameters;
 
         //Compatibility with GD <= 3.3
-        if (actionElem.HasChild("Parametre")) {
+        if (instrElement.HasChild("Parametre")) {
 
-            for (std::size_t j = 0;j<actionElem.GetChildrenCount("Parametre");++j)
-                parameters.push_back(gd::Expression(actionElem.GetChild("Parametre", j).GetValue().GetString()));
+            for (std::size_t j = 0;j<instrElement.GetChildrenCount("Parametre");++j)
+                parameters.push_back(gd::Expression(instrElement.GetChild("Parametre", j).GetValue().GetString()));
 
         }
         //end of compatibility code
         else
         {
-            const SerializerElement & parametersElem = actionElem.GetChild("parameters");
+            const SerializerElement & parametersElem = instrElement.GetChild("parameters");
             parametersElem.ConsiderAsArrayOf("parameter");
             for (std::size_t j = 0;j<parametersElem.GetChildrenCount();++j)
                 parameters.push_back(gd::Expression(parametersElem.GetChild(j).GetValue().GetString()));
@@ -281,62 +240,48 @@ void gd::EventsListSerialization::OpenActions(gd::Project & project, gd::Instruc
 
         instruction.SetParameters( parameters );
 
-        //Read sub actions
-        if ( actionElem.HasChild("subActions", "SubActions") )
-            OpenActions(project, instruction.GetSubInstructions(), actionElem.GetChild("subActions", 0, "SubActions" ));
+        //Read sub instructions
+        if ( instrElement.HasChild("subInstructions") )
+            UnserializeInstructionsFrom(project, instruction.GetSubInstructions(), instrElement.GetChild("subInstructions"));
+        //Compatibility with GD <= 4.0.95
+        if ( instrElement.HasChild("subConditions", "SubConditions") )
+            UnserializeInstructionsFrom(project, instruction.GetSubInstructions(), instrElement.GetChild("subConditions", 0, "SubConditions" ));
+        if ( instrElement.HasChild("subActions", "SubActions") )
+            UnserializeInstructionsFrom(project, instruction.GetSubInstructions(), instrElement.GetChild("subActions", 0, "SubActions" ));
+        //end of compatibility code
 
-        actions.Insert( instruction );
+        instructions.Insert( instruction );
     }
 
+    //Compatibility with GD <= 3.1
     if ( project.GetLastSaveGDMajorVersion() < 3 ||
          (project.GetLastSaveGDMajorVersion() == 3 && project.GetLastSaveGDMinorVersion() <= 1 ) )
-        UpdateInstructionsFromGD31x(project, actions, true);
+        UpdateInstructionsFromGD31x(project, instructions);
 
     if ( project.GetLastSaveGDMajorVersion() < 3 )
-        UpdateInstructionsFromGD2x(project, actions, true);
+        UpdateInstructionsFromGD2x(project, instructions, elem.HasChild("action", "Action"));
+    //end of compatibility code
 }
 
-void gd::EventsListSerialization::SaveActions(const gd::InstructionsList & list, SerializerElement & actions)
+void gd::EventsListSerialization::SerializeInstructionsTo(const gd::InstructionsList & list, SerializerElement & instructions)
 {
-    actions.ConsiderAsArrayOf("action");
+    instructions.ConsiderAsArrayOf("instruction");
     for ( std::size_t k = 0;k < list.size();k++ )
     {
-        SerializerElement & action = actions.AddChild("action");
-        action.AddChild("type")
+        SerializerElement & instruction = instructions.AddChild("instruction");
+        instruction.AddChild("type")
             .SetAttribute("value", list[k].GetType())
             .SetAttribute("inverted", list[k].IsInverted());
 
         //Parameters
-        SerializerElement & parameters = action.AddChild("parameters");
+        SerializerElement & parameters = instruction.AddChild("parameters");
         parameters.ConsiderAsArrayOf("parameter");
         for ( std::size_t l = 0;l < list[k].GetParameters().size();l++ )
             parameters.AddChild("parameter").SetValue(list[k].GetParameter(l).GetPlainString());
 
         //Sub instructions
-        SerializerElement & subActions = action.AddChild("subActions");
-        SaveActions(list[k].GetSubInstructions(), subActions);
-    }
-}
-
-void gd::EventsListSerialization::SaveConditions(const gd::InstructionsList & list, SerializerElement & conditions)
-{
-    conditions.ConsiderAsArrayOf("condition");
-    for ( std::size_t k = 0;k < list.size();k++ )
-    {
-        SerializerElement & condition = conditions.AddChild("condition");
-        condition.AddChild("type")
-            .SetAttribute("value", list[k].GetType())
-            .SetAttribute("inverted", list[k].IsInverted());
-
-        //Parameters
-        SerializerElement & parameters = condition.AddChild("parameters");
-        parameters.ConsiderAsArrayOf("parameter");
-        for ( std::size_t l = 0;l < list[k].GetParameters().size();l++ )
-            parameters.AddChild("parameter").SetValue(list[k].GetParameter(l).GetPlainString());
-
-        //Sub instructions
-        SerializerElement & subConditions = condition.AddChild("subConditions");
-        SaveConditions(list[k].GetSubInstructions(), subConditions);
+        SerializerElement & subInstructions = instruction.AddChild("subInstructions");
+        SerializeInstructionsTo(list[k].GetSubInstructions(), subInstructions);
     }
 }
 

Core/GDCore/Events/Serialization.h

@@ -5,9 +5,9 @@
  */
 #ifndef GDCORE_EVENTS_SERIALIZATION_H
 #define GDCORE_EVENTS_SERIALIZATION_H
-#include "GDCore/Events/Instruction.h"
 #include "GDCore/Serialization/Serializer.h"
 #include <vector>
+namespace gd { class InstructionsList; }
 namespace gd { class Project; }
 namespace gd { class EventsList; }
 
@@ -15,46 +15,37 @@ namespace gd
 {
 
 /**
- * \brief Contains tools for loading and saving events to XML.
+ * \brief Contains tools for loading and saving events to SerializerElement.
  */
 class GD_CORE_API EventsListSerialization
 {
 public:
     /**
-     * \brief Load an events list from a TiXmlElement
+     * \brief Load an events list from a SerializerElement
      * \param project The project the events belongs to.
      * \param list The event list in which the events must be loaded.
-     * \param events The TiXmlElement containing the events
+     * \param events The SerializerElement containing the events
      */
     static void UnserializeEventsFrom(gd::Project & project, gd::EventsList & list, const SerializerElement & events);
 
     /**
-     * \brief Save an events list from a TiXmlElement
+     * \brief Save an events list to a SerializerElement
      * \param list The event list to be saved.
-     * \param events The TiXmlElement in which the events must be saved.
+     * \param events The SerializerElement in which the events must be serialized.
      */
     static void SerializeEventsTo(const gd::EventsList & list, SerializerElement & events);
 
     /**
-     * \brief Load a list of conditions from a TiXmlElement
+     * \brief Unserialize a list of instructions
      */
-    static void OpenConditions(gd::Project & project, gd::InstructionsList & list, const SerializerElement & elem);
+    static void UnserializeInstructionsFrom(gd::Project & project, gd::InstructionsList & list, const SerializerElement & elem);
 
     /**
-     * \brief Load a list of actions from a TiXmlElement
+     * \brief Serialize a list of instructions
      */
-    static void OpenActions(gd::Project & project, gd::InstructionsList & list, const SerializerElement & elem);
-
-    /**
-     * \brief Save a list of conditions to a TiXmlElement
-     */
-    static void SaveConditions(const gd::InstructionsList & list, SerializerElement & elem);
-
-    /**
-     * \brief Save a list of actions to a TiXmlElement
-     */
-    static void SaveActions(const gd::InstructionsList & list, SerializerElement & elem);
+    static void SerializeInstructionsTo(const gd::InstructionsList & list, SerializerElement & elem);
 
+private:
     /**
      * \brief Internal method called when opening events created with GD2.x
      *
@@ -67,7 +58,7 @@ public:
      *
      * Variables related and some storage instructions have been changed.
      */
-    static void UpdateInstructionsFromGD31x(gd::Project & project, gd::InstructionsList & list, bool instructionsAreActions);
+    static void UpdateInstructionsFromGD31x(gd::Project & project, gd::InstructionsList & list);
 };
 
 }

Core/GDCore/Extensions/Builtin/AdvancedExtension.cpp

@@ -21,7 +21,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsAdvancedExtension(gd::P
     #if defined(GD_IDE_ONLY)
     extension.AddCondition("Toujours",
                  _("Always"),
-                 _("This condition returns always true (or always false if condition is inverted)."),
+                 _("This condition always returns true (or always false, if the condition is inverted)."),
                  _("Always"),
                  _("Other"),
                  "res/conditions/toujours24.png",

Core/GDCore/Extensions/Builtin/AudioExtension.cpp

@@ -21,8 +21,8 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsAudioExtension(gd::Plat
     #if defined(GD_IDE_ONLY)
     extension.AddAction("PlaySoundCanal",
                    _("Play a sound on a channel"),
-                   _("Play a sound (small audio file) on a specific channel,\nso as to be able to manipulate it."),
-                   _("Play the sound _PARAM1_ on the channel _PARAM2_"),
+                   _("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_, vol.: _PARAM4_, loop: _PARAM3_"),
                    _("Audio/Sounds on channels"),
                    "res/actions/son24.png",
                    "res/actions/son.png")
@@ -68,10 +68,10 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsAudioExtension(gd::Plat
         .MarkAsAdvanced();
 
     extension.AddAction("PlayMusicCanal",
-                   _("Play a music on a channel"),
-                   _("Play a music an on specific channel,\nso as to be able to interact with later."),
-                   _("Play the music _PARAM1_ on channel _PARAM2_"),
-                   _("Audio/Musics on channels"),
+                   _("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_, vol.: _PARAM4_, loop: _PARAM3_"),
+                   _("Audio/Music on channels"),
                    "res/actions/music24.png",
                    "res/actions/music.png")
         .AddCodeOnlyParameter("currentScene", "")
@@ -86,7 +86,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsAudioExtension(gd::Plat
                    _("Stop the music on a channel"),
                    _("Stop the music on the specified channel"),
                    _("Stop the music of channel _PARAM1_"),
-                   _("Audio/Musics on channels"),
+                   _("Audio/Music on channels"),
                    "res/actions/music24.png",
                    "res/actions/music.png")
         .AddCodeOnlyParameter("currentScene", "")
@@ -97,7 +97,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsAudioExtension(gd::Plat
                    _("Pause the music of a channel"),
                    _("Pause the music on the specified channel."),
                    _("Pause the music of channel _PARAM1_"),
-                   _("Audio/Musics on channels"),
+                   _("Audio/Music on channels"),
                    "res/actions/music24.png",
                    "res/actions/music.png")
         .AddCodeOnlyParameter("currentScene", "")
@@ -108,7 +108,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsAudioExtension(gd::Plat
                    _("Play the music of a channel"),
                    _("Play the music of the channel."),
                    _("Play the music of channel _PARAM1_"),
-                   _("Audio/Musics on channels"),
+                   _("Audio/Music on channels"),
                    "res/actions/music24.png",
                    "res/actions/music.png")
         .AddCodeOnlyParameter("currentScene", "")
@@ -117,7 +117,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsAudioExtension(gd::Plat
 
     extension.AddAction("ModVolumeSoundCanal",
                    _("Volume of the sound on a channel"),
-                   _("This action modify the volume of the sound on the specified channel. The volume is between 0 and 100."),
+                   _("This action modifies the volume of the sound on the specified channel. The volume is between 0 and 100."),
                    _("Do _PARAM2__PARAM3_ to the volume of the sound on channel _PARAM1_"),
                    _("Audio/Sounds on channels"),
                    "res/actions/sonVolume24.png",
@@ -131,9 +131,9 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsAudioExtension(gd::Plat
 
     extension.AddAction("ModVolumeMusicCanal",
                    _("Volume of the music on a channel"),
-                   _("This action modify the volume of the music on the specified channel. The volume is between 0 and 100."),
+                   _("This action modifies the volume of the music on the specified channel. The volume is between 0 and 100."),
                    _("Do _PARAM2__PARAM3_ to the volume of the music on channel _PARAM1_"),
-                   _("Audio/Musics on channels"),
+                   _("Audio/Music on channels"),
                    "res/actions/musicVolume24.png",
                    "res/actions/musicVolume.png")
         .AddCodeOnlyParameter("currentScene", "")
@@ -145,7 +145,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsAudioExtension(gd::Plat
 
     extension.AddAction("ModGlobalVolume",
                    _("Game global volume"),
-                   _("This action modify the global volume of the game. The volume is between 0 and 100."),
+                   _("This action modifies the global volume of the game. The volume is between 0 and 100."),
                    _("Do _PARAM1__PARAM2_ to global sound level"),
                    _("Audio"),
                    "res/actions/volume24.png",
@@ -158,7 +158,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsAudioExtension(gd::Plat
 
     extension.AddAction("ModPitchSoundChannel",
                    _("Pitch of the sound of a channel"),
-                   _("This action modify pitch (speed) of the sound on a channel.\n1 is the default pitch."),
+                   _("This action modifies the pitch (speed) of the sound on a channel.\n1 is the default pitch."),
                    _("Do _PARAM2__PARAM3_ to the pitch of the sound on channel _PARAM1_"),
                    _("Audio/Sounds on channels"),
                    "res/actions/son24.png",
@@ -172,9 +172,9 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsAudioExtension(gd::Plat
 
     extension.AddAction("ModPitchMusicChannel",
                    _("Pitch of the music on a channel"),
-                   _("This action modify the pitch of the music on the specified channel. 1 is the default pitch"),
+                   _("This action modifies the pitch of the music on the specified channel. 1 is the default pitch"),
                    _("Do _PARAM2__PARAM3_ to the pitch of the music on channel _PARAM1_"),
-                   _("Audio/Musics on channels"),
+                   _("Audio/Music on channels"),
                    "res/actions/music24.png",
                    "res/actions/music.png")
         .AddCodeOnlyParameter("currentScene", "")
@@ -186,7 +186,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsAudioExtension(gd::Plat
 
     extension.AddAction("ModPlayingOffsetSoundChannel",
                    _("Playing offset of the sound on a channel"),
-                   _("This action modify the playing offset of the sound on a channel"),
+                   _("This action modifies the playing offset of the sound on a channel"),
                    _("Do _PARAM2__PARAM3_ to the playing offset of the sound on channel _PARAM1_"),
                    _("Audio/Sounds on channels"),
                    "res/actions/son24.png",
@@ -200,9 +200,9 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsAudioExtension(gd::Plat
 
     extension.AddAction("ModPlayingOffsetMusicChannel",
                    _("Playing offset of the music on a channel"),
-                   _("This action modify the playing offset of the music on the specified channel"),
+                   _("This action modifies the playing offset of the music on the specified channel"),
                    _("Do _PARAM2__PARAM3_ to the playing offset of the music on channel _PARAM1_"),
-                   _("Audio/Musics on channels"),
+                   _("Audio/Music on channels"),
                    "res/actions/music24.png",
                    "res/actions/music.png")
         .AddCodeOnlyParameter("currentScene", "")
@@ -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")
@@ -227,9 +227,9 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsAudioExtension(gd::Plat
         .MarkAsSimple();
 
     extension.AddAction("PlayMusic",
-                   _("Play a music"),
-                   _("Play a music."),
-                   _("Play the music _PARAM1_"),
+                   _("Play a music file"),
+                   _("Play a music file."),
+                   _("Play the music _PARAM1_, vol.: _PARAM3_, loop: _PARAM2_)"),
                    _("Audio"),
                    "res/actions/music24.png",
                    "res/actions/music.png")
@@ -241,10 +241,10 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsAudioExtension(gd::Plat
         .MarkAsSimple();
 
     extension.AddCondition("MusicPlaying",
-                   _("A music is being played"),
+                   _("A music file is being played"),
                    _("Test if the music on a channel is being played"),
                    _("Music on channel _PARAM1_ is being played"),
-                   _("Audio/Musics on channels"),
+                   _("Audio/Music on channels"),
                    "res/conditions/musicplaying24.png",
                    "res/conditions/musicplaying.png")
         .AddCodeOnlyParameter("currentScene", "")
@@ -252,10 +252,10 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsAudioExtension(gd::Plat
         .MarkAsAdvanced();
 
     extension.AddCondition("MusicPaused",
-                   _("A music is paused"),
+                   _("A music file is paused"),
                    _("Test if the music on the specified channel is paused."),
                    _("Music on channel _PARAM1_ is paused"),
-                   _("Audio/Musics on channels"),
+                   _("Audio/Music on channels"),
                    "res/conditions/musicpaused24.png",
                    "res/conditions/musicpaused.png")
         .AddCodeOnlyParameter("currentScene", "")
@@ -263,10 +263,10 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsAudioExtension(gd::Plat
         .MarkAsAdvanced();
 
     extension.AddCondition("MusicStopped",
-                   _("A music is stopped"),
+                   _("A music file is stopped"),
                    _("Test if the music on the specified channel is stopped."),
                    _("Music on channel _PARAM1_ is stopped"),
-                   _("Audio/Musics on channels"),
+                   _("Audio/Music on channels"),
                    "res/conditions/musicstopped24.png",
                    "res/conditions/musicstopped.png")
         .AddCodeOnlyParameter("currentScene", "")
@@ -322,9 +322,9 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsAudioExtension(gd::Plat
 
     extension.AddCondition("MusicCanalVolume",
                    _("Volume of the music on a channel"),
-                   _("Test the volume of the music on specified channel. The volume is between 0 and 100."),
+                   _("Test the volume of the music on a specified channel. The volume is between 0 and 100."),
                    _("The volume of the music on channel _PARAM1_ is _PARAM2__PARAM3_"),
-                   _("Audio/Musics on channels"),
+                   _("Audio/Music on channels"),
                    "res/conditions/musicVolume24.png",
                    "res/conditions/musicVolume.png")
         .AddCodeOnlyParameter("currentScene", "")
@@ -362,9 +362,9 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsAudioExtension(gd::Plat
 
     extension.AddCondition("MusicChannelPitch",
                    _("Pitch of the music on a channel"),
-                   _("Test the pitch (speed) of the music on specified channel. 1 is the default pitch."),
-                   _("The volume of the music on channel _PARAM1_ is _PARAM2__PARAM3_"),
-                   _("Audio/Musics on channels"),
+                   _("Test the pitch (speed) of the music on a specified channel. 1 is the default pitch."),
+                   _("The pitch of the music on channel _PARAM1_ is _PARAM2__PARAM3_"),
+                   _("Audio/Music on channels"),
                    "res/conditions/musicVolume24.png",
                    "res/conditions/musicVolume.png")
         .AddCodeOnlyParameter("currentScene", "")
@@ -392,7 +392,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsAudioExtension(gd::Plat
                    _("Playing offset of the music on a channel"),
                    _("Test the playing offset of the music on the specified channel."),
                    _("The playing offset of the music on channel _PARAM1_ is _PARAM2__PARAM3_"),
-                   _("Audio/Musics on channels"),
+                   _("Audio/Music on channels"),
                    "res/conditions/musicVolume24.png",
                    "res/conditions/musicVolume.png")
         .AddCodeOnlyParameter("currentScene", "")
@@ -406,7 +406,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsAudioExtension(gd::Plat
         .AddCodeOnlyParameter("currentScene", "")
         .AddParameter("expression", _("Channel"));
 
-    extension.AddExpression("MusicChannelPlayingOffset", _("Music playing offset"), _("Music playing offset"), _("Musics"), "res/actions/music.png")
+    extension.AddExpression("MusicChannelPlayingOffset", _("Music playing offset"), _("Music playing offset"), _("Music"), "res/actions/music.png")
         .AddCodeOnlyParameter("currentScene", "")
         .AddParameter("expression", _("Channel"));
 
@@ -414,7 +414,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsAudioExtension(gd::Plat
         .AddCodeOnlyParameter("currentScene", "")
         .AddParameter("expression", _("Channel"));
 
-    extension.AddExpression("MusicChannelVolume", _("Music volume"), _("Music volume"), _("Musics"), "res/actions/music.png")
+    extension.AddExpression("MusicChannelVolume", _("Music volume"), _("Music volume"), _("Music"), "res/actions/music.png")
         .AddCodeOnlyParameter("currentScene", "")
         .AddParameter("expression", _("Channel"));
 
@@ -422,7 +422,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsAudioExtension(gd::Plat
         .AddCodeOnlyParameter("currentScene", "")
         .AddParameter("expression", _("Channel"));
 
-    extension.AddExpression("MusicChannelPitch", _("Music's pitch"), _("Music's pitch"), _("Musics"), "res/actions/music.png")
+    extension.AddExpression("MusicChannelPitch", _("Music's pitch"), _("Music's pitch"), _("Music"), "res/actions/music.png")
         .AddCodeOnlyParameter("currentScene", "")
         .AddParameter("expression", _("Channel"));
 

Core/GDCore/Extensions/Builtin/BaseObjectExtension.cpp

@@ -177,7 +177,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(gd:
 
     obj.AddAction("AddForceXY",
                    _("Add a force"),
-                   _("Add a force to an object. The object will move according to all forces it has."),
+                   _("Add a force to an object. The object will move according to all of the forces it has."),
                    _("Add to _PARAM0_ a force of _PARAM1_ p/s on X axis and _PARAM2_ p/s on Y axis"),
                    _("Movement"),
                    "res/actions/force24.png",
@@ -191,7 +191,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(gd:
 
     obj.AddAction("AddForceAL",
                    _("Add a force (angle)"),
-                   _("Add a force to an object. The object will move according to all forces it has. This action creates the force using the specified angle and length."),
+                   _("Add a force to an object. The object will move according to all of the forces it has. This action creates the force using the specified angle and length."),
                    _("Add to _PARAM0_ a force, angle: _PARAM1_ degrees and length: _PARAM2_ pixels"),
                    _("Movement"),
                    "res/actions/force24.png",
@@ -221,8 +221,8 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(gd:
         .MarkAsAdvanced();
 
     obj.AddAction("AddForceTournePos",
-                   _("Add a force to move around an position"),
-                   _("Add a force to an object to make it rotate around a position.\nNote that the movement is not precise, especially if the speed is high.\nTo position an object around a position more precisly, use the actions in the category \"Position\"."),
+                   _("Add a force to move around a position"),
+                   _("Add a force to an object to make it rotate around a position.\nNote that the movement is not precise, especially if the speed is high.\nTo position an object around a position more precisely, use the actions in the category \"Position\"."),
                    _("Rotate _PARAM0_ around _PARAM1_;_PARAM2_ at _PARAM3_ deg/sec and _PARAM4_ pixels away"),
                    _("Movement"),
                    "res/actions/forceTourne24.png",
@@ -239,7 +239,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(gd:
 
     obj.AddAction("Arreter",
                    _("Stop the object"),
-                   _("Stop the object by deleting all its forces."),
+                   _("Stop the object by deleting all of its forces."),
                    _("Stop the object _PARAM0_"),
                    _("Movement"),
                    "res/actions/arreter24.png",
@@ -263,7 +263,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(gd:
 
     obj.AddAction("ChangePlan",
                    _("Z order"),
-                   _("Modify the z order of an object"),
+                   _("Modify the Z-order of an object"),
                    _("Do _PARAM1__PARAM2_ to z-Order of _PARAM0_"),
                    _("Z order"),
                    "res/actions/planicon24.png",
@@ -276,14 +276,14 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(gd:
 
     obj.AddAction("ChangeLayer",
                    _("Layer"),
-                   _("Change the layer where is the object."),
+                   _("Move the object to a different layer."),
                    _("Put _PARAM0_ on the layer _PARAM1_"),
                    _("Layers and cameras"),
                    "res/actions/layer24.png",
                    "res/actions/layer.png")
 
         .AddParameter("object", _("Object"))
-        .AddParameter("layer", _("Put on the layer (base layer if empty)")).SetDefaultValue("\"\"")
+        .AddParameter("layer", _("Move it to this layer (base layer if empty)")).SetDefaultValue("\"\"")
         .MarkAsAdvanced();
 
     obj.AddAction("ModVarObjet",
@@ -338,6 +338,17 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(gd:
         .AddParameter("string", _("Child's name"))
         .MarkAsAdvanced();
 
+    obj.AddAction("ObjectVariableClearChildren",
+               _("Clear variable"),
+               _("Remove all the children from the object variable."),
+               _("Clear children from variable _PARAM1_ of _PARAM0_"),
+               _("Variables/Structure"),
+               "res/actions/var24.png",
+               "res/actions/var.png")
+        .AddParameter("object", _("Object"))
+        .AddParameter("objectvar", _("Variable"))
+        .MarkAsAdvanced();
+
     obj.AddAction("Cache",
                    _("Hide"),
                    _("Hide the specified object."),
@@ -363,7 +374,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(gd:
 
     obj.AddCondition("Angle",
                    _("Angle"),
-                   _("Compare angle of the specified object."),
+                   _("Compare the angle of the specified object."),
                    _("Angle of _PARAM0_ is _PARAM1__PARAM2_ deg."),
                    _("Angle"),
                    "res/conditions/direction24.png",
@@ -377,7 +388,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(gd:
 
     obj.AddCondition("Plan",
                    _("Compare Z order"),
-                   _("Compare the z-order of the specified object."),
+                   _("Compare the Z-order of the specified object."),
                    _("Z Order of _PARAM0_ is _PARAM1__PARAM2_"),
                    _("Z order"),
                    "res/conditions/planicon24.png",
@@ -391,7 +402,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(gd:
 
     obj.AddCondition("Layer",
                    _("Compare layer"),
-                   _("Test if the object is on the specified layer."),
+                   _("Check if the object is on the specified layer."),
                    _("_PARAM0_ is on layer _PARAM1_"),
                    _("Layer"),
                    "res/conditions/layer24.png",
@@ -403,7 +414,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(gd:
 
     obj.AddCondition("Visible",
                    _("Visibility of an object"),
-                   _("Test if an object is not hidden."),
+                   _("Check if an object is visible."),
                    _("The object _PARAM0_ is visible"),
                    _("Visibility"),
                    "res/conditions/visibilite24.png",
@@ -414,7 +425,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(gd:
 
     obj.AddCondition("Invisible",
                    _("Invisibility of an object"),
-                   _("Test if an object is hidden."),
+                   _("Check if an object is hidden."),
                    _("_PARAM0_ is hidden"),
                    _("Visibility"),
                    "res/conditions/visibilite24.png",
@@ -425,7 +436,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(gd:
 
     obj.AddCondition("Arret",
                    _("Object is stopped"),
-                   _("Test if an object does not move"),
+                   _("Check if an object is not moving"),
                    _("_PARAM0_ is stopped"),
                    _("Movement"),
                    "res/conditions/arret24.png",
@@ -449,7 +460,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(gd:
         .SetManipulatedType("number");
 
     obj.AddCondition("AngleOfDisplacement",
-                   _("Angle of moving"),
+                   _("Angle of movement"),
                    _("Compare the angle of displacement of an object"),
                    _("Angle of displacement of _PARAM0_ is _PARAM1_ (tolerance : _PARAM2_ degrees)"),
                    _("Movement"),
@@ -491,7 +502,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(gd:
 
     obj.AddCondition("VarObjetDef",
                    _("Variable defined"),
-                   _("Test "),
+                   _("Check if the variable is defined."),
                    _("Variable _PARAM1 of _PARAM0_ is defined"),
                    _("Variables"),
                    "res/conditions/var24.png",
@@ -542,7 +553,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(gd:
 
     obj.AddAction("AddForceTourne",
                    _("Add a force to move around an object"),
-                   _("Add a force to an object to make it rotate around another.\nNote that the movement is not precise, especially if the speed is high.\nTo position an object around a position more precisly, use the actions in category \"Position\"."),
+                   _("Add a force to an object to make it rotate around another.\nNote that the movement is not precise, especially if the speed is high.\nTo position an object around a position more precisely, use the actions in category \"Position\"."),
                    _("Rotate _PARAM0_ around _PARAM1_ at _PARAM2_ deg/sec and _PARAM3_ pixels away"),
                    _("Movement"),
                    "res/actions/forceTourne24.png",
@@ -574,7 +585,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(gd:
     obj.AddAction("Rebondir",
                    _("Move an object away from another"),
                    _("Move an object away from another, using forces."),
-                   _("Move _PARAM0_ away of _PARAM1_ (only _PARAM0_ will move)"),
+                   _("Move _PARAM0_ away from _PARAM1_ (only _PARAM0_ will move)"),
                    _("Movement"),
                    "res/actions/ecarter24.png",
                    "res/actions/ecarter.png")
@@ -588,7 +599,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(gd:
     obj.AddAction("Ecarter",
                    _("Move an object away from another"),
                    _("Move an object away from another without using forces."),
-                   _("Move _PARAM0_ away of _PARAM2_ (only _PARAM0_ will move)"),
+                   _("Move _PARAM0_ away from _PARAM2_ (only _PARAM0_ will move)"),
                    _("Position"),
                    "res/actions/ecarter24.png",
                    "res/actions/ecarter.png")
@@ -600,8 +611,8 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(gd:
 
     obj.AddAction("SeparateFromObjects",
                    _("Separate two objects"),
-                   _("Move an object away from another using their collision masks.\nBe sure to call this action on a reasonable number of objects so as\nnot to slow down the game."),
-                   _("Move _PARAM0_ away of _PARAM1_ (only _PARAM0_ will move)"),
+                   _("Move an object away from another using their collision masks.\nBe sure to call this action on a reasonable number of objects\nto avoid slowing down the game."),
+                   _("Move _PARAM0_ away from _PARAM1_ (only _PARAM0_ will move)"),
                    _("Position"),
                    "res/actions/ecarter24.png",
                    "res/actions/ecarter.png")
@@ -610,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"));
 
@@ -693,13 +716,13 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(gd:
 
     extension.AddAction("CreateByName",
                    _("Create an object from its name"),
-                   _("Among the objects of the specified group, the action will create the object with the specified name."),
+                   _("Among the objects of the specified group, this action will create the object with the specified name."),
                    _("Among objects _PARAM1_, create object named _PARAM2_ at position _PARAM3_;_PARAM4_"),
                    _("Objects"),
                    "res/actions/create24.png",
                    "res/actions/create.png")
         .AddCodeOnlyParameter("currentScene", "")
-        .AddParameter("objectListWithoutPicking", _("Groups containing objects which can be created by the action"))
+        .AddParameter("objectListWithoutPicking", _("Groups containing objects that can be created by the action"))
         .AddParameter("string", _("Text representing the name of the object to create"))
         .AddParameter("expression", _("X position"))
         .AddParameter("expression", _("Y position"))
@@ -719,7 +742,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(gd:
 
     extension.AddAction("AjoutHasard",
                    _("Pick a random object"),
-                   _("Pick only one object with this name among all"),
+                   _("Pick only one object with this name, among all"),
                    _("Pick a random _PARAM1_"),
                    _("Objects"),
                    "res/actions/ajouthasard24.png",
@@ -729,9 +752,9 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(gd:
         .MarkAsSimple();
 
     extension.AddAction("MoveObjects",
-                   _("Apply objects movement"),
-                   _("Moves the objects according to the forces they have. GDevelop call this action at the end of the events by default."),
-                   _("Apply objects movement"),
+                   _("Apply movement to all objects"),
+                   _("Moves all objects according to the forces they have. GDevelop calls this action at the end of the events by default."),
+                   _("Apply movement to all objects"),
                    _("Movement"),
                    "res/actions/doMove24.png",
                    "res/actions/doMove.png")
@@ -777,7 +800,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(gd:
 
     extension.AddCondition("AjoutHasard",
                    _("Pick a random object"),
-                   _("Pick only one object with this name among all"),
+                   _("Pick only one object with this name, among all"),
                    _("Pick a random _PARAM1_"),
                    _("Objects"),
                    "res/conditions/ajouthasard24.png",
@@ -814,7 +837,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(gd:
 
     extension.AddCondition("CollisionNP", //"CollisionNP" cames from an old condition to test collision between two sprites non precisely.
                    _("Collision"),
-                   _("Test the collision between two objects using their collision mask.\nNote that some objects may not have a collision mask.\nSome others, like Sprite, provide also more precise collision conditions."),
+                   _("Test the collision between two objects using their collision masks.\nNote that some objects may not have collision masks.\nSome others, like Sprite objects, also provide more precise collision conditions."),
                    _("_PARAM0_ is in collision with _PARAM1_"),
                    _("Collision"),
                    "res/conditions/collision24.png",
@@ -826,7 +849,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(gd:
 
     extension.AddCondition("EstTourne",
                       _("An object is turned toward another"),
-                      _("Test if an object is turned toward another"),
+                      _("Check if an object is turned toward another"),
                       _("_PARAM0_ is rotated towards _PARAM1_"),
                       _("Angle"),
                       "res/conditions/estTourne24.png",

Core/GDCore/Extensions/Builtin/CameraExtension.cpp

@@ -14,7 +14,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsCameraExtension(gd::Pla
 {
     extension.SetExtensionInformation("BuiltinCamera",
                           _("Cameras and layers features"),
-                          _("Builtin camera extension"),
+                          _("Built-in camera extension"),
                           "Florian Rival",
                           "Open source (MIT License)");
 
@@ -36,8 +36,8 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsCameraExtension(gd::Pla
 
     extension.AddCondition("CameraY",
                    _("Camera center Y position"),
-                   _("Compare the Y position of a the center of a camera."),
-                   _("The Y position of camera _PARAM4_ is _PARAM1__PARAM2_  (layer: _PARAM3_)"),
+                   _("Compare the Y position of the center of a camera."),
+                   _("The Y position of camera _PARAM4_ is _PARAM1__PARAM2_ (layer: _PARAM3_)"),
                    _("Layers and cameras"),
                    "res/conditions/camera24.png",
                    "res/conditions/camera.png")
@@ -51,7 +51,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsCameraExtension(gd::Pla
 
     extension.AddAction("CameraX",
                    _("Camera center X position"),
-                   _("Change X position of the center of the specified camera."),
+                   _("Change the X position of the center of the specified camera."),
                    _("Do _PARAM1__PARAM2_ to X position of camera _PARAM4_ (layer: _PARAM3_)"),
                    _("Layers and cameras"),
                    "res/conditions/camera24.png",
@@ -66,7 +66,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsCameraExtension(gd::Pla
 
     extension.AddAction("CameraY",
                    _("Camera center Y position"),
-                   _("Change Y position of the center of the specified camera."),
+                   _("Change the Y position of the center of the specified camera."),
                    _("Do _PARAM1__PARAM2_ to Y position of camera _PARAM4_ (layer: _PARAM3_)"),
                    _("Layers and cameras"),
                    "res/conditions/camera24.png",
@@ -126,7 +126,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsCameraExtension(gd::Pla
 
     extension.AddAction("RotateCamera",
                    _("Change camera angle"),
-                   _("This action modify the angle of a camera of the specified layer."),
+                   _("This action modifies the angle of a camera in the specified layer."),
                    _("Do _PARAM1__PARAM2_ to angle of camera (layer: _PARAM3_, camera: _PARAM4_)"),
                    _("Layers and cameras"),
                    "res/actions/camera24.png",
@@ -140,7 +140,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsCameraExtension(gd::Pla
 
     extension.AddAction("AddCamera",
                    _("Add a camera to a layer"),
-                   _("This action add a camera to a layer"),
+                   _("This action adds a camera to a layer"),
                    _("Add a camera to layer _PARAM1_"),
                    _("Layers and cameras"),
                    "res/actions/camera24.png",
@@ -169,7 +169,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsCameraExtension(gd::Pla
 
     extension.AddAction("CameraSize",
                    _("Modify the size of a camera"),
-                   _("This action modify the size of a camera of the specified layer. The zoom will be reset."),
+                   _("This action modifies the size of a camera of the specified layer. The zoom will be reset."),
                    _("Change the size of camera _PARAM2_ of _PARAM1_ to _PARAM3_*_PARAM4_"),
                    _("Layers and cameras"),
                    "res/actions/camera24.png",
@@ -183,7 +183,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsCameraExtension(gd::Pla
 
     extension.AddAction("CameraViewport",
                    _("Modify the render zone of a camera"),
-                   _("This action modify the render zone of a camera of the specified layer."),
+                   _("This action modifies the render zone of a camera of the specified layer."),
                    _("Set the render zone of camera _PARAM2_ from layer _PARAM1_ to _PARAM3_;_PARAM4_ _PARAM5_;_PARAM6_"),
                    _("Layers and cameras"),
                    "res/actions/camera24.png",
@@ -265,7 +265,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsCameraExtension(gd::Pla
 
     extension.AddCondition("LayerVisible",
                    _("Visibility of a layer"),
-                   _("Test if a layer is displayed"),
+                   _("Test if a layer is set as visible."),
                    _("Layer _PARAM1_ is visible"),
                    _("Layers and cameras"),
                    "res/conditions/layer24.png",
@@ -290,7 +290,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsCameraExtension(gd::Pla
 
     extension.AddCondition("LayerTimeScale",
                    _("Layer time scale"),
-                   _("Compare the time scale applied on the objects of the layer."),
+                   _("Compare the time scale applied to the objects of the layer."),
                    _("The time scale of layer _PARAM1_ is _PARAM2__PARAM3_"),
                    _("Layers and cameras/Time"),
                    "res/conditions/time24.png",
@@ -304,7 +304,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsCameraExtension(gd::Pla
 
     extension.AddAction("ChangeLayerTimeScale",
                    _("Change layer time scale"),
-                   _("Change the time scale applied on the objects of the layer."),
+                   _("Change the time scale applied to the objects of the layer."),
                    _("Set time scale of layer _PARAM1_ to _PARAM2_"),
                    _("Layers and cameras/Time"),
                    "res/actions/time24.png",

Core/GDCore/Extensions/Builtin/CommonConversionsExtension.cpp

@@ -25,21 +25,21 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsCommonConversionsExtens
                        _("Convert the text to a number"),
                        _("Conversion"),
                        "res/conditions/toujours24.png")
-        .AddParameter("string", _("Text to convert in a number"));
+        .AddParameter("string", _("Text to convert to a number"));
 
     extension.AddStrExpression("ToString",
                        _("Number > Text"),
-                       _("Convert the result of the expression in a text"),
+                       _("Convert the result of the expression to text"),
                        _("Conversion"),
                        "res/conditions/toujours24.png")
-        .AddParameter("expression", _("Expression to be converted to a text"));
+        .AddParameter("expression", _("Expression to be converted to text"));
 
     extension.AddStrExpression("LargeNumberToString",
                        _("Number > Text ( without scientific notation )"),
-                       _("Convert the result of the expression in a text, without using the scientific notation"),
+                       _("Convert the result of the expression to text, without using the scientific notation"),
                        _("Conversion"),
                        "res/conditions/toujours24.png")
-        .AddParameter("expression", _("Expression to be converted to a text"));
+        .AddParameter("expression", _("Expression to be converted to text"));
 
     extension.AddExpression("ToRad",
                        _("Degrees > Radians"),

Core/GDCore/Extensions/Builtin/ExternalLayoutsExtension.cpp

@@ -22,7 +22,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsExternalLayoutsExtensio
     extension.AddAction("CreateObjectsFromExternalLayout",
                    _("Create objects from an external layout"),
                    _("Create objects from an external layout."),
-                   _("Create objects from the external layout _PARAM1_"),
+                   _("Create objects from the external layout named _PARAM1_"),
                    _("External layouts"),
                    "res/conditions/fichier24.png",
                    "res/conditions/fichier.png")

Core/GDCore/Extensions/Builtin/FileExtension.cpp

@@ -32,7 +32,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsFileExtension(gd::Platf
 
     extension.AddAction("LoadFile",
                    _("Load a structured file in memory"),
-                   _("This action load the structured file in memory, so as to write and read it.\nYou can open and write without using this action, but it will be slower.\nIf you use this action, do not forget to unload the file from memory.\n\nFor the native platform, the file format is XML."),
+                   _("This action loads the structured file in memory, so you can write and read it.\nYou can open and write without using this action, but it will be slower.\nIf you use this action, do not forget to unload the file from memory.\n\nFor the native platform, the file format is XML."),
                    _("Load structured file _PARAM0_ in memory"),
                    _("Storage"),
                    "res/actions/fichier24.png",
@@ -42,7 +42,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsFileExtension(gd::Platf
 
     extension.AddAction("UnloadFile",
                    _("Close a structured file"),
-                   _("This action close the structured file previously loaded in memory, saving all changes made."),
+                   _("This action closes the structured file previously loaded in memory, saving all changes made."),
                    _("Close structured file _PARAM0_"),
                    _("Storage"),
                    "res/actions/fichier24.png",
@@ -98,7 +98,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsFileExtension(gd::Platf
 
     extension.AddAction("DeleteGroupFichier",
                    _("Delete an element"),
-                   _("This action delete the specified element from the structured file.\nSpecify the structure leading to the element using / (example : Root/Level/Current)\nSpaces are forbidden in element names."),
+                   _("This action deletes the specified element from the structured file.\nSpecify the structure leading to the element using / (example : Root/Level/Current)\nSpaces are forbidden in element names."),
                    _("Delete _PARAM1_ from the file _PARAM0_"),
                    _("Storage"),
                    "res/actions/delete24.png",
@@ -127,8 +127,8 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsFileExtension(gd::Platf
         .MarkAsAdvanced();
 
     extension.AddAction("LaunchFile",
-                   _("Open an URL or a file"),
-                   _("This action launch the specified file or URL, in a browser (or in a new tab if the game is using the Web platform and is launched inside a browser)."),
+                   _("Open a URL or a file"),
+                   _("This action launches the specified file or URL, in a browser (or in a new tab if the game is using the Web platform and is launched inside a browser)."),
                    _("Open URL (or file) _PARAM0_"),
                    _("Files"),
                    "res/actions/launchFile24.png",
@@ -138,7 +138,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsFileExtension(gd::Platf
 
     extension.AddAction("ExecuteCmd",
                    _("Execute a command"),
-                   _("This action execute the specified command."),
+                   _("This action executes the specified command."),
                    _("Execute _PARAM0_"),
                    _("Files"),
                    "res/actions/launchFile24.png",

Core/GDCore/Extensions/Builtin/JoystickExtension.cpp

@@ -14,14 +14,14 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsJoystickExtension(gd::P
 {
     extension.SetExtensionInformation("BuiltinJoystick",
                           _("Joysticks features"),
-                          _("Built-in extension allowing to use joysticks"),
+                          _("Built-in extension that enables the use of joysticks"),
                           "Florian Rival",
                           "Open source (MIT License)");
 
     #if defined(GD_IDE_ONLY)
     extension.AddCondition("JoystickButtonDown",
-                   _("A button of a joystick is pressed"),
-                   _("Test if a button of a joystick is pressed."),
+                   _("A button on a joystick is pressed"),
+                   _("Test if a button on a joystick is pressed."),
                    _("The button _PARAM2_ of joystick _PARAM1_ is pressed"),
                    _("Joystick"),
                    "res/conditions/joystick24.png",
@@ -46,7 +46,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsJoystickExtension(gd::P
 
     extension.AddAction("GetJoystickAxis",
                    _("Get the value of the axis of a joystick"),
-                   _("Save in the variable the value of the axis of the joystick (from -100 to 100)."),
+                   _("Save the value of the axis of the joystick (from -100 to 100)."),
                    _("Save in _PARAM3_ the value of axis _PARAM2_ of joystick _PARAM1_"),
                    _("Joystick"),
                    "res/actions/joystick24.png",
@@ -54,7 +54,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsJoystickExtension(gd::P
         .AddCodeOnlyParameter("currentScene", "")
         .AddParameter("expression", _("Joystick number (first joystick: 0)"))
         .AddParameter("joyaxis", _("Axis"))
-        .AddParameter("scenevar", _("Save result to scene variable"))
+        .AddParameter("scenevar", _("Save the result to the scene variable"))
         .SetManipulatedType("number");
 
     extension.AddExpression("GetJoystickAxis",

Core/GDCore/Extensions/Builtin/KeyboardExtension.cpp

@@ -14,7 +14,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsKeyboardExtension(gd::P
 {
     extension.SetExtensionInformation("BuiltinKeyboard",
                           _("Keyboard features"),
-                          _("Built-in extension allowing to use keyboard"),
+                          _("Built-in extension that enables the use of a keyboard"),
                           "Florian Rival",
                           "Open source (MIT License)");
 

Core/GDCore/Extensions/Builtin/MouseExtension.cpp

@@ -14,7 +14,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsMouseExtension(gd::Plat
 {
     extension.SetExtensionInformation("BuiltinMouse",
                           _("Mouse features"),
-                          _("Built-in extension allowing to use the mouse"),
+                          _("Built-in extension that enables the use of a mouse"),
                           "Florian Rival",
                           "Open source (MIT License)");
 
@@ -34,8 +34,8 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsMouseExtension(gd::Plat
         .MarkAsSimple();
 
     extension.AddAction("TouchSimulateMouse",
-                   _("De/activate moving mouse cursor with touches"),
-                   _("When activated, any touch made on a touchscreen will also move the mouse cursor. When deactivated, mouse and touch positions will be completely independant.\nBy default, this is activated so that you can simply use the mouse conditions to also support touchscreens. If you want to have multitouch and differentiate mouse and touches, just deactivate it with this action."),
+                   _("De/activate moving the mouse cursor with touches"),
+                   _("When activated, any touch made on a touchscreen will also move the mouse cursor. When deactivated, mouse and touch positions will be completely independent.\nBy default, this is activated so that you can simply use the mouse conditions to also support touchscreens. If you want to have multitouch and differentiate mouse movement and touches, just deactivate it with this action."),
                    _("Move mouse cursor when touching screen: _PARAM1_"),
                    _("Mouse and touch"),
                    "res/conditions/touch24.png",
@@ -141,8 +141,8 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsMouseExtension(gd::Plat
         .SetManipulatedType("number");
 
     extension.AddCondition("SourisBouton",
-                   _("Mouse button down or touch held"),
-                   _("Return true if the specified button of the mouse is down or if any touch is in contact with the screen."),
+                   _("Mouse button pressed or touch held"),
+                   _("Return true if the specified mouse button is pressed or if a touch is in contact with the screen."),
                    _("Touch or _PARAM1_ mouse button is down"),
                    _("Mouse and touch"),
                    "res/conditions/mouse24.png",
@@ -153,7 +153,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsMouseExtension(gd::Plat
 
     extension.AddCondition("MouseButtonReleased",
                    _("Mouse button released"),
-                   _("Return true if the specified button of the mouse was released."),
+                   _("Return true if the specified mouse button was released."),
                    _("_PARAM1_ mouse button was released"),
                    _("Mouse and touch"),
                    "res/conditions/mouse24.png",
@@ -194,7 +194,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsMouseExtension(gd::Plat
 
     extension.AddCondition("PopStartedTouch",
                    _("A new touch has started"),
-                   _("Return true if a touch has started. The touch identifier can be accessed using LastTouchId().\nAs more than one touch can have started, this condition is only true once for each touch: the next time you use it, it will be for a new touch or it will return false if there is no more touch that just started."),
+                   _("Return true if a touch has started. The touch identifier can be accessed using LastTouchId().\nAs more than one touch can be started, this condition is only true once for each touch: the next time you use it, it will be for a new touch, or it will return false if no more touches have just started."),
                    _("A new touch has started"),
                    _("Mouse and touch/Multitouch"),
                    "res/conditions/touch24.png",
@@ -203,7 +203,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsMouseExtension(gd::Plat
 
     extension.AddCondition("PopEndedTouch",
                    _("A touch has ended"),
-                   _("Return true if a touch has ended. The touch identifier can be accessed using LastEndedTouchId().\nAs more than one touch can have ended, this condition is only true once for each touch: the next time you use it, it will be for a new touch or it will return false if there is no more touch that just ended."),
+                   _("Return true if a touch has ended. The touch identifier can be accessed using LastEndedTouchId().\nAs more than one touch can be ended, this condition is only true once for each touch: the next time you use it, it will be for a new touch, or it will return false if no more touches have just ended."),
                    _("A touch has ended"),
                    _("Mouse and touch/Multitouch"),
                    "res/conditions/touch24.png",

Core/GDCore/Extensions/Builtin/NetworkExtension.cpp

@@ -20,9 +20,9 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsNetworkExtension(gd::Pl
 
     #if defined(GD_IDE_ONLY)
     extension.AddAction("EnvoiDataNet",
-            _("Send datas to a website"),
-            _("Send datas to a specified web site.\nYou need to set up a .php page on your web site so as to receive this datas.\nEnter here a password, and enter the same in the configuration of your .php page.\nRead the help file to get more informations."),
-            _("Send to _PARAM0_ the following datas : _PARAM2_, _PARAM3_,_PARAM4_,_PARAM5_,_PARAM6_,_PARAM7_"),
+            _("Send data to a website"),
+            _("Send data to a specified web site.\nYou need to set up a .php page on your web site to receive this data.\nEnter a password here, and enter the same password in the configuration of your .php page.\nRead the help file to get more information."),
+            _("Send to _PARAM0_ the following data : _PARAM2_, _PARAM3_,_PARAM4_,_PARAM5_,_PARAM6_,_PARAM7_"),
             _("Network"),
             "res/actions/net24.png",
             "res/actions/net.png")
@@ -63,7 +63,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsNetworkExtension(gd::Pl
         .AddParameter("string", _("Save as"));
 
     extension.AddAction("JSONToVariableStructure",
-            _("Convert JSON to variable"),
+            _("Convert JSON to a variable"),
             _("Parse a JSON object and store it into a variable"),
             _("Parse JSON string _PARAM0_ and store it into variable _PARAM1_"),
             _("Network"),
@@ -73,12 +73,50 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsNetworkExtension(gd::Pl
         .AddParameter("scenevar", _("Variable where store the JSON object"))
         .MarkAsAdvanced();
 
+    extension.AddAction("JSONToGlobalVariableStructure",
+            _("Convert JSON to global variable"),
+            _("Parse a JSON object and store it into a global variable"),
+            _("Parse JSON string _PARAM0_ and store it into global variable _PARAM1_"),
+            _("Network"),
+            "res/actions/net24.png",
+            "res/actions/net.png")
+        .AddParameter("string", _("JSON string"))
+        .AddParameter("globalvar", _("Global variable where store the JSON object"))
+        .MarkAsAdvanced();
+
+    extension.AddAction("JSONToObjectVariableStructure",
+            _("Convert JSON to object variable"),
+            _("Parse a JSON object and store it into an object variable"),
+            _("Parse JSON string _PARAM0_ and store it into variable _PARAM2_ of _PARAM1_"),
+            _("Network"),
+            "res/actions/net24.png",
+            "res/actions/net.png")
+        .AddParameter("string", _("JSON string"))
+        .AddParameter("objectPtr", _("Object"))
+        .AddParameter("objectvar", _("Object variable where store the JSON object"))
+        .MarkAsAdvanced();
+
     extension.AddStrExpression("ToJSON",
-                       _("Convert to JSON"),
+                       _("Convert variable to JSON"),
                        _("Convert a variable to JSON"),
                        _("Conversion"),
                        "res/conditions/toujours24.png")
-        .AddParameter("scenevar", _("The variable to be stringify"));
+        .AddParameter("scenevar", _("The variable to be stringified"));
+
+    extension.AddStrExpression("GlobalVarToJSON",
+                       _("Convert global variable to JSON"),
+                       _("Convert a global variable to JSON"),
+                       _("Conversion"),
+                       "res/conditions/toujours24.png")
+        .AddParameter("globalvar", _("The global variable to be stringified"));
+
+    extension.AddStrExpression("ObjectVarToJSON",
+                       _("Convert object variable to JSON"),
+                       _("Convert an object variable to JSON"),
+                       _("Conversion"),
+                       "res/conditions/toujours24.png")
+        .AddParameter("objectPtr", _("The object with the variable"))
+        .AddParameter("objectvar", _("The object variable to be stringified"));
     #endif
 }
 

Core/GDCore/Extensions/Builtin/SceneExtension.cpp

@@ -14,7 +14,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsSceneExtension(gd::Plat
 {
     extension.SetExtensionInformation("BuiltinScene",
                           _("Scene management features"),
-                          _("Built-in extension allowing to manipulate scenes"),
+                          _("This Built-in extension allows you to manipulate scenes"),
                           "Florian Rival",
                           "Open source (MIT License)");
 
@@ -50,7 +50,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsSceneExtension(gd::Plat
 
     extension.AddAction("PushScene",
                    _("Pause and start a new scene"),
-                   _("Pause this scene and start the specified one.\nLater, you can use \"Stop and go back to previous scene\" action to go back to this scene."),
+                   _("Pause this scene and start the specified one.\nLater, you can use the \"Stop and go back to previous scene\" action to go back to this scene."),
                    _("Pause the scene and start _PARAM1_"),
                    _("Scene"),
                    "res/actions/pushScene24.png",
@@ -61,7 +61,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsSceneExtension(gd::Plat
 
     extension.AddAction("PopScene",
                    _("Stop and go back to previous scene"),
-                   _("Stop this scene and go back to the previous paused one.\nTo pause a scene, use \"Pause and start a new scene\" action."),
+                   _("Stop this scene and go back to the previous paused one.\nTo pause a scene, use the \"Pause and start a new scene\" action."),
                    _("Stop the scene and go back to the previous paused one"),
                    _("Scene"),
                    "res/actions/popScene24.png",
@@ -92,7 +92,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsSceneExtension(gd::Plat
 
     extension.AddAction("DisableInputWhenFocusIsLost",
                    _("Disable input when focus is lost"),
-                   _("Set if the keyboard and mouse buttons must be taken into account even\nif the window is not active."),
+                   _("Decide if the keyboard and mouse buttons must be taken into account even\nif the window is not active."),
                    _("Disable input when focus is lost: _PARAM1_"),
                    _("Scene"),
                    "res/actions/window24.png",
@@ -103,7 +103,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsSceneExtension(gd::Plat
 
     extension.AddCondition("Egal",
                _("Compare two expressions"),
-               _("Test the two expression"),
+               _("Test the two expressions"),
                _("_PARAM0_ _PARAM1_ _PARAM2_"),
                _("Other"),
                "res/conditions/egal24.png",

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

@@ -62,6 +62,16 @@ void Direction::SwapSprites(std::size_t firstSpriteIndex, std::size_t secondSpri
         swap(sprites[firstSpriteIndex], sprites[secondSpriteIndex]);
 }
 
+void Direction::MoveSprite(std::size_t oldIndex, std::size_t newIndex)
+{
+    if ( oldIndex >= sprites.size() || newIndex >= sprites.size())
+        return;
+
+    auto sprite = sprites[oldIndex];
+    sprites.erase(sprites.begin() + oldIndex);
+    sprites.insert(sprites.begin() + newIndex, sprite);
+}
+
 bool Direction::HasNoSprites() const
 {
     return sprites.empty();

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

@@ -95,6 +95,11 @@ public:
      */
     void SwapSprites(std::size_t firstSpriteIndex, std::size_t secondSpriteIndex);
 
+    /**
+     * Change the position of the specified sprite.
+     */
+    void MoveSprite(std::size_t oldIndex, std::size_t newIndex);
+
     void UnserializeFrom(const gd::SerializerElement & element);
     #if defined(GD_IDE_ONLY)
     void SerializeTo(gd::SerializerElement & element) const;

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

@@ -131,7 +131,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)
@@ -315,4 +316,14 @@ void SpriteObject::SwapAnimations(std::size_t firstIndex, std::size_t secondInde
         std::swap(animations[firstIndex], animations[secondIndex]);
 }
 
+void SpriteObject::MoveAnimation(std::size_t oldIndex, std::size_t newIndex)
+{
+    if ( oldIndex >= animations.size() || newIndex >= animations.size())
+        return;
+
+    auto animation = animations[oldIndex];
+    animations.erase(animations.begin() + oldIndex);
+    animations.insert(animations.begin() + newIndex, animation);
+}
+
 }

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

@@ -112,6 +112,11 @@ public :
      */
     void SwapAnimations(std::size_t firstIndex, std::size_t secondIndex);
 
+    /**
+     * \brief Change the position of the specified animation
+     */
+    void MoveAnimation(std::size_t oldIndex, std::size_t newIndex);
+
     /**
      * \brief Return a read-only reference to the vector containing all the animation of the object.
      */

Core/GDCore/Extensions/Builtin/StringInstructionsExtension.cpp

@@ -14,7 +14,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsStringInstructionsExten
 {
     extension.SetExtensionInformation("BuiltinStringInstructions",
                           _("Text manipulation"),
-                          _("Built-in extension providing expressions for manipulating texts."),
+                          _("Built-in extension providing expressions for manipulating text objects."),
                           "Florian Rival",
                           "Open source (MIT License)");
 
@@ -22,13 +22,13 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsStringInstructionsExten
     extension.AddStrExpression("NewLine",
                    _("Insert a new line"),
                    _("Insert a new line"),
-                   _("Manipulation on text"),
+                   _("Manipulation of text"),
                    "res/conditions/toujours24.png");
 
     extension.AddStrExpression("FromCodePoint",
                    _("Get character from code point"),
                    _("Get character from code point"),
-                   _("Manipulation on text"),
+                   _("Manipulation of text"),
                    "res/conditions/toujours24.png")
 
         .AddParameter("expression", _("Code point"));
@@ -36,7 +36,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsStringInstructionsExten
     extension.AddStrExpression("ToUpperCase",
                    _("Uppercase a text"),
                    _("Uppercase a text"),
-                   _("Manipulation on text"),
+                   _("Manipulation of text"),
                    "res/conditions/toujours24.png")
 
         .AddParameter("string", _("Text"));
@@ -44,7 +44,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsStringInstructionsExten
     extension.AddStrExpression("ToLowerCase",
                    _("Lowercase a text"),
                    _("Lowercase a text"),
-                   _("Manipulation on text"),
+                   _("Manipulation of text"),
                    "res/conditions/toujours24.png")
 
         .AddParameter("string", _("Text"));
@@ -52,7 +52,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsStringInstructionsExten
     extension.AddStrExpression("SubStr",
                    _("Get a portion of a text"),
                    _("Get a portion of a text"),
-                   _("Manipulation on text"),
+                   _("Manipulation of text"),
                    "res/conditions/toujours24.png")
 
         .AddParameter("string", _("Text"))
@@ -62,7 +62,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsStringInstructionsExten
     extension.AddStrExpression("StrAt",
                    _("Get a character from a text"),
                    _("Get a character from a text"),
-                   _("Manipulation on text"),
+                   _("Manipulation of text"),
                    "res/conditions/toujours24.png")
 
         .AddParameter("string", _("Text"))
@@ -71,7 +71,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsStringInstructionsExten
     extension.AddStrExpression("StrRepeat",
                    _("Repeat a text"),
                    _("Repeat a text"),
-                   _("Manipulation on text"),
+                   _("Manipulation of text"),
                    "res/conditions/toujours24.png")
 
         .AddParameter("string", _("Text to repeat"))
@@ -80,7 +80,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsStringInstructionsExten
     extension.AddExpression("StrLength",
                    _("Length of a text"),
                    _("Length of a text"),
-                   _("Manipulation on text"),
+                   _("Manipulation of text"),
                    "res/conditions/toujours24.png")
 
         .AddParameter("string", _("Text"));
@@ -89,7 +89,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsStringInstructionsExten
     extension.AddExpression("StrFind",
                    _("Search in a text"),
                    _("Search in a text (return the position of the result or -1 if not found)"),
-                   _("Manipulation on text"),
+                   _("Manipulation of text"),
                    "res/conditions/toujours24.png")
 
         .AddParameter("string", _("Text"))
@@ -97,9 +97,9 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsStringInstructionsExten
 
 
     extension.AddExpression("StrRFind",
-                   _("Search in a text from end"),
+                   _("Search in a text from the end"),
                    _("Search in a text from the end (return the position of the result or -1 if not found)"),
-                   _("Manipulation on text"),
+                   _("Manipulation of text"),
                    "res/conditions/toujours24.png")
 
         .AddParameter("string", _("Text"))
@@ -109,8 +109,8 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsStringInstructionsExten
 
     extension.AddExpression("StrFindFrom",
                    _("Search in a text, starting from a position"),
-                   _("Search in a text starting from a position (return the position of the result or -1 if not found)"),
-                   _("Manipulation on text"),
+                   _("Search in a text, starting from a position (return the position of the result or -1 if not found)"),
+                   _("Manipulation of text"),
                    "res/conditions/toujours24.png")
 
         .AddParameter("string", _("Text"))
@@ -122,7 +122,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsStringInstructionsExten
     extension.AddExpression("StrRFindFrom",
                    _("Search in a text from the end, starting from a position"),
                    _("Search in a text from the end, starting from a position (return the position of the result or -1 if not found)"),
-                   _("Manipulation on text"),
+                   _("Manipulation of text"),
                    "res/conditions/toujours24.png")
 
         .AddParameter("string", _("Text"))

Core/GDCore/Extensions/Builtin/TimeExtension.cpp

@@ -14,7 +14,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsTimeExtension(gd::Platf
 {
     extension.SetExtensionInformation("BuiltinTime",
                           _("Time"),
-                          _("Built-in extension providing actions and conditions about the time."),
+                          _("Built-in extension providing actions and conditions related to time."),
                           "Florian Rival",
                           "Open source (MIT License)");
 
@@ -146,7 +146,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsTimeExtension(gd::Platf
 
     extension.AddExpression("Time", _("Current time"), _("Current time"), _("Time"), "res/actions/time.png")
         .AddCodeOnlyParameter("currentScene", "")
-        .AddParameter("", _("Hour : hour\nMinutes : min\nSeconds : sec\nDay in the month : mday\nMonths since January : mon\nYear since 1900 : year\nDays since sunday :wday\nDays since January 1st : yday"));
+        .AddParameter("", _("Hour : hour\nMinutes : min\nSeconds : sec\nDay of the month : mday\nMonths since January : mon\nYear since 1900 : year\nDays since sunday :wday\nDays since January 1st : yday"));
 
     #endif
 }

Core/GDCore/Extensions/Builtin/VariablesExtension.cpp

@@ -14,7 +14,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsVariablesExtension(gd::
 {
     extension.SetExtensionInformation("BuiltinVariables",
                           _("Variable features"),
-                          _("Built-in extension allowing to manipulate variables"),
+                          _("This Built-in extension allows the manipulation of variables"),
                           "Florian Rival",
                           "Open source (MIT License)");
 
@@ -186,10 +186,30 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsVariablesExtension(gd::
         .AddParameter("string", _("Child's name"))
         .MarkAsAdvanced();
 
-    extension.AddExpression("GlobalVariableChildCount", _("Global variable number of children"), _("Get the number of children from global variable"), _("Variables"), "res/actions/var.png")
+    extension.AddAction("VariableClearChildren",
+               _("Clear variable"),
+               _("Remove all the children from the variable."),
+               _("Clear children from variable _PARAM0_"),
+               _("Variables/Structure"),
+               "res/actions/var24.png",
+               "res/actions/var.png")
+        .AddParameter("scenevar", _("Variable"))
+        .MarkAsAdvanced();
+
+    extension.AddAction("GlobalVariableClearChildren",
+               _("Clear global variable"),
+               _("Remove all the children from the global variable."),
+               _("Clear children from global variable _PARAM0_"),
+               _("Variables/Global variables/Structure"),
+               "res/actions/var24.png",
+               "res/actions/var.png")
+        .AddParameter("globalvar", _("Variable"))
+        .MarkAsAdvanced();
+
+    extension.AddExpression("GlobalVariableChildCount", _("Global variable number of children"), _("Get the number of children of a global variable"), _("Variables"), "res/actions/var.png")
 	.AddParameter("globalvar", _("Variable"));
 
-    extension.AddExpression("VariableChildCount", _("Scene variable number of children"), _("Get the number of children from scene variable"), _("Variables"), "res/actions/var.png")
+    extension.AddExpression("VariableChildCount", _("Scene variable number of children"), _("Get the number of children of a scene variable"), _("Variables"), "res/actions/var.png")
 	.AddParameter("scenevar", _("Variable"));
 
     extension.AddExpression("Variable", _("Scene variables"), _("Scene variables"), _("Variables"), "res/actions/var.png")

Core/GDCore/Extensions/Builtin/WindowExtension.cpp

@@ -14,14 +14,14 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsWindowExtension(gd::Pla
 {
     extension.SetExtensionInformation("BuiltinWindow",
                           _("Window features"),
-                          _("Built-in extension allowing to manipulate the game's window"),
+                          _("This Built-in extension enables the manipulation of the game's window"),
                           "Florian Rival",
                           "Open source (MIT License)");
 
     #if defined(GD_IDE_ONLY)
     extension.AddAction("SetFullScreen",
                    _("De/activate fullscreen"),
-                   _("This action activate or desactivate fullscreen."),
+                   _("This action activates or deactivates fullscreen."),
                    _("Activate fullscreen: _PARAM1_ (keep aspect ratio: _PARAM2_)"),
                    _("Game's window"),
                    "res/actions/fullscreen24.png",
@@ -31,8 +31,8 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsWindowExtension(gd::Pla
         .AddParameter("yesorno", _("Keep aspect ratio (HTML5 games only, yes by default)"), "",true).SetDefaultValue("yes");
 
     extension.AddAction("SetWindowMargins",
-                   _("Change window's margins"),
-                   _("This action change the margins, in pixels, of the game's window."),
+                   _("Change the window's margins"),
+                   _("This action changes the margins, in pixels, of the game's window."),
                    _("Set margins of game window to _PARAM1_;_PARAM2_;_PARAM3_;_PARAM4_"),
                    _("Game's window"),
                    "res/actions/window24.png",
@@ -44,8 +44,8 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsWindowExtension(gd::Pla
         .AddParameter("expression", _("Left"));
 
     extension.AddAction("SetWindowSize",
-                   _("Change the size of the screen"),
-                   _("This action change the size of the game window."),
+                   _("Change the size of the window"),
+                   _("This action changes the size of the game's window."),
                    _("Change window size: _PARAM1_x_PARAM2_"),
                    _("Game's window"),
                    "res/actions/window24.png",
@@ -53,12 +53,12 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsWindowExtension(gd::Pla
         .AddCodeOnlyParameter("currentScene", "")
         .AddParameter("expression", _("Width"))
         .AddParameter("expression", _("Height"))
-        .AddParameter("yesorno", _("Use this size as default size for new scene cameras\?\n(Yes to change extend the game area, No to stretch the game to the window's size)."));
+        .AddParameter("yesorno", _("Do you want to use this size as the default size for new scene cameras\?\n(Yes to change the size of the game's viewable area,\nNo to stretch the game to the window's size)."));
 
     extension.AddAction("SetWindowIcon",
-                   _("Change window's icon"),
-                   _("This action change the icon of the game's window."),
-                   _("Use _PARAM1_ as icon for the game's window."),
+                   _("Change the window's icon"),
+                   _("This action changes the icon of the game's window."),
+                   _("Use _PARAM1_ as the icon for the game's window."),
                    _("Game's window"),
                    "res/actions/window24.png",
                    "res/actions/window.png")
@@ -66,8 +66,8 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsWindowExtension(gd::Pla
         .AddParameter("string", _("Name of the image to be used as the icon"));
 
     extension.AddAction("SetWindowTitle",
-                   _("Change window's title"),
-                   _("This action change the title of the game window."),
+                   _("Change the window's title"),
+                   _("This action changes the title of the game's window."),
                    _("Change window title to _PARAM1_"),
                    _("Game's window"),
                    "res/actions/window24.png",

Core/GDCore/Extensions/Metadata/ObjectMetadata.cpp

@@ -32,15 +32,18 @@ ObjectMetadata::ObjectMetadata(const gd::String & extensionNamespace_,
     SetDescription(gd::String(informations_));
     iconFilename = icon24x24;
 #if !defined(GD_NO_WX_GUI)
-    if ( gd::SkinHelper::IconExists(icon24x24, 24) )
-        SetBitmapIcon(gd::SkinHelper::GetIcon(icon24x24, 24));
-    else if ( wxFile::Exists(icon24x24) )
-        SetBitmapIcon(wxBitmap(icon24x24, wxBITMAP_TYPE_ANY));
-    else {
-        std::cout << "Warning: The icon file for object \"" << name_
-            << " was not found in the current skin icons"
-            << " and the specified name is not an existing filename.";
-        SetBitmapIcon(wxBitmap(24,24));
+    if (!iconFilename.empty())
+    {
+        if ( gd::SkinHelper::IconExists(icon24x24, 24) )
+            SetBitmapIcon(gd::SkinHelper::GetIcon(icon24x24, 24));
+        else if ( wxFile::Exists(icon24x24) )
+            SetBitmapIcon(wxBitmap(icon24x24, wxBITMAP_TYPE_ANY));
+        else {
+            std::cout << "Warning: The icon file for object \"" << name_
+                << " was not found in the current skin icons"
+                << " and the specified name is not an existing filename.";
+            SetBitmapIcon(wxBitmap(24,24));
+        }
     }
 #endif
 #endif

Core/GDCore/Extensions/PlatformExtension.inl

@@ -23,7 +23,7 @@ gd::ObjectMetadata & PlatformExtension::AddObject(const gd::String & name,
         GetNameSpace(),
         nameWithNamespace,
         fullname,
-        informations,
+        description,
         icon24x24,
         [](gd::String name) -> std::unique_ptr<gd::Object> { return gd::make_unique<T>(name); }
     );

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

@@ -1,3 +1,9 @@
+/*
+ * GDevelop Core
+ * Copyright 2008-2016 Florian Rival (Florian.Rival@gmail.com). All rights reserved.
+ * This project is released under the MIT License.
+ */
+
 #if defined(GD_IDE_ONLY)
 #include <algorithm>
 #include "GDCore/Events/EventsList.h"
@@ -7,7 +13,6 @@
 #include "GDCore/Project/Project.h"
 #include "GDCore/Project/SourceFile.h"
 #include "GDCore/Events/Builtin/LinkEvent.h"
-#include "GDCpp/Events/Builtin/CppCodeEvent.h"
 #include "DependenciesAnalyzer.h"
 
 DependenciesAnalyzer::DependenciesAnalyzer(gd::Project & project_, gd::Layout & layout_) :
@@ -54,12 +59,12 @@ bool DependenciesAnalyzer::Analyze(gd::EventsList & events, bool isOnTopLevel)
 {
     for (unsigned int i = 0;i<events.size();++i)
     {
-        try {
-            gd::LinkEvent & linkEvent = dynamic_cast<gd::LinkEvent &>(events[i]);
-
+        gd::LinkEvent* linkEvent = dynamic_cast<gd::LinkEvent*>(&events[i]);
+        if (linkEvent)
+        {
             DependenciesAnalyzer analyzer(*this);
 
-            gd::String linked = linkEvent.GetTarget();
+            gd::String linked = linkEvent->GetTarget();
             if ( project.HasExternalEventsNamed(linked) )
             {
                 if ( std::find(parentExternalEvents.begin(), parentExternalEvents.end(), linked) != parentExternalEvents.end() )
@@ -96,16 +101,16 @@ bool DependenciesAnalyzer::Analyze(gd::EventsList & events, bool isOnTopLevel)
                 notTopLevelScenesDependencies.insert(analyzer.GetScenesDependencies().begin(), analyzer.GetScenesDependencies().end());
                 notTopLevelExternalEventsDependencies.insert(analyzer.GetExternalEventsDependencies().begin(), analyzer.GetExternalEventsDependencies().end());
             }
-        } catch(...) {}
+        }
 
-        try {
-            CppCodeEvent & cppCodeEvent = dynamic_cast<CppCodeEvent &>(events[i]);
+        // Search for source files dependencies
+        std::vector<gd::String> dependencies = events[i].GetSourceFileDependencies();
+        sourceFilesDependencies.insert(dependencies.begin(), dependencies.end());
 
-            const std::vector<gd::String> & dependencies = cppCodeEvent.GetDependencies();
-            sourceFilesDependencies.insert(dependencies.begin(), dependencies.end());
-            sourceFilesDependencies.insert(cppCodeEvent.GetAssociatedGDManagedSourceFile(project));
-        } catch(...) {}
+        const gd::String & associatedSourceFile = events[i].GetAssociatedGDManagedSourceFile(project);
+        if (!associatedSourceFile.empty()) sourceFilesDependencies.insert(associatedSourceFile);
 
+        // Analyze sub events dependencies
         if ( events[i].CanHaveSubEvents() )
         {
             if ( !Analyze(events[i].GetSubEvents(), false) )

Core/GDCore/IDE/DependenciesAnalyzer.h

@@ -1,5 +1,5 @@
 /*
- * GDevelop C++ Platform
+ * GDevelop Core
  * Copyright 2008-2016 Florian Rival (Florian.Rival@gmail.com). All rights reserved.
  * This project is released under the MIT License.
  */
@@ -10,7 +10,7 @@
 #include <string>
 #include <vector>
 #include <memory>
-#include "GDCpp/Runtime/String.h"
+#include "GDCore/String.h"
 namespace gd { class EventsList; }
 namespace gd { class BaseEvent; }
 namespace gd { class Project; }
@@ -20,7 +20,7 @@ namespace gd { class ExternalEvents; }
 /**
  * \brief Compute the dependencies of a scene or external events.
  */
-class DependenciesAnalyzer
+class GD_CORE_API DependenciesAnalyzer
 {
 public:
 

Core/GDCore/IDE/Dialogs/ChooseVariableDialog.cpp

@@ -146,7 +146,7 @@ ChooseVariableDialog::ChooseVariableDialog(wxWindow* parent, gd::VariablesContai
     toolbar->SetToolBitmapSize( wxSize( 16, 16 ) );
     toolbar->AddTool( idAddVar, _( "Add a variable" ), gd::SkinHelper::GetIcon("add", 16), _("Add a variable") );
     toolbar->AddTool( idEditVar, _( "Edit the initial value of the variable" ), gd::SkinHelper::GetIcon("edit", 16), _("Edit the initial value of the variable") );
-    toolbar->AddTool( idRenameVar, _( "Rename variable" ), gd::SkinHelper::GetIcon("editname", 16), _("Rename variable") );
+    toolbar->AddTool( idRenameVar, _( "Rename the variable" ), gd::SkinHelper::GetIcon("editname", 16), _("Rename the variable") );
     toolbar->AddTool( idDelVar, _( "Delete the selected variable" ), gd::SkinHelper::GetIcon("delete", 16), _("Delete the selected variable") );
     toolbar->AddSeparator();
     toolbar->AddTool( idMoveUpVar, _( "Move up" ), gd::SkinHelper::GetIcon("up", 16), _("Move up") );

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/EventsEditor/EventsRenderingHelper.cpp

@@ -11,6 +11,8 @@
 #include <wx/dcclient.h>
 #include <wx/dcmemory.h>
 #include <wx/renderer.h>
+#include "GDCore/String.h"
+#include "GDCore/Events/InstructionsList.h"
 #include "GDCore/Events/Instruction.h"
 #include "GDCore/Extensions/Platform.h"
 #include "GDCore/Extensions/Metadata/MetadataProvider.h"

Core/GDCore/IDE/Dialogs/EventsEditor/EventsRenderingHelper.h

@@ -10,7 +10,7 @@
 #include <wx/html/htmprint.h>
 #include <vector>
 #include "GDCore/Events/InstructionsList.h"
-
+namespace gd { class String; }
 namespace gd { class BaseEvent; }
 namespace gd { class Instruction; }
 namespace gd { class Platform; }

Core/GDCore/IDE/Dialogs/ExternalEditor/ExternalEditor.cpp

@@ -42,7 +42,7 @@ bool ExternalEditor::Launch(const gd::String & editorName, const gd::String edit
 
     String cmd = GetExternalGDevelopIDEExecutable();
 	// Uncomment and adapt to launch a local development version of the GDevelop IDE:
-	// cmd = "/Users/florian/Projects/F/GD/newIDE/electron-app/node_modules/electron/dist/Electron.app/Contents/MacOS/Electron /Users/florian/Projects/F/GD/newIDE/electron-app/app";
+	cmd = "/Users/florian/Projects/F/GD/newIDE/electron-app/node_modules/electron/dist/Electron.app/Contents/MacOS/Electron /Users/florian/Projects/F/GD/newIDE/electron-app/app";
 
 	cmd += " --mode=integrated";
 	if (editorName != "") cmd += " --editor " + editorName;

Core/GDCore/IDE/Dialogs/ExternalEditor/ExternalEditorBridge.h

@@ -207,7 +207,7 @@ private:
 						// CPU usage while waiting for messages.
 						// Note that this is not done if a message was received, as
 						// other chunks could be received just after.
-						sf::sleep(sf::milliseconds(75));
+						sf::sleep(sf::milliseconds(150));
 					}
 
 					//Send messages

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

@@ -494,7 +494,7 @@ void LayoutEditorCanvas::LaunchPreview()
 void LayoutEditorCanvas::OnEditionBtClick( wxCommandEvent & event )
 {
     if ( editing ) return;
-    std::cout << "Switching to edition mode..." << std::endl;
+    std::cout << "Switching to editing mode..." << std::endl;
     editing = true;
 
     //Notice the previewer it must stop preview.
@@ -1127,7 +1127,7 @@ void LayoutEditorCanvas::OnMotion(wxMouseEvent &)
         double mouseX = GetMouseXOnLayout();
         double mouseY = GetMouseYOnLayout();
 
-        gd::LogStatus( wxString::Format(  wxString(_( "Position %f;%f. SHIFT for multiple selection, right click for more options." )),
+        gd::LogStatus( wxString::Format(  wxString(_( "Position %f;%f. Hold SHIFT to select multiple items, and right-click for more options." )),
             mouseX, mouseY ));
 
         //Check if there is a gui element hovered inside the layout
@@ -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/ObjectListDialogsHelper.cpp

@@ -6,6 +6,7 @@
 #if defined(GD_IDE_ONLY)
 #include "ObjectListDialogsHelper.h"
 #include "GDCore/Project/Project.h"
+#include "GDCore/Project/ObjectGroupsContainer.h"
 #include "GDCore/Project/Layout.h"
 #include "GDCore/Project/Object.h"
 #include "GDCore/CommonTools.h"
@@ -133,7 +134,7 @@ wxTreeItemId ObjectListDialogsHelper::AddObjectsToList(wxTreeCtrl * objectsList,
     return lastAddedItem;
 }
 
-wxTreeItemId ObjectListDialogsHelper::AddGroupsToList(wxTreeCtrl * objectsList, wxTreeItemId rootItem, const std::vector <ObjectGroup> & groups, bool globalGroups)
+wxTreeItemId ObjectListDialogsHelper::AddGroupsToList(wxTreeCtrl * objectsList, wxTreeItemId rootItem, const gd::ObjectGroupsContainer & groups, bool globalGroups)
 {
     bool searching = searchText.empty() ? false : true;
 

Core/GDCore/IDE/Dialogs/ObjectListDialogsHelper.h

@@ -14,6 +14,7 @@ namespace gd { class Project; }
 namespace gd { class Layout; }
 namespace gd { class Object; }
 namespace gd { class ClassWithObjects; }
+namespace gd { class ObjectGroupsContainer; }
 namespace gd { class ObjectGroup; }
 class wxTreeCtrl;
 class wxTreeItemId;
@@ -109,7 +110,7 @@ public:
 private:
     #if !defined(GD_NO_WX_GUI)
     wxTreeItemId AddObjectsToList(wxTreeCtrl * tree, wxTreeItemId rootItem, const gd::ClassWithObjects & objects, bool globalObjects);
-    wxTreeItemId AddGroupsToList(wxTreeCtrl * tree, wxTreeItemId rootItem, const std::vector <gd::ObjectGroup> & groups, bool globalGroup);
+    wxTreeItemId AddGroupsToList(wxTreeCtrl * tree, wxTreeItemId rootItem, const gd::ObjectGroupsContainer & groups, bool globalGroup);
 
     /**
      * \brief Generate the thumnail for the specified object, add it to the image list of the

Core/GDCore/IDE/Dialogs/ProjectExtensionsDialog.cpp

@@ -103,7 +103,7 @@ ProjectExtensionsDialog::ProjectExtensionsDialog(wxWindow* parent, gd::Project &
 	FlexGridSizer6->AddGrowableCol(0);
 	platformList = new wxListCtrl(this, ID_LISTCTRL1, wxDefaultPosition, wxSize(713,106), wxLC_REPORT|wxLC_NO_HEADER, wxDefaultValidator, _T("ID_LISTCTRL1"));
 	FlexGridSizer6->Add(platformList, 1, wxALL|wxEXPAND|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5);
-	StaticText1 = new wxStaticText(this, ID_STATICTEXT1, _("Right click to add or remove a platform.\nPlatforms which are not used by the project are grayed."), wxDefaultPosition, wxDefaultSize, wxALIGN_RIGHT, _T("ID_STATICTEXT1"));
+	StaticText1 = new wxStaticText(this, ID_STATICTEXT1, _("Right-click to add or remove a platform.\nPlatforms that are not used by the project are grayed."), wxDefaultPosition, wxDefaultSize, wxALIGN_RIGHT, _T("ID_STATICTEXT1"));
 	FlexGridSizer6->Add(StaticText1, 1, wxALL|wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL, 5);
 	FlexGridSizer1->Add(FlexGridSizer6, 1, wxALL|wxEXPAND|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 0);
 	FlexGridSizer12 = new wxFlexGridSizer(0, 3, 0, 0);
@@ -171,9 +171,9 @@ ProjectExtensionsDialog::ProjectExtensionsDialog(wxWindow* parent, gd::Project &
 	FlexGridSizer3->Add(-1,-1,1, wxALL|wxEXPAND|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 0);
 	StaticBoxSizer3 = new wxStaticBoxSizer(wxHORIZONTAL, this, _("More extensions"));
 	FlexGridSizer11 = new wxFlexGridSizer(0, 1, 0, 0);
-	StaticText6 = new wxStaticText(this, ID_STATICTEXT8, _("A list of extensions provided by others developers is available on the wiki :"), wxDefaultPosition, wxDefaultSize, 0, _T("ID_STATICTEXT8"));
+	StaticText6 = new wxStaticText(this, ID_STATICTEXT8, _("If you create new extensions for GDevelop, please share them here :"), wxDefaultPosition, wxDefaultSize, 0, _T("ID_STATICTEXT8"));
 	FlexGridSizer11->Add(StaticText6, 1, wxALL|wxEXPAND|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5);
-	HyperlinkCtrl1 = new wxHyperlinkCtrl(this, ID_HYPERLINKCTRL1, _("Go to the wiki unofficial extensions page"), _("http://compilgames.net/wiki/doku.php/game_develop/extensions"), wxDefaultPosition, wxDefaultSize, wxHL_CONTEXTMENU|wxHL_ALIGN_CENTRE|wxNO_BORDER, _T("ID_HYPERLINKCTRL1"));
+	HyperlinkCtrl1 = new wxHyperlinkCtrl(this, ID_HYPERLINKCTRL1, _("Go to the Wiki page for unofficial extensions"), _("http://wiki.compilgames.net/doku.php/gdevelop/extensions"), wxDefaultPosition, wxDefaultSize, wxHL_CONTEXTMENU|wxHL_ALIGN_CENTRE|wxNO_BORDER, _T("ID_HYPERLINKCTRL1"));
 	FlexGridSizer11->Add(HyperlinkCtrl1, 1, wxALL|wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL, 5);
 	StaticBoxSizer3->Add(FlexGridSizer11, 1, wxALL|wxEXPAND|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 0);
 	FlexGridSizer3->Add(StaticBoxSizer3, 1, wxALL|wxEXPAND|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5);
@@ -191,7 +191,7 @@ ProjectExtensionsDialog::ProjectExtensionsDialog(wxWindow* parent, gd::Project &
 	helpBt->SetToolTip(_("Display help about this window"));
 	FlexGridSizer17->Add(helpBt, 1, wxALL|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5);
 	FlexGridSizer4->Add(FlexGridSizer17, 1, wxALL|wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL, 0);
-	StaticText2 = new wxStaticText(this, ID_STATICTEXT2, _("Close and reopen scene editors so as to take in account newly added extensions."), wxDefaultPosition, wxDefaultSize, 0, _T("ID_STATICTEXT2"));
+	StaticText2 = new wxStaticText(this, ID_STATICTEXT2, _("You must close and reopen scene editors for newly-added extensions to become active."), wxDefaultPosition, wxDefaultSize, 0, _T("ID_STATICTEXT2"));
 	wxFont StaticText2Font = wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT);
 	if ( !StaticText2Font.Ok() ) StaticText2Font = wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT);
 	StaticText2Font.SetStyle(wxFONTSTYLE_ITALIC);

Core/GDCore/IDE/Dialogs/ResourcesEditor.cpp

@@ -945,7 +945,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 +959,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]);