#
# ChangeLog for code/branches/presentationHS15/data/particle
#
# Generated by Trac 1.0.9
# Nov 22, 2024, 11:37:58 AM

Sat, 09 Jan 2016 15:25:02 GMT landauf [11048]
	* code/branches/presentationHS15/data/particle/engine.particle (modified)
	* code/branches/presentationHS15/data/particle/engineglow.particle (modified)

	fixed material in particle effects


Sun, 03 Jan 2016 13:57:42 GMT landauf [11026]
	* code/branches/presentationHS15/data/levels/AITest.oxw (modified)
	* code/branches/presentationHS15/data/levels/Hover.oxw (modified)
	* code/branches/presentationHS15/data/levels/expeditionSector.oxw (modified)
	* code/branches/presentationHS15/data/levels/includes/weaponSettingsEscortMine.oxi (modified)
	* code/branches/presentationHS15/data/levels/includes/weaponSettingsHover.oxi (modified)
	* code/branches/presentationHS15/data/levels/mineLevel.oxw (modified)
	* code/branches/presentationHS15/data/levels/planetLevelHS15.oxw (modified)
	* code/branches/presentationHS15/data/levels/shuttleAttack.oxw (modified)
	* code/branches/presentationHS15/data/levels/shuttleRetaliation.oxw (modified)
	* code/branches/presentationHS15/data/levels/templates/spaceshipEscortMine.oxt (modified)
	* code/branches/presentationHS15/data/levels/templates/spaceshipHover.oxt (modified)
	* code/branches/presentationHS15/data/levels/templates/spaceshipShuttle.oxt (modified)
	* code/branches/presentationHS15/data/overlays/HoverHUD.oxo (modified)
	* code/branches/presentationHS15/data/particle/MineExpl.particle (modified)
	* code/branches/presentationHS15/data/particle/MineExpl1.particle (modified)
	* code/branches/presentationHS15/data/particle/MineExpl2.particle (modified)
	* code/branches/presentationHS15/data/particle/engine.particle (modified)
	* code/branches/presentationHS15/data/particle/ice.particle (modified)
	* code/branches/presentationHS15/data/particle/mineparticle.particle (modified)
	* code/branches/presentationHS15/data/particle/psygun.particle (modified)
	* code/branches/presentationHS15/src/libraries/core/CoreConfig.cc (modified)
	* code/branches/presentationHS15/src/libraries/core/CoreConfig.h (modified)
	* code/branches/presentationHS15/src/libraries/core/GameConfig.cc (modified)
	* code/branches/presentationHS15/src/libraries/core/GameConfig.h (modified)
	* code/branches/presentationHS15/src/libraries/core/command/ConsoleCommandIncludes.cc (modified)
	* code/branches/presentationHS15/src/libraries/core/command/ConsoleCommandManager.cc (modified)
	* code/branches/presentationHS15/src/libraries/core/commandline/CMakeLists.txt (modified)
	* code/branches/presentationHS15/src/libraries/core/singleton/ScopedSingletonIncludes.cc (modified)
	* code/branches/presentationHS15/src/libraries/core/singleton/ScopedSingletonIncludes.h (modified)
	* code/branches/presentationHS15/src/libraries/network/NetworkFunctionIncludes.cc (modified)
	* code/branches/presentationHS15/src/libraries/network/NetworkFunctionIncludes.h (modified)
	* code/branches/presentationHS15/src/libraries/network/NetworkFunctionManager.cc (modified)
	* code/branches/presentationHS15/src/libraries/network/NetworkFunctionManager.h (modified)
	* code/branches/presentationHS15/src/modules/hover/CMakeLists.txt (modified)
	* code/branches/presentationHS15/src/modules/hover/FlagHUD.cc (modified)
	* code/branches/presentationHS15/src/modules/hover/FlagHUD.h (modified)
	* code/branches/presentationHS15/src/modules/hover/Hover.cc (modified)
	* code/branches/presentationHS15/src/modules/hover/Hover.h (modified)
	* code/branches/presentationHS15/src/modules/hover/HoverFlag.cc (modified)
	* code/branches/presentationHS15/src/modules/hover/HoverFlag.h (modified)
	* code/branches/presentationHS15/src/modules/hover/HoverOrigin.cc (modified)
	* code/branches/presentationHS15/src/modules/hover/HoverOrigin.h (modified)
	* code/branches/presentationHS15/src/modules/hover/HoverPrereqs.h (modified)
	* code/branches/presentationHS15/src/modules/hover/HoverShip.cc (modified)
	* code/branches/presentationHS15/src/modules/hover/HoverShip.h (modified)
	* code/branches/presentationHS15/src/modules/hover/HoverWall.cc (modified)
	* code/branches/presentationHS15/src/modules/hover/HoverWall.h (modified)
	* code/branches/presentationHS15/src/modules/hover/TimeHUD.cc (modified)
	* code/branches/presentationHS15/src/modules/hover/TimeHUD.h (modified)
	* code/branches/presentationHS15/src/modules/overlays/hud/HUDEnemyShieldBar.cc (modified)
	* code/branches/presentationHS15/src/modules/overlays/hud/HUDEnemyShieldBar.h (modified)
	* code/branches/presentationHS15/src/modules/overlays/hud/HUDRocketFuelBar.cc (modified)
	* code/branches/presentationHS15/src/modules/overlays/hud/HUDRocketFuelBar.h (modified)
	* code/branches/presentationHS15/src/modules/overlays/hud/HUDShieldBar.cc (modified)
	* code/branches/presentationHS15/src/modules/overlays/hud/HUDShieldBar.h (modified)
	* code/branches/presentationHS15/src/modules/overlays/hud/HUDWeapon.cc (modified)
	* code/branches/presentationHS15/src/modules/overlays/hud/HUDWeapon.h (modified)
	* code/branches/presentationHS15/src/modules/overlays/hud/HUDWeaponMode.cc (modified)
	* code/branches/presentationHS15/src/modules/overlays/hud/HUDWeaponMode.h (modified)
	* code/branches/presentationHS15/src/modules/overlays/hud/HUDWeaponSystem.cc (modified)
	* code/branches/presentationHS15/src/modules/overlays/hud/HUDWeaponSystem.h (modified)
	* code/branches/presentationHS15/src/modules/pickup/items/BoostPickup.cc (modified)
	* code/branches/presentationHS15/src/modules/pickup/items/BoostPickup.h (modified)
	* code/branches/presentationHS15/src/modules/pickup/items/MunitionContainer.cc (modified)
	* code/branches/presentationHS15/src/modules/pickup/items/MunitionContainer.h (modified)
	* code/branches/presentationHS15/src/modules/pickup/items/MunitionPickup.cc (modified)
	* code/branches/presentationHS15/src/modules/pickup/items/MunitionPickup.h (modified)
	* code/branches/presentationHS15/src/modules/towerdefense/TowerDefenseField.cc (modified)
	* code/branches/presentationHS15/src/modules/towerdefense/TowerDefenseField.h (modified)
	* code/branches/presentationHS15/src/modules/weapons/IceGunFreezer.cc (modified)
	* code/branches/presentationHS15/src/modules/weapons/IceGunFreezer.h (modified)
	* code/branches/presentationHS15/src/modules/weapons/munitions/IceMunition.cc (modified)
	* code/branches/presentationHS15/src/modules/weapons/munitions/IceMunition.h (modified)
	* code/branches/presentationHS15/src/modules/weapons/munitions/LightningMunition.cc (modified)
	* code/branches/presentationHS15/src/modules/weapons/munitions/LightningMunition.h (modified)
	* code/branches/presentationHS15/src/modules/weapons/munitions/MineMunition.cc (modified)
	* code/branches/presentationHS15/src/modules/weapons/munitions/MineMunition.h (modified)
	* code/branches/presentationHS15/src/modules/weapons/munitions/SplitMunition.cc (modified)
	* code/branches/presentationHS15/src/modules/weapons/munitions/SplitMunition.h (modified)
	* code/branches/presentationHS15/src/modules/weapons/projectiles/IceGunProjectile.cc (modified)
	* code/branches/presentationHS15/src/modules/weapons/projectiles/IceGunProjectile.h (modified)
	* code/branches/presentationHS15/src/modules/weapons/projectiles/MineProjectile.cc (modified)
	* code/branches/presentationHS15/src/modules/weapons/projectiles/MineProjectile.h (modified)
	* code/branches/presentationHS15/src/modules/weapons/projectiles/SplitGunProjectile.cc (modified)
	* code/branches/presentationHS15/src/modules/weapons/projectiles/SplitGunProjectile.h (modified)
	* code/branches/presentationHS15/src/modules/weapons/weaponmodes/IceGun.cc (modified)
	* code/branches/presentationHS15/src/modules/weapons/weaponmodes/IceGun.h (modified)
	* code/branches/presentationHS15/src/modules/weapons/weaponmodes/MineGun.cc (modified)
	* code/branches/presentationHS15/src/modules/weapons/weaponmodes/MineGun.h (modified)
	* code/branches/presentationHS15/src/modules/weapons/weaponmodes/SplitGun.cc (modified)
	* code/branches/presentationHS15/src/modules/weapons/weaponmodes/SplitGun.h (modified)
	* code/branches/presentationHS15/src/orxonox/controllers/ActionpointController.cc (modified)
	* code/branches/presentationHS15/src/orxonox/controllers/ActionpointController.h (modified)
	* code/branches/presentationHS15/src/orxonox/controllers/CommonController.cc (modified)
	* code/branches/presentationHS15/src/orxonox/controllers/CommonController.h (modified)
	* code/branches/presentationHS15/src/orxonox/controllers/DivisionController.cc (modified)
	* code/branches/presentationHS15/src/orxonox/controllers/DivisionController.h (modified)
	* code/branches/presentationHS15/src/orxonox/controllers/FightingController.cc (modified)
	* code/branches/presentationHS15/src/orxonox/controllers/FightingController.h (modified)
	* code/branches/presentationHS15/src/orxonox/controllers/FlyingController.cc (modified)
	* code/branches/presentationHS15/src/orxonox/controllers/FlyingController.h (modified)
	* code/branches/presentationHS15/src/orxonox/controllers/MasterController.cc (modified)
	* code/branches/presentationHS15/src/orxonox/controllers/MasterController.h (modified)
	* code/branches/presentationHS15/src/orxonox/controllers/SectionController.cc (modified)
	* code/branches/presentationHS15/src/orxonox/controllers/SectionController.h (modified)
	* code/branches/presentationHS15/src/orxonox/controllers/WingmanController.cc (modified)
	* code/branches/presentationHS15/src/orxonox/controllers/WingmanController.h (modified)
	* code/branches/presentationHS15/src/orxonox/weaponsystem/ReplenishingMunition.cc (modified)
	* code/branches/presentationHS15/src/orxonox/weaponsystem/ReplenishingMunition.h (modified)
	* code/branches/presentationHS15/src/orxonox/worldentities/Actionpoint.cc (modified)
	* code/branches/presentationHS15/src/orxonox/worldentities/Actionpoint.h (modified)
	* code/branches/presentationHS15/src/orxonox/worldentities/ExplosionPart.cc (modified)
	* code/branches/presentationHS15/src/orxonox/worldentities/ExplosionPart.h (modified)
	* code/branches/presentationHS15/test/core/class/IdentifierNestedClassHierarchyTest.cc (modified)

	eol-style:native


Wed, 09 Dec 2015 15:56:39 GMT maxima [10963]
	* code/branches/presentationHS15 (modified)
	* code/branches/presentationHS15/data/levels/emptyLevel.oxw (modified)
	* code/branches/presentationHS15/data/levels/includes/weaponSettingsAssff2.oxi (modified)
	* code/branches/presentationHS15/data/levels/includes/weaponSettingsEscortMine.oxi (added)
	* code/branches/presentationHS15/data/levels/mineLevel.oxw (added)
	* code/branches/presentationHS15/data/levels/pong.oxw (modified)
	* code/branches/presentationHS15/data/levels/templates/spaceshipEscort.oxt (modified)
	* code/branches/presentationHS15/data/levels/templates/spaceshipEscortMine.oxt (added)
	* code/branches/presentationHS15/data/particle/MineExpl.particle (copied)
	* code/branches/presentationHS15/data/particle/MineExpl1.particle (copied)
	* code/branches/presentationHS15/data/particle/MineExpl2.particle (copied)
	* code/branches/presentationHS15/data/particle/engine.particle (copied)
	* code/branches/presentationHS15/data/particle/engineglow.particle (modified)
	* code/branches/presentationHS15/data/particle/ice.particle (copied)
	* code/branches/presentationHS15/data/particle/mineparticle.particle (copied)
	* code/branches/presentationHS15/data/particle/psygun.particle (copied)
	* code/branches/presentationHS15/data/particle/rocketfire.particle (modified)
	* code/branches/presentationHS15/src/modules/weapons/WeaponsPrereqs.h (modified)
	* code/branches/presentationHS15/src/modules/weapons/munitions/CMakeLists.txt (modified)
	* code/branches/presentationHS15/src/modules/weapons/munitions/MineMunition.cc (copied)
	* code/branches/presentationHS15/src/modules/weapons/munitions/MineMunition.h (copied)
	* code/branches/presentationHS15/src/modules/weapons/projectiles/CMakeLists.txt (modified)
	* code/branches/presentationHS15/src/modules/weapons/projectiles/IceGunProjectile.cc (modified)
	* code/branches/presentationHS15/src/modules/weapons/projectiles/IceGunProjectile.h (modified)
	* code/branches/presentationHS15/src/modules/weapons/projectiles/MineProjectile.cc (copied)
	* code/branches/presentationHS15/src/modules/weapons/projectiles/MineProjectile.h (copied)
	* code/branches/presentationHS15/src/modules/weapons/projectiles/Projectile.h (modified)
	* code/branches/presentationHS15/src/modules/weapons/weaponmodes/CMakeLists.txt (modified)
	* code/branches/presentationHS15/src/modules/weapons/weaponmodes/MineGun.cc (copied)
	* code/branches/presentationHS15/src/modules/weapons/weaponmodes/MineGun.h (copied)
	* code/branches/presentationHS15/src/orxonox/weaponsystem/WeaponMode.cc (modified)

	Merged presentation and particleEffects branches. Added a new level, ...


Wed, 09 Dec 2015 11:14:46 GMT maxima [10959]
	* code/branches/presentationHS15 (copied)

	New branch for PPS-presentation


Sun, 04 Oct 2015 13:45:56 GMT landauf [10622]
	* code/trunk (modified)
	* code/trunk/data/defaultConfig/keybindings.ini (modified)
	* code/trunk/data/gui/scripts/MultiplayerMenu.lua (modified)
	* code/trunk/data/gui/scripts/presentation.lua (copied)
	* code/trunk/data/gui/scripts/testscript.lua (modified)
	* code/trunk/data/levels/clangenb.oxw (copied)
	* code/trunk/data/levels/includes/weaponSettingsAssff.oxi (modified)
	* code/trunk/data/levels/includes/weaponSettingsFS15.oxi (copied)
	* code/trunk/data/levels/includes/weaponSettingsHeartAttack.oxi (copied)
	* code/trunk/data/levels/includes/weaponSettingsRing.oxi (copied)
	* code/trunk/data/levels/presentationFS15.oxw (copied)
	* code/trunk/data/levels/scriptController.oxw (modified)
	* code/trunk/data/levels/simone.oxw (copied)
	* code/trunk/data/levels/templates/enemytowerdefense.oxt (modified)
	* code/trunk/data/levels/templates/orbStation.oxt (copied)
	* code/trunk/data/levels/templates/spaceshipFS15.oxt (copied)
	* code/trunk/data/levels/templates/spaceshipHeartAttack.oxt (copied)
	* code/trunk/data/levels/templates/spaceshipRing.oxt (copied)
	* code/trunk/data/levels/templates/tower.oxt (deleted)
	* code/trunk/data/levels/templates/towerdefensetower.oxt (copied)
	* code/trunk/data/levels/towerDefense.oxw (modified)
	* code/trunk/data/particle/FieldExplosion.particle (copied)
	* code/trunk/data/particle/GravityBombField.particle (copied)
	* code/trunk/data/particle/orxonox_explosionAfterglow.particle (copied)
	* code/trunk/data/particle/orxonox_explosionFlame.particle (copied)
	* code/trunk/data/particle/orxonox_explosionFlame2.particle (copied)
	* code/trunk/data/particle/orxonox_explosionFlash.particle (copied)
	* code/trunk/data/particle/orxonox_explosionFlash2.particle (copied)
	* code/trunk/data/particle/orxonox_explosionShockwave.particle (copied)
	* code/trunk/data/particle/orxonox_explosionShockwave2.particle (copied)
	* code/trunk/data/particle/orxonox_explosionSparks.particle (copied)
	* code/trunk/data/particle/orxonox_explosionSparks2.particle (copied)
	* code/trunk/data/particle/orxonox_explosionStreak1.particle (copied)
	* code/trunk/data/particle/orxonox_explosionStreak2.particle (copied)
	* code/trunk/src/libraries/network/GamestateManager.h (modified)
	* code/trunk/src/libraries/network/LANDiscoverable.cc (modified)
	* code/trunk/src/libraries/network/LANDiscoverable.h (modified)
	* code/trunk/src/libraries/network/LANDiscovery.cc (modified)
	* code/trunk/src/libraries/network/LANDiscovery.h (modified)
	* code/trunk/src/libraries/network/MasterServer.cc (modified)
	* code/trunk/src/libraries/network/MasterServer.h (modified)
	* code/trunk/src/libraries/network/MasterServerProtocol.h (modified)
	* code/trunk/src/libraries/network/PeerList.cc (modified)
	* code/trunk/src/libraries/network/PeerList.h (modified)
	* code/trunk/src/libraries/network/Server.cc (modified)
	* code/trunk/src/libraries/network/Server.h (modified)
	* code/trunk/src/libraries/network/ServerList.cc (modified)
	* code/trunk/src/libraries/network/ServerList.h (modified)
	* code/trunk/src/libraries/network/WANDiscoverable.cc (modified)
	* code/trunk/src/libraries/network/WANDiscoverable.h (modified)
	* code/trunk/src/libraries/network/WANDiscovery.cc (modified)
	* code/trunk/src/libraries/network/WANDiscovery.h (modified)
	* code/trunk/src/libraries/network/packet/ServerInformation.cc (modified)
	* code/trunk/src/libraries/network/packet/ServerInformation.h (modified)
	* code/trunk/src/modules/objects/ForceField.h (modified)
	* code/trunk/src/modules/objects/Turret.cc (modified)
	* code/trunk/src/modules/objects/Turret.h (modified)
	* code/trunk/src/modules/objects/controllers/TurretController.cc (modified)
	* code/trunk/src/modules/tetris/Tetris.h (modified)
	* code/trunk/src/modules/towerdefense/CMakeLists.txt (modified)
	* code/trunk/src/modules/towerdefense/TDCoordinate.cc (modified)
	* code/trunk/src/modules/towerdefense/TDCoordinate.h (modified)
	* code/trunk/src/modules/towerdefense/Tower.cc (deleted)
	* code/trunk/src/modules/towerdefense/Tower.h (deleted)
	* code/trunk/src/modules/towerdefense/TowerDefense.cc (modified)
	* code/trunk/src/modules/towerdefense/TowerDefense.h (modified)
	* code/trunk/src/modules/towerdefense/TowerDefenseCenterpoint.cc (modified)
	* code/trunk/src/modules/towerdefense/TowerDefenseCenterpoint.h (modified)
	* code/trunk/src/modules/towerdefense/TowerDefenseEnemy.cc (modified)
	* code/trunk/src/modules/towerdefense/TowerDefenseSelecter.cc (copied)
	* code/trunk/src/modules/towerdefense/TowerDefenseSelecter.h (copied)
	* code/trunk/src/modules/towerdefense/TowerDefenseTower.cc (modified)
	* code/trunk/src/modules/towerdefense/TowerDefenseTower.h (modified)
	* code/trunk/src/modules/towerdefense/TowerTurret.cc (deleted)
	* code/trunk/src/modules/towerdefense/TowerTurret.h (deleted)
	* code/trunk/src/modules/weapons/WeaponsPrereqs.h (modified)
	* code/trunk/src/modules/weapons/munitions/CMakeLists.txt (modified)
	* code/trunk/src/modules/weapons/munitions/GravityBombMunition.cc (copied)
	* code/trunk/src/modules/weapons/munitions/GravityBombMunition.h (copied)
	* code/trunk/src/modules/weapons/projectiles/CMakeLists.txt (modified)
	* code/trunk/src/modules/weapons/projectiles/GravityBomb.cc (copied)
	* code/trunk/src/modules/weapons/projectiles/GravityBomb.h (copied)
	* code/trunk/src/modules/weapons/projectiles/GravityBombField.cc (copied)
	* code/trunk/src/modules/weapons/projectiles/GravityBombField.h (copied)
	* code/trunk/src/modules/weapons/projectiles/LightningGunProjectile.cc (modified)
	* code/trunk/src/modules/weapons/projectiles/Rocket.cc (modified)
	* code/trunk/src/modules/weapons/projectiles/RocketOld.cc (copied)
	* code/trunk/src/modules/weapons/projectiles/RocketOld.h (copied)
	* code/trunk/src/modules/weapons/weaponmodes/CMakeLists.txt (modified)
	* code/trunk/src/modules/weapons/weaponmodes/EnergyDrink.cc (modified)
	* code/trunk/src/modules/weapons/weaponmodes/FusionFire.cc (modified)
	* code/trunk/src/modules/weapons/weaponmodes/GravityBombFire.cc (copied)
	* code/trunk/src/modules/weapons/weaponmodes/GravityBombFire.h (copied)
	* code/trunk/src/modules/weapons/weaponmodes/LaserFire.cc (modified)
	* code/trunk/src/modules/weapons/weaponmodes/RocketFireOld.cc (copied)
	* code/trunk/src/modules/weapons/weaponmodes/RocketFireOld.h (copied)
	* code/trunk/src/orxonox/controllers/ControllerDirector.cc (modified)
	* code/trunk/src/orxonox/controllers/ControllerDirector.h (modified)
	* code/trunk/src/orxonox/controllers/FormationController.cc (modified)
	* code/trunk/src/orxonox/controllers/ScriptController.cc (modified)
	* code/trunk/src/orxonox/controllers/ScriptController.h (modified)
	* code/trunk/src/orxonox/controllers/testscript.lua (modified)
	* code/trunk/src/orxonox/worldentities/pawns/Pawn.cc (modified)

	merged branch presentationFS15merge back to trunk