Version bump

b2TOISolver initialization fix

Binaries/Output/Release_Windows/Free resources/GDevelop logos/Readme.txt

@@ -1,5 +1,5 @@
 GDevelop logos
-2008-2015 Florian Rival
+2008-2016 Florian Rival
 -------------------
 
 GDevelop's logos can be used in a game to indicate that it was created using GDevelop, as long as these logos stay unmodified and you do not state being the author of the logos.

Binaries/Output/Release_Windows/SelectLanguage-fi.cfg

@@ -0,0 +1 @@
+fi_FI

Binaries/Output/Release_Windows/SelectLanguage-nl.cfg

@@ -0,0 +1 @@
+nl_NL

Binaries/Releases/InnoSetupInstallerScript.iss

@@ -20,10 +20,10 @@ SetupIconFile=..\Output\Release_Windows\res\icon.ico
 VersionInfoVersion=4.0
 WizardImageFile=Setup bitmap\wizbmp.bmp
 WizardSmallImageFile=Setup bitmap/smallicon.bmp
-AppCopyright=2008-2015 Florian Rival
+AppCopyright=2008-2016 Florian Rival
 VersionInfoCompany=Florian Rival
 VersionInfoDescription=GDevelop setup
-VersionInfoCopyright=2008-2015 Florian Rival
+VersionInfoCopyright=2008-2016 Florian Rival
 VersionInfoProductName=GDevelop
 VersionInfoProductVersion=4.0
 
@@ -36,7 +36,9 @@ Name: "portuguese"; MessagesFile: "compiler:Languages\Portuguese.isl";
 Name: "german"; MessagesFile: "compiler:Languages\German.isl";
 Name: "chinese"; MessagesFile: "..\Packaging\innosetup-languages\ChineseSimplified.isl";
 Name: "italian"; MessagesFile: "compiler:Languages\Italian.isl";
+Name: "finnish"; MessagesFile: "compiler:Languages\Finnish.isl";
 Name: "polish"; MessagesFile: "compiler:Languages\Polish.isl";
+Name: "dutch"; MessagesFile: "compiler:Languages\Dutch.isl";
 
 [Tasks]
 Name: desktopicon; Description: {cm:CreateDesktopIcon}; GroupDescription: {cm:AdditionalIcons}; Flags:
@@ -45,11 +47,11 @@ Name: quicklaunchicon; Description: {cm:CreateQuickLaunchIcon}; GroupDescription
 [Components]
 Name: "main"; Description: "GDevelop"; Types: full compact custom; Flags: fixed
 Name: "example"; Description: "Exemples"; Types: full custom; Languages: french
-Name: "example"; Description: "Examples"; Types: full custom; Languages: english russian
+Name: "example"; Description: "Examples"; Types: full custom; Languages: english russian italian polish chinese dutch finnish
 Name: "example"; Description: "Ejemplos"; Types: full custom; Languages: spanish
 Name: "res"; Description: "Ressources (Images, sons...)"; Types: full custom; Languages: french
-Name: "res"; Description: "Resources (images, sounds...)"; Types: full custom; Languages: english russian italian polish chinese
-Name: "res"; Description: "Recursos (im<69>genes, sonidos ...)"; Types: full custom; Languages: spanish
+Name: "res"; Description: "Resources (images, sounds...)"; Types: full custom; Languages: english russian italian polish chinese dutch finnish
+Name: "res"; Description: "Recursos (im<69>genes, sonidos ...)"; Types: full custom; Languages: spanish
 
 [Files]
 Source: ..\Output\Release_Windows\GDIDE.exe; DestDir: {app}; Flags: ignoreversion
@@ -72,6 +74,8 @@ Source: ..\Output\Release_Windows\SelectLanguage-pt.cfg; DestDir: {userdocs}\..\
 Source: ..\Output\Release_Windows\SelectLanguage-pl.cfg; DestDir: {userdocs}\..\.GDevelop; Flags: ignoreversion createallsubdirs recursesubdirs; DestName: SelectLanguage.cfg; Languages: polish ; Components: main
 Source: ..\Output\Release_Windows\SelectLanguage-zh.cfg; DestDir: {userdocs}\..\.GDevelop; Flags: ignoreversion createallsubdirs recursesubdirs; DestName: SelectLanguage.cfg; Languages: chinese ; Components: main
 Source: ..\Output\Release_Windows\SelectLanguage-it.cfg; DestDir: {userdocs}\..\.GDevelop; Flags: ignoreversion createallsubdirs recursesubdirs; DestName: SelectLanguage.cfg; Languages: italian ; Components: main
+Source: ..\Output\Release_Windows\SelectLanguage-nl.cfg; DestDir: {userdocs}\..\.GDevelop; Flags: ignoreversion createallsubdirs recursesubdirs; DestName: SelectLanguage.cfg; Languages: dutch ; Components: main
+Source: ..\Output\Release_Windows\SelectLanguage-fi.cfg; DestDir: {userdocs}\..\.GDevelop; Flags: ignoreversion createallsubdirs recursesubdirs; DestName: SelectLanguage.cfg; Languages: finnish ; Components: main
 
 [Icons]
 Name: {group}\GDevelop; Filename: {app}\GDIDE.exe; WorkingDir: {app}

Binaries/Releases/gd-updateinfo-fr.xml

@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="ISO-8859-1" ?>
 <News>
-	<Version Major="3" Minor="6" Build="84" Revision="0"/>
-	<Info Info="La version 3.6.84 est disponible.&#x0A;&#x0A;Correction d'un crash lors de l'<27>dition d'un nouvel objet Carte de tuiles&#x0A;&#x0A;Nouveaut<75>s de la version 3.6.83 :&#x0A;&#x0A;Nouvelles traductions (partielles) italiennes, chinoises et polonaises.&#x0A;Nouvelle condition 'S<>lectionner l'objet le plus proche'&#x0A;Nouvelle conditions pour tester si un bouton de la souris ou du clavier est relach<63>&#x0A;Am<41>lioration du syst<73>me audio des jeux HTML5, meilleure performances sur les mobiles.&#x0A;Mise <20> jour du moteur de rendu des jeux HTML5 (Pixi.js)&#x0A;Nouvelle d<>mo technique Advanced 3D Tower&#x0A;Ajout de la touche retour arri<72>re en alternative <20> Suppr. dans la majorit<69> des <20>diteurs.&#x0A;Correction du crash avec les objets lumi<6D>res sur Windows.&#x0A;Correction de l'usage trop intensif du processeur dans l'<27>diteur d'<27>venements sur Linux.&#x0A;Correction de l'ordre d'insertion d'images multiples dans une animation.&#x0A;Correction de la couleur global d'un objet Sprite dans les jeux HTML5&#x0A;Correction de l'<27>chelle de la taille d'un Sprite quand l'objet est invers<72>.&#x0A;Correction de la recherche de chemin qui ne marchait plus pour les jeux natifs.&#x0A;Correction de crash avec l'objet Carte de tuiles en utilisant des grandes images pour les tuiles.&#x0A;Correction de glitchs avec GTK3
-Correction de la mauvaise prise en compte de la taille/animation initiale d'un Sprite dans les jeux HTML5.
-" Lien="http://compilgames.net"/>
+	<Version Major="4" Minor="0" Build="88" Revision="0"/>
+	<Info Info="La version 4.0.88 est disponible.&#x0A;&#x0A;Importants changements en interne pour supporter l'Unicode dans les jeux, c'est <20> dire la possibilit<69> de pouvoir utiliser des charact<63>res de d'autres alphabets.&#x0A;Nouvel objet AdMob, pour afficher des banni<6E>res publicitaires (ou <20>crans interstitiels) dans les jeux HTML5 export<72>s sur Android/iOS avec Intel XDK.&#x0A;Les automatismes sont maintenant appel<65>s des Comportements (Behavior en anglais).&#x0A;Nouvelle fonctionnalit<EFBFBD>, la 'pile de sc<73>nes' : une nouvelle action permet de mettre en pause la sc<73>ne courante et d'en lancer une autre. On peut ensuite revenir <20> la sc<73>ne pr<70>c<EFBFBD>dente avec une autre action. Id<49>al pour faire des menus de pause, des <20>crans de combats, des <20>crans d'int<6E>rieurs de batiments..&#x0A;Am<41>lioration de l'export des jeux HTML5 pour Cordova/Intel XDK.&#x0A;Nouvel <20>diteur pour les objets textes&#x0A;Ajout de la fonctionnalit<69> 'Sauvegarder en tant que projet dossier': les projets peuvent <20>tre sauvegard<72>s avec les sc<73>nes, <20>v<EFBFBD>nements externes et agencements externes sauvegard<72>s dans diff<66>rents fichiers. Cela rend beaucoup plus facile la collaboration dans une <20>quipe.&#x0A;L'appui sur Shift dans l'<27>diteur de sc<73>ne permet de redimensionner un objet en gardant ses proportions.&#x0A;L'appui sur Shift dans l'<27>diteur de sc<73>ne permet de tourner un objet par incr<63>ment r<>guliers de 15 degr<67>s.&#x0A;La grille aimant<6E>e de l'<27>diteur de sc<73>ne s'applique aussi lors du redimensionnement d'objets.&#x0A;Am<41>lioration de l'objet Carte de Tuiles, notamment une baisse de la consommation m<>moire pour les grandes cartes.&#x0A;Am<41>lioration pour les <EFBFBD>crans haute d<>finition ('retina').&#x0A;Plusieurs corrections de bugs pour la recherche de chemin, qui devrait maintenant fonctionner correctement dans tous les cas.&#x0A;Correction de la recherche dans l'<27>diteur d'objets.&#x0A;Correction de la condition sur la bordure suppl<70>mentaire du comportement 'D<>truire <20> la sortie de l'<27>cran'&#x0A;Nouvel d<>mo utilisant les fonctionnalit<69>s Javascript 'PIXI Particles'&#x0A;Correction dans l'<27>diteur de sc<73>ne o<> les objets sur des calques cach<63>s pouvaient encore <20>tre selectionn<6E>s.&#x0A;Am<41>lioration et nettoyage du code en interne.&#x0A;Corrections pour Mac OS X dans l'<27>diteur de sc<73>ne.&#x0A;Suppression de la compilation en un fichier unique (trop instable et detect<63> comme un virus par certains antivirus).&#x0A;Ajout du support pour les molettes <20> d<>filement horizontal dans l'<27>diteur de sc<73>ne.&#x0A;Divers bugs corrig<69>s." Lien="http://compilgames.net"/>
 	<CommunityNews text="GDevApp est une web app de cr<63>ation de jeux bas<61>e sur GDevelop : venez essayer la plus avanc<6E>e des applications online de cr<63>ation de jeux. Compatible avec les tablettes et fournie avec des superbes packs de graphismes pr<70>-pr<70>par<61>s." link1="https://github.com/4ian/GD" linkLabel1="GDevelop sur GitHub" link2="https://gdevapp.com?utm_source=software&amp;utm_medium=link_fr&amp;utm_campaign=launch" linkLabel2="Tester GDevApp, la nouvelle app de cr<63>ation de jeux"/>
 </News>

Binaries/Releases/gd-updateinfo.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="ISO-8859-1" ?>
 <News>
-	<Version Major="3" Minor="6" Build="84" Revision="0"/>
-	<Info Info="Version 3.6.84 is available.&#x0A;&#x0A;Fix crash when editing newly created TileMap objects&#x0A;&#x0A;Changes of version 3.6.83:&#x0A;&#x0A;New (partial) Italian, Polish and Chinese translations! Your help is welcome, you can contribute on https://crowdin.com/project/gdevelop&#x0A;New 'Pick nearest object' condition&#x0A;New condition to check if a mouse button is released&#x0A;New condition to check if a key is released&#x0A;New sound system for HTML5 with huge performance improvements&#x0A;Update rendering engine of HTML5 (Pixi.js) for improved performances&#x0A;New Advanced 3D tower technical demo&#x0A;Add Backspace as an alternative to Delete key shortcut in most editors&#x0A;Fixed crash with Lights objects on Windows.&#x0A;Fixed the high cpu usage when switching to the event editor on Linux&#x0A;Fixed images insertion order when adding multiple picture to an animation&#x0A;Fixed sprite global color action for HTML5 games&#x0A;Fixed scale factor of Sprite objects being negative when object is flipped&#x0A;Fixed pathfinding not working for native games&#x0A;Updated titles of some editors to make them more consistent&#x0A;Fixed crash with tilemap and large tilesets&#x0A;Fixed some GTK3 glitches&#x0A;Fixed wrong initial sprite size and animation when custom properties were set in HTML5 games" Lien="http://compilgames.net"/>
+	<Version Major="4" Minor="0" Build="88" Revision="0"/>
+	<Info Info="Version 4.0.88 is available.&#x0A;&#x0A;Huge internal changes to have multi-language support ('Unicode') in games.&#x0A;New AdMob object, that can be used to display ad banners (or interstitial screens) in HTML5 games exported to iOS/Android with Intel XDK.&#x0A;Automatisms are now called Behaviors for objects (more intuitive and easier to understand).&#x0A;New scene stacking feature: a new action allows to pause the current scene and launch a new one. You can then go back to the previous one with another action. This makes it easy to create a pause menu, a RPG combat system, rooms/building that you enter from a map...&#x0A;Improved export of HTML5 games to Cordova/Intel XDK.&#x0A;New editor for text objects&#x0A;Add 'Save as a folder project': projects can be saved with scenes, external events and external layouts stored in a different file for each. This makes it easier to collaborate on a game as a team.&#x0A;Hold Shift in scene editor to resize object while keeping its aspect ratio.&#x0A;Hold Shift in scene editor to rotate an object in increments.&#x0A;'Snap to grid' now snaps objects when resizing them in scene editor.&#x0A;Improvements on TileMap objects, including a reduced memory consumption for large maps.&#x0A;Improvements for HDPI ('retina') screens.&#x0A;Several bugfixes for pathfinding that should now work properly in all cases.&#x0A;Fixed search not working in the objects editor.&#x0A;Fixed extra border condition of Destroy Outside Behavior.&#x0A;New PIXI Particles advanced Javascript demo.&#x0A;Fixed objects from hidden layers could still be selected and moved in scene editor&#x0A;Internal code cleaning and improvements.&#x0A;Fixes for Mac OS X in the scene editor.&#x0A;Removed compilation of native games to a single file executable (was too unstable and prone to antivirus blocking).&#x0A;Add support for horizontal mouse wheel in the scene editor.&#x0A;Fixed Vertical Synchronization and framerate limit not applied after changing the window resolution in native games&#x0A;Fix small bug in Destroy Outside behavior of HTML5 games&#x0A;Add an option to repeat borders and center textures of PanelSprite objects for HTML5 games&#x0A;Improve performances of PanelSprite objects for HTML5 games&#x0A;Fix hitboxes collision condition for HTML5 games&#x0A;Fix conflicts when exporting a game using different images with the same file name.&#x0A;Fix error when deactivating a behavior of an object that was just created.&#x0A;Fix scene editor not properly refreshed after being resized on OS X." Lien="http://compilgames.net"/>
 	<CommunityNews text="GDevelop has a new website! Help us to translate it to your language by going on the Crowdin project.&#x0A;&#x0A;GDevApp is an online game creator based on GDevelop: Go try the most advanced game creation web app. Compatible with tablets and bundled with awesome graphics assets." link1="https://crowdin.com/project/gdevelop-website/" linkLabel1="Help translate GD website" link2="https://gdevapp.com?utm_source=software&amp;utm_medium=link_en&amp;utm_campaign=launch" linkLabel2="Try GDevApp, the online game creator based on GD"/>
 </News>

CMakeLists.txt

@@ -42,6 +42,7 @@ IF(APPLE)
 	set(CMAKE_INSTALL_RPATH ".")
 	set(CMAKE_BUILD_WITH_INSTALL_RPATH TRUE)
 	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -D_WCHAR_H_CPLUSPLUS_98_CONFORMANCE_")
+	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-potentially-evaluated-expression")
 ENDIF()
 
 #Sanity checks
@@ -59,10 +60,6 @@ IF("${CMAKE_BUILD_TYPE}" STREQUAL "Release" AND NOT WIN32 AND CMAKE_COMPILER_IS_
 	SET(CMAKE_SHARED_LINKER_FLAGS "-s") #Force stripping to avoid errors when packaging for linux.
 ENDIF()
 
-if(EMSCRIPTEN) #When compiling for the web, ensure we get no warning when using our own external libraries.
-	SET( CMAKE_CXX_FLAGS  "${CMAKE_CXX_FLAGS} -Wno-warn-absolute-paths" )
-ENDIF()
-
 #Activate C++11
 include(CheckCXXCompilerFlag)
 CHECK_CXX_COMPILER_FLAG("-std=gnu++11" COMPILER_SUPPORTS_CXX11)

Core/GDCore.cbp

@@ -246,8 +246,8 @@
 		<Unit filename="GDCore/CommonTools.cpp" />
 		<Unit filename="GDCore/CommonTools.h" />
 		<Unit filename="GDCore/DocMainPage.h" />
-		<Unit filename="GDCore/Events/BehaviorMetadata.cpp" />
-		<Unit filename="GDCore/Events/BehaviorMetadata.h" />
+		<Unit filename="GDCore/Extensions/Metadata/BehaviorMetadata.cpp" />
+		<Unit filename="GDCore/Extensions/Metadata/BehaviorMetadata.h" />
 		<Unit filename="GDCore/Events/Builtin/CommentEvent.cpp" />
 		<Unit filename="GDCore/Events/Builtin/CommentEvent.h" />
 		<Unit filename="GDCore/Events/Builtin/ForEachEvent.cpp" />
@@ -262,37 +262,37 @@
 		<Unit filename="GDCore/Events/Builtin/WhileEvent.h" />
 		<Unit filename="GDCore/Events/Event.cpp" />
 		<Unit filename="GDCore/Events/Event.h" />
-		<Unit filename="GDCore/Events/EventMetadata.cpp" />
-		<Unit filename="GDCore/Events/EventMetadata.h" />
-		<Unit filename="GDCore/Events/EventsCodeGenerationContext.cpp" />
-		<Unit filename="GDCore/Events/EventsCodeGenerationContext.h" />
-		<Unit filename="GDCore/Events/EventsCodeGenerator.cpp" />
-		<Unit filename="GDCore/Events/EventsCodeGenerator.h" />
-		<Unit filename="GDCore/Events/EventsCodeNameMangler.cpp" />
-		<Unit filename="GDCore/Events/EventsCodeNameMangler.h" />
+		<Unit filename="GDCore/Extensions/Metadata/EventMetadata.cpp" />
+		<Unit filename="GDCore/Extensions/Metadata/EventMetadata.h" />
+		<Unit filename="GDCore/Events/CodeGeneration/EventsCodeGenerationContext.cpp" />
+		<Unit filename="GDCore/Events/CodeGeneration/EventsCodeGenerationContext.h" />
+		<Unit filename="GDCore/Events/CodeGeneration/EventsCodeGenerator.cpp" />
+		<Unit filename="GDCore/Events/CodeGeneration/EventsCodeGenerator.h" />
+		<Unit filename="GDCore/Events/Tools/EventsCodeNameMangler.cpp" />
+		<Unit filename="GDCore/Events/Tools/EventsCodeNameMangler.h" />
 		<Unit filename="GDCore/Events/Expression.h" />
-		<Unit filename="GDCore/Events/ExpressionMetadata.cpp" />
-		<Unit filename="GDCore/Events/ExpressionMetadata.h" />
-		<Unit filename="GDCore/Events/ExpressionParser.cpp" />
-		<Unit filename="GDCore/Events/ExpressionParser.h" />
-		<Unit filename="GDCore/Events/ExpressionsCodeGeneration.cpp" />
-		<Unit filename="GDCore/Events/ExpressionsCodeGeneration.h" />
+		<Unit filename="GDCore/Extensions/Metadata/ExpressionMetadata.cpp" />
+		<Unit filename="GDCore/Extensions/Metadata/ExpressionMetadata.h" />
+		<Unit filename="GDCore/Events/Parsers/ExpressionParser.cpp" />
+		<Unit filename="GDCore/Events/Parsers/ExpressionParser.h" />
+		<Unit filename="GDCore/Events/CodeGeneration/ExpressionsCodeGeneration.cpp" />
+		<Unit filename="GDCore/Events/CodeGeneration/ExpressionsCodeGeneration.h" />
 		<Unit filename="GDCore/Events/Instruction.cpp" />
 		<Unit filename="GDCore/Events/Instruction.h" />
-		<Unit filename="GDCore/Events/InstructionMetadata.cpp" />
-		<Unit filename="GDCore/Events/InstructionMetadata.h" />
-		<Unit filename="GDCore/Events/ObjectMetadata.cpp" />
-		<Unit filename="GDCore/Events/ObjectMetadata.h" />
+		<Unit filename="GDCore/Extensions/Metadata/InstructionMetadata.cpp" />
+		<Unit filename="GDCore/Extensions/Metadata/InstructionMetadata.h" />
+		<Unit filename="GDCore/Extensions/Metadata/ObjectMetadata.cpp" />
+		<Unit filename="GDCore/Extensions/Metadata/ObjectMetadata.h" />
 		<Unit filename="GDCore/Events/Serialization.cpp" />
 		<Unit filename="GDCore/Events/Serialization.h" />
 		<Unit filename="GDCore/IDE/ActionSentenceFormatter.cpp" />
 		<Unit filename="GDCore/IDE/ActionSentenceFormatter.h" />
-		<Unit filename="GDCore/IDE/ArbitraryResourceWorker.cpp" />
-		<Unit filename="GDCore/IDE/ArbitraryResourceWorker.h" />
+		<Unit filename="GDCore/IDE/Project/ArbitraryResourceWorker.cpp" />
+		<Unit filename="GDCore/IDE/Project/ArbitraryResourceWorker.h" />
 		<Unit filename="GDCore/IDE/Clipboard.cpp" />
 		<Unit filename="GDCore/IDE/Clipboard.h" />
-		<Unit filename="GDCore/IDE/CommonBitmapManager.cpp" />
-		<Unit filename="GDCore/IDE/CommonBitmapManager.h" />
+		<Unit filename="GDCore/IDE/CommonBitmapProvider.cpp" />
+		<Unit filename="GDCore/IDE/wxTools/CommonBitmapProvider.h" />
 		<Unit filename="GDCore/IDE/ConditionSentenceFormatter.cpp" />
 		<Unit filename="GDCore/IDE/ConditionSentenceFormatter.h" />
 		<Unit filename="GDCore/IDE/Dialogs/AdvancedEntryDialog.cpp" />
@@ -356,41 +356,41 @@
 		<Unit filename="GDCore/IDE/Dialogs/ResourceLibraryDialog.h" />
 		<Unit filename="GDCore/IDE/EventsChangesNotifier.cpp" />
 		<Unit filename="GDCore/IDE/EventsChangesNotifier.h" />
-		<Unit filename="GDCore/IDE/EventsEditorItemsAreas.cpp" />
-		<Unit filename="GDCore/IDE/EventsEditorItemsAreas.h" />
-		<Unit filename="GDCore/IDE/EventsEditorSelection.cpp" />
-		<Unit filename="GDCore/IDE/EventsEditorSelection.h" />
-		<Unit filename="GDCore/IDE/EventsRefactorer.cpp" />
-		<Unit filename="GDCore/IDE/EventsRefactorer.h" />
-		<Unit filename="GDCore/IDE/EventsRenderingHelper.cpp" />
-		<Unit filename="GDCore/IDE/EventsRenderingHelper.h" />
-		<Unit filename="GDCore/IDE/EventsVariablesFinder.cpp" />
-		<Unit filename="GDCore/IDE/EventsVariablesFinder.h" />
-		<Unit filename="GDCore/IDE/ExpressionsCorrectnessTesting.cpp" />
-		<Unit filename="GDCore/IDE/ExpressionsCorrectnessTesting.h" />
+		<Unit filename="GDCore/IDE/Dialogs/EventsEditor/EventsEditorItemsAreas.cpp" />
+		<Unit filename="GDCore/IDE/Dialogs/EventsEditor/EventsEditorItemsAreas.h" />
+		<Unit filename="GDCore/IDE/Dialogs/EventsEditor/EventsEditorSelection.cpp" />
+		<Unit filename="GDCore/IDE/Dialogs/EventsEditor/EventsEditorSelection.h" />
+		<Unit filename="GDCore/IDE/Events/EventsRefactorer.cpp" />
+		<Unit filename="GDCore/IDE/Events/EventsRefactorer.h" />
+		<Unit filename="GDCore/IDE/Dialogs/EventsEditor/EventsRenderingHelper.cpp" />
+		<Unit filename="GDCore/IDE/Dialogs/EventsEditor/EventsRenderingHelper.h" />
+		<Unit filename="GDCore/IDE/Events/EventsVariablesFinder.cpp" />
+		<Unit filename="GDCore/IDE/Events/EventsVariablesFinder.h" />
+		<Unit filename="GDCore/IDE/Events/ExpressionsCorrectnessTesting.cpp" />
+		<Unit filename="GDCore/IDE/Events/ExpressionsCorrectnessTesting.h" />
 		<Unit filename="GDCore/IDE/ExtensionsLoader.cpp" />
 		<Unit filename="GDCore/IDE/ExtensionsLoader.h" />
-		<Unit filename="GDCore/IDE/ImagesUsedInventorizer.cpp" />
-		<Unit filename="GDCore/IDE/ImagesUsedInventorizer.h" />
-		<Unit filename="GDCore/IDE/MetadataProvider.cpp" />
-		<Unit filename="GDCore/IDE/MetadataProvider.h" />
+		<Unit filename="GDCore/IDE/Project/ImagesUsedInventorizer.cpp" />
+		<Unit filename="GDCore/IDE/Project/ImagesUsedInventorizer.h" />
+		<Unit filename="GDCore/Extensions/Metadata/MetadataProvider.cpp" />
+		<Unit filename="GDCore/Extensions/Metadata/MetadataProvider.h" />
 		<Unit filename="GDCore/IDE/PlatformLoader.cpp" />
 		<Unit filename="GDCore/IDE/PlatformLoader.h" />
 		<Unit filename="GDCore/IDE/PlatformManager.cpp" />
 		<Unit filename="GDCore/IDE/PlatformManager.h" />
 		<Unit filename="GDCore/IDE/ProjectExporter.cpp" />
 		<Unit filename="GDCore/IDE/ProjectExporter.h" />
-		<Unit filename="GDCore/IDE/ProjectResourcesCopier.cpp" />
-		<Unit filename="GDCore/IDE/ProjectResourcesCopier.h" />
-		<Unit filename="GDCore/IDE/ResourcesAbsolutePathChecker.cpp" />
-		<Unit filename="GDCore/IDE/ResourcesAbsolutePathChecker.h" />
-		<Unit filename="GDCore/IDE/ResourcesMergingHelper.cpp" />
-		<Unit filename="GDCore/IDE/ResourcesMergingHelper.h" />
+		<Unit filename="GDCore/IDE/Project/ProjectResourcesCopier.cpp" />
+		<Unit filename="GDCore/IDE/Project/ProjectResourcesCopier.h" />
+		<Unit filename="GDCore/IDE/Project/ResourcesAbsolutePathChecker.cpp" />
+		<Unit filename="GDCore/IDE/Project/ResourcesAbsolutePathChecker.h" />
+		<Unit filename="GDCore/IDE/Project/ResourcesMergingHelper.cpp" />
+		<Unit filename="GDCore/IDE/Project/ResourcesMergingHelper.h" />
 		<Unit filename="GDCore/IDE/ResourcesUnmergingHelper.cpp" />
 		<Unit filename="GDCore/IDE/ResourcesUnmergingHelper.h" />
 		<Unit filename="GDCore/IDE/SceneNameMangler.cpp" />
 		<Unit filename="GDCore/IDE/SceneNameMangler.h" />
-		<Unit filename="GDCore/IDE/TextFormatting.h" />
+		<Unit filename="GDCore/IDE/Events/TextFormatting.h" />
 		<Unit filename="GDCore/IDE/wxTools/AuiTabArt.cpp" />
 		<Unit filename="GDCore/IDE/wxTools/AuiTabArt.h" />
 		<Unit filename="GDCore/IDE/wxTools/FileProperty.cpp" />
@@ -400,50 +400,50 @@
 		<Unit filename="GDCore/IDE/wxTools/SkinHelper.cpp" />
 		<Unit filename="GDCore/IDE/wxTools/SkinHelper.h" />
 		<Unit filename="GDCore/IDE/wxTools/TreeItemStringData.h" />
-		<Unit filename="GDCore/PlatformDefinition/Behavior.cpp" />
-		<Unit filename="GDCore/PlatformDefinition/Behavior.h" />
-		<Unit filename="GDCore/PlatformDefinition/BehaviorsSharedData.cpp" />
-		<Unit filename="GDCore/PlatformDefinition/BehaviorsSharedData.h" />
-		<Unit filename="GDCore/PlatformDefinition/ChangesNotifier.cpp" />
-		<Unit filename="GDCore/PlatformDefinition/ChangesNotifier.h" />
-		<Unit filename="GDCore/PlatformDefinition/ClassWithObjects.cpp" />
-		<Unit filename="GDCore/PlatformDefinition/ClassWithObjects.h" />
-		<Unit filename="GDCore/PlatformDefinition/ExternalEvents.cpp" />
-		<Unit filename="GDCore/PlatformDefinition/ExternalEvents.h" />
-		<Unit filename="GDCore/PlatformDefinition/ExternalLayout.cpp" />
-		<Unit filename="GDCore/PlatformDefinition/ExternalLayout.h" />
-		<Unit filename="GDCore/PlatformDefinition/ImageManager.cpp" />
-		<Unit filename="GDCore/PlatformDefinition/ImageManager.h" />
-		<Unit filename="GDCore/PlatformDefinition/InitialInstance.cpp" />
-		<Unit filename="GDCore/PlatformDefinition/InitialInstance.h" />
-		<Unit filename="GDCore/PlatformDefinition/InitialInstancesContainer.cpp" />
-		<Unit filename="GDCore/PlatformDefinition/InitialInstancesContainer.h" />
-		<Unit filename="GDCore/PlatformDefinition/Layer.cpp" />
-		<Unit filename="GDCore/PlatformDefinition/Layer.h" />
-		<Unit filename="GDCore/PlatformDefinition/Layout.cpp" />
-		<Unit filename="GDCore/PlatformDefinition/Layout.h" />
-		<Unit filename="GDCore/PlatformDefinition/LayoutEditorPreviewer.cpp" />
-		<Unit filename="GDCore/PlatformDefinition/LayoutEditorPreviewer.h" />
-		<Unit filename="GDCore/PlatformDefinition/Object.cpp" />
-		<Unit filename="GDCore/PlatformDefinition/Object.h" />
-		<Unit filename="GDCore/PlatformDefinition/ObjectGroup.cpp" />
-		<Unit filename="GDCore/PlatformDefinition/ObjectGroup.h" />
-		<Unit filename="GDCore/PlatformDefinition/Platform.cpp" />
-		<Unit filename="GDCore/PlatformDefinition/Platform.h" />
-		<Unit filename="GDCore/PlatformDefinition/PlatformExtension.cpp" />
-		<Unit filename="GDCore/PlatformDefinition/PlatformExtension.h" />
-		<Unit filename="GDCore/PlatformDefinition/Project.cpp" />
-		<Unit filename="GDCore/PlatformDefinition/Project.h" />
-		<Unit filename="GDCore/PlatformDefinition/ResourcesManager.cpp" />
-		<Unit filename="GDCore/PlatformDefinition/ResourcesManager.h" />
-		<Unit filename="GDCore/PlatformDefinition/RessourcesLoader.cpp" />
-		<Unit filename="GDCore/PlatformDefinition/RessourcesLoader.h" />
-		<Unit filename="GDCore/PlatformDefinition/SourceFile.cpp" />
-		<Unit filename="GDCore/PlatformDefinition/SourceFile.h" />
-		<Unit filename="GDCore/PlatformDefinition/Variable.cpp" />
-		<Unit filename="GDCore/PlatformDefinition/Variable.h" />
-		<Unit filename="GDCore/PlatformDefinition/VariablesContainer.cpp" />
-		<Unit filename="GDCore/PlatformDefinition/VariablesContainer.h" />
+		<Unit filename="GDCore/Project/Behavior.cpp" />
+		<Unit filename="GDCore/Project/Behavior.h" />
+		<Unit filename="GDCore/Project/BehaviorsSharedData.cpp" />
+		<Unit filename="GDCore/Project/BehaviorsSharedData.h" />
+		<Unit filename="GDCore/Project/ChangesNotifier.cpp" />
+		<Unit filename="GDCore/Project/ChangesNotifier.h" />
+		<Unit filename="GDCore/Project/ClassWithObjects.cpp" />
+		<Unit filename="GDCore/Project/ClassWithObjects.h" />
+		<Unit filename="GDCore/Project/ExternalEvents.cpp" />
+		<Unit filename="GDCore/Project/ExternalEvents.h" />
+		<Unit filename="GDCore/Project/ExternalLayout.cpp" />
+		<Unit filename="GDCore/Project/ExternalLayout.h" />
+		<Unit filename="GDCore/Project/ImageManager.cpp" />
+		<Unit filename="GDCore/Project/ImageManager.h" />
+		<Unit filename="GDCore/Project/InitialInstance.cpp" />
+		<Unit filename="GDCore/Project/InitialInstance.h" />
+		<Unit filename="GDCore/Project/InitialInstancesContainer.cpp" />
+		<Unit filename="GDCore/Project/InitialInstancesContainer.h" />
+		<Unit filename="GDCore/Project/Layer.cpp" />
+		<Unit filename="GDCore/Project/Layer.h" />
+		<Unit filename="GDCore/Project/Layout.cpp" />
+		<Unit filename="GDCore/Project/Layout.h" />
+		<Unit filename="GDCore/Project/LayoutEditorPreviewer.cpp" />
+		<Unit filename="GDCore/Project/LayoutEditorPreviewer.h" />
+		<Unit filename="GDCore/Project/Object.cpp" />
+		<Unit filename="GDCore/Project/Object.h" />
+		<Unit filename="GDCore/Project/ObjectGroup.cpp" />
+		<Unit filename="GDCore/Project/ObjectGroup.h" />
+		<Unit filename="GDCore/Extensions/Platform.cpp" />
+		<Unit filename="GDCore/Extensions/Platform.h" />
+		<Unit filename="GDCore/Extensions/PlatformExtension.cpp" />
+		<Unit filename="GDCore/Extensions/PlatformExtension.h" />
+		<Unit filename="GDCore/Project/Project.cpp" />
+		<Unit filename="GDCore/Project/Project.h" />
+		<Unit filename="GDCore/Project/ResourcesManager.cpp" />
+		<Unit filename="GDCore/Project/ResourcesManager.h" />
+		<Unit filename="GDCore/Project/RessourcesLoader.cpp" />
+		<Unit filename="GDCore/Project/RessourcesLoader.h" />
+		<Unit filename="GDCore/Project/SourceFile.cpp" />
+		<Unit filename="GDCore/Project/SourceFile.h" />
+		<Unit filename="GDCore/Project/Variable.cpp" />
+		<Unit filename="GDCore/Project/Variable.h" />
+		<Unit filename="GDCore/Project/VariablesContainer.cpp" />
+		<Unit filename="GDCore/Project/VariablesContainer.h" />
 		<Unit filename="GDCore/TinyXml/tinystr.cpp" />
 		<Unit filename="GDCore/TinyXml/tinystr.h" />
 		<Unit filename="GDCore/TinyXml/tinyxml.cpp" />
@@ -489,29 +489,29 @@
 			<debugger />
 			<wxsmith version="1">
 				<resources>
-					<wxDialog wxs="wxsmith/ChooseVariableDialog.wxs" src="GDCore\IDE\Dialogs\ChooseVariableDialog.cpp" hdr="GDCore\IDE\Dialogs\ChooseVariableDialog.h" fwddecl="0" i18n="1" name="ChooseVariableDialog" language="CPP" />
-					<wxDialog wxs="wxsmith/ResourceLibraryDialog.wxs" src="GDCore\IDE\Dialogs\ResourceLibraryDialog.cpp" hdr="GDCore\IDE\Dialogs\ResourceLibraryDialog.h" fwddecl="0" i18n="1" name="ResourceLibraryDialog" language="CPP" />
-					<wxDialog wxs="wxsmith/ProjectExtensionsDialog.wxs" src="GDCore\IDE\Dialogs\ProjectExtensionsDialog.cpp" hdr="GDCore\IDE\Dialogs\ProjectExtensionsDialog.h" fwddecl="0" i18n="1" name="ProjectExtensionsDialog" language="CPP" />
-					<wxDialog wxs="wxsmith/ChooseObjectDialog.wxs" src="GDCore\IDE\Dialogs\ChooseObjectDialog.cpp" hdr="GDCore\IDE\Dialogs\ChooseObjectDialog.h" fwddecl="0" i18n="1" name="ChooseObjectDialog" language="CPP" />
-					<wxDialog wxs="wxsmith/ChooseBehaviorDialog.wxs" src="GDCore\IDE\Dialogs\ChooseBehaviorDialog.cpp" hdr="GDCore\IDE\Dialogs\ChooseBehaviorDialog.h" fwddecl="0" i18n="1" name="ChooseBehaviorDialog" language="CPP" />
-					<wxDialog wxs="wxsmith/ChooseLayerDialog.wxs" src="GDCore\IDE\Dialogs\ChooseLayerDialog.cpp" hdr="GDCore\IDE\Dialogs\ChooseLayerDialog.h" fwddecl="0" i18n="1" name="ChooseLayerDialog" language="CPP" />
-					<wxDialog wxs="wxsmith/EditExpressionDialog.wxs" src="GDCore\IDE\Dialogs\EditExpressionDialog.cpp" hdr="GDCore\IDE\Dialogs\EditExpressionDialog.h" fwddecl="0" i18n="1" name="EditExpressionDialog" language="CPP" />
-					<wxDialog wxs="wxsmith/EditStrExpressionDialog.wxs" src="GDCore\IDE\Dialogs\EditStrExpressionDialog.cpp" hdr="GDCore\IDE\Dialogs\EditStrExpressionDialog.h" fwddecl="0" i18n="1" name="EditStrExpressionDialog" language="CPP" />
-					<wxDialog wxs="wxsmith/AdvancedEntryDialog.wxs" src="GDCore\IDE\Dialogs\AdvancedEntryDialog.cpp" hdr="GDCore\IDE\Dialogs\AdvancedEntryDialog.h" fwddecl="0" i18n="1" name="AdvancedEntryDialog" language="CPP" />
-					<wxDialog wxs="wxsmith/ChooseObjectTypeDialog.wxs" src="GDCore\IDE\Dialogs\ChooseObjectTypeDialog.cpp" hdr="GDCore\IDE\Dialogs\ChooseObjectTypeDialog.h" fwddecl="0" i18n="1" name="ChooseObjectTypeDialog" language="CPP" />
-					<wxPanel wxs="wxsmith/LayoutEditorCanvas.wxs" src="GDCore\IDE\Dialogs\LayoutEditorCanvas.cpp" hdr="GDCore\IDE\Dialogs\LayoutEditorCanvas.h" fwddecl="0" i18n="1" name="LayoutEditorCanvas" language="CPP" />
-					<wxDialog wxs="wxsmith/GridSetupDialog.wxs" src="GDCore\IDE\Dialogs\GridSetupDialog.cpp" hdr="GDCore\IDE\Dialogs\GridSetupDialog.h" fwddecl="0" i18n="1" name="GridSetupDialog" language="CPP" />
-					<wxPanel wxs="wxsmith/LayersEditorPanel.wxs" src="GDCore\IDE\Dialogs\LayersEditorPanel.cpp" hdr="GDCore\IDE\Dialogs\LayersEditorPanel.h" fwddecl="0" i18n="1" name="LayersEditorPanel" language="CPP" />
-					<wxDialog wxs="wxsmith/InstancesAdvancedPasteDialog.wxs" src="GDCore\IDE\Dialogs\InstancesAdvancedPasteDialog.cpp" hdr="GDCore\IDE\Dialogs\InstancesAdvancedPasteDialog.h" fwddecl="0" i18n="1" name="InstancesAdvancedPasteDialog" language="CPP" />
-					<wxDialog wxs="wxsmith/ChooseBehaviorTypeDialog.wxs" src="GDCore\IDE\Dialogs\ChooseBehaviorTypeDialog.cpp" hdr="GDCore\IDE\Dialogs\ChooseBehaviorTypeDialog.h" fwddecl="0" i18n="1" name="ChooseBehaviorTypeDialog" language="CPP" />
-					<wxDialog wxs="wxsmith/EditLayerDialog.wxs" src="GDCore\IDE\Dialogs\EditLayerDialog.cpp" hdr="GDCore\IDE\Dialogs\EditLayerDialog.h" fwddecl="0" i18n="1" name="EditLayerDialog" language="CPP" />
-					<wxDialog wxs="wxsmith/EditLink.wxs" src="GDCore\IDE\Dialogs\EditLink.cpp" hdr="GDCore\IDE\Dialogs\EditLink.h" fwddecl="0" i18n="1" name="EditLink" language="CPP" />
-					<wxDialog wxs="wxsmith/EditComment.wxs" src="GDCore\IDE\Dialogs\EditComment.cpp" hdr="GDCore\IDE\Dialogs\EditComment.h" fwddecl="0" i18n="1" name="EditComment" language="CPP" />
-					<wxDialog wxs="wxsmith/EditForEachEvent.wxs" src="GDCore\IDE\Dialogs\EditForEachEvent.cpp" hdr="GDCore\IDE\Dialogs\EditForEachEvent.h" fwddecl="0" i18n="1" name="EditForEachEvent" language="CPP" />
-					<wxDialog wxs="wxsmith/EditRepeatEvent.wxs" src="GDCore\IDE\Dialogs\EditRepeatEvent.cpp" hdr="GDCore\IDE\Dialogs\EditRepeatEvent.h" fwddecl="0" i18n="1" name="EditRepeatEvent" language="CPP" />
-					<wxDialog wxs="wxsmith/ProjectUpdateDialog.wxs" src="GDCore\IDE\Dialogs\ProjectUpdateDialog.cpp" hdr="GDCore\IDE\Dialogs\ProjectUpdateDialog.h" fwddecl="0" i18n="1" name="ProjectUpdateDialog" language="CPP" />
-					<wxDialog wxs="wxsmith/SpriteObjectEditor.wxs" src="GDCore\BuiltinExtensions\SpriteExtension\Dialogs\SpriteObjectEditor.cpp" hdr="GDCore\BuiltinExtensions\SpriteExtension\Dialogs\SpriteObjectEditor.h" fwddecl="0" i18n="1" name="SpriteObjectEditor" language="CPP" />
-					<wxPanel wxs="wxsmith/ResourcesEditor.wxs" src="GDCore\IDE\Dialogs\ResourcesEditor.cpp" hdr="GDCore\IDE\Dialogs\ResourcesEditor.h" fwddecl="0" i18n="1" name="ResourcesEditor" language="CPP" />
+					<wxDialog wxs="wxsmith/ChooseVariableDialog.wxs" src="GDCore/IDE/Dialogs/ChooseVariableDialog.cpp" hdr="GDCore/IDE/Dialogs/ChooseVariableDialog.h" fwddecl="0" i18n="1" name="ChooseVariableDialog" language="CPP" />
+					<wxDialog wxs="wxsmith/ResourceLibraryDialog.wxs" src="GDCore/IDE/Dialogs/ResourceLibraryDialog.cpp" hdr="GDCore/IDE/Dialogs/ResourceLibraryDialog.h" fwddecl="0" i18n="1" name="ResourceLibraryDialog" language="CPP" />
+					<wxDialog wxs="wxsmith/ProjectExtensionsDialog.wxs" src="GDCore/IDE/Dialogs/ProjectExtensionsDialog.cpp" hdr="GDCore/IDE/Dialogs/ProjectExtensionsDialog.h" fwddecl="0" i18n="1" name="ProjectExtensionsDialog" language="CPP" />
+					<wxDialog wxs="wxsmith/ChooseObjectDialog.wxs" src="GDCore/IDE/Dialogs/ChooseObjectDialog.cpp" hdr="GDCore/IDE/Dialogs/ChooseObjectDialog.h" fwddecl="0" i18n="1" name="ChooseObjectDialog" language="CPP" />
+					<wxDialog wxs="wxsmith/ChooseBehaviorDialog.wxs" src="GDCore/IDE/Dialogs/ChooseBehaviorDialog.cpp" hdr="GDCore/IDE/Dialogs/ChooseBehaviorDialog.h" fwddecl="0" i18n="1" name="ChooseBehaviorDialog" language="CPP" />
+					<wxDialog wxs="wxsmith/ChooseLayerDialog.wxs" src="GDCore/IDE/Dialogs/ChooseLayerDialog.cpp" hdr="GDCore/IDE/Dialogs/ChooseLayerDialog.h" fwddecl="0" i18n="1" name="ChooseLayerDialog" language="CPP" />
+					<wxDialog wxs="wxsmith/EditExpressionDialog.wxs" src="GDCore/IDE/Dialogs/EditExpressionDialog.cpp" hdr="GDCore/IDE/Dialogs/EditExpressionDialog.h" fwddecl="0" i18n="1" name="EditExpressionDialog" language="CPP" />
+					<wxDialog wxs="wxsmith/EditStrExpressionDialog.wxs" src="GDCore/IDE/Dialogs/EditStrExpressionDialog.cpp" hdr="GDCore/IDE/Dialogs/EditStrExpressionDialog.h" fwddecl="0" i18n="1" name="EditStrExpressionDialog" language="CPP" />
+					<wxDialog wxs="wxsmith/AdvancedEntryDialog.wxs" src="GDCore/IDE/Dialogs/AdvancedEntryDialog.cpp" hdr="GDCore/IDE/Dialogs/AdvancedEntryDialog.h" fwddecl="0" i18n="1" name="AdvancedEntryDialog" language="CPP" />
+					<wxDialog wxs="wxsmith/ChooseObjectTypeDialog.wxs" src="GDCore/IDE/Dialogs/ChooseObjectTypeDialog.cpp" hdr="GDCore/IDE/Dialogs/ChooseObjectTypeDialog.h" fwddecl="0" i18n="1" name="ChooseObjectTypeDialog" language="CPP" />
+					<wxPanel wxs="wxsmith/LayoutEditorCanvas.wxs" src="GDCore/IDE/Dialogs/LayoutEditorCanvas.cpp" hdr="GDCore/IDE/Dialogs/LayoutEditorCanvas.h" fwddecl="0" i18n="1" name="LayoutEditorCanvas" language="CPP" />
+					<wxDialog wxs="wxsmith/GridSetupDialog.wxs" src="GDCore/IDE/Dialogs/GridSetupDialog.cpp" hdr="GDCore/IDE/Dialogs/GridSetupDialog.h" fwddecl="0" i18n="1" name="GridSetupDialog" language="CPP" />
+					<wxPanel wxs="wxsmith/LayersEditorPanel.wxs" src="GDCore/IDE/Dialogs/LayersEditorPanel.cpp" hdr="GDCore/IDE/Dialogs/LayersEditorPanel.h" fwddecl="0" i18n="1" name="LayersEditorPanel" language="CPP" />
+					<wxDialog wxs="wxsmith/InstancesAdvancedPasteDialog.wxs" src="GDCore/IDE/Dialogs/InstancesAdvancedPasteDialog.cpp" hdr="GDCore/IDE/Dialogs/InstancesAdvancedPasteDialog.h" fwddecl="0" i18n="1" name="InstancesAdvancedPasteDialog" language="CPP" />
+					<wxDialog wxs="wxsmith/ChooseBehaviorTypeDialog.wxs" src="GDCore/IDE/Dialogs/ChooseBehaviorTypeDialog.cpp" hdr="GDCore/IDE/Dialogs/ChooseBehaviorTypeDialog.h" fwddecl="0" i18n="1" name="ChooseBehaviorTypeDialog" language="CPP" />
+					<wxDialog wxs="wxsmith/EditLayerDialog.wxs" src="GDCore/IDE/Dialogs/EditLayerDialog.cpp" hdr="GDCore/IDE/Dialogs/EditLayerDialog.h" fwddecl="0" i18n="1" name="EditLayerDialog" language="CPP" />
+					<wxDialog wxs="wxsmith/EditLink.wxs" src="GDCore/IDE/Dialogs/EditLink.cpp" hdr="GDCore/IDE/Dialogs/EditLink.h" fwddecl="0" i18n="1" name="EditLink" language="CPP" />
+					<wxDialog wxs="wxsmith/EditComment.wxs" src="GDCore/IDE/Dialogs/EditComment.cpp" hdr="GDCore/IDE/Dialogs/EditComment.h" fwddecl="0" i18n="1" name="EditComment" language="CPP" />
+					<wxDialog wxs="wxsmith/EditForEachEvent.wxs" src="GDCore/IDE/Dialogs/EditForEachEvent.cpp" hdr="GDCore/IDE/Dialogs/EditForEachEvent.h" fwddecl="0" i18n="1" name="EditForEachEvent" language="CPP" />
+					<wxDialog wxs="wxsmith/EditRepeatEvent.wxs" src="GDCore/IDE/Dialogs/EditRepeatEvent.cpp" hdr="GDCore/IDE/Dialogs/EditRepeatEvent.h" fwddecl="0" i18n="1" name="EditRepeatEvent" language="CPP" />
+					<wxDialog wxs="wxsmith/ProjectUpdateDialog.wxs" src="GDCore/IDE/Dialogs/ProjectUpdateDialog.cpp" hdr="GDCore/IDE/Dialogs/ProjectUpdateDialog.h" fwddecl="0" i18n="1" name="ProjectUpdateDialog" language="CPP" />
+					<wxDialog wxs="wxsmith/SpriteObjectEditor.wxs" src="GDCore\Extensions\BuiltinExtensions\SpriteExtension\Dialogs\SpriteObjectEditor.cpp" hdr="GDCore\Extensions\BuiltinExtensions\SpriteExtension\Dialogs\SpriteObjectEditor.h" fwddecl="0" i18n="1" name="SpriteObjectEditor" language="CPP" />
+					<wxPanel wxs="wxsmith/ResourcesEditor.wxs" src="GDCore/IDE/Dialogs/ResourcesEditor.cpp" hdr="GDCore/IDE/Dialogs/ResourcesEditor.h" fwddecl="0" i18n="1" name="ResourcesEditor" language="CPP" />
 				</resources>
 			</wxsmith>
 		</Extensions>

Core/GDCore/CommonTools.h

@@ -1,6 +1,6 @@
 /*
  * GDevelop Core
- * Copyright 2008-2015 Florian Rival (Florian.Rival@gmail.com). All rights reserved.
+ * Copyright 2008-2016 Florian Rival (Florian.Rival@gmail.com). All rights reserved.
  * This project is released under the MIT License.
  */
 

Core/GDCore/Events/Builtin/CommentEvent.cpp

@@ -1,6 +1,6 @@
 /*
  * GDevelop Core
- * Copyright 2008-2015 Florian Rival (Florian.Rival@gmail.com). All rights reserved.
+ * Copyright 2008-2016 Florian Rival (Florian.Rival@gmail.com). All rights reserved.
  * This project is released under the MIT License.
  */
 
@@ -8,11 +8,11 @@
 #include <wx/dcmemory.h>
 #endif
 #include "CommentEvent.h"
-#include "GDCore/IDE/EventsRenderingHelper.h"
+#include "GDCore/IDE/Dialogs/EventsEditor/EventsRenderingHelper.h"
 #include "GDCore/Serialization/SerializerElement.h"
 #include "GDCore/IDE/Dialogs/EditComment.h"
-#include "GDCore/IDE/EventsEditorItemsAreas.h"
-#include "GDCore/IDE/EventsEditorSelection.h"
+#include "GDCore/IDE/Dialogs/EventsEditor/EventsEditorItemsAreas.h"
+#include "GDCore/IDE/Dialogs/EventsEditor/EventsEditorSelection.h"
 #include "GDCore/CommonTools.h"
 
 using namespace std;
@@ -87,7 +87,7 @@ void CommentEvent::Render(wxDC & dc, int x, int y, unsigned int width, gd::Event
     unsigned int text2Height = renderingHelper->GetHTMLRenderer().GetTotalHeight();
 
     //Prepare background
-    dc.SetBrush(wxBrush(wxColour(r, v, b), wxTRANSPARENT));
+    dc.SetBrush(wxBrush(wxColour(r, v, b), wxBRUSHSTYLE_TRANSPARENT));
     dc.SetPen(wxPen(wxColour(r/2, v/2, b/2), 1));
 
     //Draw the background

Core/GDCore/Events/Builtin/CommentEvent.h

@@ -1,6 +1,6 @@
 /*
  * GDevelop Core
- * Copyright 2008-2015 Florian Rival (Florian.Rival@gmail.com). All rights reserved.
+ * Copyright 2008-2016 Florian Rival (Florian.Rival@gmail.com). All rights reserved.
  * This project is released under the MIT License.
  */
 #ifndef COMMENTEVENT_H

Core/GDCore/Events/Builtin/ForEachEvent.cpp

@@ -1,21 +1,21 @@
 /*
  * GDevelop Core
- * Copyright 2008-2015 Florian Rival (Florian.Rival@gmail.com). All rights reserved.
+ * Copyright 2008-2016 Florian Rival (Florian.Rival@gmail.com). All rights reserved.
  * This project is released under the MIT License.
  */
 
 #include "ForEachEvent.h"
 #include <iostream>
 #include "GDCore/TinyXml/tinyxml.h"
-#include "GDCore/IDE/EventsRenderingHelper.h"
-#include "GDCore/IDE/EventsEditorItemsAreas.h"
-#include "GDCore/IDE/EventsEditorSelection.h"
+#include "GDCore/IDE/Dialogs/EventsEditor/EventsRenderingHelper.h"
+#include "GDCore/IDE/Dialogs/EventsEditor/EventsEditorItemsAreas.h"
+#include "GDCore/IDE/Dialogs/EventsEditor/EventsEditorSelection.h"
 #include "GDCore/Serialization/SerializerElement.h"
 #include "GDCore/Events/Serialization.h"
-#include "GDCore/Events/EventsCodeGenerator.h"
-#include "GDCore/Events/ExpressionsCodeGeneration.h"
-#include "GDCore/Events/EventsCodeNameMangler.h"
-#include "GDCore/Events/EventsCodeGenerationContext.h"
+#include "GDCore/Events/CodeGeneration/EventsCodeGenerator.h"
+#include "GDCore/Events/CodeGeneration/ExpressionsCodeGeneration.h"
+#include "GDCore/Events/Tools/EventsCodeNameMangler.h"
+#include "GDCore/Events/CodeGeneration/EventsCodeGenerationContext.h"
 #include "GDCore/IDE/Dialogs/EditForEachEvent.h"
 
 using namespace std;

Core/GDCore/Events/Builtin/ForEachEvent.h

@@ -1,6 +1,6 @@
 /*
  * GDevelop Core
- * Copyright 2008-2015 Florian Rival (Florian.Rival@gmail.com). All rights reserved.
+ * Copyright 2008-2016 Florian Rival (Florian.Rival@gmail.com). All rights reserved.
  * This project is released under the MIT License.
  */
 

Core/GDCore/Events/Builtin/GroupEvent.cpp

@@ -1,6 +1,6 @@
 /*
  * GDevelop Core
- * Copyright 2008-2015 Florian Rival (Florian.Rival@gmail.com). All rights reserved.
+ * Copyright 2008-2016 Florian Rival (Florian.Rival@gmail.com). All rights reserved.
  * This project is released under the MIT License.
  */
 
@@ -10,15 +10,15 @@
 #include <wx/renderer.h>
 #include "GDCore/IDE/Dialogs/MainFrameWrapper.h"
 #endif
-#include "GDCore/IDE/EventsRenderingHelper.h"
-#include "GDCore/IDE/EventsEditorItemsAreas.h"
-#include "GDCore/IDE/EventsEditorSelection.h"
+#include "GDCore/IDE/Dialogs/EventsEditor/EventsRenderingHelper.h"
+#include "GDCore/IDE/Dialogs/EventsEditor/EventsEditorItemsAreas.h"
+#include "GDCore/IDE/Dialogs/EventsEditor/EventsEditorSelection.h"
 #include "GDCore/Events/Serialization.h"
 #include "GDCore/Serialization/SerializerElement.h"
 #include "GDCore/TinyXml/tinyxml.h"
 #include "GDCore/CommonTools.h"
-#include "GDCore/Events/EventsCodeGenerator.h"
-#include "GDCore/Events/EventsCodeGenerationContext.h"
+#include "GDCore/Events/CodeGeneration/EventsCodeGenerator.h"
+#include "GDCore/Events/CodeGeneration/EventsCodeGenerationContext.h"
 #include "GDCore/IDE/Dialogs/GroupEventDialog.h"
 #include "GDCore/IDE/Dialogs/EventStoreDialog.h"
 
@@ -132,7 +132,7 @@ void GroupEvent::Render(wxDC & dc, int x, int y, unsigned int width, gd::EventsE
 
     dc.SetTextBackground(backgroundColor);
     dc.SetTextForeground(textColor);
-    dc.SetFont( wxFont( 12, wxDEFAULT, wxNORMAL, wxFONTWEIGHT_BOLD ) );
+    dc.SetFont( wxFont( 12, wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD ) );
     dc.DrawText( groupTitle, x+5, y + 5 );
 #endif
 }
@@ -148,7 +148,7 @@ unsigned int GroupEvent::GetRenderedHeight(unsigned int width, const gd::Platfor
 
         wxString groupTitle = name.empty() ? _("Untitled group") : wxString(name);
 
-        dc.SetFont( wxFont( 12, wxDEFAULT, wxNORMAL, wxNORMAL ) );
+        dc.SetFont( wxFont( 12, wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL ) );
         wxRect text = dc.GetTextExtent(groupTitle);
 
         renderedHeight = text.GetHeight()+10;

Core/GDCore/Events/Builtin/GroupEvent.h

@@ -1,6 +1,6 @@
 /*
  * GDevelop Core
- * Copyright 2008-2015 Florian Rival (Florian.Rival@gmail.com). All rights reserved.
+ * Copyright 2008-2016 Florian Rival (Florian.Rival@gmail.com). All rights reserved.
  * This project is released under the MIT License.
  */
 

Core/GDCore/Events/Builtin/LinkEvent.cpp

@@ -1,6 +1,6 @@
 /*
  * GDevelop Core
- * Copyright 2008-2015 Florian Rival (Florian.Rival@gmail.com). All rights reserved.
+ * Copyright 2008-2016 Florian Rival (Florian.Rival@gmail.com). All rights reserved.
  * This project is released under the MIT License.
  */
 #include <iostream>
@@ -8,16 +8,16 @@
 #if !defined(GD_NO_WX_GUI)
 #include <wx/dcmemory.h>
 #endif
-#include "GDCore/IDE/SkinHelper.h"
+#include "GDCore/IDE/wxTools/SkinHelper.h"
 #include "GDCore/Serialization/SerializerElement.h"
-#include "GDCore/IDE/EventsRenderingHelper.h"
-#include "GDCore/PlatformDefinition/Object.h"
-#include "GDCore/PlatformDefinition/Project.h"
-#include "GDCore/PlatformDefinition/Layout.h"
-#include "GDCore/PlatformDefinition/ExternalEvents.h"
-#include "GDCore/Events/EventsCodeGenerationContext.h"
-#include "GDCore/Events/EventsCodeGenerator.h"
-#include "GDCore/Events/EventsCodeNameMangler.h"
+#include "GDCore/IDE/Dialogs/EventsEditor/EventsRenderingHelper.h"
+#include "GDCore/Project/Object.h"
+#include "GDCore/Project/Project.h"
+#include "GDCore/Project/Layout.h"
+#include "GDCore/Project/ExternalEvents.h"
+#include "GDCore/Events/CodeGeneration/EventsCodeGenerationContext.h"
+#include "GDCore/Events/CodeGeneration/EventsCodeGenerator.h"
+#include "GDCore/Events/Tools/EventsCodeNameMangler.h"
 #include "GDCore/Events/Builtin/LinkEvent.h"
 #include "GDCore/IDE/Dialogs/EditLink.h"
 #include "GDCore/CommonTools.h"

Core/GDCore/Events/Builtin/LinkEvent.h

@@ -1,6 +1,6 @@
 /*
  * GDevelop Core
- * Copyright 2008-2015 Florian Rival (Florian.Rival@gmail.com). All rights reserved.
+ * Copyright 2008-2016 Florian Rival (Florian.Rival@gmail.com). All rights reserved.
  * This project is released under the MIT License.
  */
 #ifndef GDCORE_LINKEVENT_H

Core/GDCore/Events/Builtin/RepeatEvent.cpp

@@ -1,18 +1,18 @@
 /*
  * GDevelop Core
- * Copyright 2008-2015 Florian Rival (Florian.Rival@gmail.com). All rights reserved.
+ * Copyright 2008-2016 Florian Rival (Florian.Rival@gmail.com). All rights reserved.
  * This project is released under the MIT License.
  */
 
 #include "RepeatEvent.h"
-#include "GDCore/IDE/EventsEditorItemsAreas.h"
-#include "GDCore/IDE/EventsEditorSelection.h"
-#include "GDCore/IDE/EventsRenderingHelper.h"
+#include "GDCore/IDE/Dialogs/EventsEditor/EventsEditorItemsAreas.h"
+#include "GDCore/IDE/Dialogs/EventsEditor/EventsEditorSelection.h"
+#include "GDCore/IDE/Dialogs/EventsEditor/EventsRenderingHelper.h"
 #include "GDCore/Events/Serialization.h"
 #include "GDCore/Serialization/SerializerElement.h"
-#include "GDCore/Events/EventsCodeGenerator.h"
-#include "GDCore/Events/ExpressionsCodeGeneration.h"
-#include "GDCore/Events/EventsCodeGenerationContext.h"
+#include "GDCore/Events/CodeGeneration/EventsCodeGenerator.h"
+#include "GDCore/Events/CodeGeneration/ExpressionsCodeGeneration.h"
+#include "GDCore/Events/CodeGeneration/EventsCodeGenerationContext.h"
 #include "GDCore/IDE/Dialogs/EditRepeatEvent.h"
 
 using namespace std;

Core/GDCore/Events/Builtin/RepeatEvent.h

@@ -1,6 +1,6 @@
 /*
  * GDevelop Core
- * Copyright 2008-2015 Florian Rival (Florian.Rival@gmail.com). All rights reserved.
+ * Copyright 2008-2016 Florian Rival (Florian.Rival@gmail.com). All rights reserved.
  * This project is released under the MIT License.
  */
 

Core/GDCore/Events/Builtin/StandardEvent.cpp

@@ -1,19 +1,19 @@
 /*
  * GDevelop Core
- * Copyright 2008-2015 Florian Rival (Florian.Rival@gmail.com). All rights reserved.
+ * Copyright 2008-2016 Florian Rival (Florian.Rival@gmail.com). All rights reserved.
  * This project is released under the MIT License.
  */
 
 #include "StandardEvent.h"
-#include "GDCore/IDE/EventsRenderingHelper.h"
-#include "GDCore/IDE/EventsEditorItemsAreas.h"
-#include "GDCore/IDE/EventsEditorSelection.h"
+#include "GDCore/IDE/Dialogs/EventsEditor/EventsRenderingHelper.h"
+#include "GDCore/IDE/Dialogs/EventsEditor/EventsEditorItemsAreas.h"
+#include "GDCore/IDE/Dialogs/EventsEditor/EventsEditorSelection.h"
 #include "GDCore/Events/Serialization.h"
 #include "GDCore/Serialization/SerializerElement.h"
 #include "GDCore/TinyXml/tinyxml.h"
 #include "GDCore/CommonTools.h"
-#include "GDCore/Events/EventsCodeGenerator.h"
-#include "GDCore/Events/EventsCodeGenerationContext.h"
+#include "GDCore/Events/CodeGeneration/EventsCodeGenerator.h"
+#include "GDCore/Events/CodeGeneration/EventsCodeGenerationContext.h"
 
 using namespace std;
 

Core/GDCore/Events/Builtin/StandardEvent.h

@@ -1,6 +1,6 @@
 /*
  * GDevelop Core
- * Copyright 2008-2015 Florian Rival (Florian.Rival@gmail.com). All rights reserved.
+ * Copyright 2008-2016 Florian Rival (Florian.Rival@gmail.com). All rights reserved.
  * This project is released under the MIT License.
  */
 

Core/GDCore/Events/Builtin/WhileEvent.cpp

@@ -1,6 +1,6 @@
 /*
  * GDevelop Core
- * Copyright 2008-2015 Florian Rival (Florian.Rival@gmail.com). All rights reserved.
+ * Copyright 2008-2016 Florian Rival (Florian.Rival@gmail.com). All rights reserved.
  * This project is released under the MIT License.
  */
 
@@ -8,17 +8,17 @@
 #include "WhileEvent.h"
 #if !defined(GD_NO_WX_GUI)
 #include <wx/msgdlg.h>
-#include "GDCore/IDE/CommonBitmapManager.h"
+#include "GDCore/IDE/wxTools/CommonBitmapProvider.h"
 #endif
 #include "GDCore/TinyXml/tinyxml.h"
-#include "GDCore/Events/EventsCodeGenerator.h"
-#include "GDCore/Events/ExpressionsCodeGeneration.h"
-#include "GDCore/IDE/EventsRenderingHelper.h"
-#include "GDCore/IDE/EventsEditorItemsAreas.h"
-#include "GDCore/IDE/EventsEditorSelection.h"
+#include "GDCore/Events/CodeGeneration/EventsCodeGenerator.h"
+#include "GDCore/Events/CodeGeneration/ExpressionsCodeGeneration.h"
+#include "GDCore/IDE/Dialogs/EventsEditor/EventsRenderingHelper.h"
+#include "GDCore/IDE/Dialogs/EventsEditor/EventsEditorItemsAreas.h"
+#include "GDCore/IDE/Dialogs/EventsEditor/EventsEditorSelection.h"
 #include "GDCore/Serialization/SerializerElement.h"
 #include "GDCore/Events/Serialization.h"
-#include "GDCore/Events/EventsCodeGenerationContext.h"
+#include "GDCore/Events/CodeGeneration/EventsCodeGenerationContext.h"
 
 using namespace std;
 
@@ -102,8 +102,8 @@ void WhileEvent::Render(wxDC & dc, int x, int y, unsigned int width, gd::EventsE
     //Draw icon if infinite loop warning is deactivated.
     if (!infiniteLoopWarning)
     {
-        if ( gd::CommonBitmapManager::Get()->noProtection.IsOk() )
-            dc.DrawBitmap(gd::CommonBitmapManager::Get()->noProtection, wxPoint(x+5,y+5+18), /*useMask=*/true);
+        if ( gd::CommonBitmapProvider::Get()->noProtection.IsOk() )
+            dc.DrawBitmap(gd::CommonBitmapProvider::Get()->noProtection, wxPoint(x+5,y+5+18), /*useMask=*/true);
     }
 
     //Draw "while conditions"

Core/GDCore/Events/Builtin/WhileEvent.h

@@ -1,6 +1,6 @@
 /*
  * GDevelop Core
- * Copyright 2008-2015 Florian Rival (Florian.Rival@gmail.com). All rights reserved.
+ * Copyright 2008-2016 Florian Rival (Florian.Rival@gmail.com). All rights reserved.
  * This project is released under the MIT License.
  */
 

Core/GDCore/Events/CodeGeneration/EventsCodeGenerationContext.cpp

@@ -1,12 +1,12 @@
 /*
  * GDevelop Core
- * Copyright 2008-2015 Florian Rival (Florian.Rival@gmail.com). All rights reserved.
+ * Copyright 2008-2016 Florian Rival (Florian.Rival@gmail.com). All rights reserved.
  * This project is released under the MIT License.
  */
-#include "GDCore/Events/EventsCodeGenerationContext.h"
-#include "GDCore/Events/EventsCodeNameMangler.h"
+#include "GDCore/Events/CodeGeneration/EventsCodeGenerationContext.h"
+#include "GDCore/Events/Tools/EventsCodeNameMangler.h"
 #include "GDCore/CommonTools.h"
-#include "GDCore/Events/EventsCodeGenerator.h"
+#include "GDCore/Events/CodeGeneration/EventsCodeGenerator.h"
 #include <set>
 
 using namespace std;

Core/GDCore/Events/CodeGeneration/EventsCodeGenerationContext.h

@@ -1,6 +1,6 @@
 /*
  * GDevelop Core
- * Copyright 2008-2015 Florian Rival (Florian.Rival@gmail.com). All rights reserved.
+ * Copyright 2008-2016 Florian Rival (Florian.Rival@gmail.com). All rights reserved.
  * This project is released under the MIT License.
  */
 #ifndef EVENTSCODEGENERATIONCONTEXT_H

Core/GDCore/Events/CodeGeneration/EventsCodeGenerator.cpp

@@ -1,19 +1,19 @@
 #include <algorithm>
 #include <utility>
-#include "GDCore/PlatformDefinition/Layout.h"
-#include "GDCore/PlatformDefinition/Project.h"
-#include "GDCore/PlatformDefinition/PlatformExtension.h"
-#include "GDCore/PlatformDefinition/Platform.h"
-#include "GDCore/IDE/MetadataProvider.h"
-#include "GDCore/Events/EventsCodeGenerator.h"
+#include "GDCore/Project/Layout.h"
+#include "GDCore/Project/Project.h"
+#include "GDCore/Extensions/PlatformExtension.h"
+#include "GDCore/Extensions/Platform.h"
+#include "GDCore/Extensions/Metadata/MetadataProvider.h"
+#include "GDCore/Events/CodeGeneration/EventsCodeGenerator.h"
 #include "GDCore/CommonTools.h"
-#include "GDCore/Events/ExpressionParser.h"
-#include "GDCore/Events/EventsCodeNameMangler.h"
-#include "GDCore/Events/EventsCodeGenerationContext.h"
-#include "GDCore/Events/ExpressionsCodeGeneration.h"
-#include "GDCore/Events/InstructionMetadata.h"
-#include "GDCore/Events/ObjectMetadata.h"
-#include "GDCore/Events/BehaviorMetadata.h"
+#include "GDCore/Events/Parsers/ExpressionParser.h"
+#include "GDCore/Events/Tools/EventsCodeNameMangler.h"
+#include "GDCore/Events/CodeGeneration/EventsCodeGenerationContext.h"
+#include "GDCore/Events/CodeGeneration/ExpressionsCodeGeneration.h"
+#include "GDCore/Extensions/Metadata/InstructionMetadata.h"
+#include "GDCore/Extensions/Metadata/ObjectMetadata.h"
+#include "GDCore/Extensions/Metadata/BehaviorMetadata.h"
 
 using namespace std;
 

Core/GDCore/Events/CodeGeneration/EventsCodeGenerator.h

@@ -317,7 +317,7 @@ protected:
      * \code
         AddExpression("Count", _("Object count"), _("Count the number of picked objects"), _("Objects"), "res/conditions/nbObjet.png")
         .AddParameter("objectList", _("Object"))
-        .SetFunctionName("PickedObjectsCount").SetIncludeFile("GDCpp/BuiltinExtensions/ObjectTools.h");
+        .SetFunctionName("PickedObjectsCount").SetIncludeFile("GDCpp/Extensions/Builtin/ObjectTools.h");
 
      * \endcode
      * - objectListWithoutPicking : Same as objectList but do not pick object if they are not already picked.

Core/GDCore/Events/CodeGeneration/ExpressionsCodeGeneration.cpp

@@ -1,21 +1,21 @@
 /*
  * GDevelop Core
- * Copyright 2008-2015 Florian Rival (Florian.Rival@gmail.com). All rights reserved.
+ * Copyright 2008-2016 Florian Rival (Florian.Rival@gmail.com). All rights reserved.
  * This project is released under the MIT License.
  */
 #include "ExpressionsCodeGeneration.h"
-#include "GDCore/PlatformDefinition/Project.h"
-#include "GDCore/PlatformDefinition/Layout.h"
-#include "GDCore/PlatformDefinition/Platform.h"
-#include "GDCore/PlatformDefinition/PlatformExtension.h"
-#include "GDCore/IDE/MetadataProvider.h"
-#include "GDCore/Events/ExpressionParser.h"
-#include "GDCore/Events/EventsCodeGenerator.h"
-#include "GDCore/Events/EventsCodeNameMangler.h"
-#include "GDCore/Events/EventsCodeGenerationContext.h"
-#include "GDCore/Events/ExpressionMetadata.h"
-#include "GDCore/Events/ObjectMetadata.h"
-#include "GDCore/Events/BehaviorMetadata.h"
+#include "GDCore/Project/Project.h"
+#include "GDCore/Project/Layout.h"
+#include "GDCore/Extensions/Platform.h"
+#include "GDCore/Extensions/PlatformExtension.h"
+#include "GDCore/Extensions/Metadata/MetadataProvider.h"
+#include "GDCore/Events/Parsers/ExpressionParser.h"
+#include "GDCore/Events/CodeGeneration/EventsCodeGenerator.h"
+#include "GDCore/Events/Tools/EventsCodeNameMangler.h"
+#include "GDCore/Events/CodeGeneration/EventsCodeGenerationContext.h"
+#include "GDCore/Extensions/Metadata/ExpressionMetadata.h"
+#include "GDCore/Extensions/Metadata/ObjectMetadata.h"
+#include "GDCore/Extensions/Metadata/BehaviorMetadata.h"
 #include "GDCore/CommonTools.h"
 
 using namespace std;

Core/GDCore/Events/CodeGeneration/ExpressionsCodeGeneration.h

@@ -1,6 +1,6 @@
 /*
  * GDevelop Core
- * Copyright 2008-2015 Florian Rival (Florian.Rival@gmail.com). All rights reserved.
+ * Copyright 2008-2016 Florian Rival (Florian.Rival@gmail.com). All rights reserved.
  * This project is released under the MIT License.
  */
 #ifndef EXPRESSIONSCODEGENERATION_H
@@ -8,7 +8,7 @@
 
 #include <vector>
 #include "GDCore/String.h"
-#include "GDCore/Events/ExpressionParser.h"
+#include "GDCore/Events/Parsers/ExpressionParser.h"
 namespace gd { class ExpressionMetadata; }
 namespace gd { class Expression; }
 namespace gd { class Project; }

Core/GDCore/Events/Event.cpp

@@ -1,14 +1,14 @@
 /*
  * GDevelop Core
- * Copyright 2008-2015 Florian Rival (Florian.Rival@gmail.com). All rights reserved.
+ * Copyright 2008-2016 Florian Rival (Florian.Rival@gmail.com). All rights reserved.
  * This project is released under the MIT License.
  */
 
 #include "GDCore/Events/Event.h"
 #include "GDCore/Events/EventsList.h"
-#include "GDCore/PlatformDefinition/Platform.h"
-#include "GDCore/PlatformDefinition/PlatformExtension.h"
-#include "GDCore/Events/EventsCodeGenerator.h"
+#include "GDCore/Extensions/Platform.h"
+#include "GDCore/Extensions/PlatformExtension.h"
+#include "GDCore/Events/CodeGeneration/EventsCodeGenerator.h"
 
 namespace gd
 {

Core/GDCore/Events/Event.h

@@ -1,6 +1,6 @@
 /*
  * GDevelop Core
- * Copyright 2008-2015 Florian Rival (Florian.Rival@gmail.com). All rights reserved.
+ * 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)

Core/GDCore/Events/EventsList.cpp

@@ -1,13 +1,13 @@
 /*
  * GDevelop Core
- * Copyright 2008-2015 Florian Rival (Florian.Rival@gmail.com). All rights reserved.
+ * Copyright 2008-2016 Florian Rival (Florian.Rival@gmail.com). All rights reserved.
  * This project is released under the MIT License.
  */
 
 #include "EventsList.h"
 #include "GDCore/Events/Event.h"
 #include "GDCore/Tools/Log.h"
-#include "GDCore/PlatformDefinition/Project.h"
+#include "GDCore/Project/Project.h"
 #include "Serialization.h"
 
 namespace gd

Core/GDCore/Events/EventsList.h

@@ -1,6 +1,6 @@
 /*
  * GDevelop Core
- * Copyright 2008-2015 Florian Rival (Florian.Rival@gmail.com). All rights reserved.
+ * 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)

Core/GDCore/Events/Expression.h

@@ -1,6 +1,6 @@
 /*
  * GDevelop Core
- * Copyright 2008-2015 Florian Rival (Florian.Rival@gmail.com). All rights reserved.
+ * Copyright 2008-2016 Florian Rival (Florian.Rival@gmail.com). All rights reserved.
  * This project is released under the MIT License.
  */
 

Core/GDCore/Events/Instruction.cpp

@@ -1,6 +1,6 @@
 /*
  * GDevelop Core
- * Copyright 2008-2015 Florian Rival (Florian.Rival@gmail.com). All rights reserved.
+ * Copyright 2008-2016 Florian Rival (Florian.Rival@gmail.com). All rights reserved.
  * This project is released under the MIT License.
  */
 #include "GDCore/Events/Instruction.h"
@@ -60,11 +60,6 @@ void Instruction::SetParametersCount(std::size_t size)
         parameters.push_back(gd::Expression(""));
 }
 
-Instruction::~Instruction()
-{
-    //dtor
-}
-
 void Instruction::SetParameter(std::size_t nb, const gd::Expression & val)
 {
     if ( nb >= parameters.size() )

Core/GDCore/Events/Instruction.h

@@ -1,6 +1,6 @@
 /*
  * GDevelop Core
- * Copyright 2008-2015 Florian Rival (Florian.Rival@gmail.com). All rights reserved.
+ * Copyright 2008-2016 Florian Rival (Florian.Rival@gmail.com). All rights reserved.
  * This project is released under the MIT License.
  */
 #ifndef INSTRUCTION_H
@@ -48,7 +48,7 @@ public:
      */
     Instruction(gd::String type_, const std::vector <gd::Expression> & parameters_, bool inverted = false);
 
-    virtual ~Instruction();
+    virtual ~Instruction() {};
 
     /**
      * \brief Return the type of the instruction.

Core/GDCore/Events/Parsers/ExpressionParser.cpp

@@ -1,16 +1,16 @@
 /*
  * GDevelop Core
- * Copyright 2008-2015 Florian Rival (Florian.Rival@gmail.com). All rights reserved.
+ * Copyright 2008-2016 Florian Rival (Florian.Rival@gmail.com). All rights reserved.
  * This project is released under the MIT License.
  */
-#include "GDCore/PlatformDefinition/Layout.h"
-#include "GDCore/PlatformDefinition/Project.h"
+#include "GDCore/Project/Layout.h"
+#include "GDCore/Project/Project.h"
 #include "GDCore/Events/Expression.h"
-#include "GDCore/Events/ExpressionParser.h"
-#include "GDCore/Events/InstructionMetadata.h"
-#include "GDCore/Events/ExpressionMetadata.h"
-#include "GDCore/IDE/MetadataProvider.h"
-#include "GDCore/PlatformDefinition/Platform.h"
+#include "GDCore/Events/Parsers/ExpressionParser.h"
+#include "GDCore/Extensions/Metadata/InstructionMetadata.h"
+#include "GDCore/Extensions/Metadata/ExpressionMetadata.h"
+#include "GDCore/Extensions/Metadata/MetadataProvider.h"
+#include "GDCore/Extensions/Platform.h"
 #include "GDCore/CommonTools.h"
 #include <algorithm>
 #include <iostream>

Core/GDCore/Events/Parsers/ExpressionParser.h

@@ -1,6 +1,6 @@
 /*
  * GDevelop Core
- * Copyright 2008-2015 Florian Rival (Florian.Rival@gmail.com). All rights reserved.
+ * Copyright 2008-2016 Florian Rival (Florian.Rival@gmail.com). All rights reserved.
  * This project is released under the MIT License.
  */
 #ifndef GDCORE_EXPRESSIONPARSER_H

Core/GDCore/Events/Parsers/VariableParser.cpp

@@ -1,11 +1,11 @@
 /*
  * GDevelop Core
- * Copyright 2008-2015 Florian Rival (Florian.Rival@gmail.com). All rights reserved.
+ * Copyright 2008-2016 Florian Rival (Florian.Rival@gmail.com). All rights reserved.
  * This project is released under the MIT License.
  */
 #include "GDCore/String.h"
 #include <vector>
-#include "GDCore/Events/VariableParser.h"
+#include "GDCore/Events/Parsers/VariableParser.h"
 namespace gd { class Layout; }
 namespace gd { class Project; }
 namespace gd { class Platform; }

Core/GDCore/Events/Parsers/VariableParser.h

@@ -1,6 +1,6 @@
 /*
  * GDevelop Core
- * Copyright 2008-2015 Florian Rival (Florian.Rival@gmail.com). All rights reserved.
+ * Copyright 2008-2016 Florian Rival (Florian.Rival@gmail.com). All rights reserved.
  * This project is released under the MIT License.
  */
 #ifndef GDCORE_VARIABLEPARSER_H

Core/GDCore/Events/Serialization.cpp

@@ -1,19 +1,18 @@
 /*
  * GDevelop Core
- * Copyright 2008-2015 Florian Rival (Florian.Rival@gmail.com). All rights reserved.
+ * Copyright 2008-2016 Florian Rival (Florian.Rival@gmail.com). All rights reserved.
  * This project is released under the MIT License.
  */
-#include "GDCore/PlatformDefinition/Project.h"
-#include "GDCore/PlatformDefinition/Platform.h"
-#include "GDCore/Events/InstructionMetadata.h"
+#include "GDCore/Project/Project.h"
+#include "GDCore/Extensions/Platform.h"
+#include "GDCore/Extensions/Metadata/InstructionMetadata.h"
 #include "GDCore/Events/EventsList.h"
 #include "GDCore/Events/Event.h"
 #include "GDCore/Events/Serialization.h"
 #include "GDCore/Serialization/Serializer.h"
 #include "GDCore/Serialization/SerializerElement.h"
 #include "GDCore/Events/Instruction.h"
-#include "GDCore/TinyXml/tinyxml.h"
-#include "GDCore/IDE/MetadataProvider.h"
+#include "GDCore/Extensions/Metadata/MetadataProvider.h"
 #include "GDCore/Tools/Log.h"
 #include "GDCore/CommonTools.h"
 

Core/GDCore/Events/Serialization.h

@@ -1,11 +1,10 @@
 /*
  * GDevelop Core
- * Copyright 2008-2015 Florian Rival (Florian.Rival@gmail.com). All rights reserved.
+ * Copyright 2008-2016 Florian Rival (Florian.Rival@gmail.com). All rights reserved.
  * This project is released under the MIT License.
  */
 #ifndef GDCORE_EVENTS_SERIALIZATION_H
 #define GDCORE_EVENTS_SERIALIZATION_H
-#include "GDCore/TinyXml/tinyxml.h"
 #include "GDCore/Events/Instruction.h"
 #include "GDCore/Serialization/Serializer.h"
 #include <vector>

Core/GDCore/Events/Tools/EventsCodeNameMangler.cpp

@@ -1,6 +1,6 @@
 /*
  * GDevelop Core
- * Copyright 2008-2015 Florian Rival (Florian.Rival@gmail.com). All rights reserved.
+ * 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)

Core/GDCore/Events/Tools/EventsCodeNameMangler.h

@@ -1,6 +1,6 @@
 /*
  * GDevelop Core
- * Copyright 2008-2015 Florian Rival (Florian.Rival@gmail.com). All rights reserved.
+ * 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)

Core/GDCore/Extensions/Builtin/AdvancedExtension.cpp

@@ -1,6 +1,6 @@
 /*
  * GDevelop Core
- * Copyright 2008-2015 Florian Rival (Florian.Rival@gmail.com). All rights reserved.
+ * Copyright 2008-2016 Florian Rival (Florian.Rival@gmail.com). All rights reserved.
  * This project is released under the MIT License.
  */
 #include "AllBuiltinExtensions.h"

Core/GDCore/Extensions/Builtin/AllBuiltinExtensions.h

@@ -1,12 +1,12 @@
 /*
  * GDevelop Core
- * Copyright 2008-2015 Florian Rival (Florian.Rival@gmail.com). All rights reserved.
+ * Copyright 2008-2016 Florian Rival (Florian.Rival@gmail.com). All rights reserved.
  * This project is released under the MIT License.
  */
 
 #ifndef GDCORE_COMMONINSTRUCTIONSEXTENSION_H
 #define GDCORE_COMMONINSTRUCTIONSEXTENSION_H
-#include "GDCore/PlatformDefinition/PlatformExtension.h"
+#include "GDCore/Extensions/PlatformExtension.h"
 
 namespace gd
 {

Core/GDCore/Extensions/Builtin/AudioExtension.cpp

@@ -1,6 +1,6 @@
 /*
  * GDevelop Core
- * Copyright 2008-2015 Florian Rival (Florian.Rival@gmail.com). All rights reserved.
+ * Copyright 2008-2016 Florian Rival (Florian.Rival@gmail.com). All rights reserved.
  * This project is released under the MIT License.
  */
 #include "AllBuiltinExtensions.h"
@@ -27,7 +27,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsAudioExtension(gd::Plat
                    "res/actions/son24.png",
                    "res/actions/son.png")
         .AddCodeOnlyParameter("currentScene", "")
-        .AddParameter("soundfile", _("Audio file"))
+        .AddParameter("soundfile", _("Audio file (or audio resource name)"))
         .AddParameter("expression", _("Channel identifier"))
         .AddParameter("yesorno", _("Repeat the sound"), "",true).SetDefaultValue("no")
         .AddParameter("expression", _("Volume (from 0 to 100, 100 by default)"), "",true).SetDefaultValue("100")
@@ -75,7 +75,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsAudioExtension(gd::Plat
                    "res/actions/music24.png",
                    "res/actions/music.png")
         .AddCodeOnlyParameter("currentScene", "")
-        .AddParameter("musicfile", _("Audio file"))
+        .AddParameter("musicfile", _("Audio file (or audio resource name)"))
         .AddParameter("expression", _("Channel identifier"))
         .AddParameter("yesorno", _("Repeat the sound"), "",true).SetDefaultValue("no")
         .AddParameter("expression", _("Volume (from 0 to 100, 100 by default)"), "",true).SetDefaultValue("100")
@@ -220,7 +220,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsAudioExtension(gd::Plat
                    "res/actions/son24.png",
                    "res/actions/son.png")
         .AddCodeOnlyParameter("currentScene", "")
-        .AddParameter("soundfile", _("Audio file"))
+        .AddParameter("soundfile", _("Audio file (or audio resource name)"))
         .AddParameter("yesorno", _("Repeat the sound"), "",true).SetDefaultValue("no")
         .AddParameter("expression", _("Volume (from 0 to 100, 100 by default)"), "",true).SetDefaultValue("100")
         .AddParameter("expression", _("Pitch (speed) (1 by default)"), "",true).SetDefaultValue("1")
@@ -234,7 +234,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsAudioExtension(gd::Plat
                    "res/actions/music24.png",
                    "res/actions/music.png")
         .AddCodeOnlyParameter("currentScene", "")
-        .AddParameter("musicfile", _("Audio file"))
+        .AddParameter("musicfile", _("Audio file (or audio resource name)"))
         .AddParameter("yesorno", _("Repeat the sound"), "",true).SetDefaultValue("no")
         .AddParameter("expression", _("Volume (from 0 to 100, 100 by default)"), "",true).SetDefaultValue("100")
         .AddParameter("expression", _("Pitch (speed) (1 by default)"), "",true).SetDefaultValue("1")

Core/GDCore/Extensions/Builtin/BaseObjectExtension.cpp

@@ -1,11 +1,11 @@
 /*
  * GDevelop Core
- * Copyright 2008-2015 Florian Rival (Florian.Rival@gmail.com). All rights reserved.
+ * Copyright 2008-2016 Florian Rival (Florian.Rival@gmail.com). All rights reserved.
  * This project is released under the MIT License.
  */
 #include "AllBuiltinExtensions.h"
 #include "GDCore/Tools/Localization.h"
-#include "GDCore/PlatformDefinition/Object.h"
+#include "GDCore/Project/Object.h"
 
 using namespace std;
 namespace gd
@@ -38,6 +38,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(gd:
         .AddParameter("relationalOperator", _("Sign of the test"))
         .AddParameter("expression", _("X position"))
         .MarkAsSimple()
+        .SetHelpPage("gdevelop/documentation/manual/base")
         .SetManipulatedType("number");
 
     obj.AddAction("MettreX",
@@ -52,6 +53,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(gd:
         .AddParameter("operator", _("Modification's sign"))
         .AddParameter("expression", _("Value"))
         .MarkAsSimple()
+        .SetHelpPage("gdevelop/documentation/manual/base")
         .SetManipulatedType("number");
 
     obj.AddCondition("PosY",
@@ -66,6 +68,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(gd:
         .AddParameter("relationalOperator", _("Sign of the test"))
         .AddParameter("expression", _("Y position"))
         .MarkAsSimple()
+        .SetHelpPage("gdevelop/documentation/manual/base")
         .SetManipulatedType("number");
 
     obj.AddAction("MettreY",
@@ -80,6 +83,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(gd:
         .AddParameter("operator", _("Modification's sign"))
         .AddParameter("expression", _("Value"))
         .MarkAsSimple()
+        .SetHelpPage("gdevelop/documentation/manual/base")
         .SetManipulatedType("number");
 
     obj.AddAction("MettreXY",
@@ -95,6 +99,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(gd:
         .AddParameter("expression", _("X position"))
         .AddParameter("operator", _("Modification's sign"))
         .AddParameter("expression", _("Y position"))
+        .SetHelpPage("gdevelop/documentation/manual/base")
         .MarkAsSimple();
 
     obj.AddAction("MettreAutourPos",
@@ -110,6 +115,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(gd:
         .AddParameter("expression", _("Y position"))
         .AddParameter("expression", _("Distance"))
         .AddParameter("expression", _("Angle, in degrees"))
+        .SetHelpPage("gdevelop/documentation/manual/base")
         .MarkAsAdvanced();
 
     obj.AddAction("SetAngle",
@@ -123,6 +129,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(gd:
         .AddParameter("object", _("Object"))
         .AddParameter("operator", _("Modification's sign"))
         .AddParameter("expression", _("Value"))
+        .SetHelpPage("gdevelop/documentation/manual/base")
         .SetManipulatedType("number");
 
     obj.AddAction("Rotate",
@@ -136,6 +143,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(gd:
         .AddParameter("object", _("Object"))
         .AddParameter("expression", _("Angular speed (in degrees per second)"))
         .AddCodeOnlyParameter("currentScene", "")
+        .SetHelpPage("gdevelop/documentation/manual/base")
         .MarkAsSimple();
 
     obj.AddAction("RotateTowardAngle",
@@ -149,6 +157,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(gd:
         .AddParameter("object", _("Object"))
         .AddParameter("expression", _("Angle to rotate towards (in degrees)"))
         .AddParameter("expression", _("Angular speed (in degrees per second) (0 for immediate rotation)"))
+        .SetHelpPage("gdevelop/documentation/manual/base")
         .AddCodeOnlyParameter("currentScene", "");
 
     obj.AddAction("RotateTowardPosition",
@@ -164,6 +173,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(gd:
         .AddParameter("expression", _("Y position"))
         .AddParameter("expression", _("Angular speed (in degrees per second) (0 for immediate rotation)"))
         .AddCodeOnlyParameter("currentScene", "")
+        .SetHelpPage("gdevelop/documentation/manual/base")
         .MarkAsAdvanced();
 
     obj.AddAction("AddForceXY",
@@ -177,7 +187,8 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(gd:
         .AddParameter("object", _("Object"))
         .AddParameter("expression", _("Speed on X axis (in pixels per second)"))
         .AddParameter("expression", _("Speed on Y axis (in pixels per second)"))
-        .AddParameter("expression", _("Damping (Default: 0)"));
+        .AddParameter("expression", _("Damping (Default: 0)"))
+        .SetHelpPage("gdevelop/documentation/manual/base");
 
     obj.AddAction("AddForceAL",
                    _("Add a force (angle)"),
@@ -191,6 +202,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(gd:
         .AddParameter("expression", _("Angle"))
         .AddParameter("expression", _("Speed (in pixels per second)"))
         .AddParameter("expression", _("Damping (Default: 0)"))
+        .SetHelpPage("gdevelop/documentation/manual/base")
         .MarkAsAdvanced();
 
     obj.AddAction("AddForceVersPos",
@@ -206,6 +218,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(gd:
         .AddParameter("expression", _("Y position"))
         .AddParameter("expression", _("Speed (in pixels per second)"))
         .AddParameter("expression", _("Damping (Default: 0)"))
+        .SetHelpPage("gdevelop/documentation/manual/base#displacement")
         .MarkAsAdvanced();
 
     obj.AddAction("AddForceTournePos",
@@ -234,6 +247,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(gd:
                    "res/actions/arreter.png")
 
         .AddParameter("object", _("Object"))
+        .SetHelpPage("gdevelop/documentation/manual/base#displacement")
         .MarkAsAdvanced();
 
     obj.AddAction("Delete",

Core/GDCore/Extensions/Builtin/CameraExtension.cpp

@@ -1,6 +1,6 @@
 /*
  * GDevelop Core
- * Copyright 2008-2015 Florian Rival (Florian.Rival@gmail.com). All rights reserved.
+ * Copyright 2008-2016 Florian Rival (Florian.Rival@gmail.com). All rights reserved.
  * This project is released under the MIT License.
  */
 #include "AllBuiltinExtensions.h"
@@ -21,7 +21,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsCameraExtension(gd::Pla
     #if defined(GD_IDE_ONLY)
     extension.AddCondition("CameraX",
                    _("Camera center X position"),
-                   _("Compare the X position of a the center of a camera."),
+                   _("Compare the X position of the center of a camera."),
                    _("X position of camera _PARAM4_ is _PARAM1__PARAM2_ (layer: _PARAM3_)"),
                    _("Layers and cameras"),
                    "res/conditions/camera24.png",

Core/GDCore/Extensions/Builtin/CommonConversionsExtension.cpp

@@ -1,6 +1,6 @@
 /*
  * GDevelop Core
- * Copyright 2008-2015 Florian Rival (Florian.Rival@gmail.com). All rights reserved.
+ * Copyright 2008-2016 Florian Rival (Florian.Rival@gmail.com). All rights reserved.
  * This project is released under the MIT License.
  */
 #include "AllBuiltinExtensions.h"

Core/GDCore/Extensions/Builtin/CommonInstructionsExtension.cpp

@@ -1,6 +1,6 @@
 /*
  * GDevelop Core
- * Copyright 2008-2015 Florian Rival (Florian.Rival@gmail.com). All rights reserved.
+ * Copyright 2008-2016 Florian Rival (Florian.Rival@gmail.com). All rights reserved.
  * This project is released under the MIT License.
  */
 #include "AllBuiltinExtensions.h"

Core/GDCore/Extensions/Builtin/ExternalLayoutsExtension.cpp

@@ -1,6 +1,6 @@
 /*
  * GDevelop Core
- * Copyright 2008-2015 Florian Rival (Florian.Rival@gmail.com). All rights reserved.
+ * Copyright 2008-2016 Florian Rival (Florian.Rival@gmail.com). All rights reserved.
  * This project is released under the MIT License.
  */
 #include "AllBuiltinExtensions.h"

Core/GDCore/Extensions/Builtin/FileExtension.cpp

@@ -1,6 +1,6 @@
 /*
  * GDevelop Core
- * Copyright 2008-2015 Florian Rival (Florian.Rival@gmail.com). All rights reserved.
+ * Copyright 2008-2016 Florian Rival (Florian.Rival@gmail.com). All rights reserved.
  * This project is released under the MIT License.
  */
 #include "AllBuiltinExtensions.h"

Core/GDCore/Extensions/Builtin/JoystickExtension.cpp

@@ -1,6 +1,6 @@
 /*
  * GDevelop Core
- * Copyright 2008-2015 Florian Rival (Florian.Rival@gmail.com). All rights reserved.
+ * Copyright 2008-2016 Florian Rival (Florian.Rival@gmail.com). All rights reserved.
  * This project is released under the MIT License.
  */
 #include "AllBuiltinExtensions.h"

Core/GDCore/Extensions/Builtin/KeyboardExtension.cpp

@@ -1,6 +1,6 @@
 /*
  * GDevelop Core
- * Copyright 2008-2015 Florian Rival (Florian.Rival@gmail.com). All rights reserved.
+ * Copyright 2008-2016 Florian Rival (Florian.Rival@gmail.com). All rights reserved.
  * This project is released under the MIT License.
  */
 #include "AllBuiltinExtensions.h"

Core/GDCore/Extensions/Builtin/MathematicalToolsExtension.cpp

@@ -1,6 +1,6 @@
 /*
  * GDevelop Core
- * Copyright 2008-2015 Florian Rival (Florian.Rival@gmail.com). All rights reserved.
+ * Copyright 2008-2016 Florian Rival (Florian.Rival@gmail.com). All rights reserved.
  * This project is released under the MIT License.
  */
 #include "AllBuiltinExtensions.h"

Core/GDCore/Extensions/Builtin/MouseExtension.cpp

@@ -1,6 +1,6 @@
 /*
  * GDevelop Core
- * Copyright 2008-2015 Florian Rival (Florian.Rival@gmail.com). All rights reserved.
+ * Copyright 2008-2016 Florian Rival (Florian.Rival@gmail.com). All rights reserved.
  * This project is released under the MIT License.
  */
 #include "AllBuiltinExtensions.h"

Core/GDCore/Extensions/Builtin/NetworkExtension.cpp

@@ -1,6 +1,6 @@
 /*
  * GDevelop Core
- * Copyright 2008-2015 Florian Rival (Florian.Rival@gmail.com). All rights reserved.
+ * Copyright 2008-2016 Florian Rival (Florian.Rival@gmail.com). All rights reserved.
  * This project is released under the MIT License.
  */
 #include "AllBuiltinExtensions.h"

Core/GDCore/Extensions/Builtin/SceneExtension.cpp

@@ -1,6 +1,6 @@
 /*
  * GDevelop Core
- * Copyright 2008-2015 Florian Rival (Florian.Rival@gmail.com). All rights reserved.
+ * Copyright 2008-2016 Florian Rival (Florian.Rival@gmail.com). All rights reserved.
  * This project is released under the MIT License.
  */
 #include "AllBuiltinExtensions.h"

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

@@ -1,12 +1,12 @@
 /*
  * GDevelop Core
- * Copyright 2008-2015 Florian Rival (Florian.Rival@gmail.com). All rights reserved.
+ * Copyright 2008-2016 Florian Rival (Florian.Rival@gmail.com). All rights reserved.
  * This project is released under the MIT License.
  */
 
-#include "GDCore/BuiltinExtensions/SpriteExtension/Animation.h"
-#include "GDCore/BuiltinExtensions/SpriteExtension/Direction.h"
-#include "GDCore/BuiltinExtensions/SpriteExtension/Sprite.h"
+#include "GDCore/Extensions/Builtin/SpriteExtension/Animation.h"
+#include "GDCore/Extensions/Builtin/SpriteExtension/Direction.h"
+#include "GDCore/Extensions/Builtin/SpriteExtension/Sprite.h"
 #include "GDCore/String.h"
 #include <vector>
 

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

@@ -1,6 +1,6 @@
 /*
  * GDevelop Core
- * Copyright 2008-2015 Florian Rival (Florian.Rival@gmail.com). All rights reserved.
+ * Copyright 2008-2016 Florian Rival (Florian.Rival@gmail.com). All rights reserved.
  * This project is released under the MIT License.
  */
 

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

@@ -1,6 +1,6 @@
 /*
  * GDevelop Core
- * Copyright 2008-2015 Florian Rival (Florian.Rival@gmail.com). All rights reserved.
+ * 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) && !defined(GD_NO_WX_GUI)
@@ -23,18 +23,18 @@
 #include <algorithm>
 #include "GDCore/Tools/Log.h"
 #include "GDCore/Tools/Localization.h"
-#include "GDCore/IDE/CommonBitmapManager.h"
+#include "GDCore/IDE/wxTools/CommonBitmapProvider.h"
 #include "GDCore/Tools/HelpFileAccess.h"
-#include "GDCore/IDE/SkinHelper.h"
+#include "GDCore/IDE/wxTools/SkinHelper.h"
 #include "GDCore/IDE/wxTools/TreeItemStringData.h"
-#include "GDCore/PlatformDefinition/ResourcesManager.h"
-#include "GDCore/PlatformDefinition/Project.h"
-#include "GDCore/PlatformDefinition/Platform.h"
+#include "GDCore/Project/ResourcesManager.h"
+#include "GDCore/Project/Project.h"
+#include "GDCore/Extensions/Platform.h"
 #include "GDCore/IDE/Dialogs/ResourcesEditor.h"
 #include "GDCore/CommonTools.h"
-#include "GDCore/BuiltinExtensions/SpriteExtension/SpriteObject.h"
-#include "GDCore/BuiltinExtensions/SpriteExtension/Animation.h"
-#include "GDCore/BuiltinExtensions/SpriteExtension/Direction.h"
+#include "GDCore/Extensions/Builtin/SpriteExtension/SpriteObject.h"
+#include "GDCore/Extensions/Builtin/SpriteExtension/Animation.h"
+#include "GDCore/Extensions/Builtin/SpriteExtension/Direction.h"
 #include "SpriteObjectEditor.h"
 #ifdef __WXMSW__
 #include <wx/msw/winundef.h>
@@ -177,8 +177,8 @@ SpriteObjectEditor::SpriteObjectEditor(wxWindow* parent, gd::Project & game_, Sp
 	toolbarPanel = new wxPanel(centerPanel, ID_PANEL6, wxDefaultPosition, wxSize(-1,25), wxTAB_TRAVERSAL, _T("ID_PANEL6"));
 	AuiManager1 = new wxAuiManager(toolbarPanel, wxAUI_MGR_DEFAULT);
 	toolbar = new wxAuiToolBar(toolbarPanel, ID_AUITOOLBAR1, wxDefaultPosition, wxDefaultSize, wxAUI_TB_DEFAULT_STYLE);
-	toolbar->AddTool(ID_MASKITEM, _("Edit the collision masks (hitbox)"), gd::CommonBitmapManager::Get()->maskEdit16, wxNullBitmap, wxITEM_CHECK, _("Edit the collision masks (hitbox)"), wxEmptyString, NULL);
-	toolbar->AddTool(ID_POINTSITEM, _("Edit the image\'s point"), gd::CommonBitmapManager::Get()->pointEdit16, wxNullBitmap, wxITEM_CHECK, _("Edit the image\'s point"), wxEmptyString, NULL);
+	toolbar->AddTool(ID_MASKITEM, _("Edit the collision masks (hitbox)"), gd::CommonBitmapProvider::Get()->maskEdit16, wxNullBitmap, wxITEM_CHECK, _("Edit the collision masks (hitbox)"), wxEmptyString, NULL);
+	toolbar->AddTool(ID_POINTSITEM, _("Edit the image\'s point"), gd::CommonBitmapProvider::Get()->pointEdit16, wxNullBitmap, wxITEM_CHECK, _("Edit the image\'s point"), wxEmptyString, NULL);
 	toolbar->AddSeparator();
 	toolbar->AddTool(ID_AUITOOLBARITEM4, _("Preview"), gd::SkinHelper::GetIcon("preview", 16), wxNullBitmap, wxITEM_NORMAL, _("Preview"), wxEmptyString, NULL);
 	toolbar->AddSeparator();
@@ -257,7 +257,7 @@ SpriteObjectEditor::SpriteObjectEditor(wxWindow* parent, gd::Project & game_, Sp
 	maskToolbar->AddSeparator();
 	maskToolbar->AddTool(ID_AUITOOLBARITEM7, _("Item label"), gd::SkinHelper::GetIcon("remove", 16), wxNullBitmap, wxITEM_NORMAL, wxEmptyString, wxEmptyString, NULL);
 	maskToolbar->AddSeparator();
-	maskToolbar->AddTool(ID_AUITOOLBARITEM1, _("Go back to default mask"), gd::CommonBitmapManager::Get()->defaultMask16, wxNullBitmap, wxITEM_NORMAL, _("Go back to default mask"), wxEmptyString, NULL);
+	maskToolbar->AddTool(ID_AUITOOLBARITEM1, _("Go back to default mask"), gd::CommonBitmapProvider::Get()->defaultMask16, wxNullBitmap, wxITEM_NORMAL, _("Go back to default mask"), wxEmptyString, NULL);
 	maskToolbar->AddSeparator();
 	maskToolbar->AddTool(ID_MASKAPPLYWHOLEANIMITEM, _("Item label"), gd::SkinHelper::GetIcon("copy", 16), wxNullBitmap, wxITEM_CHECK, wxEmptyString, wxEmptyString, NULL);
 	maskToolbar->Realize();
@@ -407,7 +407,7 @@ SpriteObjectEditor::SpriteObjectEditor(wxWindow* parent, gd::Project & game_, Sp
     Connect(ID_SCROLLBAR2,wxEVT_SCROLL_THUMBTRACK,(wxObjectEventFunction)&SpriteObjectEditor::OnxScrollBarScroll);
 
     wxImageList * iconList = new wxImageList(16,16);
-    iconList->Add(gd::CommonBitmapManager::Get()->pointEdit16);
+    iconList->Add(gd::CommonBitmapProvider::Get()->pointEdit16);
     pointsList->AssignImageList(iconList, wxIMAGE_LIST_SMALL);
     pointsList->InsertColumn(0, _("Name"));
     pointsList->InsertColumn(1, _("X"), wxLIST_FORMAT_LEFT, 35);
@@ -511,15 +511,15 @@ void SpriteObjectEditor::RefreshAnimationTree()
 {
     wxImageList * iconList = new wxImageList(16,16);
     animationsTree->AssignImageList(iconList);
-    iconList->Add(gd::CommonBitmapManager::Get()->animation16);
-    iconList->Add(gd::CommonBitmapManager::Get()->rightdir16);
-    iconList->Add(gd::CommonBitmapManager::Get()->rightdowndir16);
-    iconList->Add(gd::CommonBitmapManager::Get()->downdir16);
-    iconList->Add(gd::CommonBitmapManager::Get()->leftdowndir16);
-    iconList->Add(gd::CommonBitmapManager::Get()->leftdir16);
-    iconList->Add(gd::CommonBitmapManager::Get()->leftupdir16);
-    iconList->Add(gd::CommonBitmapManager::Get()->updir16);
-    iconList->Add(gd::CommonBitmapManager::Get()->rightupdir16);
+    iconList->Add(gd::CommonBitmapProvider::Get()->animation16);
+    iconList->Add(gd::CommonBitmapProvider::Get()->rightdir16);
+    iconList->Add(gd::CommonBitmapProvider::Get()->rightdowndir16);
+    iconList->Add(gd::CommonBitmapProvider::Get()->downdir16);
+    iconList->Add(gd::CommonBitmapProvider::Get()->leftdowndir16);
+    iconList->Add(gd::CommonBitmapProvider::Get()->leftdir16);
+    iconList->Add(gd::CommonBitmapProvider::Get()->leftupdir16);
+    iconList->Add(gd::CommonBitmapProvider::Get()->updir16);
+    iconList->Add(gd::CommonBitmapProvider::Get()->rightupdir16);
 
     animationsTree->DeleteAllItems();
     wxTreeItemId root = animationsTree->AddRoot(_("All animations"));
@@ -567,7 +567,7 @@ void SpriteObjectEditor::RefreshImagesList()
             if ( spriteBitmap.IsOk() )
                 thumbnailList->Add(spriteBitmap);
             else
-                thumbnailList->Add(gd::CommonBitmapManager::Get()->error48);
+                thumbnailList->Add(gd::CommonBitmapProvider::Get()->error48);
             imagesList->InsertItem(imagesList->GetItemCount(), gd::String::From(i), i);
         }
     }
@@ -600,7 +600,7 @@ wxBitmap SpriteObjectEditor::GetwxBitmapFromImageResource(gd::Resource & resourc
         //Resource is probably not an image.
     }
 
-    return gd::CommonBitmapManager::Get()->error48;
+    return gd::CommonBitmapProvider::Get()->error48;
 }
 
 SpriteObjectEditor::~SpriteObjectEditor()
@@ -643,7 +643,7 @@ void SpriteObjectEditor::OnimagePanelPaint(wxPaintEvent& event)
     wxSize size = imagePanel->GetSize();
 
     //Checkerboard background
-    dc.SetBrush(gd::CommonBitmapManager::Get()->transparentBg);
+    dc.SetBrush(gd::CommonBitmapProvider::Get()->transparentBg);
     dc.DrawRectangle(0,0, imagePanel->GetSize().GetWidth(), imagePanel->GetSize().GetHeight());
 
     if ( selectedAnimation < object.GetAnimationsCount() &&
@@ -687,9 +687,9 @@ void SpriteObjectEditor::OnimagePanelPaint(wxPaintEvent& event)
                 pointY = sprite.GetPoint(pointsList->GetItemText(pointIndex)).GetY();
             }
 
-            dc.DrawBitmap(gd::CommonBitmapManager::Get()->point,
-                          spritePosX+pointX-gd::CommonBitmapManager::Get()->point.GetWidth()/2,
-                          spritePosY+pointY-gd::CommonBitmapManager::Get()->point.GetHeight()/2,
+            dc.DrawBitmap(gd::CommonBitmapProvider::Get()->point,
+                          spritePosX+pointX-gd::CommonBitmapProvider::Get()->point.GetWidth()/2,
+                          spritePosY+pointY-gd::CommonBitmapProvider::Get()->point.GetHeight()/2,
                           /*useMask=*/true);
         }
 
@@ -718,7 +718,7 @@ void SpriteObjectEditor::OnpreviewPanelPaint(wxPaintEvent& event)
     wxSize size = previewPanel->GetSize();
 
     //Checkerboard background
-    dc.SetBrush(gd::CommonBitmapManager::Get()->transparentBg);
+    dc.SetBrush(gd::CommonBitmapProvider::Get()->transparentBg);
     dc.DrawRectangle(0,0, previewPanel->GetSize().GetWidth(), previewPanel->GetSize().GetHeight());
 
     if ( selectedAnimation < object.GetAnimationsCount() &&
@@ -1029,7 +1029,7 @@ bool DndTextSpriteObjectEditor::OnDropText(wxCoord x, wxCoord y, const wxString&
     	//Add ressources dragged from the library dialog to the project.
         std::vector<gd::String> files;
         for (std::size_t i = 2;i<command.size();++i) files.push_back(command[i]);
-        std::vector<gd::String> names = editor.resourcesEditorPnl->CopyAndAddResources(files, command[1]);
+        std::vector<gd::String> names = editor.resourcesEditorPnl->CopyAndAddResources(files, command[1], "image");
 
     	//And add them as usual to the animation.
         for (std::size_t i = 0;i<names.size();++i)
@@ -1813,7 +1813,7 @@ void SpriteObjectEditor::OnAddFromImageBankSelected(wxCommandEvent& event)
 
 void SpriteObjectEditor::OnHelpClick(wxCommandEvent& event)
 {
-    gd::HelpFileAccess::Get()->OpenURL(_("http://wiki.compilgames.net/doku.php/en/game_develop/documentation/manual/built_sprite"));
+    gd::HelpFileAccess::Get()->OpenPage("en/game_develop/documentation/manual/built_sprite");
 }
 
 void SpriteObjectEditor::OnyScrollBarScroll(wxScrollEvent& event)

Core/GDCore/Extensions/Builtin/SpriteExtension/Dialogs/SpriteObjectEditor.h

@@ -1,6 +1,6 @@
 /*
  * GDevelop Core
- * Copyright 2008-2015 Florian Rival (Florian.Rival@gmail.com). All rights reserved.
+ * 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) && !defined(GD_NO_WX_GUI)

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

@@ -1,13 +1,13 @@
 /*
  * GDevelop Core
- * Copyright 2008-2015 Florian Rival (Florian.Rival@gmail.com). All rights reserved.
+ * Copyright 2008-2016 Florian Rival (Florian.Rival@gmail.com). All rights reserved.
  * This project is released under the MIT License.
  */
 #include <iostream>
 #include "GDCore/String.h"
 #include <vector>
-#include "GDCore/BuiltinExtensions/SpriteExtension/Direction.h"
-#include "GDCore/BuiltinExtensions/SpriteExtension/Sprite.h"
+#include "GDCore/Extensions/Builtin/SpriteExtension/Direction.h"
+#include "GDCore/Extensions/Builtin/SpriteExtension/Sprite.h"
 #include "GDCore/Serialization/SerializerElement.h"
 #include "GDCore/CommonTools.h"
 

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

@@ -1,6 +1,6 @@
 /*
  * GDevelop Core
- * Copyright 2008-2015 Florian Rival (Florian.Rival@gmail.com). All rights reserved.
+ * Copyright 2008-2016 Florian Rival (Florian.Rival@gmail.com). All rights reserved.
  * This project is released under the MIT License.
  */
 #ifndef GDCORE_DIRECTION_H

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

@@ -1,10 +1,10 @@
 /*
  * GDevelop Core
- * Copyright 2008-2015 Florian Rival (Florian.Rival@gmail.com). All rights reserved.
+ * Copyright 2008-2016 Florian Rival (Florian.Rival@gmail.com). All rights reserved.
  * This project is released under the MIT License.
  */
 
-#include "GDCore/BuiltinExtensions/SpriteExtension/Point.h"
+#include "GDCore/Extensions/Builtin/SpriteExtension/Point.h"
 #include "GDCore/String.h"
 
 Point::Point(const gd::String & name_) :

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

@@ -1,6 +1,6 @@
 /*
  * GDevelop Core
- * Copyright 2008-2015 Florian Rival (Florian.Rival@gmail.com). All rights reserved.
+ * Copyright 2008-2016 Florian Rival (Florian.Rival@gmail.com). All rights reserved.
  * This project is released under the MIT License.
  */
 

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

@@ -1,6 +1,6 @@
 /*
  * GDevelop Core
- * Copyright 2008-2015 Florian Rival (Florian.Rival@gmail.com). All rights reserved.
+ * Copyright 2008-2016 Florian Rival (Florian.Rival@gmail.com). All rights reserved.
  * This project is released under the MIT License.
  */
 #include "Polygon2d.h"

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

@@ -1,6 +1,6 @@
 /*
  * GDevelop Core
- * Copyright 2008-2015 Florian Rival (Florian.Rival@gmail.com). All rights reserved.
+ * Copyright 2008-2016 Florian Rival (Florian.Rival@gmail.com). All rights reserved.
  * This project is released under the MIT License.
  */
 #ifndef GDCORE_POLYGON_H

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

@@ -1,11 +1,11 @@
 /*
  * GDevelop Core
- * Copyright 2008-2015 Florian Rival (Florian.Rival@gmail.com). All rights reserved.
+ * Copyright 2008-2016 Florian Rival (Florian.Rival@gmail.com). All rights reserved.
  * This project is released under the MIT License.
  */
-#include "GDCore/BuiltinExtensions/SpriteExtension/Polygon2d.h"
-#include "GDCore/BuiltinExtensions/SpriteExtension/Sprite.h"
-#include "GDCore/PlatformDefinition/ImageManager.h"
+#include "GDCore/Extensions/Builtin/SpriteExtension/Polygon2d.h"
+#include "GDCore/Extensions/Builtin/SpriteExtension/Sprite.h"
+#include "GDCore/Project/ImageManager.h"
 #include <SFML/Graphics/Sprite.hpp>
 #include <iostream>
 

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

@@ -1,6 +1,6 @@
 /*
  * GDevelop Core
- * Copyright 2008-2015 Florian Rival (Florian.Rival@gmail.com). All rights reserved.
+ * Copyright 2008-2016 Florian Rival (Florian.Rival@gmail.com). All rights reserved.
  * This project is released under the MIT License.
  */
 
@@ -9,8 +9,8 @@
 #include "GDCore/String.h"
 #include <memory>
 #include <SFML/Graphics/Sprite.hpp>
-#include "GDCore/BuiltinExtensions/SpriteExtension/Point.h"
-#include "GDCore/BuiltinExtensions/SpriteExtension/Polygon2d.h"
+#include "GDCore/Extensions/Builtin/SpriteExtension/Point.h"
+#include "GDCore/Extensions/Builtin/SpriteExtension/Polygon2d.h"
 class SFMLTextureWrapper;
 #undef LoadImage //prevent windows.h to be polluting everything
 

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

@@ -1,12 +1,12 @@
 /*
  * GDevelop Core
- * Copyright 2008-2015 Florian Rival (Florian.Rival@gmail.com). All rights reserved.
+ * Copyright 2008-2016 Florian Rival (Florian.Rival@gmail.com). All rights reserved.
  * This project is released under the GNU Lesser General Public LicenFse.
  */
-#include "GDCore/BuiltinExtensions/AllBuiltinExtensions.h"
+#include "GDCore/Extensions/Builtin/AllBuiltinExtensions.h"
 #include "GDCore/Tools/Localization.h"
-#include "GDCore/PlatformDefinition/Object.h"
-#include "GDCore/BuiltinExtensions/SpriteExtension/SpriteObject.h"
+#include "GDCore/Project/Object.h"
+#include "GDCore/Extensions/Builtin/SpriteExtension/SpriteObject.h"
 
 using namespace std;
 namespace gd

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

@@ -1,6 +1,6 @@
 /*
  * GDevelop Core
- * Copyright 2008-2015 Florian Rival (Florian.Rival@gmail.com). All rights reserved.
+ * Copyright 2008-2016 Florian Rival (Florian.Rival@gmail.com). All rights reserved.
  * This project is released under the MIT License.
  */
 
@@ -9,24 +9,24 @@
 #endif
 #include <algorithm>
 #include "GDCore/Tools/Localization.h"
-#include "GDCore/BuiltinExtensions/SpriteExtension/SpriteObject.h"
-#include "GDCore/BuiltinExtensions/SpriteExtension/Animation.h"
-#include "GDCore/BuiltinExtensions/SpriteExtension/Direction.h"
-#include "GDCore/BuiltinExtensions/SpriteExtension/Sprite.h"
-#include "GDCore/PlatformDefinition/Project.h"
-#include "GDCore/PlatformDefinition/Layout.h"
-#include "GDCore/PlatformDefinition/Object.h"
-#include "GDCore/PlatformDefinition/ImageManager.h"
+#include "GDCore/Extensions/Builtin/SpriteExtension/SpriteObject.h"
+#include "GDCore/Extensions/Builtin/SpriteExtension/Animation.h"
+#include "GDCore/Extensions/Builtin/SpriteExtension/Direction.h"
+#include "GDCore/Extensions/Builtin/SpriteExtension/Sprite.h"
+#include "GDCore/Project/Project.h"
+#include "GDCore/Project/Layout.h"
+#include "GDCore/Project/Object.h"
+#include "GDCore/Project/ImageManager.h"
 #include "GDCore/Serialization/SerializerElement.h"
-#include "GDCore/PlatformDefinition/InitialInstance.h"
+#include "GDCore/Project/InitialInstance.h"
 #include "GDCore/CommonTools.h"
 
 #if defined(GD_IDE_ONLY)
 #include <SFML/Graphics.hpp>
-#include "GDCore/IDE/ArbitraryResourceWorker.h"
+#include "GDCore/IDE/Project/ArbitraryResourceWorker.h"
 #include "GDCore/IDE/Dialogs/MainFrameWrapper.h"
 #include "GDCore/IDE/Dialogs/PropertyDescriptor.h"
-#include "GDCore/BuiltinExtensions/SpriteExtension/Dialogs/SpriteObjectEditor.h"
+#include "GDCore/Extensions/Builtin/SpriteExtension/Dialogs/SpriteObjectEditor.h"
 #endif
 
 namespace gd {

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

@@ -1,15 +1,15 @@
 /*
  * GDevelop Core
- * Copyright 2008-2015 Florian Rival (Florian.Rival@gmail.com). All rights reserved.
+ * Copyright 2008-2016 Florian Rival (Florian.Rival@gmail.com). All rights reserved.
  * This project is released under the MIT License.
  */
 
 #ifndef GDCORE_SPRITEOBJECT_H
 #define GDCORE_SPRITEOBJECT_H
-#include "GDCore/PlatformDefinition/Object.h"
-#include "GDCore/BuiltinExtensions/SpriteExtension/Animation.h"
-#include "GDCore/BuiltinExtensions/SpriteExtension/Direction.h"
-#include "GDCore/BuiltinExtensions/SpriteExtension/Sprite.h"
+#include "GDCore/Project/Object.h"
+#include "GDCore/Extensions/Builtin/SpriteExtension/Animation.h"
+#include "GDCore/Extensions/Builtin/SpriteExtension/Direction.h"
+#include "GDCore/Extensions/Builtin/SpriteExtension/Sprite.h"
 namespace gd { class InitialInstance; }
 namespace gd { class Object; }
 namespace gd { class Layout; }

Core/GDCore/Extensions/Builtin/StringInstructionsExtension.cpp

@@ -1,6 +1,6 @@
 /*
  * GDevelop Core
- * Copyright 2008-2015 Florian Rival (Florian.Rival@gmail.com). All rights reserved.
+ * Copyright 2008-2016 Florian Rival (Florian.Rival@gmail.com). All rights reserved.
  * This project is released under the MIT License.
  */
 #include "AllBuiltinExtensions.h"

Core/GDCore/Extensions/Builtin/TimeExtension.cpp

@@ -1,6 +1,6 @@
 /*
  * GDevelop Core
- * Copyright 2008-2015 Florian Rival (Florian.Rival@gmail.com). All rights reserved.
+ * Copyright 2008-2016 Florian Rival (Florian.Rival@gmail.com). All rights reserved.
  * This project is released under the MIT License.
  */
 #include "AllBuiltinExtensions.h"