Changeset 9898 for code/branches/presentationHS13

Timestamp:

Dec 16, 2013, 1:26:30 PM (11 years ago)

Author:

noep

Message:

Added HeavyCruiser files

Location:

code/branches/presentationHS13

Files:

• data/levels/HeavyCruiser.oxw (added)
• data/levels/includes/HeavyCruiserParts.lua (added)
• data/levels/includes/weaponSettingsHeavyCruiser.oxi (added)
• data/levels/includes/weaponSettingsHeavyCruiserBody.oxi (added)
• data/levels/templates/HeavyCruiser.oxt (added)
• data/levels/templates/HeavyCruiserBody.oxt (added)
• src/orxonox/controllers/NewHumanController.cc (modified) (1 diff)
• src/orxonox/interfaces/RadarViewable.h (modified) (1 diff)

code/branches/presentationHS13/src/orxonox/controllers/NewHumanController.cc

@@ -443 +443 @@
 
         if (pawn)
-            pawn->setAimPosition( mouseRay.getOrigin() + mouseRay.getDirection() * 1200 );
+            pawn->setAimPosition( mouseRay.getOrigin() + mouseRay.getDirection() * 3000 );
 
         if( this->getControllableEntity() && this->getControllableEntity()->getTarget() != 0 )

code/branches/presentationHS13/src/orxonox/interfaces/RadarViewable.h

@@ -63 +63 @@
         virtual void setRadarName(const std::string& name)
             {
+            // The following if-clause hides objects with radarname "HIDDEN"
+                if (name == "HIDDEN")
+                {
+                    this->bVisibility_ = 0;
+                    this->settingsChanged();
+                }
                 if (this->radarName_ != name)
                 {