diff --git a/IDE/BugReport.cpp b/IDE/BugReport.cpp index 158a60c8c1..13aed2b924 100644 --- a/IDE/BugReport.cpp +++ b/IDE/BugReport.cpp @@ -1,6 +1,6 @@ /** \file * Game Develop - * 2008-2011 Florian Rival (Florian.Rival@gmail.com) + * 2008-2012 Florian Rival (Florian.Rival@gmail.com) */ #include "BugReport.h" diff --git a/IDE/BuildMessagesPnl.cpp b/IDE/BuildMessagesPnl.cpp index c7dd02b404..5005ea4f8e 100644 --- a/IDE/BuildMessagesPnl.cpp +++ b/IDE/BuildMessagesPnl.cpp @@ -1,6 +1,6 @@ /** \file * Game Develop - * 2008-2011 Florian Rival (Florian.Rival@gmail.com) + * 2008-2012 Florian Rival (Florian.Rival@gmail.com) */ #include "BuildMessagesPnl.h" diff --git a/IDE/BuildMessagesPnl.h b/IDE/BuildMessagesPnl.h index c6281dd1b2..7ba820e642 100644 --- a/IDE/BuildMessagesPnl.h +++ b/IDE/BuildMessagesPnl.h @@ -1,6 +1,6 @@ /** \file * Game Develop - * 2008-2011 Florian Rival (Florian.Rival@gmail.com) + * 2008-2012 Florian Rival (Florian.Rival@gmail.com) */ #ifndef BUILDMESSAGESPNL_H diff --git a/IDE/BuildProgressPnl.cpp b/IDE/BuildProgressPnl.cpp index 10dca78b54..1ab5b509a7 100644 --- a/IDE/BuildProgressPnl.cpp +++ b/IDE/BuildProgressPnl.cpp @@ -1,6 +1,6 @@ /** \file * Game Develop - * 2008-2011 Florian Rival (Florian.Rival@gmail.com) + * 2008-2012 Florian Rival (Florian.Rival@gmail.com) */ #include "BuildProgressPnl.h" diff --git a/IDE/BuildProgressPnl.h b/IDE/BuildProgressPnl.h index b6ebd579c2..94d0b0071a 100644 --- a/IDE/BuildProgressPnl.h +++ b/IDE/BuildProgressPnl.h @@ -1,6 +1,6 @@ /** \file * Game Develop - * 2008-2011 Florian Rival (Florian.Rival@gmail.com) + * 2008-2012 Florian Rival (Florian.Rival@gmail.com) */ #ifndef BUILDPROGRESSPNL_H diff --git a/IDE/CheckMAJ.cpp b/IDE/CheckMAJ.cpp index 5eabf0d76c..cf582c3f1f 100644 --- a/IDE/CheckMAJ.cpp +++ b/IDE/CheckMAJ.cpp @@ -1,6 +1,6 @@ /** \file * Game Develop - * 2008-2011 Florian Rival (Florian.Rival@gmail.com) + * 2008-2012 Florian Rival (Florian.Rival@gmail.com) */ #include "CheckMAJ.h" diff --git a/IDE/CheckMAJ.h b/IDE/CheckMAJ.h index 622f1d2346..c87e82e787 100644 --- a/IDE/CheckMAJ.h +++ b/IDE/CheckMAJ.h @@ -1,6 +1,6 @@ /** \file * Game Develop - * 2008-2011 Florian Rival (Florian.Rival@gmail.com) + * 2008-2012 Florian Rival (Florian.Rival@gmail.com) */ #ifndef CHECKMAJ_H diff --git a/IDE/ChoiceFile.cpp b/IDE/ChoiceFile.cpp index fbd6f7f758..1a57404885 100644 --- a/IDE/ChoiceFile.cpp +++ b/IDE/ChoiceFile.cpp @@ -1,6 +1,6 @@ /** \file * Game Develop - * 2008-2011 Florian Rival (Florian.Rival@gmail.com) + * 2008-2012 Florian Rival (Florian.Rival@gmail.com) */ #include "ChoiceFile.h" diff --git a/IDE/ChoiceFile.h b/IDE/ChoiceFile.h index 4b85fc08bd..21f610e478 100644 --- a/IDE/ChoiceFile.h +++ b/IDE/ChoiceFile.h @@ -1,6 +1,6 @@ /** \file * Game Develop - * 2008-2011 Florian Rival (Florian.Rival@gmail.com) + * 2008-2012 Florian Rival (Florian.Rival@gmail.com) */ #ifndef CHOICEFILE_H diff --git a/IDE/ChoiceJoyAxis.cpp b/IDE/ChoiceJoyAxis.cpp index d01eec8951..8d6a657885 100644 --- a/IDE/ChoiceJoyAxis.cpp +++ b/IDE/ChoiceJoyAxis.cpp @@ -1,6 +1,6 @@ /** \file * Game Develop - * 2008-2011 Florian Rival (Florian.Rival@gmail.com) + * 2008-2012 Florian Rival (Florian.Rival@gmail.com) */ #include "ChoiceJoyAxis.h" diff --git a/IDE/ChoiceJoyAxis.h b/IDE/ChoiceJoyAxis.h index d0b4dca4a1..07f9acddb9 100644 --- a/IDE/ChoiceJoyAxis.h +++ b/IDE/ChoiceJoyAxis.h @@ -1,6 +1,6 @@ /** \file * Game Develop - * 2008-2011 Florian Rival (Florian.Rival@gmail.com) + * 2008-2012 Florian Rival (Florian.Rival@gmail.com) */ #ifndef CHOICEJOYAXIS_H diff --git a/IDE/ChoixAction.cpp b/IDE/ChoixAction.cpp index 8e6ca357cd..27e09596cc 100644 --- a/IDE/ChoixAction.cpp +++ b/IDE/ChoixAction.cpp @@ -1,6 +1,6 @@ /** \file * Game Develop - * 2008-2011 Florian Rival (Florian.Rival@gmail.com) + * 2008-2012 Florian Rival (Florian.Rival@gmail.com) */ #include "ChoixAction.h" diff --git a/IDE/ChoixAction.h b/IDE/ChoixAction.h index 1e993fe025..73fd76702f 100644 --- a/IDE/ChoixAction.h +++ b/IDE/ChoixAction.h @@ -1,6 +1,6 @@ /** \file * Game Develop - * 2008-2011 Florian Rival (Florian.Rival@gmail.com) + * 2008-2012 Florian Rival (Florian.Rival@gmail.com) */ #ifndef CHOIXACTION_H diff --git a/IDE/ChoixCondition.cpp b/IDE/ChoixCondition.cpp index 6994b9ceeb..72f83e815b 100644 --- a/IDE/ChoixCondition.cpp +++ b/IDE/ChoixCondition.cpp @@ -1,6 +1,6 @@ /** \file * Game Develop - * 2008-2011 Florian Rival (Florian.Rival@gmail.com) + * 2008-2012 Florian Rival (Florian.Rival@gmail.com) */ #include "CppUnitLite/TestHarness.h" diff --git a/IDE/ChoixCondition.h b/IDE/ChoixCondition.h index 272bac46b5..7bf4db382f 100644 --- a/IDE/ChoixCondition.h +++ b/IDE/ChoixCondition.h @@ -1,6 +1,6 @@ /** \file * Game Develop - * 2008-2011 Florian Rival (Florian.Rival@gmail.com) + * 2008-2012 Florian Rival (Florian.Rival@gmail.com) */ #ifndef CHOIXCONDITION_H diff --git a/IDE/CodeEditor.cpp b/IDE/CodeEditor.cpp index 97e98ee04e..2d210225be 100644 --- a/IDE/CodeEditor.cpp +++ b/IDE/CodeEditor.cpp @@ -1,6 +1,6 @@ /** \file * Game Develop - * 2008-2011 Florian Rival (Florian.Rival@gmail.com) + * 2008-2012 Florian Rival (Florian.Rival@gmail.com) */ #include "CodeEditor.h" diff --git a/IDE/Compilation.cpp b/IDE/Compilation.cpp index 29c6f56715..89dd7c3716 100644 --- a/IDE/Compilation.cpp +++ b/IDE/Compilation.cpp @@ -1,6 +1,6 @@ /** \file * Game Develop - * 2008-2011 Florian Rival (Florian.Rival@gmail.com) + * 2008-2012 Florian Rival (Florian.Rival@gmail.com) */ //(*InternalHeaders(Compilation) diff --git a/IDE/ConsoleManager.h b/IDE/ConsoleManager.h index a3452b5fe0..e546d34124 100644 --- a/IDE/ConsoleManager.h +++ b/IDE/ConsoleManager.h @@ -1,6 +1,6 @@ /** \file * Game Develop - * 2008-2011 Florian Rival (Florian.Rival@gmail.com) + * 2008-2012 Florian Rival (Florian.Rival@gmail.com) */ #ifndef CONSOLEMANAGER_H diff --git a/IDE/Credits.cpp b/IDE/Credits.cpp index afe9f92dec..482e16f2f9 100644 --- a/IDE/Credits.cpp +++ b/IDE/Credits.cpp @@ -1,6 +1,6 @@ /** \file * Game Develop - * 2008-2011 Florian Rival (Florian.Rival@gmail.com) + * 2008-2012 Florian Rival (Florian.Rival@gmail.com) */ #include "Credits.h" diff --git a/IDE/EditPropJeu.cpp b/IDE/EditPropJeu.cpp index 2bcb3bcaff..ba98e8f473 100644 --- a/IDE/EditPropJeu.cpp +++ b/IDE/EditPropJeu.cpp @@ -1,6 +1,6 @@ /** \file * Game Develop - * 2008-2011 Florian Rival (Florian.Rival@gmail.com) + * 2008-2012 Florian Rival (Florian.Rival@gmail.com) */ #include "EditPropJeu.h" diff --git a/IDE/EditorObjets.cpp b/IDE/EditorObjets.cpp index 13a2fbeee4..eecdf26ddd 100644 --- a/IDE/EditorObjets.cpp +++ b/IDE/EditorObjets.cpp @@ -1,6 +1,6 @@ /** \file * Game Develop - * 2008-2011 Florian Rival (Florian.Rival@gmail.com) + * 2008-2012 Florian Rival (Florian.Rival@gmail.com) */ #ifdef __WXMSW__ diff --git a/IDE/EditorObjets.h b/IDE/EditorObjets.h index 83e4766db9..180ecaf7a6 100644 --- a/IDE/EditorObjets.h +++ b/IDE/EditorObjets.h @@ -1,6 +1,6 @@ /** \file * Game Develop - * 2008-2011 Florian Rival (Florian.Rival@gmail.com) + * 2008-2012 Florian Rival (Florian.Rival@gmail.com) */ #ifndef EDITOROBJETS_H diff --git a/IDE/EditorObjetsGroups.h b/IDE/EditorObjetsGroups.h index 0634138197..0dcbe72dad 100644 --- a/IDE/EditorObjetsGroups.h +++ b/IDE/EditorObjetsGroups.h @@ -7,6 +7,7 @@ #include #include //*) +#include #include #include #include diff --git a/IDE/EventsEditor.cpp b/IDE/EventsEditor.cpp index 8506d4891f..3bef461b2c 100644 --- a/IDE/EventsEditor.cpp +++ b/IDE/EventsEditor.cpp @@ -1,6 +1,6 @@ /** \file * Game Develop - * 2008-2011 Florian Rival (Florian.Rival@gmail.com) + * 2008-2012 Florian Rival (Florian.Rival@gmail.com) */ #include "EventsEditor.h" diff --git a/IDE/EventsEditor.h b/IDE/EventsEditor.h index bed270a934..7809cfd7d9 100644 --- a/IDE/EventsEditor.h +++ b/IDE/EventsEditor.h @@ -1,6 +1,6 @@ /** \file * Game Develop - * 2008-2011 Florian Rival (Florian.Rival@gmail.com) + * 2008-2012 Florian Rival (Florian.Rival@gmail.com) */ #ifndef EVENTSEDITOR_H @@ -16,6 +16,8 @@ #include #include //*) +#include +#include #include #include #include "GDL/MainEditorCommand.h" diff --git a/IDE/EventsRefactorer.cpp b/IDE/EventsRefactorer.cpp index 84be578141..8e167f655d 100644 --- a/IDE/EventsRefactorer.cpp +++ b/IDE/EventsRefactorer.cpp @@ -678,7 +678,7 @@ vector < boost::weak_ptr > EventsRefactorer::SearchInEvents(Game & ga if ( events[i]->CanHaveSubEvents() ) { - vector < boost::weak_ptr > subResults = SearchInEvents(game, scene, events[i]->GetSubEvents(), search, matchCase, inConditions, inActions);; + vector < boost::weak_ptr > subResults = SearchInEvents(game, scene, events[i]->GetSubEvents(), search, matchCase, inConditions, inActions); std::copy(subResults.begin(), subResults.end(), std::back_inserter(results)); } } diff --git a/IDE/ExternalEventsEditor.cpp b/IDE/ExternalEventsEditor.cpp index a8f44f4e17..27e4642c69 100644 --- a/IDE/ExternalEventsEditor.cpp +++ b/IDE/ExternalEventsEditor.cpp @@ -6,6 +6,7 @@ //*) #include #include +#include #include "GDL/ExternalEvents.h" #include "GDL/Game.h" #include "GDL/MainEditorCommand.h" diff --git a/IDE/Fusion.cpp b/IDE/Fusion.cpp index 692018847d..c68abc6c79 100644 --- a/IDE/Fusion.cpp +++ b/IDE/Fusion.cpp @@ -1,6 +1,6 @@ /** \file * Game Develop - * 2008-2011 Florian Rival (Florian.Rival@gmail.com) + * 2008-2012 Florian Rival (Florian.Rival@gmail.com) */ #include "Fusion.h" diff --git a/IDE/Game_Develop_EditorApp.cpp b/IDE/Game_Develop_EditorApp.cpp index a67a069ce1..9dfd9f2f94 100644 --- a/IDE/Game_Develop_EditorApp.cpp +++ b/IDE/Game_Develop_EditorApp.cpp @@ -1,6 +1,6 @@ /** \file * Game Develop - * 2008-2011 Florian Rival (Florian.Rival@gmail.com) + * 2008-2012 Florian Rival (Florian.Rival@gmail.com) */ //This file was created 2008-03-01 diff --git a/IDE/Game_Develop_EditorApp.h b/IDE/Game_Develop_EditorApp.h index 9892816874..d6a80532a6 100644 --- a/IDE/Game_Develop_EditorApp.h +++ b/IDE/Game_Develop_EditorApp.h @@ -1,6 +1,6 @@ /** \file * Game Develop - * 2008-2011 Florian Rival (Florian.Rival@gmail.com) + * 2008-2012 Florian Rival (Florian.Rival@gmail.com) */ #ifndef GAME_DEVELOP_EDITORAPP_H diff --git a/IDE/Game_Develop_EditorMain.cpp b/IDE/Game_Develop_EditorMain.cpp index 6b9d14b6d2..8d2f94cc0e 100644 --- a/IDE/Game_Develop_EditorMain.cpp +++ b/IDE/Game_Develop_EditorMain.cpp @@ -1,6 +1,6 @@ /** \file * Game Develop - * 2008-2011 Florian Rival (Florian.Rival@gmail.com) + * 2008-2012 Florian Rival (Florian.Rival@gmail.com) */ //(*InternalHeaders(Game_Develop_EditorFrame) @@ -56,6 +56,7 @@ //(*IdInit(Game_Develop_EditorFrame) const long Game_Develop_EditorFrame::ID_PANEL3 = wxNewId(); +const long Game_Develop_EditorFrame::ID_CUSTOM1 = wxNewId(); const long Game_Develop_EditorFrame::ID_AUINOTEBOOK1 = wxNewId(); const long Game_Develop_EditorFrame::ID_PANEL1 = wxNewId(); const long Game_Develop_EditorFrame::ID_MENUITEM1 = wxNewId(); @@ -97,13 +98,16 @@ END_EVENT_TABLE() /** - * Constructor : Create window + * Constructor of the main frame. */ Game_Develop_EditorFrame::Game_Develop_EditorFrame( wxWindow* parent, bool createEmptyProject) : gameCurrentlyEdited(0), m_ribbon(NULL), ribbonSceneEditorButtonBar(NULL), -buildToolsPnl(NULL) +buildToolsPnl(NULL), +mainEditorCommand(NULL, NULL, this, NULL, NULL, NULL, &scenesLockingShortcuts), +startPage(NULL), +projectManager(NULL) { //(*Initialize(Game_Develop_EditorFrame) @@ -142,7 +146,9 @@ buildToolsPnl(NULL) Panel1 = new wxPanel(this, ID_PANEL1, wxDefaultPosition, wxSize(629,484), wxTAB_TRAVERSAL, _T("ID_PANEL1")); FlexGridSizer2 = new wxFlexGridSizer(0, 1, 0, 0); FlexGridSizer2->AddGrowableCol(0); - FlexGridSizer2->AddGrowableRow(0); + FlexGridSizer2->AddGrowableRow(1); + infoBar = new wxInfoBar(Panel1,ID_CUSTOM1); + FlexGridSizer2->Add(infoBar, 1, wxALL|wxEXPAND|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 0); editorsNotebook = new wxAuiNotebook(Panel1, ID_AUINOTEBOOK1, wxDefaultPosition, wxDefaultSize, wxAUI_NB_TAB_SPLIT|wxAUI_NB_TAB_MOVE|wxAUI_NB_SCROLL_BUTTONS|wxAUI_NB_TOP|wxNO_BORDER); FlexGridSizer2->Add(editorsNotebook, 1, wxALL|wxEXPAND|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 0); Panel1->SetSizer(FlexGridSizer2); @@ -240,7 +246,7 @@ buildToolsPnl(NULL) //Create status bar MyStatusBar * myStatusBar = new MyStatusBar(this); - myStatusBar->SetStatusText( "2008-2011 Compil Games", 1 ); + myStatusBar->SetStatusText( "2008-2012 Compil Games", 1 ); SetStatusBar(myStatusBar); //Ribbon setup @@ -395,6 +401,10 @@ buildToolsPnl(NULL) UpdateNotebook(); m_ribbon->Realize(); + infoBar->SetShowHideEffects(wxSHOW_EFFECT_SLIDE_TO_BOTTOM, wxSHOW_EFFECT_BLEND); + + mainEditorCommand = MainEditorCommand(m_ribbon, ribbonSceneEditorButtonBar, this, buildToolsPnl, &m_mgr, infoBar, &scenesLockingShortcuts); + SetSize(900,740); Center(); Maximize(true); diff --git a/IDE/Game_Develop_EditorMain.h b/IDE/Game_Develop_EditorMain.h index 59edd5e19e..819658879c 100644 --- a/IDE/Game_Develop_EditorMain.h +++ b/IDE/Game_Develop_EditorMain.h @@ -1,6 +1,6 @@ /** \file * Game Develop - * 2008-2011 Florian Rival (Florian.Rival@gmail.com) + * 2008-2012 Florian Rival (Florian.Rival@gmail.com) */ #ifndef GAME_DEVELOP_EDITORMAIN_H @@ -12,6 +12,7 @@ #include #include #include +#include #include //*) #include "wx/aui/aui.h" @@ -104,6 +105,11 @@ class Game_Develop_EditorFrame: public wxFrame inline const wxAuiNotebook * GetEditorsNotebook() const { return editorsNotebook; }; inline wxAuiNotebook * GetEditorsNotebook() { return editorsNotebook; }; + /** + * Get a lightweight interface to this class. + */ + MainEditorCommand & GetMainEditorCommand() { return mainEditorCommand; }; + /** * Get a pointer to the ribbon */ @@ -235,6 +241,7 @@ class Game_Develop_EditorFrame: public wxFrame //(*Identifiers(Game_Develop_EditorFrame) static const long ID_PANEL3; + static const long ID_CUSTOM1; static const long ID_AUINOTEBOOK1; static const long ID_PANEL1; static const long ID_MENUITEM1; @@ -276,6 +283,7 @@ class Game_Develop_EditorFrame: public wxFrame wxMenuItem* MenuItem10; wxMenu decomposerContextMenu; wxPanel* ribbonPanel; + wxInfoBar* infoBar; wxMenuItem* MenuItem43; wxMenu saveContextMenu; //*) @@ -284,6 +292,7 @@ class Game_Develop_EditorFrame: public wxFrame wxRibbonButtonBar * ribbonSceneEditorButtonBar; ///Pointer to the ribbon bar which can be changed by scene editors BuildToolsPnl * buildToolsPnl; std::vector scenesLockingShortcuts; + MainEditorCommand mainEditorCommand; StartHerePage * startPage; ProjectManager * projectManager; diff --git a/IDE/IDE.depend b/IDE/IDE.depend index 139134fa2e..197db866e0 100644 --- a/IDE/IDE.depend +++ b/IDE/IDE.depend @@ -15616,7 +15616,7 @@ 1253304853 d:\florian\programmation\gamedevelop2\extlibs\wxwidgets\include\wx\palmos\imaglist.h "wx/bitmap.h" -1319824888 d:\florian\programmation\gamedevelop2\gdl\gdl\game.h +1325278120 d:\florian\programmation\gamedevelop2\gdl\gdl\game.h @@ -15627,7 +15627,7 @@ "GDL/LoadingScreen.h" "GDL/ResourcesManager.h" -1325101458 d:\florian\programmation\gamedevelop2\gdl\gdl\object.h +1325278120 d:\florian\programmation\gamedevelop2\gdl\gdl\object.h "GDL/Force.h" @@ -16871,9 +16871,9 @@ 1253304910 d:\florian\programmation\gamedevelop2\extlibs\wxwidgets\include\wx\cocoa\mdi.h "wx/frame.h" -1312665277 d:\florian\programmation\gamedevelop2\gdl\gdl\force.h +1325278120 d:\florian\programmation\gamedevelop2\gdl\gdl\force.h -1325101458 d:\florian\programmation\gamedevelop2\gdl\gdl\event.h +1325278120 d:\florian\programmation\gamedevelop2\gdl\gdl\event.h @@ -20316,17 +20316,17 @@ -1313668931 d:\florian\programmation\gamedevelop2\gdl\gdl\log.h +1325278120 d:\florian\programmation\gamedevelop2\gdl\gdl\log.h -1325101458 d:\florian\programmation\gamedevelop2\gdl\gdl\instruction.h +1325278120 d:\florian\programmation\gamedevelop2\gdl\gdl\instruction.h "GDL/GDExpression.h" -1308405099 d:\florian\programmation\gamedevelop2\gdl\gdl\gdexpression.h +1325278120 d:\florian\programmation\gamedevelop2\gdl\gdl\gdexpression.h @@ -20698,12 +20698,12 @@ -1325101458 d:\florian\programmation\gamedevelop2\gdl\gdl\expressioninstruction.h +1325278120 d:\florian\programmation\gamedevelop2\gdl\gdl\expressioninstruction.h -1325101458 d:\florian\programmation\gamedevelop2\gdl\gdl\strexpressioninstruction.h +1325278121 d:\florian\programmation\gamedevelop2\gdl\gdl\strexpressioninstruction.h @@ -20746,22 +20746,22 @@ -1297527793 d:\florian\programmation\gamedevelop2\gdl\gdl\listvariable.h +1325278120 d:\florian\programmation\gamedevelop2\gdl\gdl\listvariable.h "GDL/Variable.h" -1314210839 d:\florian\programmation\gamedevelop2\gdl\gdl\variable.h +1325278122 d:\florian\programmation\gamedevelop2\gdl\gdl\variable.h -1297520343 d:\florian\programmation\gamedevelop2\gdl\gdl\objecthelpers.h +1325278120 d:\florian\programmation\gamedevelop2\gdl\gdl\objecthelpers.h 1309119157 d:\florian\programmation\gamedevelop2\gdl\gdl\rotatedrectangle.h -1320525687 d:\florian\programmation\gamedevelop2\gdl\gdl\scene.h +1325278121 d:\florian\programmation\gamedevelop2\gdl\gdl\scene.h "GDL/Event.h" @@ -20772,7 +20772,7 @@ "GDL/Position.h" "GDL/Layer.h" -1308405409 d:\florian\programmation\gamedevelop2\gdl\gdl\objectgroup.h +1325278120 d:\florian\programmation\gamedevelop2\gdl\gdl\objectgroup.h @@ -22322,37 +22322,37 @@ -1297540952 d:\florian\programmation\gamedevelop2\gdl\gdl\position.h +1325278121 d:\florian\programmation\gamedevelop2\gdl\gdl\position.h -1297524574 d:\florian\programmation\gamedevelop2\gdl\gdl\layer.h +1325278120 d:\florian\programmation\gamedevelop2\gdl\gdl\layer.h "GDL/Camera.h" -1297525936 d:\florian\programmation\gamedevelop2\gdl\gdl\camera.h +1325278119 d:\florian\programmation\gamedevelop2\gdl\gdl\camera.h -1297520342 d:\florian\programmation\gamedevelop2\gdl\gdl\dossier.h +1325278119 d:\florian\programmation\gamedevelop2\gdl\gdl\dossier.h -1308410764 d:\florian\programmation\gamedevelop2\gdl\gdl\image.h +1325278120 d:\florian\programmation\gamedevelop2\gdl\gdl\image.h -1297524574 d:\florian\programmation\gamedevelop2\gdl\gdl\loadingscreen.h +1325278120 d:\florian\programmation\gamedevelop2\gdl\gdl\loadingscreen.h -1308398453 d:\florian\programmation\gamedevelop2\gdl\gdl\automatism.h +1325278119 d:\florian\programmation\gamedevelop2\gdl\gdl\automatism.h -1319659433 d:\florian\programmation\gamedevelop2\gdl\gdl\extensionsmanager.h +1325278120 d:\florian\programmation\gamedevelop2\gdl\gdl\extensionsmanager.h @@ -22360,7 +22360,7 @@ -1325099289 d:\florian\programmation\gamedevelop2\gdl\gdl\extensionbase.h +1325278120 d:\florian\programmation\gamedevelop2\gdl\gdl\extensionbase.h @@ -22900,7 +22900,7 @@ 1307986684 d:\florian\programmation\gamedevelop2\extlibs\wxwidgets\include\wx\os2\minifram.h "wx/frame.h" -1298493501 source:d:\florian\programmation\gamedevelop2\ide\buildmessagespnl.cpp +1325278122 source:d:\florian\programmation\gamedevelop2\ide\buildmessagespnl.cpp "BuildMessagesPnl.h" @@ -22908,7 +22908,7 @@ "GDL/CommonTools.h" "ProjectManager.h" -1297530283 d:\florian\programmation\gamedevelop2\ide\buildmessagespnl.h +1325278122 d:\florian\programmation\gamedevelop2\ide\buildmessagespnl.h @@ -22919,7 +22919,7 @@ -1313669014 d:\florian\programmation\gamedevelop2\gdl\gdl\commontools.h +1325278119 d:\florian\programmation\gamedevelop2\gdl\gdl\commontools.h @@ -22996,7 +22996,7 @@ -1297597563 d:\florian\programmation\gamedevelop2\ide\buildprogresspnl.h +1325278122 d:\florian\programmation\gamedevelop2\ide\buildprogresspnl.h @@ -23005,7 +23005,7 @@ "GDL/SourceFileBuilder.h" -1324920970 d:\florian\programmation\gamedevelop2\gdl\gdl\sourcefilebuilder.h +1325278121 d:\florian\programmation\gamedevelop2\gdl\gdl\sourcefilebuilder.h @@ -23018,7 +23018,7 @@ "wx/stream.h" "wx/utils.h" -1297525498 d:\florian\programmation\gamedevelop2\gdl\gdl\compilertoolchainpathmanager.h +1325278119 d:\florian\programmation\gamedevelop2\gdl\gdl\compilertoolchainpathmanager.h 1301765482 source:d:\florian\programmation\gamedevelop2\ide\wxstedit\src\steshell.cpp "wx/wxprec.h" @@ -23029,13 +23029,13 @@ 1171506042 d:\florian\programmation\gamedevelop2\ide\wxstedit\include\wx\stedit\steshell.h "wx/stedit/stedefs.h" -1311947741 source:d:\florian\programmation\gamedevelop2\ide\choicefile.cpp +1325278122 source:d:\florian\programmation\gamedevelop2\ide\choicefile.cpp "ChoiceFile.h" "GDL/EditTextDialog.h" -1311947741 d:\florian\programmation\gamedevelop2\ide\choicefile.h +1325278122 d:\florian\programmation\gamedevelop2\ide\choicefile.h @@ -23070,7 +23070,7 @@ 1307986701 d:\florian\programmation\gamedevelop2\extlibs\wxwidgets\include\wx\generic\hyperlink.h -1311947741 source:d:\florian\programmation\gamedevelop2\ide\choicejoyaxis.cpp +1325278122 source:d:\florian\programmation\gamedevelop2\ide\choicejoyaxis.cpp "ChoiceJoyAxis.h" @@ -23078,7 +23078,7 @@ "GDL/EditTextDialog.h" -1311947741 d:\florian\programmation\gamedevelop2\ide\choicejoyaxis.h +1325278122 d:\florian\programmation\gamedevelop2\ide\choicejoyaxis.h @@ -23088,7 +23088,7 @@ -1325008666 source:d:\florian\programmation\gamedevelop2\ide\choixaction.cpp +1325278122 source:d:\florian\programmation\gamedevelop2\ide\choixaction.cpp "ChoixAction.h" @@ -23130,7 +23130,7 @@ -1300628570 d:\florian\programmation\gamedevelop2\ide\choixaction.h +1325278122 d:\florian\programmation\gamedevelop2\ide\choixaction.h @@ -23296,7 +23296,7 @@ "wx/filesys.h" "wx/hashmap.h" -1313245253 d:\florian\programmation\gamedevelop2\gdl\gdl\translateaction.h +1325278122 d:\florian\programmation\gamedevelop2\gdl\gdl\translateaction.h @@ -23354,7 +23354,7 @@ -1297523268 d:\florian\programmation\gamedevelop2\gdl\gdl\bitmapguimanager.h +1325278119 d:\florian\programmation\gamedevelop2\gdl\gdl\bitmapguimanager.h @@ -23416,7 +23416,7 @@ -1297520343 d:\florian\programmation\gamedevelop2\gdl\gdl\objectlistdialogshelper.h +1325278121 d:\florian\programmation\gamedevelop2\gdl\gdl\objectlistdialogshelper.h @@ -24440,7 +24440,7 @@ -1306952418 source:d:\florian\programmation\gamedevelop2\ide\buildprogresspnl.cpp +1325278122 source:d:\florian\programmation\gamedevelop2\ide\buildprogresspnl.cpp "BuildProgressPnl.h" @@ -24454,7 +24454,7 @@ "wx/stream.h" "wx/convauto.h" -1322940341 d:\florian\programmation\gamedevelop2\ide\scenecanvas.h +1325286129 d:\florian\programmation\gamedevelop2\ide\scenecanvas.h "wxSFMLCanvas.hpp" @@ -24467,6 +24467,8 @@ + + "GDL/Object.h" "GDL/Collisions.h" "GDL/Event.h" @@ -24531,14 +24533,14 @@ "wx/icon.h" "wx/aui/auibook.h" -1309719595 d:\florian\programmation\gamedevelop2\gdl\gdl\collisions.h +1325278119 d:\florian\programmation\gamedevelop2\gdl\gdl\collisions.h "GDL/SpriteObject.h" -1325101458 d:\florian\programmation\gamedevelop2\gdl\gdl\spriteobject.h +1325278121 d:\florian\programmation\gamedevelop2\gdl\gdl\spriteobject.h "GDL/Object.h" "GDL/Animation.h" @@ -24552,7 +24554,7 @@ 1297528174 d:\florian\programmation\gamedevelop2\gdl\gdl\point.h -1312667272 d:\florian\programmation\gamedevelop2\gdl\gdl\animation.h +1325278119 d:\florian\programmation\gamedevelop2\gdl\gdl\animation.h @@ -24562,7 +24564,7 @@ "GDL/Sprite.h" -1319816389 d:\florian\programmation\gamedevelop2\gdl\gdl\runtimescene.h +1325278121 d:\florian\programmation\gamedevelop2\gdl\gdl\runtimescene.h "GDL/Scene.h" @@ -24588,7 +24590,7 @@ 1305403438 d:\florian\programmation\gamedevelop2\extlibs\llvm\include\llvm\llvmcontext.h -1316276504 d:\florian\programmation\gamedevelop2\gdl\gdl\runtimegame.h +1325278121 d:\florian\programmation\gamedevelop2\gdl\gdl\runtimegame.h "GDL/Game.h" "GDL/ImageManager.h" @@ -24668,13 +24670,13 @@ -1314039353 d:\florian\programmation\gamedevelop2\gdl\gdl\music.h +1325278120 d:\florian\programmation\gamedevelop2\gdl\gdl\music.h 1297523942 d:\florian\programmation\gamedevelop2\gdl\gdl\constantes.h -1297539407 d:\florian\programmation\gamedevelop2\gdl\gdl\runtimelayer.h +1325278121 d:\florian\programmation\gamedevelop2\gdl\gdl\runtimelayer.h "GDL/Layer.h" "GDL/RuntimeCamera.h" @@ -24682,11 +24684,11 @@ 1268854766 d:\florian\programmation\gamedevelop2\gdl\gdl\runtimecamera.h "GDL/Camera.h" -1297522571 d:\florian\programmation\gamedevelop2\gdl\gdl\text.h +1325278121 d:\florian\programmation\gamedevelop2\gdl\gdl\text.h -1309958161 d:\florian\programmation\gamedevelop2\gdl\gdl\soundmanager.h +1325278121 d:\florian\programmation\gamedevelop2\gdl\gdl\soundmanager.h "GDL/Sound.h" "GDL/Music.h" @@ -24734,19 +24736,17 @@ 1264360630 d:\florian\programmation\gamedevelop2\gdl\gdl\btalignedallocator.h "GDL/btScalar.h" -1297527793 d:\florian\programmation\gamedevelop2\gdl\gdl\maineditorcommand.h - - - +1325292136 d:\florian\programmation\gamedevelop2\gdl\gdl\maineditorcommand.h + 1264364134 d:\florian\programmation\gamedevelop2\ide\memtrace.h -1322947362 d:\florian\programmation\gamedevelop2\ide\sceneedittimerenderer.h +1325278122 d:\florian\programmation\gamedevelop2\ide\sceneedittimerenderer.h "GDL/RuntimeScene.h" "GDL/Game.h" @@ -24762,7 +24762,7 @@ -1325008666 source:d:\florian\programmation\gamedevelop2\ide\choixcondition.cpp +1325278122 source:d:\florian\programmation\gamedevelop2\ide\choixcondition.cpp "CppUnitLite/TestHarness.h" "ChoixCondition.h" @@ -24831,7 +24831,7 @@ 1211550024 d:\florian\programmation\gamedevelop2\ide\cppunitlite\\cppunitlite\testregistry.h -1317473352 d:\florian\programmation\gamedevelop2\ide\choixcondition.h +1325278122 d:\florian\programmation\gamedevelop2\ide\choixcondition.h @@ -24850,7 +24850,7 @@ -1312902048 d:\florian\programmation\gamedevelop2\gdl\gdl\translatecondition.h +1325278122 d:\florian\programmation\gamedevelop2\gdl\gdl\translatecondition.h @@ -24920,12 +24920,12 @@ -1297521546 d:\florian\programmation\gamedevelop2\ide\templateevents.h +1325278122 d:\florian\programmation\gamedevelop2\ide\templateevents.h "GDL/Event.h" -1318161446 d:\florian\programmation\gamedevelop2\gdl\gdl\opensavegame.h +1325278121 d:\florian\programmation\gamedevelop2\gdl\gdl\opensavegame.h "GDL/Game.h" "GDL/tinyxml.h" @@ -24946,11 +24946,11 @@ "GDL/Instruction.h" "GDL/ExternalEvents.h" -1313665975 d:\florian\programmation\gamedevelop2\gdl\gdl\externalevents.h +1325278120 d:\florian\programmation\gamedevelop2\gdl\gdl\externalevents.h "GDL/Event.h" -1303723493 source:d:\florian\programmation\gamedevelop2\ide\codeeditor.cpp +1325278122 source:d:\florian\programmation\gamedevelop2\ide\codeeditor.cpp "CodeEditor.h" @@ -25009,7 +25009,7 @@ 1307986691 d:\florian\programmation\gamedevelop2\extlibs\wxwidgets\include\wx\osx\fontdlg.h "wx/dialog.h" -1315158180 source:d:\florian\programmation\gamedevelop2\ide\compilation.cpp +1325278122 source:d:\florian\programmation\gamedevelop2\ide\compilation.cpp @@ -25057,12 +25057,12 @@ -1297520343 d:\florian\programmation\gamedevelop2\gdl\gdl\opensaveloadingscreen.h +1325278121 d:\florian\programmation\gamedevelop2\gdl\gdl\opensaveloadingscreen.h "GDL/LoadingScreen.h" "GDL/tinyxml.h" -1317476824 d:\florian\programmation\gamedevelop2\gdl\gdl\resourcesmerginghelper.h +1325278121 d:\florian\programmation\gamedevelop2\gdl\gdl\resourcesmerginghelper.h @@ -25250,7 +25250,7 @@ "ConsoleFrame.h" -1297542356 d:\florian\programmation\gamedevelop2\ide\consolemanager.h +1325278122 d:\florian\programmation\gamedevelop2\ide\consolemanager.h 1303908014 source:d:\florian\programmation\gamedevelop2\ide\convertjrc.cpp "ConvertJRC.h" @@ -25388,7 +25388,7 @@ "GDL/BaseDebugger.h" -1297525936 d:\florian\programmation\gamedevelop2\gdl\gdl\basedebugger.h +1325278119 d:\florian\programmation\gamedevelop2\gdl\gdl\basedebugger.h 1324423750 source:d:\florian\programmation\gamedevelop2\ide\demarrage.cpp @@ -25424,12 +25424,13 @@ -1318081968 d:\florian\programmation\gamedevelop2\ide\game_develop_editormain.h +1325292876 d:\florian\programmation\gamedevelop2\ide\game_develop_editormain.h + "wx/aui/aui.h" @@ -25466,7 +25467,7 @@ "GDL/MainEditorCommand.h" "GDL/ImageFilesWatcher.h" -1316269935 d:\florian\programmation\gamedevelop2\gdl\gdl\imagefileswatcher.h +1325278120 d:\florian\programmation\gamedevelop2\gdl\gdl\imagefileswatcher.h @@ -25622,7 +25623,7 @@ "GDL/Position.h" "GDL/Object.h" -1314047295 source:d:\florian\programmation\gamedevelop2\ide\editpropjeu.cpp +1325278122 source:d:\florian\programmation\gamedevelop2\ide\editpropjeu.cpp "EditPropJeu.h" "nommgr.h" @@ -25659,12 +25660,12 @@ "GDL/Game.h" -1297524919 d:\florian\programmation\gamedevelop2\gdl\gdl\fontmanager.h +1325278120 d:\florian\programmation\gamedevelop2\gdl\gdl\fontmanager.h -1297522952 d:\florian\programmation\gamedevelop2\gdl\gdl\sourcefile.h +1325278121 d:\florian\programmation\gamedevelop2\gdl\gdl\sourcefile.h @@ -25763,18 +25764,18 @@ "GDL/EventsRenderingHelper.h" "GDL/Game.h" -1315131746 d:\florian\programmation\gamedevelop2\gdl\gdl\eventsrenderinghelper.h +1325278120 d:\florian\programmation\gamedevelop2\gdl\gdl\eventsrenderinghelper.h -1325101458 d:\florian\programmation\gamedevelop2\gdl\gdl\standardevent.h +1325278121 d:\florian\programmation\gamedevelop2\gdl\gdl\standardevent.h "Event.h" -1314037442 d:\florian\programmation\gamedevelop2\gdl\gdl\baseprofiler.h +1325278119 d:\florian\programmation\gamedevelop2\gdl\gdl\baseprofiler.h @@ -25793,7 +25794,7 @@ "GDL/Event.h" -1297521546 d:\florian\programmation\gamedevelop2\ide\profiledlg.h +1325278122 d:\florian\programmation\gamedevelop2\ide\profiledlg.h @@ -25913,11 +25914,12 @@ -1285008194 d:\florian\programmation\gamedevelop2\ide\editorobjetsgroups.h +1325286213 d:\florian\programmation\gamedevelop2\ide\editorobjetsgroups.h + @@ -25955,12 +25957,12 @@ "GDL/ListVariable.h" -1308398453 d:\florian\programmation\gamedevelop2\gdl\gdl\automatismsshareddatas.h +1325278119 d:\florian\programmation\gamedevelop2\gdl\gdl\automatismsshareddatas.h "GDL/AutomatismsRuntimeSharedDatas.h" -1297520341 d:\florian\programmation\gamedevelop2\gdl\gdl\automatismsruntimeshareddatas.h +1325278119 d:\florian\programmation\gamedevelop2\gdl\gdl\automatismsruntimeshareddatas.h 1314877317 d:\florian\programmation\gamedevelop2\ide\eventsrefactorer.h @@ -25968,7 +25970,7 @@ -1308418321 source:d:\florian\programmation\gamedevelop2\ide\editorobjets.cpp +1325278122 source:d:\florian\programmation\gamedevelop2\ide\editorobjets.cpp "EditorObjets.h" @@ -25990,7 +25992,7 @@ "GDL/BitmapGUIManager.h" -1308418321 d:\florian\programmation\gamedevelop2\ide\editorobjets.h +1325278122 d:\florian\programmation\gamedevelop2\ide\editorobjets.h "EditorObjectList.h" @@ -26087,7 +26089,7 @@ "ErrorCompilation.h" "nommgr.h" -1325168208 source:d:\florian\programmation\gamedevelop2\ide\eventsrefactorer.cpp +1325268403 source:d:\florian\programmation\gamedevelop2\ide\eventsrefactorer.cpp "EventsRefactorer.h" "GDL/Event.h" "GDL/GDExpressionParser.h" @@ -26102,7 +26104,7 @@ -1313662459 d:\florian\programmation\gamedevelop2\gdl\gdl\gdexpressionparser.h +1325278120 d:\florian\programmation\gamedevelop2\gdl\gdl\gdexpressionparser.h @@ -26148,21 +26150,22 @@ "GDL/ExtensionsLoader.h" "GDL/gdTreeItemStringData.h" -1302441884 d:\florian\programmation\gamedevelop2\gdl\gdl\extensionsloader.h +1325278120 d:\florian\programmation\gamedevelop2\gdl\gdl\extensionsloader.h "GDL/DynamicLibrariesTools.h" -1314527954 d:\florian\programmation\gamedevelop2\gdl\gdl\dynamiclibrariestools.h +1325278119 d:\florian\programmation\gamedevelop2\gdl\gdl\dynamiclibrariestools.h -1314879215 source:d:\florian\programmation\gamedevelop2\ide\externaleventseditor.cpp +1325286408 source:d:\florian\programmation\gamedevelop2\ide\externaleventseditor.cpp "ExternalEventsEditor.h" + "GDL/ExternalEvents.h" "GDL/Game.h" "GDL/MainEditorCommand.h" @@ -26176,7 +26179,7 @@ "GDL/Scene.h" "GDL/MainEditorCommand.h" -1318104372 source:d:\florian\programmation\gamedevelop2\ide\fusion.cpp +1325278122 source:d:\florian\programmation\gamedevelop2\ide\fusion.cpp "Fusion.h" @@ -26221,7 +26224,7 @@ -1324920295 source:d:\florian\programmation\gamedevelop2\ide\game_develop_editorapp.cpp +1325278122 source:d:\florian\programmation\gamedevelop2\ide\game_develop_editorapp.cpp @@ -26341,7 +26344,7 @@ "wx/arrstr.h" "wx/cmdargs.h" -1315856306 d:\florian\programmation\gamedevelop2\ide\game_develop_editorapp.h +1325278122 d:\florian\programmation\gamedevelop2\ide\game_develop_editorapp.h @@ -26356,7 +26359,7 @@ -1324920438 d:\florian\programmation\gamedevelop2\ide\checkmaj.h +1325278122 d:\florian\programmation\gamedevelop2\ide\checkmaj.h 1292276995 d:\florian\programmation\gamedevelop2\ide\maj.h @@ -26390,16 +26393,16 @@ 1324504752 d:\florian\programmation\gamedevelop2\ide\compilationchecker.h -1309706027 d:\florian\programmation\gamedevelop2\gdl\gdl\spriteextension.h +1325278121 d:\florian\programmation\gamedevelop2\gdl\gdl\spriteextension.h "GDL/ExtensionBase.h" 1324504752 d:\florian\programmation\gamedevelop2\gdl\gdl\versionwrapper.h -1304159083 d:\florian\programmation\gamedevelop2\gdl\gdl\localemanager.h +1325278120 d:\florian\programmation\gamedevelop2\gdl\gdl\localemanager.h -1318159132 source:d:\florian\programmation\gamedevelop2\ide\game_develop_editormain.cpp +1325292876 source:d:\florian\programmation\gamedevelop2\ide\game_develop_editormain.cpp @@ -26615,7 +26618,7 @@ "wx/convauto.h" -1308418321 source:d:\florian\programmation\gamedevelop2\ide\mainaide.cpp +1325278122 source:d:\florian\programmation\gamedevelop2\ide\mainaide.cpp "Game_Develop_EditorMain.h" @@ -26636,7 +26639,7 @@ -1314717471 source:d:\florian\programmation\gamedevelop2\ide\mainfichier.cpp +1325278122 source:d:\florian\programmation\gamedevelop2\ide\mainfichier.cpp @@ -26657,7 +26660,7 @@ "ProjectManager.h" "StartHerePage.h" -1297525137 d:\florian\programmation\gamedevelop2\gdl\gdl\dynamicextensionsmanager.h +1325278119 d:\florian\programmation\gamedevelop2\gdl\gdl\dynamicextensionsmanager.h @@ -26773,7 +26776,7 @@ "green.xpm" "red.xpm" -1312669378 source:d:\florian\programmation\gamedevelop2\ide\newcppfiledlg.cpp +1325278122 source:d:\florian\programmation\gamedevelop2\ide\newcppfiledlg.cpp "NewCppFileDlg.h" @@ -26883,7 +26886,7 @@ -1314712470 source:d:\florian\programmation\gamedevelop2\ide\profiledlg.cpp +1325278122 source:d:\florian\programmation\gamedevelop2\ide\profiledlg.cpp "ProfileDlg.h" @@ -26892,14 +26895,14 @@ "SceneCanvas.h" -1325101722 d:\florian\programmation\gamedevelop2\gdl\gdl\profileevent.h +1325278121 d:\florian\programmation\gamedevelop2\gdl\gdl\profileevent.h "Event.h" "GDL/profile.h" -1325006958 source:d:\florian\programmation\gamedevelop2\ide\projectmanager.cpp +1325284212 source:d:\florian\programmation\gamedevelop2\ide\projectmanager.cpp "ProjectManager.h" @@ -26933,7 +26936,7 @@ -1313664349 d:\florian\programmation\gamedevelop2\gdl\gdl\commentevent.h +1325278119 d:\florian\programmation\gamedevelop2\gdl\gdl\commentevent.h "Event.h" 1279382587 d:\florian\programmation\gamedevelop2\extlibs\boost\boost\archive\xml_oarchive.hpp @@ -27448,7 +27451,7 @@ -1324165098 source:d:\florian\programmation\gamedevelop2\ide\scenecanvas.cpp +1325293310 source:d:\florian\programmation\gamedevelop2\ide\scenecanvas.cpp "SceneCanvas.h" @@ -27459,6 +27462,7 @@ + @@ -27493,6 +27497,7 @@ "DebuggerGUI.h" "GridSetup.h" "ProfileDlg.h" + 1322946313 source:d:\florian\programmation\gamedevelop2\ide\sceneedittimerenderer.cpp "SceneEdittimeRenderer.h" @@ -27539,8 +27544,7 @@ -1264360536 source:d:\florian\programmation\gamedevelop2\ide\splashscreen.cpp - "nommgr.h" +1325282387 source:d:\florian\programmation\gamedevelop2\ide\splashscreen.cpp @@ -27558,7 +27562,7 @@ "Game_Develop_EditorMain.h" -1297521546 source:d:\florian\programmation\gamedevelop2\ide\templateevents.cpp +1325278122 source:d:\florian\programmation\gamedevelop2\ide\templateevents.cpp "TemplateEvents.h" 1264360534 source:d:\florian\programmation\gamedevelop2\ide\trueorfalse.cpp @@ -27593,11 +27597,11 @@ "GDL/CommonTools.h" "mp3ogg.h" -1314613573 source:d:\florian\programmation\gamedevelop2\ide\resource.rc +1325278122 source:d:\florian\programmation\gamedevelop2\ide\resource.rc "version.h" "wx/msw/wx.rc" -1325169086 d:\florian\programmation\gamedevelop2\ide\version.h +1325293782 d:\florian\programmation\gamedevelop2\ide\version.h 1289485846 source:d:\florian\programmation\gamedevelop2\ide\wxsfmlcanvas.cpp "wxSFMLCanvas.hpp" @@ -27881,7 +27885,7 @@ 1307986706 d:\florian\programmation\gamedevelop2\extlibs\wxwidgets\include\wx\arrimpl.cpp -1324920412 source:d:\florian\programmation\gamedevelop2\ide\checkmaj.cpp +1325278122 source:d:\florian\programmation\gamedevelop2\ide\checkmaj.cpp "CheckMAJ.h" @@ -27955,7 +27959,7 @@ -1304530061 source:d:\florian\programmation\gamedevelop2\ide\bugreport.cpp +1325278122 source:d:\florian\programmation\gamedevelop2\ide\bugreport.cpp "BugReport.h" @@ -27972,7 +27976,7 @@ -1324660847 source:d:\florian\programmation\gamedevelop2\ide\credits.cpp +1325278122 source:d:\florian\programmation\gamedevelop2\ide\credits.cpp "Credits.h" @@ -27991,7 +27995,7 @@ "GDL/VersionWrapper.h" "GDL/CommonTools.h" -1324995634 d:\florian\programmation\gamedevelop2\gdl\gdl\version.h +1325278437 d:\florian\programmation\gamedevelop2\gdl\gdl\version.h 1307986678 d:\florian\programmation\gamedevelop2\extlibs\wxwidgets\lib\gcc_dll\mswd\wx\setup.h @@ -28265,7 +28269,7 @@ 1305403435 d:\florian\programmation\gamedevelop2\extlibs\llvm\include\llvm\support\dynamiclibrary.h -1321198400 d:\florian\programmation\gamedevelop2\gdl\gdl\eventscodecompiler.h +1325278120 d:\florian\programmation\gamedevelop2\gdl\gdl\eventscodecompiler.h @@ -28274,7 +28278,7 @@ -1315163375 d:\florian\programmation\gamedevelop2\gdl\gdl\eventsexecutionengine.h +1325278120 d:\florian\programmation\gamedevelop2\gdl\gdl\eventsexecutionengine.h @@ -28287,7 +28291,7 @@ "wx/defs.h" "wx/object.h" -1325168749 source:d:\florian\programmation\gamedevelop2\ide\eventseditor.cpp +1325278122 source:d:\florian\programmation\gamedevelop2\ide\eventseditor.cpp "EventsEditor.h" @@ -28323,7 +28327,7 @@ "Clipboard.h" -1325168917 d:\florian\programmation\gamedevelop2\ide\eventseditor.h +1325286341 d:\florian\programmation\gamedevelop2\ide\eventseditor.h @@ -28332,6 +28336,8 @@ + + "GDL/MainEditorCommand.h" @@ -28339,7 +28345,7 @@ "GDL/EventsEditorItemsAreas.h" "GDL/EventsEditorSelection.h" -1313662481 d:\florian\programmation\gamedevelop2\gdl\gdl\expressionscorrectnesstesting.h +1325278120 d:\florian\programmation\gamedevelop2\gdl\gdl\expressionscorrectnesstesting.h "GDL/GDExpressionParser.h" @@ -28580,7 +28586,7 @@ 1305407035 d:\florian\programmation\gamedevelop2\extlibs\llvm\include\llvm\support\alignof.h -1314705434 d:\florian\programmation\gamedevelop2\gdl\gdl\fullprojectcompiler.h +1325278120 d:\florian\programmation\gamedevelop2\gdl\gdl\fullprojectcompiler.h 1312710621 d:\florian\programmation\gamedevelop2\gdl\gdl\lightweightcommontools.h @@ -28766,21 +28772,21 @@ -1313344833 d:\florian\programmation\gamedevelop2\gdl\gdl\eventseditoritemsareas.h +1325278120 d:\florian\programmation\gamedevelop2\gdl\gdl\eventseditoritemsareas.h -1313344215 d:\florian\programmation\gamedevelop2\gdl\gdl\eventseditorselection.h +1325278120 d:\florian\programmation\gamedevelop2\gdl\gdl\eventseditorselection.h "GDL/EventsEditorItemsAreas.h" -1312972400 d:\florian\programmation\gamedevelop2\gdl\gdl\textformatting.h +1325278121 d:\florian\programmation\gamedevelop2\gdl\gdl\textformatting.h @@ -28866,7 +28872,7 @@ -1314046871 d:\florian\programmation\gamedevelop2\gdl\gdl\commoninstructions.h +1325278119 d:\florian\programmation\gamedevelop2\gdl\gdl\commoninstructions.h 1307987903 d:\florian\programmation\gamedevelop2\extlibs\wxwidgets\lib\gcc_dll\msw\wx\msw\rcdefs.h @@ -28889,17 +28895,17 @@ 1308334863 d:\florian\programmation\gamedevelop2\extlibs\wxwidgets\lib\gcc_dll\mswd\wx\msw\rcdefs.h -1313664438 d:\florian\programmation\gamedevelop2\gdl\gdl\linkevent.h +1325278120 d:\florian\programmation\gamedevelop2\gdl\gdl\linkevent.h "Event.h" -1317482676 d:\florian\programmation\gamedevelop2\gdl\gdl\arbitraryresourceworker.h +1325278119 d:\florian\programmation\gamedevelop2\gdl\gdl\arbitraryresourceworker.h -1319925345 d:\florian\programmation\gamedevelop2\gdl\gdl\resourcesmanager.h +1325278121 d:\florian\programmation\gamedevelop2\gdl\gdl\resourcesmanager.h @@ -28953,3 +28959,14 @@ +1307986704 d:\florian\programmation\gamedevelop2\extlibs\wxwidgets\include\wx\infobar.h + "wx/defs.h" + "wx/control.h" + "wx/gtk/infobar.h" + "wx/generic/infobar.h" + +1307986696 d:\florian\programmation\gamedevelop2\extlibs\wxwidgets\include\wx\gtk\infobar.h + "wx/generic/infobar.h" + +1307986701 d:\florian\programmation\gamedevelop2\extlibs\wxwidgets\include\wx\generic\infobar.h + diff --git a/IDE/IDE.layout b/IDE/IDE.layout index b38da29650..5a6832ec2b 100644 --- a/IDE/IDE.layout +++ b/IDE/IDE.layout @@ -1,6 +1,6 @@ - + @@ -14,19 +14,19 @@ - + - + - + - + - + @@ -35,28 +35,28 @@ - + - + - + - + - + - + - + - + @@ -65,10 +65,10 @@ - + - + @@ -83,13 +83,13 @@ - + - + @@ -110,7 +110,7 @@ - + @@ -137,7 +137,7 @@ - + @@ -182,7 +182,7 @@ - + @@ -203,25 +203,25 @@ - + - + - + - + - - + + - + @@ -229,14 +229,14 @@ - - + + - - + + - + @@ -248,19 +248,19 @@ - + - - + + - + @@ -271,17 +271,17 @@ - - + + - + - - + + - - + + @@ -317,10 +317,10 @@ - + - + @@ -335,13 +335,13 @@ - + - + @@ -362,16 +362,16 @@ - + - + - - + + - - + + @@ -379,20 +379,20 @@ - - + + - - + + - + - + @@ -407,7 +407,7 @@ - + @@ -419,10 +419,10 @@ - + - + @@ -440,7 +440,7 @@ - + @@ -472,6 +472,9 @@ + + + @@ -485,7 +488,7 @@ - + diff --git a/IDE/MainAide.cpp b/IDE/MainAide.cpp index bb053d5433..7beeb47045 100644 --- a/IDE/MainAide.cpp +++ b/IDE/MainAide.cpp @@ -1,6 +1,6 @@ /** \file * Game Develop - * 2008-2011 Florian Rival (Florian.Rival@gmail.com) + * 2008-2012 Florian Rival (Florian.Rival@gmail.com) */ #include "Game_Develop_EditorMain.h" diff --git a/IDE/MainFichier.cpp b/IDE/MainFichier.cpp index ec178a1e1b..e672165662 100644 --- a/IDE/MainFichier.cpp +++ b/IDE/MainFichier.cpp @@ -1,6 +1,6 @@ /** \file * Game Develop - * 2008-2011 Florian Rival (Florian.Rival@gmail.com) + * 2008-2012 Florian Rival (Florian.Rival@gmail.com) */ #include diff --git a/IDE/NewCppFileDlg.cpp b/IDE/NewCppFileDlg.cpp index 0f8f6f96e5..fd9965322b 100644 --- a/IDE/NewCppFileDlg.cpp +++ b/IDE/NewCppFileDlg.cpp @@ -1,6 +1,6 @@ /** \file * Game Develop - * 2008-2011 Florian Rival (Florian.Rival@gmail.com) + * 2008-2012 Florian Rival (Florian.Rival@gmail.com) */ #include "NewCppFileDlg.h" diff --git a/IDE/ProfileDlg.cpp b/IDE/ProfileDlg.cpp index 99f7152e91..b18ec759ba 100644 --- a/IDE/ProfileDlg.cpp +++ b/IDE/ProfileDlg.cpp @@ -1,6 +1,6 @@ /** \file * Game Develop - * 2008-2011 Florian Rival (Florian.Rival@gmail.com) + * 2008-2012 Florian Rival (Florian.Rival@gmail.com) */ #include "ProfileDlg.h" diff --git a/IDE/ProfileDlg.h b/IDE/ProfileDlg.h index ca4d3c67f8..971196f692 100644 --- a/IDE/ProfileDlg.h +++ b/IDE/ProfileDlg.h @@ -1,6 +1,6 @@ /** \file * Game Develop - * 2008-2011 Florian Rival (Florian.Rival@gmail.com) + * 2008-2012 Florian Rival (Florian.Rival@gmail.com) */ #ifndef PROFILEDLG_H diff --git a/IDE/ProjectManager.cpp b/IDE/ProjectManager.cpp index 518de93410..3fddb2061f 100644 --- a/IDE/ProjectManager.cpp +++ b/IDE/ProjectManager.cpp @@ -538,10 +538,6 @@ void ProjectManager::EditSourceFile(Game * game, std::string filename, size_t li } //Launch an internal code editor else - MainEditorCommand mainEditorCommand; - mainEditorCommand.SetMainEditor(&mainEditor); - mainEditorCommand.SetRibbon(mainEditor.GetRibbon()); - //Having a game associated with the editor is optional Game * associatedGame = NULL; if ( game ) @@ -566,7 +562,7 @@ void ProjectManager::EditSourceFile(Game * game, std::string filename, size_t li } } - CodeEditor * editorScene = new CodeEditor(mainEditor.GetEditorsNotebook(), filename, associatedGame, mainEditorCommand); + CodeEditor * editorScene = new CodeEditor(mainEditor.GetEditorsNotebook(), filename, associatedGame, mainEditor.GetMainEditorCommand()); if ( !mainEditor.GetEditorsNotebook()->AddPage(editorScene, wxFileName(filename).GetFullName(), true, wxBitmap("res/source_cpp16.png", wxBITMAP_TYPE_ANY)) ) { wxLogError(_("Impossible d'ajouter le nouvel onglet !")); @@ -587,14 +583,6 @@ void ProjectManager::OneditSceneMenuItemSelected(wxCommandEvent& event) return; } - MainEditorCommand mainEditorCommand; - mainEditorCommand.SetMainEditor(&mainEditor); - mainEditorCommand.SetRibbonSceneEditorButtonBar(mainEditor.GetRibbonSceneEditorButtonBar()); //Need link to the scene editor wxRibbonButtonBar - mainEditorCommand.SetRibbon(mainEditor.GetRibbon()); - mainEditorCommand.SetBuildToolsPanel(mainEditor.GetBuildToolsPanel()); - mainEditorCommand.SetPaneManager(mainEditor.GetAUIPaneManger()); - mainEditorCommand.SetScenesLockingShortcutsList(mainEditor.GetScenesLockingShortcutsList()); - vector< boost::shared_ptr >::const_iterator scene = find_if(game->scenes.begin(), game->scenes.end(), bind2nd(SceneHasName(), data->GetSecondString())); @@ -626,7 +614,7 @@ void ProjectManager::OneditSceneMenuItemSelected(wxCommandEvent& event) prefix = "["+game->name.substr(0, gameMaxCharDisplayedInEditor-3)+"...] "; } - EditorScene * editorScene = new EditorScene(mainEditor.GetEditorsNotebook(), *game, *(*scene), mainEditorCommand); + EditorScene * editorScene = new EditorScene(mainEditor.GetEditorsNotebook(), *game, *(*scene), mainEditor.GetMainEditorCommand()); if ( !mainEditor.GetEditorsNotebook()->AddPage(editorScene, prefix+data->GetSecondString(), true, wxBitmap("res/sceneeditor.png", wxBITMAP_TYPE_ANY)) ) { wxLogError(_("Impossible d'ajouter le nouvel onglet !")); @@ -674,11 +662,6 @@ void ProjectManager::OnmodVarSceneMenuISelected(wxCommandEvent& event) return; } - MainEditorCommand mainEditorCommand; - mainEditorCommand.SetMainEditor(&mainEditor); - mainEditorCommand.SetRibbonSceneEditorButtonBar(mainEditor.GetRibbonSceneEditorButtonBar()); //Need link to the scene editor wxRibbonButtonBar - mainEditorCommand.SetRibbon(mainEditor.GetRibbon()); - vector< boost::shared_ptr >::const_iterator scene = find_if(game->scenes.begin(), game->scenes.end(), bind2nd(SceneHasName(), data->GetSecondString())); @@ -868,10 +851,6 @@ void ProjectManager::OnRibbonEditImagesSelected(wxRibbonButtonBarEvent& event) */ void ProjectManager::EditImagesOfGame(Game * game) { - MainEditorCommand mainEditorCommand; - mainEditorCommand.SetMainEditor(&mainEditor); - mainEditorCommand.SetRibbon(mainEditor.GetRibbon()); - //Verify if the image editor is not already opened for (unsigned int j =0;jGetPageCount() ;j++ ) { @@ -894,7 +873,7 @@ void ProjectManager::EditImagesOfGame(Game * game) prefix = "["+game->name.substr(0, gameMaxCharDisplayedInEditor-3)+"...] "; } - ResourcesEditor * editorImages = new ResourcesEditor(&mainEditor, *game, mainEditorCommand, true); + ResourcesEditor * editorImages = new ResourcesEditor(&mainEditor, *game, mainEditor.GetMainEditorCommand(), true); mainEditor.GetEditorsNotebook()->AddPage(editorImages, prefix+_("Banque d'images"), true, wxBitmap("res/imageicon.png", wxBITMAP_TYPE_ANY)); } @@ -1248,11 +1227,6 @@ void ProjectManager::OnEditExternalEventsSelected(wxCommandEvent& event) gdTreeItemGameData * data; if ( !GetGameOfSelectedItem(game, data) ) return; - MainEditorCommand mainEditorCommand; - mainEditorCommand.SetMainEditor(&mainEditor); - mainEditorCommand.SetRibbonSceneEditorButtonBar(mainEditor.GetRibbonSceneEditorButtonBar()); //Need link to the scene editor wxRibbonButtonBar - mainEditorCommand.SetRibbon(mainEditor.GetRibbon()); - vector< boost::shared_ptr >::const_iterator events = find_if(game->externalEvents.begin(), game->externalEvents.end(), bind2nd(ExternalEventsHasName(), data->GetSecondString())); @@ -1284,7 +1258,7 @@ void ProjectManager::OnEditExternalEventsSelected(wxCommandEvent& event) prefix = "["+game->name.substr(0, gameMaxCharDisplayedInEditor-3)+"...] "; } - ExternalEventsEditor * editor = new ExternalEventsEditor(mainEditor.GetEditorsNotebook(), *game, *(*events), mainEditorCommand); + ExternalEventsEditor * editor = new ExternalEventsEditor(mainEditor.GetEditorsNotebook(), *game, *(*events), mainEditor.GetMainEditorCommand()); if ( !mainEditor.GetEditorsNotebook()->AddPage(editor, prefix+data->GetSecondString(), true, wxBitmap("res/events16.png", wxBITMAP_TYPE_ANY)) ) { wxLogError(_("Impossible d'ajouter le nouvel onglet !")); diff --git a/IDE/SceneCanvas.cpp b/IDE/SceneCanvas.cpp index f0bcd21572..7e1a7419c5 100644 --- a/IDE/SceneCanvas.cpp +++ b/IDE/SceneCanvas.cpp @@ -1,6 +1,6 @@ /** \file * Game Develop - * 2008-2011 Florian Rival (Florian.Rival@gmail.com) + * 2008-2012 Florian Rival (Florian.Rival@gmail.com) */ #include "SceneCanvas.h" @@ -13,6 +13,7 @@ #include #include #include +#include #ifdef __WXMSW__ #include #endif @@ -49,6 +50,7 @@ #include "DebuggerGUI.h" #include "GridSetup.h" #include "ProfileDlg.h" +#include const long SceneCanvas::ID_ADDOBJMENU = wxNewId(); const long SceneCanvas::ID_DELOBJMENU = wxNewId(); @@ -695,8 +697,13 @@ void SceneCanvas::ReloadFirstPart() //Launch now events compilation if it has not been launched by another way. ( Events editor for example ) //Useful when opening a scene for the first time for example. if ( sceneEdited.eventsModified && !EventsCodeCompiler::GetInstance()->SceneEventsBeingCompiled(sceneEdited) ) + { EventsCodeCompiler::GetInstance()->EventsCompilationNeeded(EventsCodeCompiler::Task(&gameEdited, &sceneEdited)); + if ( !edittimeRenderer.editing ) + mainEditorCommand.GetInfoBar()->ShowMessage(_("Les modifications apportées aux évènements seront prises en compte lors du retour au mode édition.")); + } + #if !defined(GD_NO_DYNAMIC_EXTENSIONS) if ( !edittimeRenderer.editing && gameEdited.useExternalSourceFiles ) { @@ -705,7 +712,7 @@ void SceneCanvas::ReloadFirstPart() if ( !mainEditorCommand.GetBuildToolsPanel()->buildProgressPnl->LaunchGameSourceFilesBuild(gameEdited) ) { - wxLogWarning(_("Game Develop est entrain de compiler les sources C++ et ne pourra lancer un aperçu qu'une fois ce processus terminé.")); + mainEditorCommand.GetInfoBar()->ShowMessage(_("Game Develop est entrain de compiler les sources C++ et ne pourra lancer un aperçu qu'une fois ce processus terminé.")); } } #endif @@ -728,7 +735,7 @@ void SceneCanvas::ReloadSecondPart() if ( !mainEditorCommand.GetBuildToolsPanel()->buildProgressPnl->LastBuildSuccessed() ) { - mainEditorCommand.GetPaneManager()->GetPane(mainEditorCommand.GetBuildToolsPanel()).Show(true); + mainEditorCommand.GetPaneManager().GetPane(mainEditorCommand.GetBuildToolsPanel()).Show(true); mainEditorCommand.GetBuildToolsPanel()->notebook->SetSelection(1); mainEditorCommand.GetBuildToolsPanel()->buildMessagesPnl->OpenFileContainingFirstError(); mainEditorCommand.GetMainEditor()->RequestUserAttention(); diff --git a/IDE/SceneCanvas.h b/IDE/SceneCanvas.h index 2b0922d7b4..063e27a3d7 100644 --- a/IDE/SceneCanvas.h +++ b/IDE/SceneCanvas.h @@ -13,6 +13,8 @@ #include #include #include +#include +#include #include "GDL/Object.h" #include "GDL/Collisions.h" diff --git a/IDE/SceneEdittimeRenderer.h b/IDE/SceneEdittimeRenderer.h index ef29aa973f..296006fab8 100644 --- a/IDE/SceneEdittimeRenderer.h +++ b/IDE/SceneEdittimeRenderer.h @@ -1,6 +1,6 @@ /** \file * Game Develop - * 2008-2011 Florian Rival (Florian.Rival@gmail.com) + * 2008-2012 Florian Rival (Florian.Rival@gmail.com) */ #ifndef SceneEdittimeRenderer_H diff --git a/IDE/SplashScreen.cpp b/IDE/SplashScreen.cpp index bdef58f5ab..b3bd65d37e 100644 --- a/IDE/SplashScreen.cpp +++ b/IDE/SplashScreen.cpp @@ -1,15 +1,7 @@ -#ifdef DEBUG -#include "nommgr.h" -#endif - #include #include #include -#ifdef DEBUG - -#endif - #include "SplashScreen.h" namespace { diff --git a/IDE/TemplateEvents.cpp b/IDE/TemplateEvents.cpp index 0b31b99e39..5c4acb2914 100644 --- a/IDE/TemplateEvents.cpp +++ b/IDE/TemplateEvents.cpp @@ -1,6 +1,6 @@ /** \file * Game Develop - * 2008-2011 Florian Rival (Florian.Rival@gmail.com) + * 2008-2012 Florian Rival (Florian.Rival@gmail.com) */ #include "TemplateEvents.h" diff --git a/IDE/TemplateEvents.h b/IDE/TemplateEvents.h index bcdd67b779..43c1808fe4 100644 --- a/IDE/TemplateEvents.h +++ b/IDE/TemplateEvents.h @@ -1,6 +1,6 @@ /** \file * Game Develop - * 2008-2011 Florian Rival (Florian.Rival@gmail.com) + * 2008-2012 Florian Rival (Florian.Rival@gmail.com) */ #ifndef TEMPLATEEVENTS_H diff --git a/IDE/resource.rc b/IDE/resource.rc index 5c4da0ea33..f3658e521b 100644 --- a/IDE/resource.rc +++ b/IDE/resource.rc @@ -21,7 +21,7 @@ BEGIN VALUE "FileDescription", "Game Develop" VALUE "FileVersion", RC_FILEVERSION_STRING VALUE "InternalName", "Game Develop" - VALUE "LegalCopyright", "2008-2011 Compil Games" + VALUE "LegalCopyright", "2008-2012 Compil Games" VALUE "LegalTrademarks1", "" VALUE "LegalTrademarks2", "" VALUE "OriginalFilename", "GDEditor.exe" diff --git a/IDE/version.h b/IDE/version.h index b0ac996434..93b0f01b5c 100644 --- a/IDE/version.h +++ b/IDE/version.h @@ -4,7 +4,7 @@ namespace AutoVersion{ //Date Version Types - static const char DATE[] = "29"; + static const char DATE[] = "31"; static const char MONTH[] = "12"; static const char YEAR[] = "2011"; static const char UBUNTU_VERSION_STYLE[] = "11.12"; @@ -16,14 +16,14 @@ namespace AutoVersion{ //Standard Version Type static const long MAJOR = 1; static const long MINOR = 4; - static const long BUILD = 12258; - static const long REVISION = 61677; + static const long BUILD = 12282; + static const long REVISION = 61814; //Miscellaneous Version Types - static const long BUILDS_COUNT = 32289; - #define RC_FILEVERSION 1,4,12258,61677 - #define RC_FILEVERSION_STRING "1, 4, 12258, 61677\0" - static const char FULLVERSION_STRING[] = "1.4.12258.61677"; + static const long BUILDS_COUNT = 32391; + #define RC_FILEVERSION 1,4,12282,61814 + #define RC_FILEVERSION_STRING "1, 4, 12282, 61814\0" + static const char FULLVERSION_STRING[] = "1.4.12282.61814"; //These values are to keep track of your versioning state, don't modify them. static const long BUILD_HISTORY = 0; diff --git a/IDE/wxsmith/Game_Develop_Editorframe.wxs b/IDE/wxsmith/Game_Develop_Editorframe.wxs index ceac5ba58d..0bbc59fa49 100644 --- a/IDE/wxsmith/Game_Develop_Editorframe.wxs +++ b/IDE/wxsmith/Game_Develop_Editorframe.wxs @@ -37,7 +37,16 @@ 1 0 - 0 + 1 + + + $(THIS) = new $(CLASS)($(PARENT),$(ID)); + wx/infobar.h + + + wxALL|wxEXPAND|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL + +