Changeset 733 for code/branches/FICN
- Timestamp:
- Dec 30, 2007, 10:17:38 PM (17 years ago)
- Location:
- code/branches/FICN
- Files:
-
- 3 added
- 2 deleted
- 17 edited
Legend:
- Unmodified
- Added
- Removed
-
code/branches/FICN/src/loader/LevelLoader.cc
r715 r733 34 34 35 35 #include "audio/AudioManager.h" 36 #include "orxonox/ objects/BaseObject.h"36 #include "orxonox/core/BaseObject.h" 37 37 #include "orxonox/Orxonox.h" 38 38 -
code/branches/FICN/src/network/GameStateClient.h
r732 r733 16 16 #include "Synchronisable.h" 17 17 #include "orxonox/core/CoreIncludes.h" 18 #include "orxonox/ objects/BaseObject.h"18 #include "orxonox/core/BaseObject.h" 19 19 #include "GameStateManager.h" 20 20 -
code/branches/FICN/src/orxonox/CMakeLists.txt
r718 r733 18 18 IF(WIN32) 19 19 SET( OBJECTS_SRC_FILES 20 objects/BaseObject.cc21 20 objects/WorldEntity.cc 22 21 objects/test1.cc -
code/branches/FICN/src/orxonox/OrxonoxPrereqs.h
r729 r733 62 62 class InputManager; 63 63 class SpaceShipSteering; 64 65 // TinyXML66 class TiXmlString;67 class TiXmlOutStream;68 class TiXmlNode;69 class TiXmlHandle;70 class TiXmlDocument;71 class TiXmlElement;72 class TiXmlComment;73 class TiXmlUnknown;74 class TiXmlAttribute;75 class TiXmlText;76 class TiXmlDeclaration;77 class TiXmlParsingData;78 64 79 65 namespace orxonox { -
code/branches/FICN/src/orxonox/core/CMakeLists.txt
r704 r733 2 2 3 3 SET( CORE_SRC_FILES 4 BaseObject.cc 4 5 Factory.cc 5 6 IdentifierList.cc -
code/branches/FICN/src/orxonox/core/Factory.cc
r715 r733 33 33 #include "Identifier.h" 34 34 #include "Debug.h" 35 #include " ../objects/BaseObject.h"35 #include "BaseObject.h" 36 36 #include "Factory.h" 37 37 -
code/branches/FICN/src/orxonox/objects/Ambient.h
r729 r733 4 4 #include "../OrxonoxPrereqs.h" 5 5 6 #include " BaseObject.h"6 #include "orxonox/core/BaseObject.h" 7 7 8 8 namespace orxonox -
code/branches/FICN/src/orxonox/objects/CMakeLists.txt
r676 r733 3 3 SET( OBJECTS_SRC_FILES 4 4 Ambient.cc 5 BaseObject.cc6 5 BillboardSet.cc 7 6 Camera.cc -
code/branches/FICN/src/orxonox/objects/Camera.h
r729 r733 4 4 #include "../OrxonoxPrereqs.h" 5 5 6 #include " BaseObject.h"6 #include "orxonox/core/BaseObject.h" 7 7 8 8 namespace orxonox -
code/branches/FICN/src/orxonox/objects/Skybox.h
r729 r733 4 4 #include "../OrxonoxPrereqs.h" 5 5 6 #include " BaseObject.h"6 #include "orxonox/core/BaseObject.h" 7 7 8 8 class TiXmlElement; // Forward declaration -
code/branches/FICN/src/orxonox/objects/WorldEntity.h
r729 r733 11 11 #include "tinyxml/tinyxml.h" 12 12 #include "../core/CoreIncludes.h" 13 #include " BaseObject.h"13 #include "orxonox/core/BaseObject.h" 14 14 #include "Tickable.h" 15 15 #include "Mesh.h" -
code/branches/FICN/src/orxonox/objects/weapon_system/AmmunitionDump.h
r729 r733 38 38 #include "network/Synchronisable.h" 39 39 //#include "../core/CoreIncludes.h" 40 #include " ../BaseObject.h"40 #include "orxonox/core/BaseObject.h" 41 41 42 42 -
code/branches/FICN/src/orxonox/objects/weapon_system/BulletManager.h
r729 r733 39 39 #include "tinyxml/tinyxml.h" 40 40 #include "../../core/CoreIncludes.h" 41 #include " ../BaseObject.h"41 #include "orxonox/core/BaseObject.h" 42 42 #include "../Tickable.h" 43 43 -
code/branches/FICN/visual_studio/FICN.sln
r729 r733 16 16 Release.AspNetCompiler.Debug = "False" 17 17 EndProjectSection 18 ProjectSection(ProjectDependencies) = postProject 19 {2240ECD7-2F48-4431-8E1B-25466A384CCC} = {2240ECD7-2F48-4431-8E1B-25466A384CCC} 20 EndProjectSection 18 21 EndProject 19 22 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Orxonox", "benixonox.vcproj", "{0B6C5CFD-F91B-432A-80A3-2610F61E060B}" … … 23 26 EndProjectSection 24 27 ProjectSection(ProjectDependencies) = postProject 28 {35575B59-E1AE-40E8-89C4-2862B5B09B68} = {35575B59-E1AE-40E8-89C4-2862B5B09B68} 29 {E283910F-F911-40FB-A09D-D025CA821912} = {E283910F-F911-40FB-A09D-D025CA821912} 30 {4733BD1A-E04C-458D-8BFB-5010250EA497} = {4733BD1A-E04C-458D-8BFB-5010250EA497} 31 {271715F3-5B90-4110-A552-70C788084A86} = {271715F3-5B90-4110-A552-70C788084A86} 25 32 {2240ECD7-2F48-4431-8E1B-25466A384CCC} = {2240ECD7-2F48-4431-8E1B-25466A384CCC} 26 {271715F3-5B90-4110-A552-70C788084A86} = {271715F3-5B90-4110-A552-70C788084A86}27 {4733BD1A-E04C-458D-8BFB-5010250EA497} = {4733BD1A-E04C-458D-8BFB-5010250EA497}28 {E283910F-F911-40FB-A09D-D025CA821912} = {E283910F-F911-40FB-A09D-D025CA821912}29 {35575B59-E1AE-40E8-89C4-2862B5B09B68} = {35575B59-E1AE-40E8-89C4-2862B5B09B68}30 33 EndProjectSection 31 34 EndProject … … 45 48 EndProjectSection 46 49 ProjectSection(ProjectDependencies) = postProject 50 {271715F3-5B90-4110-A552-70C788084A86} = {271715F3-5B90-4110-A552-70C788084A86} 51 {2240ECD7-2F48-4431-8E1B-25466A384CCC} = {2240ECD7-2F48-4431-8E1B-25466A384CCC} 47 52 {4733BD1A-E04C-458D-8BFB-5010250EA497} = {4733BD1A-E04C-458D-8BFB-5010250EA497} 48 {2240ECD7-2F48-4431-8E1B-25466A384CCC} = {2240ECD7-2F48-4431-8E1B-25466A384CCC}49 {271715F3-5B90-4110-A552-70C788084A86} = {271715F3-5B90-4110-A552-70C788084A86}50 53 EndProjectSection 51 54 EndProject -
code/branches/FICN/visual_studio/benixonox.vcproj
r729 r733 197 197 </File> 198 198 <File 199 RelativePath="..\src\orxonox\objects\BaseObject.cc"200 >201 </File>202 <File203 199 RelativePath="..\src\orxonox\objects\BillboardSet.cc" 204 200 > … … 331 327 </File> 332 328 <File 333 RelativePath="..\src\orxonox\objects\BaseObject.h"334 >335 </File>336 <File337 329 RelativePath="..\src\orxonox\objects\BillboardSet.h" 338 330 > -
code/branches/FICN/visual_studio/core.vcproj
r729 r733 160 160 </File> 161 161 <File 162 RelativePath="..\src\orxonox\core\BaseObject.cc" 163 > 164 </File> 165 <File 162 166 RelativePath="..\src\orxonox\core\ConfigValueContainer.cc" 163 167 > … … 214 218 </File> 215 219 <File 220 RelativePath="..\src\orxonox\core\BaseObject.h" 221 > 222 </File> 223 <File 216 224 RelativePath="..\src\orxonox\core\ClassFactory.h" 217 225 > -
code/branches/FICN/visual_studio/tinyxml.vcproj
r708 r733 162 162 > 163 163 </File> 164 <File 165 RelativePath="..\src\tinyxml\TinyXMLPrereqs.h" 166 > 167 </File> 164 168 </Filter> 165 169 </Files>
Note: See TracChangeset
for help on using the changeset viewer.