#
# ChangeLog for code/branches/presentationFS16/data/levels/florin_johnny_presentation.oxw
#
# Generated by Trac 1.0.9
# May 17, 2024, 5:59:42 PM

Thu, 26 May 2016 14:53:34 GMT fvultier [11208]
	* code/branches/presentationFS16 (modified)
	* code/branches/presentationFS16/data/defaultConfig/keybindings.ini (modified)
	* code/branches/presentationFS16/data/gui/scripts/KeyBindMenu.lua (modified)
	* code/branches/presentationFS16/data/levels/emptyLevel.oxw (modified)
	* code/branches/presentationFS16/data/levels/florin_johnny_presentation.oxw (copied)
	* code/branches/presentationFS16/data/levels/includes/weaponSettingsEscort.oxi (modified)
	* code/branches/presentationFS16/data/levels/includes/weaponSettingsEscortDischarger.oxi (copied)
	* code/branches/presentationFS16/data/levels/includes/weaponSettingsFx112.oxi (copied)
	* code/branches/presentationFS16/data/levels/missionOne.oxw (modified)
	* code/branches/presentationFS16/data/levels/templates/spaceshipEscortDischarger.oxt (copied)
	* code/branches/presentationFS16/data/levels/templates/spaceshipFx112.oxt (copied)
	* code/branches/presentationFS16/data/overlays/HUDTemplates3.oxo (modified)
	* code/branches/presentationFS16/src/modules/invader/InvaderEnemyShooter.cc (modified)
	* code/branches/presentationFS16/src/modules/invader/InvaderShip.cc (modified)
	* code/branches/presentationFS16/src/modules/jump/JumpFigure.cc (modified)
	* code/branches/presentationFS16/src/modules/jump/JumpFigure.h (modified)
	* code/branches/presentationFS16/src/modules/objects/controllers/TurretController.cc (modified)
	* code/branches/presentationFS16/src/modules/overlays/hud/CMakeLists.txt (modified)
	* code/branches/presentationFS16/src/modules/overlays/hud/HUDChargeBar.cc (copied)
	* code/branches/presentationFS16/src/modules/overlays/hud/HUDChargeBar.h (copied)
	* code/branches/presentationFS16/src/modules/towerdefense/TowerDefenseSelecter.cc (modified)
	* code/branches/presentationFS16/src/modules/towerdefense/TowerDefenseSelecter.h (modified)
	* code/branches/presentationFS16/src/modules/weapons/WeaponsPrereqs.h (modified)
	* code/branches/presentationFS16/src/modules/weapons/projectiles/Rocket.cc (modified)
	* code/branches/presentationFS16/src/modules/weapons/projectiles/Rocket.h (modified)
	* code/branches/presentationFS16/src/modules/weapons/projectiles/RocketOld.cc (modified)
	* code/branches/presentationFS16/src/modules/weapons/projectiles/RocketOld.h (modified)
	* code/branches/presentationFS16/src/modules/weapons/weaponmodes/CMakeLists.txt (modified)
	* code/branches/presentationFS16/src/modules/weapons/weaponmodes/Discharger.cc (copied)
	* code/branches/presentationFS16/src/modules/weapons/weaponmodes/Discharger.h (copied)
	* code/branches/presentationFS16/src/orxonox/controllers/AIController.cc (modified)
	* code/branches/presentationFS16/src/orxonox/controllers/ArtificialController.cc (modified)
	* code/branches/presentationFS16/src/orxonox/controllers/ArtificialController.h (modified)
	* code/branches/presentationFS16/src/orxonox/controllers/DroneController.cc (modified)
	* code/branches/presentationFS16/src/orxonox/controllers/FightingController.cc (modified)
	* code/branches/presentationFS16/src/orxonox/controllers/HumanController.cc (modified)
	* code/branches/presentationFS16/src/orxonox/controllers/HumanController.h (modified)
	* code/branches/presentationFS16/src/orxonox/controllers/NewHumanController.cc (modified)
	* code/branches/presentationFS16/src/orxonox/controllers/NewHumanController.h (modified)
	* code/branches/presentationFS16/src/orxonox/controllers/WaypointPatrolController.cc (modified)
	* code/branches/presentationFS16/src/orxonox/weaponsystem/Weapon.cc (modified)
	* code/branches/presentationFS16/src/orxonox/weaponsystem/Weapon.h (modified)
	* code/branches/presentationFS16/src/orxonox/weaponsystem/WeaponMode.cc (modified)
	* code/branches/presentationFS16/src/orxonox/weaponsystem/WeaponMode.h (modified)
	* code/branches/presentationFS16/src/orxonox/weaponsystem/WeaponPack.cc (modified)
	* code/branches/presentationFS16/src/orxonox/weaponsystem/WeaponPack.h (modified)
	* code/branches/presentationFS16/src/orxonox/weaponsystem/WeaponSet.cc (modified)
	* code/branches/presentationFS16/src/orxonox/weaponsystem/WeaponSet.h (modified)
	* code/branches/presentationFS16/src/orxonox/weaponsystem/WeaponSystem.cc (modified)
	* code/branches/presentationFS16/src/orxonox/weaponsystem/WeaponSystem.h (modified)
	* code/branches/presentationFS16/src/orxonox/worldentities/ControllableEntity.cc (modified)
	* code/branches/presentationFS16/src/orxonox/worldentities/ControllableEntity.h (modified)
	* code/branches/presentationFS16/src/orxonox/worldentities/pawns/Pawn.cc (modified)
	* code/branches/presentationFS16/src/orxonox/worldentities/pawns/Pawn.h (modified)
	* code/branches/presentationFS16/src/orxonox/worldentities/pawns/Spectator.cc (modified)
	* code/branches/presentationFS16/src/orxonox/worldentities/pawns/Spectator.h (modified)

	merged discharger, thats the last one


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