Changeset 2533 for code/branches/bugger/visual_studio/vc8

Timestamp:

Dec 23, 2008, 11:34:35 PM (16 years ago)

Author:

rgrieder

Message:

Merged revisions 2384-2436 from presentation branch to bugger.

Location:

code/branches/bugger

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/lua.vsprops (modified) (1 prop)
• visual_studio/vc8/network.vcproj (modified) (1 diff)
• visual_studio/vc8/network.vsprops (modified) (1 prop)
• visual_studio/vc8/orxonox.vcproj (modified) (8 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/bugger/visual_studio/vc8/network.vcproj

@@ -310 +310 @@
                                 >
                         </File>
+                        <File
+                                RelativePath="..\..\src\network\TrafficControl.h"
+                                >
+                        </File>
                         <Filter
                                 Name="packet"

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

@@ -305 +305 @@
                                         </File>
                                         <File
+                                                RelativePath="..\..\src\orxonox\objects\worldentities\Planet.cc"
+                                                >
+                                        </File>
+                                        <File
                                                 RelativePath="..\..\src\orxonox\objects\worldentities\PositionableEntity.cc"
                                                 >
@@ -625 +629 @@
                                         </File>
                                         <File
+                                                RelativePath="..\..\src\orxonox\objects\quest\QuestListener.cc"
+                                                >
+                                        </File>
+                                        <File
                                                 RelativePath="..\..\src\orxonox\objects\quest\QuestManager.cc"
                                                 >
@@ -799 +807 @@
                                         </File>
                                 </Filter>
+                                <Filter
+                                        Name="notifications"
+                                        >
+                                        <File
+                                                RelativePath="..\..\src\orxonox\overlays\notifications\Notification.cc"
+                                                >
+                                        </File>
+                                        <File
+                                                RelativePath="..\..\src\orxonox\overlays\notifications\NotificationManager.cc"
+                                                >
+                                        </File>
+                                        <File
+                                                RelativePath="..\..\src\orxonox\overlays\notifications\NotificationQueue.cc"
+                                                >
+                                        </File>
+                                </Filter>
                         </Filter>
                         <Filter
@@ -1005 +1029 @@
                                         </File>
                                         <File
+                                                RelativePath="..\..\src\orxonox\objects\worldentities\Planet.h"
+                                                >
+                                        </File>
+                                        <File
                                                 RelativePath="..\..\src\orxonox\objects\worldentities\PositionableEntity.h"
                                                 >
@@ -1044 +1072 @@
                                                 </File>
                                                 <File
+                                                        RelativePath="..\..\src\orxonox\objects\worldentities\triggers\PlayerTrigger.h"
+                                                        >
+                                                </File>
+                                                <File
                                                         RelativePath="..\..\src\orxonox\objects\worldentities\triggers\Trigger.h"
                                                         >
@@ -1153 +1185 @@
                                         </File>
                                         <File
+                                                RelativePath="..\..\src\orxonox\objects\quest\QuestEffectBeacon.h"
+                                                >
+                                        </File>
+                                        <File
                                                 RelativePath="..\..\src\orxonox\objects\quest\QuestHint.h"
                                                 >
@@ -1158 +1194 @@
                                         <File
                                                 RelativePath="..\..\src\orxonox\objects\quest\QuestItem.h"
+                                                >
+                                        </File>
+                                        <File
+                                                RelativePath="..\..\src\orxonox\objects\quest\QuestListener.h"
                                                 >
                                         </File>
@@ -1350 +1390 @@
                                         <File
                                                 RelativePath="..\..\src\orxonox\overlays\debug\DebugRTRText.h"
+                                                >
+                                        </File>
+                                </Filter>
+                                <Filter
+                                        Name="notifications"
+                                        >
+                                        <File
+                                                RelativePath="..\..\src\orxonox\overlays\notifications\Notification.h"
+                                                >
+                                        </File>
+                                        <File
+                                                RelativePath="..\..\src\orxonox\overlays\notifications\NotificationManager.h"
+                                                >
+                                        </File>
+                                        <File
+                                                RelativePath="..\..\src\orxonox\overlays\notifications\NotificationQueue.h"
                                                 >
                                         </File>