# # ChangeLog for code/branches/presentation/data/defaultConfig # # Generated by Trac 1.0.9 # Nov 26, 2024, 4:08:37 AM 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. Wed, 18 May 2011 08:57:00 GMT dafrick [8499] * code/branches/presentation (copied) Creating new presentation branch. Sat, 14 May 2011 07:38:10 GMT dafrick [8480] * code/trunk/data/defaultConfig/keybindings.ini (modified) Fixing bug #380.