Changeset 11743 for code/branches

Timestamp:

Feb 14, 2018, 11:31:43 PM (7 years ago)

Author:

landauf

Message:

merged CampaignMap_HS17

Location:

code/branches/Presentation_HS17_merge

Files:

• . (modified) (1 prop)
• data/levels/NC_StoryModeLevel (copied) (copied from code/branches/CampaignMap_HS17/data/levels/NC_StoryModeLevel)
• data/levels/NC_StoryModeLevel.oxw (copied) (copied from code/branches/CampaignMap_HS17/data/levels/NC_StoryModeLevel.oxw)
• data/levels/templates/StoryModeEscort.oxt (copied) (copied from code/branches/CampaignMap_HS17/data/levels/templates/StoryModeEscort.oxt)
• data/overlays/HUDTemplates3.oxo (modified) (1 diff)
• data/overlays/StoryModeHUD.oxo (modified) (1 diff)
• data/overlays/StoryModeHUD2.oxo (copied) (copied from code/branches/CampaignMap_HS17/data/overlays/StoryModeHUD2.oxo)
• src/modules/overlays/hud/CMakeLists.txt (modified) (1 diff)
• src/modules/overlays/hud/StoryModeHUD.cc (copied) (copied from code/branches/CampaignMap_HS17/src/modules/overlays/hud/StoryModeHUD.cc)
• src/modules/overlays/hud/StoryModeHUD.h (copied) (copied from code/branches/CampaignMap_HS17/src/modules/overlays/hud/StoryModeHUD.h)
• src/orxonox/gametypes/StoryMode.cc (modified) (4 diffs)
• src/orxonox/gametypes/StoryMode.h (modified) (1 diff)
• src/orxonox/infos/Bot.cc (modified) (1 diff)
• src/orxonox/worldentities/CMakeLists.txt (modified) (1 diff)
• src/orxonox/worldentities/NameableStaticEntity.cc (copied) (copied from code/branches/CampaignMap_HS17/src/orxonox/worldentities/NameableStaticEntity.cc)
• src/orxonox/worldentities/NameableStaticEntity.h (copied) (copied from code/branches/CampaignMap_HS17/src/orxonox/worldentities/NameableStaticEntity.h)
• src/orxonox/worldentities/pawns/CMakeLists.txt (modified) (1 diff)
• src/orxonox/worldentities/pawns/StoryModePawn.cc (copied) (copied from code/branches/CampaignMap_HS17/src/orxonox/worldentities/pawns/StoryModePawn.cc)
• src/orxonox/worldentities/pawns/StoryModePawn.h (copied) (copied from code/branches/CampaignMap_HS17/src/orxonox/worldentities/pawns/StoryModePawn.h)
• svn-commit.tmp (copied) (copied from code/branches/CampaignMap_HS17/svn-commit.tmp)

code/branches/Presentation_HS17_merge/data/overlays/HUDTemplates3.oxo

@@ -47 +47 @@
 <Template name="spaceshiphud">
   <OverlayGroup name = "spaceshiphud" scale = "1, 1">
-    <Map />
+
 
     <HUDHealthBar

code/branches/Presentation_HS17_merge/data/overlays/StoryModeHUD.oxo

@@ -2 +2 @@
 <Template name="StoryModeMap">
   <OverlayGroup name = "spaceshiphud" scale = "1, 1">
-    <Map />
-
 
      <GUIOverlay

code/branches/Presentation_HS17_merge/src/modules/overlays/hud/CMakeLists.txt

@@ -26 +26 @@
   LastTeamStandingInfos.cc
   CountDown.cc
+  StoryModeHUD.cc
 )

code/branches/Presentation_HS17_merge/src/orxonox/gametypes/StoryMode.cc

@@ -31 +31 @@
 #include "items/Engine.h"
 #include "controllers/ArtificialController.h"
+#include "controllers/NewHumanController.h"
 
 #include "core/CoreIncludes.h"
@@ -48 +49 @@
     {
         RegisterObject(StoryMode);
+        orxout() << "kill yourself1";
 
         this->gtinfo_ = new GametypeInfo(context);
@@ -60 +62 @@
         Gametype::start();
 
-        this->gtinfo_->sendAnnounceMessage("Marvin isch Chef");
+        this->gtinfo_->sendAnnounceMessage("send nudes");
     }
 */
     void StoryMode::exit()
     {
-        orxout() << "s funktioniert"<< endl;
         for (StoryMode* mission : ObjectList<StoryMode>())
         { //TODO: make sure that only the desired mission is ended !! This is a dirty HACK, that would end ALL missions!
@@ -72 +73 @@
         //Gametype::end();
     }
+
 /*
     void Mission::setTeams()

code/branches/Presentation_HS17_merge/src/orxonox/gametypes/StoryMode.h

@@ -41 +41 @@
             virtual ~StoryMode() {}
             static void exit();
+//            virtual void playerEntered(PlayerInfo* player);
 
             

code/branches/Presentation_HS17_merge/src/orxonox/infos/Bot.cc

@@ -100 +100 @@
             "Thomas the Tankengine",
             "Rick",
+            "send nudes",
             "Morty",
             "Charlie the Unicorn",

code/branches/Presentation_HS17_merge/src/orxonox/worldentities/CMakeLists.txt

@@ -13 +13 @@
   ExplosionPart.cc
   Actionpoint.cc
+  NameableStaticEntity.cc
 )
 

code/branches/Presentation_HS17_merge/src/orxonox/worldentities/pawns/CMakeLists.txt

@@ -7 +7 @@
   TeamBaseMatchBase.cc
   Destroyer.cc
+  StoryModePawn.cc
 )