Changeset 146

Timestamp:

Nov 1, 2007, 9:53:36 PM (17 years ago)

Author:

rgrieder

Message:

 

Location:

code/branches/main_reto

Files:

• include/Bullet.h (modified) (2 diffs)
• include/CameraManager.h (deleted)
• include/ExampleApplication.h (deleted)
• include/ExampleFrameListener.h (deleted)
• include/OgreControl.h (deleted)
• include/Orxonox.h (modified) (2 diffs)
• include/OrxonoxScene.h (deleted)
• include/OrxonoxShip.h (deleted)
• include/RunManager.h (deleted)
• include/WeaponManager.h (deleted)
• include/camera_manager.h (added)
• include/ogre_control.h (added)
• include/orxonox_scene.h (added)
• include/orxonox_ship.h (added)
• include/run_manager.h (added)
• include/weapon_manager.h (added)
• src/Bullet.cpp (deleted)
• src/CameraManager.cpp (deleted)
• src/OgreControl.cpp (deleted)
• src/Orxonox.cpp (deleted)
• src/OrxonoxScene.cpp (deleted)
• src/OrxonoxShip.cpp (deleted)
• src/RunManager.cpp (deleted)
• src/WeaponManager.cpp (deleted)
• src/bullet.cc (added)
• src/camera_manager.cc (added)
• src/main.cc (added)
• src/main.cpp (deleted)
• src/ogre_control.cc (added)
• src/orxonox.cc (added)
• src/orxonox_scene.cc (added)
• src/orxonox_ship.cc (added)
• src/run_manager.cc (added)
• src/weapon_manager.cc (added)
• weapon_framework (modified) (1 prop)
• weapon_framework/weapon_framework.vcproj (modified) (2 diffs)

code/branches/main_reto/include/Bullet.h

@@ -27 +27 @@
 
 
-#ifndef __Bullet__
-#define __Bullet__
+#ifndef BULLET_H
+#define BULLET_H
 
 #include "Ogre.h"
@@ -49 +49 @@
 
 
-#endif
+#endif /* BULLET_H */

code/branches/main_reto/include/Orxonox.h

@@ -27 +27 @@
 
 
-#ifndef __Orxonox__
-#define __Orxonox__
+#ifndef ORXONOX_H
+#define ORXONOX_H
 
 #include "Ogre.h"
 #include "OgreTimer.h"
 
-#include "OgreControl.h"
-#include "RunManager.h"
+#include "ogre_control.h"
+#include "run_manager.h"
 
 class Orxonox
@@ -52 +52 @@
 };
 
-#endif
+#endif /* ORXONOX_H */

code/branches/main_reto/weapon_framework

@@ -1 +1 @@
 weapon_framework.ncb
+weapon_framework.vcproj.RGRIEDERT60.rgrieder.user
+weapon_framework.suo

@@ -1 +1 @@
 weapon_framework.ncb
+weapon_framework.vcproj.RGRIEDERT60.rgrieder.user
+weapon_framework.suo

code/branches/main_reto/weapon_framework/weapon_framework.vcproj

@@ -184 +184 @@
                         >
                         <File
-                                RelativePath="..\src\Bullet.cpp"
-                                >
-                        </File>
-                        <File
-                                RelativePath="..\src\CameraManager.cpp"
-                                >
-                        </File>
-                        <File
-                                RelativePath="..\src\main.cpp"
-                                >
-                        </File>
-                        <File
-                                RelativePath="..\src\OgreControl.cpp"
-                                >
-                        </File>
-                        <File
-                                RelativePath="..\src\Orxonox.cpp"
-                                >
-                        </File>
-                        <File
-                                RelativePath="..\src\OrxonoxScene.cpp"
-                                >
-                        </File>
-                        <File
-                                RelativePath="..\src\OrxonoxShip.cpp"
-                                >
-                        </File>
-                        <File
-                                RelativePath="..\src\RunManager.cpp"
-                                >
-                        </File>
-                        <File
-                                RelativePath="..\src\WeaponManager.cpp"
+                                RelativePath="..\src\bullet.cc"
+                                >
+                        </File>
+                        <File
+                                RelativePath="..\src\camera_manager.cc"
+                                >
+                        </File>
+                        <File
+                                RelativePath="..\src\main.cc"
+                                >
+                        </File>
+                        <File
+                                RelativePath="..\src\ogre_control.cc"
+                                >
+                        </File>
+                        <File
+                                RelativePath="..\src\orxonox.cc"
+                                >
+                        </File>
+                        <File
+                                RelativePath="..\src\orxonox_scene.cc"
+                                >
+                        </File>
+                        <File
+                                RelativePath="..\src\orxonox_ship.cc"
+                                >
+                        </File>
+                        <File
+                                RelativePath="..\src\run_manager.cc"
+                                >
+                        </File>
+                        <File
+                                RelativePath="..\src\weapon_manager.cc"
                                 >
                         </File>
@@ -226 +226 @@
                         >
                         <File
-                                RelativePath="..\include\Bullet.h"
-                                >
-                        </File>
-                        <File
-                                RelativePath="..\include\CameraManager.h"
-                                >
-                        </File>
-                        <File
-                                RelativePath="..\include\OgreControl.h"
-                                >
-                        </File>
-                        <File
-                                RelativePath="..\include\Orxonox.h"
-                                >
-                        </File>
-                        <File
-                                RelativePath="..\include\OrxonoxScene.h"
-                                >
-                        </File>
-                        <File
-                                RelativePath="..\include\OrxonoxShip.h"
-                                >
-                        </File>
-                        <File
-                                RelativePath="..\include\RunManager.h"
-                                >
-                        </File>
-                        <File
-                                RelativePath="..\include\WeaponManager.h"
+                                RelativePath="..\include\bullet.h"
+                                >
+                        </File>
+                        <File
+                                RelativePath="..\include\camera_manager.h"
+                                >
+                        </File>
+                        <File
+                                RelativePath="..\include\ogre_control.h"
+                                >
+                        </File>
+                        <File
+                                RelativePath="..\include\orxonox.h"
+                                >
+                        </File>
+                        <File
+                                RelativePath="..\include\orxonox_scene.h"
+                                >
+                        </File>
+                        <File
+                                RelativePath="..\include\orxonox_ship.h"
+                                >
+                        </File>
+                        <File
+                                RelativePath="..\include\run_manager.h"
+                                >
+                        </File>
+                        <File
+                                RelativePath="..\include\weapon_manager.h"
                                 >
                         </File>

@@ -1 +1 @@
 weapon_framework.ncb
+weapon_framework.vcproj.RGRIEDERT60.rgrieder.user
+weapon_framework.suo