#
# ChangeLog for code/branches/presentation/data/particle
#
# Generated by Trac 1.0.9
# Nov 16, 2024, 3:15:40 AM

Sat, 28 May 2011 16:45:14 GMT landauf [8643]
	* code/branches/presentation/data/gui/layouts/DockingDialog.layout (modified)
	* code/branches/presentation/data/gui/scripts/DockingDialog.lua (modified)
	* code/branches/presentation/data/levels/docking.oxw (modified)
	* code/branches/presentation/data/levels/earth.oxw (modified)
	* code/branches/presentation/data/levels/includes/notifications.oxi (modified)
	* code/branches/presentation/data/levels/includes/weaponSettingsAssff2.oxi (modified)
	* code/branches/presentation/data/levels/includes/weaponSettingsImmTest.oxi (modified)
	* code/branches/presentation/data/levels/myTestLevel.oxw (modified)
	* code/branches/presentation/data/levels/portals.oxw (modified)
	* code/branches/presentation/data/levels/presentationFS11.oxw (modified)
	* code/branches/presentation/data/levels/quests.oxw (modified)
	* code/branches/presentation/data/levels/shieldTest.oxw (modified)
	* code/branches/presentation/data/levels/spaceRace.oxw (modified)
	* code/branches/presentation/data/levels/templates/spaceshipAssff2.oxt (modified)
	* code/branches/presentation/data/levels/templates/spaceshipImmTest.oxt (modified)
	* code/branches/presentation/data/levels/tetris.oxw (modified)
	* code/branches/presentation/data/particle/RingExp.particle (modified)
	* code/branches/presentation/data/particle/RingExp2.particle (modified)
	* code/branches/presentation/data/particle/RingExp3.particle (modified)
	* code/branches/presentation/data/particle/Shield.particle (modified)
	* code/branches/presentation/data/particle/weaponflare.particle (modified)
	* code/branches/presentation/data/particle/weaponshoot.particle (modified)

	set svn:eol-style to native, removed svn:executable property. no code ...


Sat, 28 May 2011 14:15:12 GMT landauf [8635]
	* code/branches/presentation/data/particle/Shield.particle (modified)
	* code/branches/presentation/src/modules/weapons/projectiles/BasicProjectile.cc (modified)

	the shield effect is now attached to the ship


Thu, 26 May 2011 11:44:06 GMT dafrick [8592]
	* code/branches/presentation (modified)
	* code/branches/presentation/data/levels/includes/weaponSettingsAssff.oxi (modified)
	* code/branches/presentation/data/levels/includes/weaponSettingsAssff2.oxi (copied)
	* code/branches/presentation/data/levels/templates/spaceshipAssff2.oxt (copied)
	* code/branches/presentation/data/particle/weaponflare.particle (copied)
	* code/branches/presentation/data/particle/weaponshoot.particle (copied)

	Merging weapons 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.


Wed, 25 May 2011 09:02:54 GMT dafrick [8570]
	* code/branches/presentation/data/levels/presentationFS11.oxw (modified)
	* code/branches/presentation/data/particle/RingExp.particle (added)
	* code/branches/presentation/data/particle/RingExp2.particle (added)
	* code/branches/presentation/data/particle/RingExp3.particle (added)

	Adding ring explosion particle effect to presentation level.


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

	Creating new presentation branch.


Mon, 06 Sep 2010 19:34:51 GMT rgrieder [7368]
	* code/trunk (modified)
	* code/trunk/data/overlays/hudtamplates_fps.oxo (modified)
	* code/trunk/data/overlays/hudtemplates3.oxo (modified)
	* code/trunk/data/overlays/underattackhud.oxo (modified)
	* code/trunk/data/particle/smoke1.particle (modified)
	* code/trunk/src/modules/overlays/hud/HUDBar.cc (modified)
	* code/trunk/src/modules/overlays/hud/HUDNavigation.cc (modified)
	* code/trunk/src/modules/overlays/hud/HUDRadar.cc (modified)

	Merged png2 branch back to trunk.