#
# ChangeLog for code/branches/presentation/src/orxonox/controllers
#
# Generated by Trac 1.0.9
# May 29, 2024, 12:51:03 AM

Sun, 29 May 2011 17:15:43 GMT landauf [8668]
	* code/branches/presentation/src/orxonox/controllers/Controller.h (modified)
	* code/branches/presentation/src/orxonox/interfaces/InterfaceCompilation.cc (modified)
	* code/branches/presentation/src/orxonox/interfaces/PlayerTrigger.h (modified)
	* code/branches/presentation/src/orxonox/worldentities/pawns/SpaceShip.cc (modified)

	small cleanup


Wed, 25 May 2011 22:58:09 GMT dafrick [8589]
	* code/branches/presentation (modified)
	* code/branches/presentation/data/levels/templates/spaceshipAssff.oxt (modified)
	* code/branches/presentation/data/levels/templates/spaceshipGhost.oxt (modified)
	* code/branches/presentation/data/levels/templates/spaceshipH2.oxt (modified)
	* code/branches/presentation/data/levels/templates/spaceshipHXY.oxt (modified)
	* code/branches/presentation/data/levels/templates/spaceshipHXYSL.oxt (modified)
	* code/branches/presentation/data/levels/templates/spaceshipPirate.oxt (modified)
	* code/branches/presentation/data/levels/templates/spaceshipSwallow.oxt (modified)
	* code/branches/presentation/data/levels/templates/spaceshipTransporter.oxt (modified)
	* code/branches/presentation/data/levels/templates/spaceshipTransporterSL.oxt (modified)
	* code/branches/presentation/src/modules/overlays/hud/HUDSpeedBar.cc (modified)
	* code/branches/presentation/src/orxonox/controllers/HumanController.cc (modified)
	* code/branches/presentation/src/orxonox/gametypes/Dynamicmatch.cc (modified)
	* code/branches/presentation/src/orxonox/gametypes/Dynamicmatch.h (modified)
	* code/branches/presentation/src/orxonox/items/Engine.cc (modified)
	* code/branches/presentation/src/orxonox/items/Engine.h (modified)
	* code/branches/presentation/src/orxonox/worldentities/MobileEntity.cc (modified)
	* code/branches/presentation/src/orxonox/worldentities/MobileEntity.h (modified)
	* code/branches/presentation/src/orxonox/worldentities/pawns/SpaceShip.cc (modified)
	* code/branches/presentation/src/orxonox/worldentities/pawns/SpaceShip.h (modified)

	Merging bigships branch into presentation branch.


Wed, 25 May 2011 19:41:29 GMT dafrick [8580]
	* code/branches/presentation (modified)
	* code/branches/presentation/data/defaultConfig/keybindings.ini (modified)
	* code/branches/presentation/data/levels/includes/weaponSettingsAssff.oxi (modified)
	* code/branches/presentation/data/levels/includes/weaponSettingsImmTest.oxi (copied)
	* code/branches/presentation/data/levels/shieldTest.oxw (copied)
	* code/branches/presentation/data/levels/templates/spaceshipAssff.oxt (modified)
	* code/branches/presentation/data/levels/templates/spaceshipImmTest.oxt (copied)
	* code/branches/presentation/data/particle/Shield.particle (copied)
	* code/branches/presentation/src/modules/weapons/projectiles/BasicProjectile.cc (copied)
	* code/branches/presentation/src/modules/weapons/projectiles/BasicProjectile.h (copied)
	* code/branches/presentation/src/modules/weapons/projectiles/CMakeLists.txt (modified)
	* code/branches/presentation/src/modules/weapons/projectiles/Projectile.cc (modified)
	* code/branches/presentation/src/modules/weapons/projectiles/Projectile.h (modified)
	* code/branches/presentation/src/modules/weapons/projectiles/Rocket.cc (modified)
	* code/branches/presentation/src/modules/weapons/projectiles/Rocket.h (modified)
	* code/branches/presentation/src/modules/weapons/projectiles/SimpleRocket.cc (modified)
	* code/branches/presentation/src/modules/weapons/projectiles/SimpleRocket.h (modified)
	* code/branches/presentation/src/modules/weapons/weaponmodes/EnergyDrink.cc (modified)
	* code/branches/presentation/src/modules/weapons/weaponmodes/FusionFire.cc (modified)
	* code/branches/presentation/src/modules/weapons/weaponmodes/HsW01.cc (modified)
	* code/branches/presentation/src/modules/weapons/weaponmodes/LaserFire.cc (modified)
	* code/branches/presentation/src/modules/weapons/weaponmodes/LightningGun.cc (modified)
	* code/branches/presentation/src/modules/weapons/weaponmodes/RocketFire.cc (modified)
	* code/branches/presentation/src/modules/weapons/weaponmodes/SimpleRocketFire.cc (modified)
	* code/branches/presentation/src/orxonox/controllers/Controller.h (modified)
	* code/branches/presentation/src/orxonox/controllers/HumanController.cc (modified)
	* code/branches/presentation/src/orxonox/controllers/HumanController.h (modified)
	* code/branches/presentation/src/orxonox/graphics/Camera.cc (modified)
	* code/branches/presentation/src/orxonox/graphics/Camera.h (modified)
	* code/branches/presentation/src/orxonox/items/Engine.cc (modified)
	* code/branches/presentation/src/orxonox/weaponsystem/WeaponMode.cc (modified)
	* code/branches/presentation/src/orxonox/weaponsystem/WeaponMode.h (modified)
	* code/branches/presentation/src/orxonox/worldentities/ControllableEntity.cc (modified)
	* code/branches/presentation/src/orxonox/worldentities/ControllableEntity.h (modified)
	* code/branches/presentation/src/orxonox/worldentities/pawns/Pawn.cc (modified)
	* code/branches/presentation/src/orxonox/worldentities/pawns/Pawn.h (modified)
	* code/branches/presentation/src/orxonox/worldentities/pawns/SpaceShip.cc (modified)
	* code/branches/presentation/src/orxonox/worldentities/pawns/SpaceShip.h (modified)

	Merging game immersion branch into presentation branch.


Wed, 25 May 2011 19:28:29 GMT dafrick [8579]
	* code/branches/presentation/data/defaultConfig/keybindings.ini (modified)
	* code/branches/presentation/data/levels/includes/weaponSettingsAssff.oxi (modified)
	* code/branches/presentation/data/levels/includes/weaponSettingsImmTest.oxi (deleted)
	* code/branches/presentation/data/levels/shieldTest.oxw (deleted)
	* code/branches/presentation/data/levels/templates/spaceshipAssff.oxt (modified)
	* code/branches/presentation/data/levels/templates/spaceshipImmTest.oxt (deleted)
	* code/branches/presentation/data/particle/Shield.particle (deleted)
	* code/branches/presentation/src/modules/weapons/projectiles/BasicProjectile.cc (deleted)
	* code/branches/presentation/src/modules/weapons/projectiles/BasicProjectile.h (deleted)
	* code/branches/presentation/src/modules/weapons/projectiles/CMakeLists.txt (modified)
	* code/branches/presentation/src/modules/weapons/projectiles/Projectile.cc (modified)
	* code/branches/presentation/src/modules/weapons/projectiles/Projectile.h (modified)
	* code/branches/presentation/src/modules/weapons/projectiles/Rocket.cc (modified)
	* code/branches/presentation/src/modules/weapons/projectiles/Rocket.h (modified)
	* code/branches/presentation/src/modules/weapons/projectiles/SimpleRocket.cc (modified)
	* code/branches/presentation/src/modules/weapons/projectiles/SimpleRocket.h (modified)
	* code/branches/presentation/src/modules/weapons/weaponmodes/EnergyDrink.cc (modified)
	* code/branches/presentation/src/modules/weapons/weaponmodes/FusionFire.cc (modified)
	* code/branches/presentation/src/modules/weapons/weaponmodes/HsW01.cc (modified)
	* code/branches/presentation/src/modules/weapons/weaponmodes/LaserFire.cc (modified)
	* code/branches/presentation/src/modules/weapons/weaponmodes/LightningGun.cc (modified)
	* code/branches/presentation/src/modules/weapons/weaponmodes/RocketFire.cc (modified)
	* code/branches/presentation/src/modules/weapons/weaponmodes/SimpleRocketFire.cc (modified)
	* code/branches/presentation/src/orxonox/controllers/Controller.h (modified)
	* code/branches/presentation/src/orxonox/controllers/HumanController.cc (modified)
	* code/branches/presentation/src/orxonox/controllers/HumanController.h (modified)
	* code/branches/presentation/src/orxonox/graphics/Camera.cc (modified)
	* code/branches/presentation/src/orxonox/graphics/Camera.h (modified)
	* code/branches/presentation/src/orxonox/items/Engine.cc (modified)
	* code/branches/presentation/src/orxonox/weaponsystem/WeaponMode.cc (modified)
	* code/branches/presentation/src/orxonox/weaponsystem/WeaponMode.h (modified)
	* code/branches/presentation/src/orxonox/worldentities/ControllableEntity.cc (modified)
	* code/branches/presentation/src/orxonox/worldentities/ControllableEntity.h (modified)
	* code/branches/presentation/src/orxonox/worldentities/pawns/Pawn.cc (modified)
	* code/branches/presentation/src/orxonox/worldentities/pawns/Pawn.h (modified)
	* code/branches/presentation/src/orxonox/worldentities/pawns/SpaceShip.cc (modified)
	* code/branches/presentation/src/orxonox/worldentities/pawns/SpaceShip.h (modified)

	Reverse merge to revert last, failed, merge. Apparently you can't ...


Wed, 25 May 2011 19:22:53 GMT dafrick [8578]
	* code/branches/presentation/data/defaultConfig/keybindings.ini (modified)
	* code/branches/presentation/data/levels/includes/weaponSettingsAssff.oxi (modified)
	* code/branches/presentation/data/levels/includes/weaponSettingsImmTest.oxi (copied)
	* code/branches/presentation/data/levels/shieldTest.oxw (copied)
	* code/branches/presentation/data/levels/templates/spaceshipAssff.oxt (modified)
	* code/branches/presentation/data/levels/templates/spaceshipImmTest.oxt (copied)
	* code/branches/presentation/data/particle/Shield.particle (copied)
	* code/branches/presentation/src/modules/weapons/projectiles/BasicProjectile.cc (copied)
	* code/branches/presentation/src/modules/weapons/projectiles/BasicProjectile.h (copied)
	* code/branches/presentation/src/modules/weapons/projectiles/CMakeLists.txt (modified)
	* code/branches/presentation/src/modules/weapons/projectiles/Projectile.cc (modified)
	* code/branches/presentation/src/modules/weapons/projectiles/Projectile.h (modified)
	* code/branches/presentation/src/modules/weapons/projectiles/Rocket.cc (modified)
	* code/branches/presentation/src/modules/weapons/projectiles/Rocket.h (modified)
	* code/branches/presentation/src/modules/weapons/projectiles/SimpleRocket.cc (modified)
	* code/branches/presentation/src/modules/weapons/projectiles/SimpleRocket.h (modified)
	* code/branches/presentation/src/modules/weapons/weaponmodes/EnergyDrink.cc (modified)
	* code/branches/presentation/src/modules/weapons/weaponmodes/FusionFire.cc (modified)
	* code/branches/presentation/src/modules/weapons/weaponmodes/HsW01.cc (modified)
	* code/branches/presentation/src/modules/weapons/weaponmodes/LaserFire.cc (modified)
	* code/branches/presentation/src/modules/weapons/weaponmodes/LightningGun.cc (modified)
	* code/branches/presentation/src/modules/weapons/weaponmodes/RocketFire.cc (modified)
	* code/branches/presentation/src/modules/weapons/weaponmodes/SimpleRocketFire.cc (modified)
	* code/branches/presentation/src/orxonox/controllers/Controller.h (modified)
	* code/branches/presentation/src/orxonox/controllers/HumanController.cc (modified)
	* code/branches/presentation/src/orxonox/controllers/HumanController.h (modified)
	* code/branches/presentation/src/orxonox/graphics/Camera.cc (modified)
	* code/branches/presentation/src/orxonox/graphics/Camera.h (modified)
	* code/branches/presentation/src/orxonox/items/Engine.cc (modified)
	* code/branches/presentation/src/orxonox/weaponsystem/WeaponMode.cc (modified)
	* code/branches/presentation/src/orxonox/weaponsystem/WeaponMode.h (modified)
	* code/branches/presentation/src/orxonox/worldentities/ControllableEntity.cc (modified)
	* code/branches/presentation/src/orxonox/worldentities/ControllableEntity.h (modified)
	* code/branches/presentation/src/orxonox/worldentities/pawns/Pawn.cc (modified)
	* code/branches/presentation/src/orxonox/worldentities/pawns/Pawn.h (modified)
	* code/branches/presentation/src/orxonox/worldentities/pawns/SpaceShip.cc (modified)
	* code/branches/presentation/src/orxonox/worldentities/pawns/SpaceShip.h (modified)

	Merging game immersion branch into presentation branch.


Tue, 24 May 2011 14:44:39 GMT dafrick [8561]
	* code/branches/presentation (modified)
	* code/branches/presentation/data/gui/layouts/DockingDialog.layout (copied)
	* code/branches/presentation/data/gui/scripts/DockingDialog.lua (copied)
	* code/branches/presentation/data/levels/docking.oxw (copied)
	* code/branches/presentation/src/modules/CMakeLists.txt (modified)
	* code/branches/presentation/src/modules/docking (copied)
	* code/branches/presentation/src/modules/docking/CMakeLists.txt (copied)
	* code/branches/presentation/src/modules/docking/Dock.cc (copied)
	* code/branches/presentation/src/modules/docking/Dock.h (copied)
	* code/branches/presentation/src/modules/docking/DockToShip.cc (copied)
	* code/branches/presentation/src/modules/docking/DockToShip.h (copied)
	* code/branches/presentation/src/modules/docking/DockingAnimation.cc (copied)
	* code/branches/presentation/src/modules/docking/DockingAnimation.h (copied)
	* code/branches/presentation/src/modules/docking/DockingController.cc (copied)
	* code/branches/presentation/src/modules/docking/DockingController.h (copied)
	* code/branches/presentation/src/modules/docking/DockingEffect.cc (copied)
	* code/branches/presentation/src/modules/docking/DockingEffect.h (copied)
	* code/branches/presentation/src/modules/docking/DockingPrecompiledHeaders.h (copied)
	* code/branches/presentation/src/modules/docking/DockingPrereqs.h (copied)
	* code/branches/presentation/src/modules/docking/DockingTarget.cc (copied)
	* code/branches/presentation/src/modules/docking/DockingTarget.h (copied)
	* code/branches/presentation/src/modules/docking/MoveToDockingTarget.cc (copied)
	* code/branches/presentation/src/modules/docking/MoveToDockingTarget.h (copied)
	* code/branches/presentation/src/modules/objects/triggers/MultiTrigger.cc (modified)
	* code/branches/presentation/src/orxonox/controllers/ArtificialController.cc (modified)
	* code/branches/presentation/src/orxonox/controllers/ArtificialController.h (modified)
	* code/branches/presentation/src/orxonox/infos/PlayerInfo.cc (modified)
	* code/branches/presentation/src/orxonox/infos/PlayerInfo.h (modified)

	Merging dockingsystem2 branch to presentation branch.


Wed, 18 May 2011 08:57:00 GMT dafrick [8499]
	* code/branches/presentation (copied)

	Creating new presentation branch.


Mon, 09 May 2011 15:27:50 GMT scheusso [8436]
	* code/trunk/src/orxonox/controllers/NewHumanController.cc (modified)

	fixing uninitialised values