Changeset 2485 for code/branches/presentation/visual_studio/vc8

Timestamp:

Dec 16, 2008, 6:01:13 PM (15 years ago)

Author:

landauf

Message:

Merged objecthierarchy2 into presentation branch

Couln't merge 2 lines in Gamestate.cc and a whole block of code in GSDedicated.cc (it seems like oli implemented in both branches something like a network-tick-limiter but with different approaches)

Not yet tested in network mode and with bots
The SpaceShips movement is also not yet fully adopted to the new physics (see Engine class)

Location:

code/branches/presentation

Files:

• . (modified) (1 prop)
• visual_studio/vc8/audio.vsprops (modified) (1 prop)
• visual_studio/vc8/base.vsprops (modified) (1 prop)
• visual_studio/vc8/ceguilua.vsprops (modified) (1 prop)
• visual_studio/vc8/core.vsprops (modified) (1 prop)
• visual_studio/vc8/cpptcl.vsprops (modified) (1 prop)
• visual_studio/vc8/debug.vsprops (modified) (1 prop)
• visual_studio/vc8/directories.vsprops (modified) (1 prop)
• visual_studio/vc8/lua.vsprops (modified) (1 prop)
• visual_studio/vc8/network.vsprops (modified) (1 prop)
• visual_studio/vc8/orxonox.vcproj (modified) (19 diffs)
• visual_studio/vc8/orxonox.vsprops (modified) (1 prop)
• visual_studio/vc8/orxonox_vc8.sln (modified) (1 prop)
• visual_studio/vc8/release.vsprops (modified) (1 prop)
• visual_studio/vc8/tinyxml.vcproj (modified) (1 prop)
• visual_studio/vc8/tinyxml.vsprops (modified) (1 prop)
• visual_studio/vc8/tolua.vsprops (modified) (1 prop)
• visual_studio/vc8/toluagen.vcproj (modified) (1 prop)
• visual_studio/vc8/toluagen.vsprops (modified) (1 prop)
• visual_studio/vc8/toluagen_orxonox.vcproj (modified) (1 prop)
• visual_studio/vc8/toluagen_orxonox.vsprops (modified) (1 prop)
• visual_studio/vc8/util.vsprops (modified) (1 prop)

code/branches/presentation/visual_studio/vc8/orxonox.vcproj

@@ -167 +167 @@
                         </File>
                         <File
+                                RelativePath="..\..\src\orxonox\PawnManager.cc"
+                                >
+                        </File>
+                        <File
                                 RelativePath="..\..\src\orxonox\PlayerManager.cc"
                                 >
@@ -210 +214 @@
                                 </File>
                                 <File
+                                        RelativePath="..\..\src\orxonox\objects\GlobalShader.cc"
+                                        >
+                                </File>
+                                <File
                                         RelativePath="..\..\src\orxonox\objects\Level.cc"
                                         >
@@ -247 +255 @@
                                                 RelativePath="..\..\src\orxonox\objects\worldentities\Backlight.cc"
                                                 >
-                                                <FileConfiguration
-                                                        Name="Debug|Win32"
-                                                        ExcludedFromBuild="true"
-                                                        >
-                                                        <Tool
-                                                                Name="VCCLCompilerTool"
-                                                        />
-                                                </FileConfiguration>
-                                                <FileConfiguration
-                                                        Name="Release|Win32"
-                                                        ExcludedFromBuild="true"
-                                                        >
-                                                        <Tool
-                                                                Name="VCCLCompilerTool"
-                                                        />
-                                                </FileConfiguration>
                                         </File>
                                         <File
@@ -282 +274 @@
                                         <File
                                                 RelativePath="..\..\src\orxonox\objects\worldentities\ControllableEntity.cc"
+                                                >
+                                        </File>
+                                        <File
+                                                RelativePath="..\..\src\orxonox\objects\worldentities\ExplosionChunk.cc"
+                                                >
+                                        </File>
+                                        <File
+                                                RelativePath="..\..\src\orxonox\objects\worldentities\FadingBillboard.cc"
                                                 >
                                         </File>
@@ -373 +373 @@
                                         >
                                         <File
+                                                RelativePath="..\..\src\orxonox\objects\infos\Bot.cc"
+                                                >
+                                        </File>
+                                        <File
+                                                RelativePath="..\..\src\orxonox\objects\infos\GametypeInfo.cc"
+                                                >
+                                        </File>
+                                        <File
                                                 RelativePath="..\..\src\orxonox\objects\infos\HumanPlayer.cc"
                                                 >
@@ -389 +397 @@
                                         >
                                         <File
+                                                RelativePath="..\..\src\orxonox\objects\controllers\AIController.cc"
+                                                >
+                                        </File>
+                                        <File
+                                                RelativePath="..\..\src\orxonox\objects\controllers\ArtificialController.cc"
+                                                >
+                                        </File>
+                                        <File
                                                 RelativePath="..\..\src\orxonox\objects\controllers\Controller.cc"
                                                 >
@@ -394 +410 @@
                                         <File
                                                 RelativePath="..\..\src\orxonox\objects\controllers\HumanController.cc"
+                                                >
+                                        </File>
+                                        <File
+                                                RelativePath="..\..\src\orxonox\objects\controllers\ScriptController.cc"
                                                 >
                                         </File>
@@ -645 +665 @@
                                         </File>
                                 </Filter>
+                                <Filter
+                                        Name="items"
+                                        >
+                                        <File
+                                                RelativePath="..\..\src\orxonox\objects\items\Engine.cc"
+                                                >
+                                        </File>
+                                        <File
+                                                RelativePath="..\..\src\orxonox\objects\items\Item.cc"
+                                                >
+                                        </File>
+                                        <File
+                                                RelativePath="..\..\src\orxonox\objects\items\MultiStateEngine.cc"
+                                                >
+                                        </File>
+                                </Filter>
                         </Filter>
                         <Filter
@@ -659 +695 @@
                                 <File
                                         RelativePath="..\..\src\orxonox\tools\ParticleInterface.cc"
+                                        >
+                                </File>
+                                <File
+                                        RelativePath="..\..\src\orxonox\tools\Shader.cc"
                                         >
                                 </File>
@@ -755 +795 @@
                                         </File>
                                         <File
+                                                RelativePath="..\..\src\orxonox\overlays\hud\GametypeStatus.cc"
+                                                >
+                                        </File>
+                                        <File
                                                 RelativePath="..\..\src\orxonox\overlays\hud\HUDBar.cc"
+                                                >
+                                        </File>
+                                        <File
+                                                RelativePath="..\..\src\orxonox\overlays\hud\HUDHealthBar.cc"
                                                 >
                                         </File>
@@ -887 +935 @@
                         </File>
                         <File
+                                RelativePath="..\..\src\orxonox\PawnManager.h"
+                                >
+                        </File>
+                        <File
                                 RelativePath="..\..\src\orxonox\PlayerManager.h"
                                 >
@@ -910 +962 @@
                                 </File>
                                 <File
+                                        RelativePath="..\..\src\orxonox\objects\GlobalShader.h"
+                                        >
+                                </File>
+                                <File
                                         RelativePath="..\..\src\orxonox\objects\Level.h"
                                         >
@@ -966 +1022 @@
                                         <File
                                                 RelativePath="..\..\src\orxonox\objects\worldentities\ControllableEntity.h"
+                                                >
+                                        </File>
+                                        <File
+                                                RelativePath="..\..\src\orxonox\objects\worldentities\ExplosionChunk.h"
+                                                >
+                                        </File>
+                                        <File
+                                                RelativePath="..\..\src\orxonox\objects\worldentities\FadingBillboard.h"
                                                 >
                                         </File>
@@ -1057 +1121 @@
                                         >
                                         <File
+                                                RelativePath="..\..\src\orxonox\objects\infos\Bot.h"
+                                                >
+                                        </File>
+                                        <File
+                                                RelativePath="..\..\src\orxonox\objects\infos\GametypeInfo.h"
+                                                >
+                                        </File>
+                                        <File
+                                                RelativePath="..\..\src\orxonox\objects\infos\HumanPlayer.h"
+                                                >
+                                        </File>
+                                        <File
                                                 RelativePath="..\..\src\orxonox\objects\infos\Info.h"
                                                 >
@@ -1069 +1145 @@
                                         >
                                         <File
+                                                RelativePath="..\..\src\orxonox\objects\controllers\AIController.h"
+                                                >
+                                        </File>
+                                        <File
+                                                RelativePath="..\..\src\orxonox\objects\controllers\ArtificialController.h"
+                                                >
+                                        </File>
+                                        <File
                                                 RelativePath="..\..\src\orxonox\objects\controllers\Controller.h"
                                                 >
@@ -1074 +1158 @@
                                         <File
                                                 RelativePath="..\..\src\orxonox\objects\controllers\HumanController.h"
+                                                >
+                                        </File>
+                                        <File
+                                                RelativePath="..\..\src\orxonox\objects\controllers\ScriptController.h"
                                                 >
                                         </File>
@@ -1229 +1317 @@
                                         </File>
                                 </Filter>
+                                <Filter
+                                        Name="items"
+                                        >
+                                        <File
+                                                RelativePath="..\..\src\orxonox\objects\items\Engine.h"
+                                                >
+                                        </File>
+                                        <File
+                                                RelativePath="..\..\src\orxonox\objects\items\Item.h"
+                                                >
+                                        </File>
+                                        <File
+                                                RelativePath="..\..\src\orxonox\objects\items\MultiStateEngine.h"
+                                                >
+                                        </File>
+                                </Filter>
                         </Filter>
                         <Filter
@@ -1250 +1354 @@
                                 </File>
                                 <File
+                                        RelativePath="..\..\src\orxonox\tools\Shader.h"
+                                        >
+                                </File>
+                                <File
                                         RelativePath="..\..\src\orxonox\tools\TextureGenerator.h"
                                         >
@@ -1293 +1401 @@
                                         </File>
                                         <File
+                                                RelativePath="..\..\src\orxonox\overlays\hud\GametypeStatus.h"
+                                                >
+                                        </File>
+                                        <File
                                                 RelativePath="..\..\src\orxonox\overlays\hud\HUDBar.h"
+                                                >
+                                        </File>
+                                        <File
+                                                RelativePath="..\..\src\orxonox\overlays\hud\HUDHealthBar.h"
                                                 >
                                         </File>