#
# ChangeLog for code/branches/presentationFS16
#
# Generated by Trac 1.0.9
# Nov 25, 2024, 5:52:49 PM

Mon, 30 May 2016 08:21:29 GMT fvultier [11209]
	* code/branches/presentationFS16/data/gui/layouts/CampaignMenu.layout (modified)
	* code/branches/presentationFS16/data/levels/florin_johnny_presentation.oxw (modified)

	Preparation for the presentation. Failing the mission in ...


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 14:38:51 GMT fvultier [11207]
	* code/branches/presentationFS16 (modified)
	* code/branches/presentationFS16/data/gui/scripts/testscript.lua (modified)
	* code/branches/presentationFS16/data/levels/scriptController.oxw (modified)
	* code/branches/presentationFS16/src/orxonox/CMakeLists.txt (modified)
	* code/branches/presentationFS16/src/orxonox/OrxonoxPrereqs.h (modified)
	* code/branches/presentationFS16/src/orxonox/controllers/CMakeLists.txt (modified)
	* code/branches/presentationFS16/src/orxonox/controllers/ControllerDirector.cc (modified)
	* code/branches/presentationFS16/src/orxonox/controllers/ControllerDirector.h (modified)
	* code/branches/presentationFS16/src/orxonox/controllers/NewScriptController.cc (copied)
	* code/branches/presentationFS16/src/orxonox/controllers/NewScriptController.h (copied)
	* code/branches/presentationFS16/src/orxonox/controllers/ScriptController.cc (modified)
	* code/branches/presentationFS16/src/orxonox/controllers/ScriptController.h (modified)
	* code/branches/presentationFS16/src/orxonox/controllers/scriptTasks (copied)

	merged scriptable controller


Thu, 26 May 2016 14:15:54 GMT fvultier [11206]
	* code/branches/presentationFS16 (modified)
	* code/branches/presentationFS16/data/defaultConfig/orxonox.ini (modified)
	* code/branches/presentationFS16/data/gui/layouts/CampaignMenu.layout (modified)
	* code/branches/presentationFS16/data/gui/scripts/CampaignMenu.lua (modified)
	* code/branches/presentationFS16/data/gui/scripts/SingleplayerMenu.lua (modified)
	* code/branches/presentationFS16/src/orxonox/CMakeLists.txt (modified)
	* code/branches/presentationFS16/src/orxonox/LevelManager.cc (modified)
	* code/branches/presentationFS16/src/orxonox/LevelManager.h (modified)
	* code/branches/presentationFS16/src/orxonox/LevelStatus.cc (copied)
	* code/branches/presentationFS16/src/orxonox/LevelStatus.h (copied)
	* code/branches/presentationFS16/src/orxonox/gametypes/Mission.cc (modified)
	* code/branches/presentationFS16/src/orxonox/gametypes/Mission.h (modified)
	* code/branches/presentationFS16/src/orxonox/overlays/CMakeLists.txt (modified)
	* code/branches/presentationFS16/src/orxonox/overlays/CampaignMenu.cc (copied)
	* code/branches/presentationFS16/src/orxonox/overlays/CampaignMenu.h (copied)
	* code/branches/presentationFS16/src/orxonox/overlays/GUISheet.cc (modified)

	merged campain menu


Thu, 26 May 2016 13:28:46 GMT fvultier [11202]
	* code/branches/presentationFS16/src/modules/hover/HoverOrigin.h (modified)

	fixed some weird merge conflict


Thu, 26 May 2016 13:13:51 GMT fvultier [11199]
	* code/branches/presentationFS16/data/levels/Hover.oxw (modified)
	* code/branches/presentationFS16/data/levels/emptyLevel.oxw (modified)
	* code/branches/presentationFS16/data/levels/includes/weaponSettingsHover.oxi (modified)
	* code/branches/presentationFS16/data/levels/templates/spaceshipHover.oxt (modified)
	* code/branches/presentationFS16/data/overlays/HoverHUD.oxo (modified)
	* code/branches/presentationFS16/src/modules/hover/CMakeLists.txt (modified)
	* code/branches/presentationFS16/src/modules/hover/Hover.cc (modified)
	* code/branches/presentationFS16/src/modules/hover/Hover.h (modified)
	* code/branches/presentationFS16/src/modules/hover/HoverFlag.cc (modified)
	* code/branches/presentationFS16/src/modules/hover/HoverOrigin.cc (modified)
	* code/branches/presentationFS16/src/modules/hover/HoverOrigin.h (modified)
	* code/branches/presentationFS16/src/modules/hover/HoverShip.cc (modified)
	* code/branches/presentationFS16/src/modules/hover/HoverShip.h (modified)
	* code/branches/presentationFS16/src/modules/hover/TFlagsLivesLevelHUD.cc (copied)
	* code/branches/presentationFS16/src/modules/hover/TFlagsLivesLevelHUD.h (copied)
	* code/branches/presentationFS16/src/modules/invader/Invader.cc (modified)
	* code/branches/presentationFS16/src/modules/pickup/PickupSpawner.h (modified)
	* code/branches/presentationFS16/src/modules/weapons/weaponmodes/HsW01.cc (modified)
	* code/branches/presentationFS16/src/modules/weapons/weaponmodes/HsW01.h (modified)

	merged branch hover


Thu, 26 May 2016 12:15:53 GMT fvultier [11193]
	* code/branches/presentationFS16 (copied)

	New branch for presentation of the PPS projects FS16. Will merge all ...


Thu, 28 Apr 2016 13:45:32 GMT fvultier [11176]
	* code/trunk/src/orxonox/Scene.h (modified)
	* code/trunk/src/orxonox/weaponsystem/WeaponSystem.h (modified)
	* code/trunk/src/orxonox/worldentities/pawns/Pawn.cc (modified)
	* code/trunk/src/orxonox/worldentities/pawns/Pawn.h (modified)

	Added a debug console command that allows visualization of the ...