Changeset 11206 for code/branches/presentationFS16/src/orxonox/overlays

Timestamp:

May 26, 2016, 4:15:54 PM (9 years ago)

Author:

fvultier

Message:

merged campain menu

Location:

code/branches/presentationFS16

Files:

• . (modified) (1 prop)
• src/orxonox/overlays/CMakeLists.txt (modified) (1 diff)
• src/orxonox/overlays/CampaignMenu.cc (copied) (copied from code/branches/bindermFS16/src/orxonox/overlays/CampaignMenu.cc)
• src/orxonox/overlays/CampaignMenu.h (copied) (copied from code/branches/bindermFS16/src/orxonox/overlays/CampaignMenu.h)
• src/orxonox/overlays/GUISheet.cc (modified) (2 diffs)

code/branches/presentationFS16/src/orxonox/overlays/CMakeLists.txt

@@ -3 +3 @@
   OrxonoxOverlay.cc
   OverlayGroup.cc
+  CampaignMenu.cc
 
 #COMPILATION_BEGIN OverlayCompilation.cc

code/branches/presentationFS16/src/orxonox/overlays/GUISheet.cc

@@ -33 +33 @@
 #include "core/XMLPort.h"
 #include "core/GameMode.h"
+#include "core/command/ConsoleCommandIncludes.h"
 
 namespace orxonox
 {
+
+
     RegisterClass(GUISheet);
+
 
     GUISheet::GUISheet(Context* context)
@@ -95 +99 @@
         // Note: This call has no effect when already showing!
     }
+
 }