Changeset 10198 for code/branches/presentationFS14
- Timestamp:
- Jan 25, 2015, 3:39:30 PM (10 years ago)
- Location:
- code/branches/presentationFS14
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
code/branches/presentationFS14/data/levels/templates/standardTurret.oxt
r10072 r10198 1 1 <Template name=standardturret> 2 <Turret collisionType="dynamic">2 <Turret> 3 3 <attached> 4 4 <Model position="0,0,0" mesh="turretSocketFront.mesh" scale3D="10,10,10" pitch=-90/> … … 8 8 <Model position="0,0,0" mesh="turretSocketRight.mesh" scale3D="10,10,10" pitch=-90/> 9 9 10 <Turret position="0,0,-10" collisionType="dynamic" angularDamping=0.999999mass=100 maxPitch=90 maxYaw=90 maxAttackRadius=2000 minAttackRadius=30>10 <Turret position="0,0,-10" mass=100 maxPitch=90 maxYaw=90 maxAttackRadius=2000 minAttackRadius=30> 11 11 <attached> 12 12 <Model position="0,0,0" pitch="-90" roll="0" mesh="turretHead.mesh" scale3D="10,10,10"/> -
code/branches/presentationFS14/src/orxonox/worldentities/WorldEntity.cc
r10073 r10198 415 415 else if (this->isDynamic()) 416 416 { 417 //***HACKY HACK (to allow turrets to be attached)*** 418 //orxout(internal_warning) << "Cannot attach a dynamic object to a WorldEntity." << endl; 419 //return false; 417 orxout(internal_warning) << "Cannot attach a dynamic object to a WorldEntity." << endl; 418 return false; 420 419 } 421 420 else if (this->isKinematic() && newParent->isDynamic())
Note: See TracChangeset
for help on using the changeset viewer.