#
# ChangeLog for code/branches/sagerjFS16/data/levels
#
# Generated by Trac 1.0.9
# Nov 30, 2024, 5:21:34 AM

Thu, 26 May 2016 13:58:37 GMT sagerj [11205]
	* code/branches/sagerjFS16/data/levels/florin_johnny_presentation.oxw (added)
	* code/branches/sagerjFS16/data/levels/includes/weaponSettingsEscortDischarger.oxi (modified)
	* code/branches/sagerjFS16/data/levels/includes/weaponSettingsFx112.oxi (added)
	* code/branches/sagerjFS16/data/levels/templates/spaceshipFx112.oxt (added)
	* code/branches/sagerjFS16/src/modules/overlays/hud/HUDChargeBar.cc (modified)
	* code/branches/sagerjFS16/src/modules/weapons/weaponmodes/Discharger.cc (modified)
	* code/branches/sagerjFS16/src/modules/weapons/weaponmodes/Discharger.h (modified)

	zusammengemerged mit florin project


Thu, 19 May 2016 15:04:41 GMT sagerj [11189]
	* code/branches/sagerjFS16/data/levels/emptyLevel.oxw (modified)
	* code/branches/sagerjFS16/data/levels/includes/weaponSettingsEscort.oxi (modified)
	* code/branches/sagerjFS16/data/levels/includes/weaponSettingsEscortDischarger.oxi (added)
	* code/branches/sagerjFS16/data/levels/templates/spaceshipEscortDischarger.oxt (added)
	* code/branches/sagerjFS16/data/overlays/HUDTemplates3.oxo (modified)
	* code/branches/sagerjFS16/src/modules/overlays/hud/HUDChargeBar.cc (modified)
	* code/branches/sagerjFS16/src/modules/overlays/hud/HUDChargeBar.h (modified)
	* code/branches/sagerjFS16/src/modules/weapons/weaponmodes/Discharger.cc (modified)
	* code/branches/sagerjFS16/src/modules/weapons/weaponmodes/Discharger.h (modified)
	* code/branches/sagerjFS16/src/orxonox/weaponsystem/WeaponMode.cc (modified)
	* code/branches/sagerjFS16/src/orxonox/weaponsystem/WeaponMode.h (modified)

	done/fixed everything, weaponmode/discharger fully commented only ...


Thu, 12 May 2016 14:03:47 GMT sagerj [11185]
	* code/branches/sagerjFS16/data/levels/includes/weaponSettingsEscort.oxi (modified)
	* code/branches/sagerjFS16/data/levels/missionOne.oxw (modified)
	* code/branches/sagerjFS16/data/overlays/HUDTemplates3.oxo (modified)
	* code/branches/sagerjFS16/src/modules/overlays/hud/CMakeLists.txt (modified)
	* code/branches/sagerjFS16/src/modules/overlays/hud/HUDChargeBar.cc (added)
	* code/branches/sagerjFS16/src/modules/overlays/hud/HUDChargeBar.h (added)
	* code/branches/sagerjFS16/src/modules/weapons/weaponmodes/Discharger.cc (modified)
	* code/branches/sagerjFS16/src/modules/weapons/weaponmodes/Discharger.h (modified)
	* code/branches/sagerjFS16/src/orxonox/weaponsystem/WeaponMode.cc (modified)
	* code/branches/sagerjFS16/src/orxonox/weaponsystem/WeaponMode.h (modified)

	fix the charging during reloadtime, the hudchargebar working so
	far...


Thu, 21 Apr 2016 13:33:48 GMT sagerj [11170]
	* code/branches/sagerjFS16/data/levels/includes/weaponSettingsEscort.oxi (modified)
	* code/branches/sagerjFS16/src/modules/weapons/weaponmodes/Discharger.cc (modified)
	* code/branches/sagerjFS16/src/modules/weapons/weaponmodes/Discharger.h (modified)
	* code/branches/sagerjFS16/src/orxonox/controllers/HumanController.cc (modified)
	* code/branches/sagerjFS16/src/orxonox/controllers/NewHumanController.cc (modified)
	* code/branches/sagerjFS16/src/orxonox/weaponsystem/Weapon.cc (modified)
	* code/branches/sagerjFS16/src/orxonox/weaponsystem/WeaponMode.cc (modified)
	* code/branches/sagerjFS16/src/orxonox/weaponsystem/WeaponMode.h (modified)
	* code/branches/sagerjFS16/src/orxonox/weaponsystem/WeaponPack.cc (modified)
	* code/branches/sagerjFS16/src/orxonox/weaponsystem/WeaponSet.cc (modified)
	* code/branches/sagerjFS16/src/orxonox/weaponsystem/WeaponSystem.cc (modified)
	* code/branches/sagerjFS16/src/orxonox/worldentities/ControllableEntity.cc (modified)
	* code/branches/sagerjFS16/src/orxonox/worldentities/pawns/Pawn.cc (modified)

	running backup


Thu, 14 Apr 2016 14:02:00 GMT sagerj [11166]
	* code/branches/sagerjFS16/data/levels/includes/weaponSettingsEscort.oxi (modified)
	* code/branches/sagerjFS16/src/modules/weapons/WeaponsPrereqs.h (modified)
	* code/branches/sagerjFS16/src/modules/weapons/weaponmodes/CMakeLists.txt (modified)
	* code/branches/sagerjFS16/src/modules/weapons/weaponmodes/Discharger.cc (modified)
	* code/branches/sagerjFS16/src/modules/weapons/weaponmodes/Discharger.h (modified)
	* code/branches/sagerjFS16/src/orxonox/controllers/HumanController.cc (modified)
	* code/branches/sagerjFS16/src/orxonox/controllers/NewHumanController.cc (modified)
	* code/branches/sagerjFS16/src/orxonox/controllers/NewHumanController.h (modified)
	* code/branches/sagerjFS16/src/orxonox/weaponsystem/Weapon.cc (modified)
	* code/branches/sagerjFS16/src/orxonox/weaponsystem/WeaponMode.cc (modified)
	* code/branches/sagerjFS16/src/orxonox/weaponsystem/WeaponMode.h (modified)
	* code/branches/sagerjFS16/src/orxonox/weaponsystem/WeaponPack.cc (modified)
	* code/branches/sagerjFS16/src/orxonox/weaponsystem/WeaponSet.cc (modified)
	* code/branches/sagerjFS16/src/orxonox/weaponsystem/WeaponSystem.cc (modified)
	* code/branches/sagerjFS16/src/orxonox/worldentities/ControllableEntity.cc (modified)
	* code/branches/sagerjFS16/src/orxonox/worldentities/pawns/Pawn.cc (modified)
	* code/branches/sagerjFS16/src/orxonox/worldentities/pawns/Pawn.h (modified)

	today I got pawn'ed


Thu, 17 Mar 2016 12:57:56 GMT fvultier [11138]
	* code/branches/sagerjFS16 (copied)




Thu, 04 Feb 2016 22:54:04 GMT fvultier [11108]
	* code/trunk/data/levels/includes/weaponSettingsFPS.oxi (modified)
	* code/trunk/data/levels/includes/weaponSettingsGhost.oxi (modified)
	* code/trunk/data/levels/templates/pickupRepresentationTemplates.oxt (modified)
	* code/trunk/src/modules/weapons/munitions/CMakeLists.txt (modified)
	* code/trunk/src/modules/weapons/munitions/FlameMunition.cc (added)
	* code/trunk/src/modules/weapons/munitions/FlameMunition.h (added)
	* code/trunk/src/modules/weapons/munitions/LaserMunition.cc (modified)
	* code/trunk/src/modules/weapons/projectiles/BasicProjectile.cc (modified)
	* code/trunk/src/modules/weapons/projectiles/BasicProjectile.h (modified)
	* code/trunk/src/modules/weapons/projectiles/CMakeLists.txt (modified)
	* code/trunk/src/modules/weapons/projectiles/FlameGunProjectile.cc (added)
	* code/trunk/src/modules/weapons/projectiles/FlameGunProjectile.h (added)
	* code/trunk/src/modules/weapons/projectiles/LightningGunProjectile.cc (modified)
	* code/trunk/src/modules/weapons/projectiles/ParticleProjectile.cc (modified)
	* code/trunk/src/modules/weapons/projectiles/ParticleProjectile.h (modified)
	* code/trunk/src/modules/weapons/projectiles/Projectile.cc (modified)
	* code/trunk/src/modules/weapons/projectiles/SplitGunProjectile.cc (modified)
	* code/trunk/src/modules/weapons/projectiles/SplitGunProjectile.h (modified)
	* code/trunk/src/modules/weapons/weaponmodes/CMakeLists.txt (modified)
	* code/trunk/src/modules/weapons/weaponmodes/EnergyDrink.cc (modified)
	* code/trunk/src/modules/weapons/weaponmodes/EnergyDrink.h (modified)
	* code/trunk/src/modules/weapons/weaponmodes/FlameGun.cc (added)
	* code/trunk/src/modules/weapons/weaponmodes/FlameGun.h (added)
	* code/trunk/src/modules/weapons/weaponmodes/FusionFire.cc (modified)
	* code/trunk/src/modules/weapons/weaponmodes/GravityBombFire.cc (modified)
	* code/trunk/src/modules/weapons/weaponmodes/HsW01.cc (modified)
	* code/trunk/src/modules/weapons/weaponmodes/IceGun.cc (modified)
	* code/trunk/src/modules/weapons/weaponmodes/LaserFire.cc (modified)
	* code/trunk/src/modules/weapons/weaponmodes/LightningGun.cc (modified)
	* code/trunk/src/modules/weapons/weaponmodes/MineGun.cc (modified)
	* code/trunk/src/modules/weapons/weaponmodes/SimpleRocketFire.cc (modified)
	* code/trunk/src/modules/weapons/weaponmodes/SplitGun.cc (modified)
	* code/trunk/src/orxonox/weaponsystem/WeaponMode.cc (modified)
	* code/trunk/src/orxonox/weaponsystem/WeaponMode.h (modified)

	A few modifications in the weapon system: WeaponModes may play a ...