[Orxonox-commit 2303] r7018 - in code/branches/presentation3: data/levels data/particle src/modules/weapons src/modules/weapons/projectiles src/modules/weapons/weaponmodes src/orxonox/controllers
scheusso at orxonox.net
scheusso at orxonox.net
Sun May 30 15:19:49 CEST 2010
Author: scheusso
Date: 2010-05-30 15:19:49 +0200 (Sun, 30 May 2010)
New Revision: 7018
Added:
code/branches/presentation3/data/particle/simplerocketfire.particle
Modified:
code/branches/presentation3/data/levels/tutorial.oxw
code/branches/presentation3/src/modules/weapons/RocketController.cc
code/branches/presentation3/src/modules/weapons/RocketController.h
code/branches/presentation3/src/modules/weapons/projectiles/Rocket.cc
code/branches/presentation3/src/modules/weapons/projectiles/SimpleRocket.cc
code/branches/presentation3/src/modules/weapons/projectiles/SimpleRocket.h
code/branches/presentation3/src/modules/weapons/weaponmodes/SimpleRocketFire.cc
code/branches/presentation3/src/modules/weapons/weaponmodes/SimpleRocketFire.h
code/branches/presentation3/src/orxonox/controllers/AIController.cc
Log:
merged rocket2 branch back into presentation3 branch
Modified: code/branches/presentation3/data/levels/tutorial.oxw
===================================================================
--- code/branches/presentation3/data/levels/tutorial.oxw 2010-05-30 12:53:26 UTC (rev 7017)
+++ code/branches/presentation3/data/levels/tutorial.oxw 2010-05-30 13:19:49 UTC (rev 7018)
@@ -13,14 +13,17 @@
skybox = "Orxonox/skypanoramagen1"
>
- <Drone name="meineDrohne" primarythrust="80" auxilarythrust="10" rotationthrust="10" mass= "50" linearDamping = "0.9" angularDamping = "0.7">
- <attached>
- <Model scale="1" mesh="drone.mesh"/>
- </attached>
- <collisionShapes>
- <BoxCollisionShape position="0,0,0" halfExtents="10, 10, 10" />
- </collisionShapes>
- </Drone>
+
+
+
+<Drone name="meineDrohne" primarythrust="80" auxilarythrust="10" rotationthrust="10" mass= "50" linearDamping = "0.9" angularDamping = "0.7">
+ <attached>
+ <Model scale="1" mesh="drone.mesh"/>
+ </attached>
+ <collisionShapes>
+ <BoxCollisionShape position="0,0,0" halfExtents="10, 10, 10" />
+ </collisionShapes>
+</Drone>
<Drone name="meineDrohne" primarythrust="80" auxilarythrust="10" rotationthrust="10" mass= "50" linearDamping = "0.9" angularDamping = "0.7">
<attached>
Copied: code/branches/presentation3/data/particle/simplerocketfire.particle (from rev 6970, code/branches/rocket2/data/particle/simplerocketfire.particle)
===================================================================
--- code/branches/presentation3/data/particle/simplerocketfire.particle (rev 0)
+++ code/branches/presentation3/data/particle/simplerocketfire.particle 2010-05-30 13:19:49 UTC (rev 7018)
@@ -0,0 +1,50 @@
+ particle_system Orxonox/simplerocketfire
+{
+ quota 300
+ material PE/explosion
+ particle_width 5
+ particle_height 2
+ cull_each false
+ renderer billboard
+ sorted false
+ local_space false
+ iteration_interval 0
+ nonvisible_update_timeout 0
+ billboard_type point
+ billboard_origin center
+ billboard_rotation_type texcoord
+ common_up_vector 0 1 0
+ point_rendering false
+ accurate_facing false
+
+ emitter Ellipsoid
+ {
+ angle 2
+ colour 1 0.682759 1 1
+ colour_range_start 1 0.682759 1 1
+ colour_range_end 1 0.682759 1 1
+ direction 0 0 1
+ emission_rate 1200
+ position 0 0 3
+ velocity 10
+ velocity_min 10
+ velocity_max 48
+ time_to_live 0.1
+ time_to_live_min 0.1
+ time_to_live_max 0.2
+ duration 0
+ duration_min 0
+ duration_max 0
+ repeat_delay 0
+ repeat_delay_min 0
+ repeat_delay_max 0
+ width 0.8
+ height 0.8
+ depth 7
+ }
+
+ affector Scaler
+ {
+ rate -20
+ }
+}
Modified: code/branches/presentation3/src/modules/weapons/RocketController.cc
===================================================================
--- code/branches/presentation3/src/modules/weapons/RocketController.cc 2010-05-30 12:53:26 UTC (rev 7017)
+++ code/branches/presentation3/src/modules/weapons/RocketController.cc 2010-05-30 13:19:49 UTC (rev 7018)
@@ -1,30 +1,30 @@
/*
- * ORXONOX - the hottest 3D action shooter ever to exist
- * > www.orxonox.net <
- *
- *
- * License notice:
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * Author:
- * Gabriel Nadler, Originalfile: Oli Scheuss
- * Co-authors:
- * ...
- *
- */
+* ORXONOX - the hottest 3D action shooter ever to exist
+* > www.orxonox.net <
+*
+*
+* License notice:
+*
+* This program is free software; you can redistribute it and/or
+* modify it under the terms of the GNU General Public License
+* as published by the Free Software Foundation; either version 2
+* of the License, or (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program; if not, write to the Free Software
+* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+*
+* Author:
+* Gabriel Nadler, Originalfile: Oli Scheuss
+* Co-authors:
+* ...
+*
+*/
#include "RocketController.h"
#include "projectiles/SimpleRocket.h"
@@ -38,38 +38,37 @@
{
/**
@brief
- Constructor.
+ Constructor.
*/
RocketController::RocketController(BaseObject* creator) : Controller(creator)
{
RegisterObject(RocketController);
COUT(5)<< "RocketController constructed\n";
-
- this->rocket = new SimpleRocket(this);
- this->rocket->setController(this);
- this->setControllableEntity(dynamic_cast<ControllableEntity*> (rocket));
- this->haha=0;
+
+ this->rocket_ = new SimpleRocket(this);
+ this->rocket_->setController(this);
+ this->setControllableEntity(dynamic_cast<ControllableEntity*> (this->rocket_));
+ this->counter_=0;
}
/**
@brief
- The controlling happens here. This method defines what the controller has to do each tick.
+ The controlling happens here. This method defines what the controller has to do each tick.
@param dt
- The duration of the tick.
+ The duration of the tick.
*/
void RocketController::tick(float dt)
{
- haha++;
+ counter_++;
- //if (haha<30)this->rocket->setVelocity(rocket->getVelocity()*1.03);
- if (this->target_) {
+ if (this->target_ && this->rocket_->hasFuel()) {
this->setTargetPosition();
this->moveToTargetPosition();
}
- if (haha>500) rocket->setDestroy();;
-
+
+
}
@@ -80,8 +79,8 @@
void RocketController::setTargetPosition()
{
- //this->targetPosition_=this->target_->getWorldPosition();
- this->targetPosition_ = getPredictedPosition(this->getControllableEntity()->getWorldPosition(),this->getControllableEntity()->getVelocity().length() , this->target_->getWorldPosition(), this->target_->getVelocity());
+ this->targetPosition_=this->target_->getWorldPosition(); //don't really note a difference in the rocket behaviour xD
+ //this->targetPosition_ = getPredictedPosition(this->getControllableEntity()->getWorldPosition(),this->getControllableEntity()->getVelocity().length() , this->target_->getWorldPosition(), this->target_->getVelocity());
}
void RocketController::moveToTargetPosition()
{
@@ -99,38 +98,16 @@
{
if (!this->getControllableEntity())
return;
- //float dx = target.x-this->getControllableEntity()->getPosition().x;
- //float dy = target.y-this->getControllableEntity()->getPosition().y;
- COUT(4)<<"\n diff: ";
- COUT(4)<<target-this->getControllableEntity()->getPosition() << endl;
- //COUT(0)<<"\n 2D view: ";
- /* COUT(0)<<this->getControllableEntity()->getPosition().x;
- COUT(0)<<" ";
- COUT(0)<<this->getControllableEntity()->getPosition().y;
- COUT(0)<<" ";
- COUT(0)<<this->getControllableEntity()->getPosition().z;
- COUT(0)<<"\n";*/
Vector2 coord = get2DViewdirection(this->getControllableEntity()->getPosition(), this->getControllableEntity()->getOrientation() * WorldEntity::FRONT, this->getControllableEntity()->getOrientation() * WorldEntity::UP, target);
- //float distance = (target - this->getControllableEntity()->getPosition()).length();
- //Vector3D diff =target-this->rocket->getPosition();
- COUT(4) << "viewdirection: "<< coord << endl;
- //COUT(0)<<" ";
- //COUT(0)<<coord.y;
- this->getControllableEntity()->rotateYaw(-0.8f*sgn(coord.x)*coord.x*coord.x);
- this->getControllableEntity()->rotatePitch(0.8f*sgn(coord.y)*coord.y*coord.y);
-// this->getControllableEntity()->rotateYaw(10);
-// this->getControllableEntity()->rotatePitch(0);
- //this->getControllableEntity()->rotatePitch(rotation.getPitch().valueRadians());
- //this->getControllableEntity()->rotateYaw(rotation.getYaw().valueRadians());
- //this->getControllableEntity()->moveUpDown(coord.y);
- //this->getControllableEntity()->moveRightLeft(coord.x);
- //this->getControllableEntity()->rotatePitch(coord);
- // if (this->target_ || distance > 10)
- // {
- // // Multiply with 0.8 to make them a bit slower
- //this->getControllableEntity()->rotateYaw(coord.x );
- // this->getControllableEntity()->rotatePitch(coord.y);
- // }
+ float distance = (target - this->getControllableEntity()->getWorldPosition()).length();
+
+
+ if (distance > 1000&&this->getControllableEntity()->getVelocity().squaredLength()<160000)
+ this->getControllableEntity()->setAcceleration(this->rocket_->getOrientation()*Vector3(-20,-20,-20));
+ if (distance <1000) this->rocket_->setAcceleration(0,0,0);
+
+ this->getControllableEntity()->rotateYaw(-sgn(coord.x)*coord.x*coord.x);
+ this->getControllableEntity()->rotatePitch(sgn(coord.y)*coord.y*coord.y);
}
Modified: code/branches/presentation3/src/modules/weapons/RocketController.h
===================================================================
--- code/branches/presentation3/src/modules/weapons/RocketController.h 2010-05-30 12:53:26 UTC (rev 7017)
+++ code/branches/presentation3/src/modules/weapons/RocketController.h 2010-05-30 13:19:49 UTC (rev 7018)
@@ -40,7 +40,7 @@
{
/**
@brief
- Controller for the Drone of the PPS tutorial.
+ Controller for the Rocket (targetseeking)
@author
Gabriel Nadler, Originalfile: Oli Scheuss
*/
@@ -51,7 +51,7 @@
virtual ~RocketController();
virtual void tick(float dt);
- SimpleRocket* getRocket(){return this->rocket;};
+ SimpleRocket* getRocket(){return this->rocket_;};
void setTarget(WorldEntity* target);
protected:
void moveToPosition(const Vector3& target);
@@ -59,11 +59,12 @@
void moveToTargetPosition();
private:
- SimpleRocket* rocket;
+ SimpleRocket* rocket_;
Vector3 targetPosition_;
WeakPtr<PlayerInfo> player_;
- int haha;
+
WeakPtr<WorldEntity> target_;
+ int counter_;
};
Modified: code/branches/presentation3/src/modules/weapons/projectiles/Rocket.cc
===================================================================
--- code/branches/presentation3/src/modules/weapons/projectiles/Rocket.cc 2010-05-30 12:53:26 UTC (rev 7017)
+++ code/branches/presentation3/src/modules/weapons/projectiles/Rocket.cc 2010-05-30 13:19:49 UTC (rev 7018)
@@ -86,11 +86,13 @@
this->defSndWpnEngine_ = new WorldSound(this);
this->defSndWpnEngine_->setLooping(true);
this->defSndWpnEngine_->setSource("sounds/Rocket_engine.ogg");
+ this->defSndWpnEngine_->setVolume(100);
this->attach(defSndWpnEngine_);
this->defSndWpnLaunch_ = new WorldSound(this);
this->defSndWpnLaunch_->setLooping(false);
this->defSndWpnLaunch_->setSource("sounds/Rocket_launch.ogg");
+ this->defSndWpnLaunch_->setVolume(100);
this->attach(defSndWpnLaunch_);
}
else
Modified: code/branches/presentation3/src/modules/weapons/projectiles/SimpleRocket.cc
===================================================================
--- code/branches/presentation3/src/modules/weapons/projectiles/SimpleRocket.cc 2010-05-30 12:53:26 UTC (rev 7017)
+++ code/branches/presentation3/src/modules/weapons/projectiles/SimpleRocket.cc 2010-05-30 13:19:49 UTC (rev 7018)
@@ -57,53 +57,72 @@
this->localAngularVelocity_ = 0;
this->bDestroy_ = false;
- this->lifetime_ = 100;
+ this->lifetime_ = 120;
+ this->setMass(15);
COUT(4) << "simplerocket constructed\n";
+ this->maxLife_=90;
-
if (GameMode::isMaster())
{
- this->setCollisionType(WorldEntity::Kinematic);
- this->setVelocity(0,0,100);
+ this->setCollisionType(WorldEntity::Kinematic);
+ this->fuel_=true;
Model* model = new Model(this);
model->setMeshSource("rocket.mesh");
model->scale(0.7f);
this->attach(model);
- ParticleEmitter* fire = new ParticleEmitter(this);
- this->attach(fire);
- fire->setOrientation(this->getOrientation());
- fire->setSource("Orxonox/rocketfire2");
-
+ this->fire_ = new ParticleEmitter(this);
+ this->attach(this->fire_);
+
+ this->fire_->setOrientation(this->getOrientation());
+ this->fire_->setSource("Orxonox/simplerocketfire");
this->enableCollisionCallback();
this->setCollisionResponse(false);
this->setCollisionType(Kinematic);
// TODO: fix the orientation and size of this collision shape to match the rocket
ConeCollisionShape* collisionShape = new ConeCollisionShape(this);
- collisionShape->setRadius(3);
+ collisionShape->setOrientation(this->getOrientation());
+ collisionShape->setRadius(1.5f);
collisionShape->setHeight(5);
this->attachCollisionShape(collisionShape);
-
this->destroyTimer_.setTimer(this->lifetime_, false, createExecutor(createFunctor(&SimpleRocket::destroyObject, this)));
}
}
-
+
+
+
+
void SimpleRocket::tick(float dt)
{
+
SUPER(SimpleRocket, tick, dt);
+ if (this->getVelocity().squaredLength() >130000) this->maxLife_-=dt; //if Velocity bigger than about 360, uses a lot more "fuel" :)
+
this->setAngularVelocity(this->getOrientation() * this->localAngularVelocity_);
this->setVelocity( this->getOrientation()*WorldEntity::FRONT*this->getVelocity().length() );
this->localAngularVelocity_ = 0;
+
+ if (this->fuel_) {
+ if (this->destroyTimer_.getRemainingTime()< this->lifetime_-this->maxLife_ )
+ this->fuel_=false;
+ } else this->disableFire();
+
if( this->bDestroy_ )
this->destroy();
-
+
}
+ void SimpleRocket::disableFire(){
+ this->setAcceleration(0,0,0);
+ this->fire_->detachFromParent();
+
+ }
+
/**s
@brief
Destructor. Destroys controller, if present and kills sounds, if playing.
@@ -135,6 +154,7 @@
}
+
bool SimpleRocket::collidesAgainst(WorldEntity* otherObject, btManifoldPoint& contactPoint)
{
if (!this->bDestroy_ && GameMode::isMaster())
@@ -184,11 +204,6 @@
}
}
- void SimpleRocket::setDestroy()
- {
- this->bDestroy_=true;
- CCOUT(4)<<"trying to destroy";
- }
void SimpleRocket::fired(unsigned int firemode)
{
Modified: code/branches/presentation3/src/modules/weapons/projectiles/SimpleRocket.h
===================================================================
--- code/branches/presentation3/src/modules/weapons/projectiles/SimpleRocket.h 2010-05-30 12:53:26 UTC (rev 7017)
+++ code/branches/presentation3/src/modules/weapons/projectiles/SimpleRocket.h 2010-05-30 13:19:49 UTC (rev 7018)
@@ -33,6 +33,7 @@
#include "tools/Timer.h"
#include "worldentities/ControllableEntity.h"
+#include "graphics/ParticleSpawner.h"
namespace orxonox
{
@@ -56,6 +57,8 @@
virtual bool collidesAgainst(WorldEntity* otherObject, btManifoldPoint& contactPoint);
void destroyObject();
+ void disableFire();
+
virtual void moveFrontBack(const Vector2& value){}
virtual void moveRightLeft(const Vector2& value){}
virtual void moveUpDown(const Vector2& value){}
@@ -95,7 +98,7 @@
@param value The amount by which the SimpleRocket is to be rotated.
*/
inline void rotatePitch(float value)
- { COUT(0)<<"rotated rocket yaw";
+ {
this->rotatePitch(Vector2(value, 0)); }
/**
@brief Rotates the SimpleRocket around the z-axis by the specifed amount.
@@ -103,13 +106,17 @@
*/
inline void rotateRoll(float value)
{
- COUT(0)<<"rotated rocket roll";
this->rotateRoll(Vector2(value, 0)); }
void setOwner(Pawn* owner);
inline Pawn* getOwner() const
{ return this->owner_; }
+ inline bool hasFuel()
+ { return this->fuel_;}
+ inline void fuelRefill()
+ {this->fuel_=true;}
+
inline void setDamage(float damage)
{ this->damage_ = damage; }
inline float getDamage() const
@@ -122,12 +129,19 @@
Vector3 localAngularVelocity_;
float damage_;
bool bDestroy_;
+ bool fuel_;
WeakPtr<PlayerInfo> player_;
Timer destroyTimer_;
float lifetime_;
+ float maxLife_;
+ ParticleEmitter* fire_;
+
+
+
+
};
}
Modified: code/branches/presentation3/src/modules/weapons/weaponmodes/SimpleRocketFire.cc
===================================================================
--- code/branches/presentation3/src/modules/weapons/weaponmodes/SimpleRocketFire.cc 2010-05-30 12:53:26 UTC (rev 7017)
+++ code/branches/presentation3/src/modules/weapons/weaponmodes/SimpleRocketFire.cc 2010-05-30 13:19:49 UTC (rev 7018)
@@ -45,10 +45,10 @@
{
RegisterObject(SimpleRocketFire);
- this->reloadTime_ = 0.20f;
+ this->reloadTime_ = 4;
this->bParallelReload_ = false;
this->damage_ = 100;
- this->speed_ = 100;
+ this->speed_ = 300;
this->setMunitionName("LaserMunition");
// The firing sound of the Rocket is played in Rocket.cc (because of OpenAl sound positioning)
@@ -63,18 +63,12 @@
RocketController* con = new RocketController(this);
SimpleRocket* rocket = con->getRocket();
this->computeMuzzleParameters(this->getWeapon()->getWeaponPack()->getWeaponSystem()->getPawn()->getAimPosition());
-// rocket->setOrientation(this->getMuzzleOrientation());
rocket->setOrientation(this->getWeapon()->getWeaponPack()->getWeaponSystem()->getPawn()->getWorldOrientation());
- Vector3 pos = this->getMuzzlePosition();
- rocket->setPosition(pos);
-// rocket->setAcceleration(20*rocket->getOrientation() * WorldEntity::FRONT);
+ rocket->setPosition(this->getMuzzlePosition());
rocket->setVelocity(this->getMuzzleDirection()*this->speed_);
rocket->setOwner(this->getWeapon()->getWeaponPack()->getWeaponSystem()->getPawn());
rocket->setDamage(this->damage_);
WorldEntity* pawnn=static_cast<ControllableEntity*>(this->getWeapon()->getWeaponPack()->getWeaponSystem()->getPawn())->getTarget();
- if (pawnn)
- {
- con->setTarget(pawnn);
- }
+ if (pawnn) con->setTarget(pawnn);
}
}
Modified: code/branches/presentation3/src/modules/weapons/weaponmodes/SimpleRocketFire.h
===================================================================
--- code/branches/presentation3/src/modules/weapons/weaponmodes/SimpleRocketFire.h 2010-05-30 12:53:26 UTC (rev 7017)
+++ code/branches/presentation3/src/modules/weapons/weaponmodes/SimpleRocketFire.h 2010-05-30 13:19:49 UTC (rev 7018)
@@ -39,11 +39,12 @@
public:
SimpleRocketFire(BaseObject* creator);
virtual ~SimpleRocketFire();
-
+ void deactivateFire();
virtual void fire();
private:
float speed_;
+
};
}
Property changes on: code/branches/presentation3/src/orxonox/controllers/AIController.cc
___________________________________________________________________
Modified: svn:mergeinfo
- /code/branches/buildsystem/src/orxonox/controllers/AIController.cc:1874-2276,2278-2400
/code/branches/buildsystem2/src/orxonox/controllers/AIController.cc:2506-2658
/code/branches/buildsystem3/src/orxonox/controllers/AIController.cc:2662-2708
/code/branches/ceguilua/src/orxonox/controllers/AIController.cc:1802-1808
/code/branches/chat/src/orxonox/controllers/AIController.cc:6527-6797
/code/branches/chat2/src/orxonox/controllers/AIController.cc:6836-6910
/code/branches/console/src/orxonox/controllers/AIController.cc:5941-6104
/code/branches/core3/src/orxonox/controllers/AIController.cc:1572-1739
/code/branches/core4/src/orxonox/controllers/AIController.cc:3221-3224,3227,3234-3238,3242,3244-3250,3252-3254,3256,3259-3261,3264-3265,3268-3275,3277-3278,3280,3284-3285,3287,3289-3294,3305,3309-3310
/code/branches/core5/src/orxonox/controllers/AIController.cc:5768-5928,6009
/code/branches/gamestate/src/orxonox/controllers/AIController.cc:6430-6572,6621-6661
/code/branches/gamestates2/src/orxonox/controllers/AIController.cc:6594-6745
/code/branches/gametypes/src/orxonox/controllers/AIController.cc:2826-3031
/code/branches/gcc43/src/orxonox/controllers/AIController.cc:1580
/code/branches/gui/src/orxonox/controllers/AIController.cc:1635-1723,2795-2894
/code/branches/hudelements/src/orxonox/controllers/AIController.cc:6584-6941
/code/branches/ingamemenu/src/orxonox/controllers/AIController.cc:6000-6023
/code/branches/input/src/orxonox/controllers/AIController.cc:1629-1636
/code/branches/libraries/src/orxonox/controllers/AIController.cc:5612-5692
/code/branches/libraries2/src/orxonox/controllers/AIController.cc:5703-5737
/code/branches/lod/src/orxonox/controllers/AIController.cc:6586-6911
/code/branches/lodfinal/src/orxonox/controllers/AIController.cc:2372-2411
/code/branches/map/src/orxonox/controllers/AIController.cc:2801-3086,3089
/code/branches/menu/src/orxonox/controllers/AIController.cc:5941-6146,6148
/code/branches/miniprojects/src/orxonox/controllers/AIController.cc:2754-2824
/code/branches/netp2/src/orxonox/controllers/AIController.cc:2835-2988
/code/branches/netp3/src/orxonox/controllers/AIController.cc:2988-3082
/code/branches/netp6/src/orxonox/controllers/AIController.cc:3214-3302
/code/branches/network/src/orxonox/controllers/AIController.cc:2356
/code/branches/network64/src/orxonox/controllers/AIController.cc:2210-2355
/code/branches/objecthierarchy/src/orxonox/controllers/AIController.cc:1911-2085,2100,2110-2169
/code/branches/objecthierarchy2/src/orxonox/controllers/AIController.cc:2171-2479
/code/branches/overlay/src/orxonox/controllers/AIController.cc:2117-2385
/code/branches/particles/src/orxonox/controllers/AIController.cc:2829-3085
/code/branches/particles2/src/orxonox/controllers/AIController.cc:6050-6106,6109
/code/branches/pch/src/orxonox/controllers/AIController.cc:3113-3194
/code/branches/physics/src/orxonox/controllers/AIController.cc:1912-2055,2107-2439
/code/branches/physics_merge/src/orxonox/controllers/AIController.cc:2436-2457
/code/branches/pickup2/src/orxonox/controllers/AIController.cc:5942-6405
/code/branches/pickup3/src/orxonox/controllers/AIController.cc:6418-6523
/code/branches/pickup4/src/orxonox/controllers/AIController.cc:6594-6710
/code/branches/pickups/src/orxonox/controllers/AIController.cc:1926-2086,2127,2827-2915
/code/branches/pickups2/src/orxonox/controllers/AIController.cc:2107-2497,2915-3071
/code/branches/ppspickups1/src/orxonox/controllers/AIController.cc:6552-6708
/code/branches/ppspickups2/src/orxonox/controllers/AIController.cc:6527-6532,6554-6709
/code/branches/ppspickups3/src/orxonox/controllers/AIController.cc:6757-6997
/code/branches/presentation/src/orxonox/controllers/AIController.cc:2369-2652,2654-2660
/code/branches/presentation2/src/orxonox/controllers/AIController.cc:6106-6416
/code/branches/questsystem/src/orxonox/controllers/AIController.cc:1894-2088
/code/branches/questsystem2/src/orxonox/controllers/AIController.cc:2107-2259
/code/branches/questsystem5/src/orxonox/controllers/AIController.cc:2776-2905
/code/branches/resource/src/orxonox/controllers/AIController.cc:3327-3366
/code/branches/resource2/src/orxonox/controllers/AIController.cc:3372-5694
/code/branches/rocket/src/orxonox/controllers/AIController.cc:6779-6950
/code/branches/script_trigger/src/orxonox/controllers/AIController.cc:1295-1953,1955
/code/branches/skybox2/src/orxonox/controllers/AIController.cc:6559-6989
/code/branches/sound/src/orxonox/controllers/AIController.cc:2829-3010
/code/branches/sound3/src/orxonox/controllers/AIController.cc:5941-6102
/code/branches/steering/src/orxonox/controllers/AIController.cc:5949-6091
/code/branches/weapon/src/orxonox/controllers/AIController.cc:1925-2094
/code/branches/weapon2/src/orxonox/controllers/AIController.cc:2107-2488
/code/branches/weapons/src/orxonox/controllers/AIController.cc:2897-3051
/code/branches/weaponsystem/src/orxonox/controllers/AIController.cc:2742-2890
+ /code/branches/buildsystem/src/orxonox/controllers/AIController.cc:1874-2276,2278-2400
/code/branches/buildsystem2/src/orxonox/controllers/AIController.cc:2506-2658
/code/branches/buildsystem3/src/orxonox/controllers/AIController.cc:2662-2708
/code/branches/ceguilua/src/orxonox/controllers/AIController.cc:1802-1808
/code/branches/chat/src/orxonox/controllers/AIController.cc:6527-6797
/code/branches/chat2/src/orxonox/controllers/AIController.cc:6836-6910
/code/branches/console/src/orxonox/controllers/AIController.cc:5941-6104
/code/branches/core3/src/orxonox/controllers/AIController.cc:1572-1739
/code/branches/core4/src/orxonox/controllers/AIController.cc:3221-3224,3227,3234-3238,3242,3244-3250,3252-3254,3256,3259-3261,3264-3265,3268-3275,3277-3278,3280,3284-3285,3287,3289-3294,3305,3309-3310
/code/branches/core5/src/orxonox/controllers/AIController.cc:5768-5928,6009
/code/branches/gamestate/src/orxonox/controllers/AIController.cc:6430-6572,6621-6661
/code/branches/gamestates2/src/orxonox/controllers/AIController.cc:6594-6745
/code/branches/gametypes/src/orxonox/controllers/AIController.cc:2826-3031
/code/branches/gcc43/src/orxonox/controllers/AIController.cc:1580
/code/branches/gui/src/orxonox/controllers/AIController.cc:1635-1723,2795-2894
/code/branches/hudelements/src/orxonox/controllers/AIController.cc:6584-6941
/code/branches/ingamemenu/src/orxonox/controllers/AIController.cc:6000-6023
/code/branches/input/src/orxonox/controllers/AIController.cc:1629-1636
/code/branches/libraries/src/orxonox/controllers/AIController.cc:5612-5692
/code/branches/libraries2/src/orxonox/controllers/AIController.cc:5703-5737
/code/branches/lod/src/orxonox/controllers/AIController.cc:6586-6911
/code/branches/lodfinal/src/orxonox/controllers/AIController.cc:2372-2411
/code/branches/map/src/orxonox/controllers/AIController.cc:2801-3086,3089
/code/branches/menu/src/orxonox/controllers/AIController.cc:5941-6146,6148
/code/branches/miniprojects/src/orxonox/controllers/AIController.cc:2754-2824
/code/branches/netp2/src/orxonox/controllers/AIController.cc:2835-2988
/code/branches/netp3/src/orxonox/controllers/AIController.cc:2988-3082
/code/branches/netp6/src/orxonox/controllers/AIController.cc:3214-3302
/code/branches/network/src/orxonox/controllers/AIController.cc:2356
/code/branches/network64/src/orxonox/controllers/AIController.cc:2210-2355
/code/branches/objecthierarchy/src/orxonox/controllers/AIController.cc:1911-2085,2100,2110-2169
/code/branches/objecthierarchy2/src/orxonox/controllers/AIController.cc:2171-2479
/code/branches/overlay/src/orxonox/controllers/AIController.cc:2117-2385
/code/branches/particles/src/orxonox/controllers/AIController.cc:2829-3085
/code/branches/particles2/src/orxonox/controllers/AIController.cc:6050-6106,6109
/code/branches/pch/src/orxonox/controllers/AIController.cc:3113-3194
/code/branches/physics/src/orxonox/controllers/AIController.cc:1912-2055,2107-2439
/code/branches/physics_merge/src/orxonox/controllers/AIController.cc:2436-2457
/code/branches/pickup2/src/orxonox/controllers/AIController.cc:5942-6405
/code/branches/pickup3/src/orxonox/controllers/AIController.cc:6418-6523
/code/branches/pickup4/src/orxonox/controllers/AIController.cc:6594-6710
/code/branches/pickups/src/orxonox/controllers/AIController.cc:1926-2086,2127,2827-2915
/code/branches/pickups2/src/orxonox/controllers/AIController.cc:2107-2497,2915-3071
/code/branches/ppspickups1/src/orxonox/controllers/AIController.cc:6552-6708
/code/branches/ppspickups2/src/orxonox/controllers/AIController.cc:6527-6532,6554-6709
/code/branches/ppspickups3/src/orxonox/controllers/AIController.cc:6757-6997
/code/branches/presentation/src/orxonox/controllers/AIController.cc:2369-2652,2654-2660
/code/branches/presentation2/src/orxonox/controllers/AIController.cc:6106-6416
/code/branches/questsystem/src/orxonox/controllers/AIController.cc:1894-2088
/code/branches/questsystem2/src/orxonox/controllers/AIController.cc:2107-2259
/code/branches/questsystem5/src/orxonox/controllers/AIController.cc:2776-2905
/code/branches/resource/src/orxonox/controllers/AIController.cc:3327-3366
/code/branches/resource2/src/orxonox/controllers/AIController.cc:3372-5694
/code/branches/rocket/src/orxonox/controllers/AIController.cc:6779-6950
/code/branches/rocket2/src/orxonox/controllers/AIController.cc:6953-6970
/code/branches/script_trigger/src/orxonox/controllers/AIController.cc:1295-1953,1955
/code/branches/skybox2/src/orxonox/controllers/AIController.cc:6559-6989
/code/branches/sound/src/orxonox/controllers/AIController.cc:2829-3010
/code/branches/sound3/src/orxonox/controllers/AIController.cc:5941-6102
/code/branches/steering/src/orxonox/controllers/AIController.cc:5949-6091
/code/branches/weapon/src/orxonox/controllers/AIController.cc:1925-2094
/code/branches/weapon2/src/orxonox/controllers/AIController.cc:2107-2488
/code/branches/weapons/src/orxonox/controllers/AIController.cc:2897-3051
/code/branches/weaponsystem/src/orxonox/controllers/AIController.cc:2742-2890
More information about the Orxonox-commit
mailing list