# # ChangeLog for code/branches/presentationHS15/src/modules # # Generated by Trac 1.0.9 # Nov 22, 2024, 11:35:50 PM 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 Sun, 03 Jan 2016 13:39:10 GMT landauf [11025] * code/branches/presentationHS15/src/modules/hover/CMakeLists.txt (modified) * code/branches/presentationHS15/src/modules/hover/FlagHUD.h (modified) * code/branches/presentationHS15/src/modules/hover/HoverShip.h (modified) * code/branches/presentationHS15/src/modules/objects/Turret.h (modified) * code/branches/presentationHS15/src/modules/towerdefense/TowerDefenseSelecter.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/worldentities/ExplosionPart.cc (modified) * code/branches/presentationHS15/src/orxonox/worldentities/ExplosionPart.h (modified) tabs -> spaces Fri, 11 Dec 2015 14:26:20 GMT maxima [10970] * code/branches/presentationHS15 (modified) * code/branches/presentationHS15/data/defaultConfig/orxonox.ini (modified) * code/branches/presentationHS15/data/gui/layouts/CampaignMenu.layout (modified) * code/branches/presentationHS15/data/gui/scripts/CampaignMenu.lua (modified) * code/branches/presentationHS15/data/levels/AITest.oxw (copied) * code/branches/presentationHS15/data/levels/expeditionSector.oxw (copied) * code/branches/presentationHS15/data/levels/missionOne.oxw (modified) * code/branches/presentationHS15/data/levels/shuttleAttack.oxw (copied) * code/branches/presentationHS15/data/levels/shuttleRetaliation.oxw (copied) * code/branches/presentationHS15/data/levels/templates/spaceshipShuttle.oxt (copied) * code/branches/presentationHS15/src/libraries/util/Math.cc (modified) * code/branches/presentationHS15/src/libraries/util/Math.h (modified) * code/branches/presentationHS15/src/modules/docking/DockingController.cc (modified) * code/branches/presentationHS15/src/modules/overlays/hud/HUDRadar.cc (modified) * code/branches/presentationHS15/src/modules/weapons/weaponmodes/MineGun.cc (modified) * code/branches/presentationHS15/src/orxonox/controllers/ActionpointController.cc (copied) * code/branches/presentationHS15/src/orxonox/controllers/ActionpointController.h (copied) * code/branches/presentationHS15/src/orxonox/controllers/CMakeLists.txt (modified) * code/branches/presentationHS15/src/orxonox/controllers/CommonController.cc (copied) * code/branches/presentationHS15/src/orxonox/controllers/CommonController.h (copied) * code/branches/presentationHS15/src/orxonox/controllers/DivisionController.cc (copied) * code/branches/presentationHS15/src/orxonox/controllers/DivisionController.h (copied) * code/branches/presentationHS15/src/orxonox/controllers/FightingController.cc (copied) * code/branches/presentationHS15/src/orxonox/controllers/FightingController.h (copied) * code/branches/presentationHS15/src/orxonox/controllers/FlyingController.cc (copied) * code/branches/presentationHS15/src/orxonox/controllers/FlyingController.h (copied) * code/branches/presentationHS15/src/orxonox/controllers/FormationController.cc (modified) * code/branches/presentationHS15/src/orxonox/controllers/MasterController.cc (copied) * code/branches/presentationHS15/src/orxonox/controllers/MasterController.h (copied) * code/branches/presentationHS15/src/orxonox/controllers/SectionController.cc (copied) * code/branches/presentationHS15/src/orxonox/controllers/SectionController.h (copied) * code/branches/presentationHS15/src/orxonox/controllers/WingmanController.cc (copied) * code/branches/presentationHS15/src/orxonox/controllers/WingmanController.h (copied) * code/branches/presentationHS15/src/orxonox/worldentities/Actionpoint.cc (copied) * code/branches/presentationHS15/src/orxonox/worldentities/Actionpoint.h (copied) * code/branches/presentationHS15/src/orxonox/worldentities/CMakeLists.txt (modified) * code/branches/presentationHS15/src/orxonox/worldentities/SpawnPoint.h (modified) * code/branches/presentationHS15/src/orxonox/worldentities/TeamSpawnPoint.cc (modified) * code/branches/presentationHS15/src/orxonox/worldentities/TeamSpawnPoint.h (modified) * code/branches/presentationHS15/src/orxonox/worldentities/pawns/Pawn.h (modified) * code/branches/presentationHS15/test/util/MathTest.cc (modified) Merged campaign and presentation. Everything seems to work fine. 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 15:03:59 GMT maxima [10962] * code/branches/presentationHS15 (modified) * code/branches/presentationHS15/data/levels/HeavyCruiser.oxw (modified) * code/branches/presentationHS15/data/levels/emptyLevel.oxw (modified) * code/branches/presentationHS15/data/levels/iiiJohnVane_EscapeTheBastards.oxw (modified) * code/branches/presentationHS15/data/levels/kecks.oxw (modified) * code/branches/presentationHS15/data/levels/missionOne.oxw (modified) * code/branches/presentationHS15/data/levels/templates/FPS.oxt (modified) * code/branches/presentationHS15/data/levels/templates/FPS_HS14.oxt (modified) * code/branches/presentationHS15/data/levels/templates/HeavyCruiser.oxt (modified) * code/branches/presentationHS15/data/levels/templates/HeavyCruiserBody.oxt (modified) * code/branches/presentationHS15/data/levels/templates/ModularSpaceShipTest.oxt (modified) * code/branches/presentationHS15/data/levels/templates/bigship.oxt (modified) * code/branches/presentationHS15/data/levels/templates/enemyInvader.oxt (modified) * code/branches/presentationHS15/data/levels/templates/spaceshipAssff.oxt (modified) * code/branches/presentationHS15/data/levels/templates/spaceshipAssff2.oxt (modified) * code/branches/presentationHS15/data/levels/templates/spaceshipCollateralDamage.oxt (modified) * code/branches/presentationHS15/data/levels/templates/spaceshipDodgeRace.oxt (modified) * code/branches/presentationHS15/data/levels/templates/spaceshipEscort.oxt (modified) * code/branches/presentationHS15/data/levels/templates/spaceshipGhost.oxt (modified) * code/branches/presentationHS15/data/levels/templates/spaceshipH2.oxt (modified) * code/branches/presentationHS15/data/levels/templates/spaceshipHXY.oxt (modified) * code/branches/presentationHS15/data/levels/templates/spaceshipHXYSL.oxt (modified) * code/branches/presentationHS15/data/levels/templates/spaceshipHeartAttack.oxt (modified) * code/branches/presentationHS15/data/levels/templates/spaceshipHover.oxt (modified) * code/branches/presentationHS15/data/levels/templates/spaceshipInvader.oxt (modified) * code/branches/presentationHS15/data/levels/templates/spaceshipPirate.oxt (modified) * code/branches/presentationHS15/data/levels/templates/spaceshipRace.oxt (modified) * code/branches/presentationHS15/data/levels/templates/spaceshipRing.oxt (modified) * code/branches/presentationHS15/data/levels/templates/spaceshipSpacecruiser.oxt (modified) * code/branches/presentationHS15/data/levels/templates/spaceshipSwallow.oxt (modified) * code/branches/presentationHS15/data/levels/templates/spaceshipTransporter.oxt (modified) * code/branches/presentationHS15/data/levels/templates/spaceshipTransporterSL.oxt (modified) * code/branches/presentationHS15/data/levels/templates/spaceshipTurret.oxt (modified) * code/branches/presentationHS15/src/libraries/tools/ParticleInterface.cc (modified) * code/branches/presentationHS15/src/libraries/tools/ParticleInterface.h (modified) * code/branches/presentationHS15/src/modules/dodgerace/DodgeRace.cc (modified) * code/branches/presentationHS15/src/modules/dodgerace/DodgeRace.h (modified) * code/branches/presentationHS15/src/modules/invader/Invader.cc (modified) * code/branches/presentationHS15/src/orxonox/OrxonoxPrereqs.h (modified) * code/branches/presentationHS15/src/orxonox/items/ShipPart.cc (modified) * code/branches/presentationHS15/src/orxonox/worldentities/BigExplosion.cc (deleted) * code/branches/presentationHS15/src/orxonox/worldentities/BigExplosion.h (deleted) * code/branches/presentationHS15/src/orxonox/worldentities/CMakeLists.txt (modified) * code/branches/presentationHS15/src/orxonox/worldentities/ExplosionPart.cc (copied) * code/branches/presentationHS15/src/orxonox/worldentities/ExplosionPart.h (copied) * code/branches/presentationHS15/src/orxonox/worldentities/pawns/Pawn.cc (modified) * code/branches/presentationHS15/src/orxonox/worldentities/pawns/Pawn.h (modified) * code/branches/presentationHS15/src/orxonox/worldentities/pawns/SpaceShip.cc (modified) Merged presentation and exlposionChunks branches. Works fine. Added ... Wed, 09 Dec 2015 13:45:58 GMT maxima [10961] * code/branches/presentationHS15 (modified) * code/branches/presentationHS15/data/gui/layouts/InGameMenu.layout (modified) * code/branches/presentationHS15/data/gui/scripts/InGameMenu.lua (modified) * code/branches/presentationHS15/data/levels/FPS_Level_HS14.oxw (modified) * code/branches/presentationHS15/data/levels/iJohnVane_TriptoArea51.oxw (modified) * code/branches/presentationHS15/data/levels/includes/invaderWeapon.oxi (modified) * code/branches/presentationHS15/data/levels/includes/invaderWeaponEnemy.oxi (modified) * code/branches/presentationHS15/data/levels/includes/pickups.oxi (modified) * code/branches/presentationHS15/data/levels/includes/towerWeaponSettings.oxi (deleted) * code/branches/presentationHS15/data/levels/includes/weaponSettingsAssff.oxi (modified) * code/branches/presentationHS15/data/levels/includes/weaponSettingsAssff2.oxi (modified) * code/branches/presentationHS15/data/levels/includes/weaponSettingsCollateral.oxi (modified) * code/branches/presentationHS15/data/levels/includes/weaponSettingsEscort.oxi (modified) * code/branches/presentationHS15/data/levels/includes/weaponSettingsFPS.oxi (modified) * code/branches/presentationHS15/data/levels/includes/weaponSettingsFPS_HS14.oxi (modified) * code/branches/presentationHS15/data/levels/includes/weaponSettingsFS15.oxi (modified) * code/branches/presentationHS15/data/levels/includes/weaponSettingsGhost.oxi (modified) * code/branches/presentationHS15/data/levels/includes/weaponSettingsH2.oxi (modified) * code/branches/presentationHS15/data/levels/includes/weaponSettingsHXY.oxi (modified) * code/branches/presentationHS15/data/levels/includes/weaponSettingsHeartAttack.oxi (modified) * code/branches/presentationHS15/data/levels/includes/weaponSettingsHeavyCruiser.oxi (modified) * code/branches/presentationHS15/data/levels/includes/weaponSettingsHeavyCruiserBody.oxi (modified) * code/branches/presentationHS15/data/levels/includes/weaponSettingsHover.oxi (modified) * code/branches/presentationHS15/data/levels/includes/weaponSettingsImmTest.oxi (modified) * code/branches/presentationHS15/data/levels/includes/weaponSettingsPirate.oxi (modified) * code/branches/presentationHS15/data/levels/includes/weaponSettingsRing.oxi (modified) * code/branches/presentationHS15/data/levels/includes/weaponSettingsSpacecruiser.oxi (modified) * code/branches/presentationHS15/data/levels/includes/weaponSettingsSwallow.oxi (modified) * code/branches/presentationHS15/data/levels/includes/weaponSettingsTransporter.oxi (modified) * code/branches/presentationHS15/data/levels/includes/weaponSettingsTurret.oxi (modified) * code/branches/presentationHS15/data/levels/includes/weaponSettingsTurret1.oxi (modified) * code/branches/presentationHS15/data/levels/includes/weaponSettingsbigship.oxi (modified) * code/branches/presentationHS15/data/levels/missionOne.oxw (modified) * code/branches/presentationHS15/data/levels/pickups.oxw (modified) * code/branches/presentationHS15/data/levels/presentationHS13.oxw (modified) * code/branches/presentationHS15/data/levels/shieldTest.oxw (modified) * code/branches/presentationHS15/data/levels/templates/HeavyCruiser.oxt (modified) * code/branches/presentationHS15/data/levels/templates/HeavyCruiserBody.oxt (modified) * code/branches/presentationHS15/data/levels/templates/ModularSpaceShipTest.oxt (modified) * code/branches/presentationHS15/data/levels/templates/bigship.oxt (modified) * code/branches/presentationHS15/data/levels/templates/enemyInvader.oxt (modified) * code/branches/presentationHS15/data/levels/templates/pickupRepresentationTemplates.oxt (modified) * code/branches/presentationHS15/data/levels/templates/spaceshipAssff.oxt (modified) * code/branches/presentationHS15/data/levels/templates/spaceshipAssff2.oxt (modified) * code/branches/presentationHS15/data/levels/templates/spaceshipCollateralDamage.oxt (modified) * code/branches/presentationHS15/data/levels/templates/spaceshipDodgeRace.oxt (modified) * code/branches/presentationHS15/data/levels/templates/spaceshipEscort.oxt (modified) * code/branches/presentationHS15/data/levels/templates/spaceshipGhost.oxt (modified) * code/branches/presentationHS15/data/levels/templates/spaceshipHeartAttack.oxt (modified) * code/branches/presentationHS15/data/levels/templates/spaceshipInvader.oxt (modified) * code/branches/presentationHS15/data/levels/templates/spaceshipPirate.oxt (modified) * code/branches/presentationHS15/data/levels/templates/spaceshipRace.oxt (modified) * code/branches/presentationHS15/data/levels/templates/spaceshipRing.oxt (modified) * code/branches/presentationHS15/data/levels/templates/spaceshipSpacecruiser.oxt (modified) * code/branches/presentationHS15/data/levels/templates/spaceshipSwallow.oxt (modified) * code/branches/presentationHS15/data/levels/templates/spaceshipTurret.oxt (modified) * code/branches/presentationHS15/data/levels/templates/towerdefensetower.oxt (modified) * code/branches/presentationHS15/data/levels/towerDefense.oxw (modified) * code/branches/presentationHS15/data/overlays/HUDTemplates3.oxo (modified) * code/branches/presentationHS15/data/overlays/HoverHUD.oxo (modified) * code/branches/presentationHS15/data/overlays/InvaderHUD.oxo (modified) * code/branches/presentationHS15/data/overlays/jumpHUD.oxo (modified) * code/branches/presentationHS15/src/modules/overlays/CMakeLists.txt (modified) * code/branches/presentationHS15/src/modules/overlays/OverlaysPrereqs.h (modified) * code/branches/presentationHS15/src/modules/overlays/hud/CMakeLists.txt (modified) * code/branches/presentationHS15/src/modules/overlays/hud/HUDBar.cc (modified) * code/branches/presentationHS15/src/modules/overlays/hud/HUDBar.h (modified) * code/branches/presentationHS15/src/modules/overlays/hud/HUDBoostBar.cc (modified) * code/branches/presentationHS15/src/modules/overlays/hud/HUDEnemyShieldBar.cc (copied) * code/branches/presentationHS15/src/modules/overlays/hud/HUDEnemyShieldBar.h (copied) * code/branches/presentationHS15/src/modules/overlays/hud/HUDHealthBar.cc (modified) * code/branches/presentationHS15/src/modules/overlays/hud/HUDHealthBar.h (modified) * code/branches/presentationHS15/src/modules/overlays/hud/HUDRocketFuelBar.cc (copied) * code/branches/presentationHS15/src/modules/overlays/hud/HUDRocketFuelBar.h (copied) * code/branches/presentationHS15/src/modules/overlays/hud/HUDShieldBar.cc (copied) * code/branches/presentationHS15/src/modules/overlays/hud/HUDShieldBar.h (copied) * code/branches/presentationHS15/src/modules/overlays/hud/HUDWeapon.cc (copied) * code/branches/presentationHS15/src/modules/overlays/hud/HUDWeapon.h (copied) * code/branches/presentationHS15/src/modules/overlays/hud/HUDWeaponMode.cc (copied) * code/branches/presentationHS15/src/modules/overlays/hud/HUDWeaponMode.h (copied) * code/branches/presentationHS15/src/modules/overlays/hud/HUDWeaponSystem.cc (copied) * code/branches/presentationHS15/src/modules/overlays/hud/HUDWeaponSystem.h (copied) * code/branches/presentationHS15/src/modules/pickup/PickupPrereqs.h (modified) * code/branches/presentationHS15/src/modules/pickup/PickupRepresentation.cc (modified) * code/branches/presentationHS15/src/modules/pickup/items/BoostPickup.cc (copied) * code/branches/presentationHS15/src/modules/pickup/items/BoostPickup.h (copied) * code/branches/presentationHS15/src/modules/pickup/items/CMakeLists.txt (modified) * code/branches/presentationHS15/src/modules/pickup/items/DronePickup.h (modified) * code/branches/presentationHS15/src/modules/pickup/items/MunitionContainer.cc (copied) * code/branches/presentationHS15/src/modules/pickup/items/MunitionContainer.h (copied) * code/branches/presentationHS15/src/modules/pickup/items/MunitionPickup.cc (copied) * code/branches/presentationHS15/src/modules/pickup/items/MunitionPickup.h (copied) * code/branches/presentationHS15/src/modules/towerdefense/TowerDefenseTower.cc (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/FusionMunition.cc (modified) * code/branches/presentationHS15/src/modules/weapons/munitions/FusionMunition.h (modified) * code/branches/presentationHS15/src/modules/weapons/munitions/GravityBombMunition.cc (modified) * code/branches/presentationHS15/src/modules/weapons/munitions/GravityBombMunition.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/LaserMunition.cc (modified) * code/branches/presentationHS15/src/modules/weapons/munitions/LaserMunition.h (modified) * code/branches/presentationHS15/src/modules/weapons/munitions/LightningMunition.cc (copied) * code/branches/presentationHS15/src/modules/weapons/munitions/LightningMunition.h (copied) * code/branches/presentationHS15/src/modules/weapons/munitions/ReplenishingMunition.cc (deleted) * code/branches/presentationHS15/src/modules/weapons/munitions/ReplenishingMunition.h (deleted) * code/branches/presentationHS15/src/modules/weapons/munitions/RocketMunition.cc (modified) * code/branches/presentationHS15/src/modules/weapons/munitions/RocketMunition.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/BasicProjectile.cc (modified) * code/branches/presentationHS15/src/modules/weapons/projectiles/GravityBombField.cc (modified) * code/branches/presentationHS15/src/modules/weapons/projectiles/Rocket.cc (modified) * code/branches/presentationHS15/src/modules/weapons/projectiles/Rocket.h (modified) * code/branches/presentationHS15/src/modules/weapons/projectiles/SimpleRocket.cc (modified) * code/branches/presentationHS15/src/modules/weapons/weaponmodes/EnergyDrink.cc (modified) * code/branches/presentationHS15/src/modules/weapons/weaponmodes/FusionFire.cc (modified) * code/branches/presentationHS15/src/modules/weapons/weaponmodes/GravityBombFire.cc (modified) * code/branches/presentationHS15/src/modules/weapons/weaponmodes/HsW01.cc (modified) * code/branches/presentationHS15/src/modules/weapons/weaponmodes/IceGun.cc (modified) * code/branches/presentationHS15/src/modules/weapons/weaponmodes/LaserFire.cc (modified) * code/branches/presentationHS15/src/modules/weapons/weaponmodes/LightningGun.cc (modified) * code/branches/presentationHS15/src/modules/weapons/weaponmodes/RocketFire.cc (modified) * code/branches/presentationHS15/src/modules/weapons/weaponmodes/RocketFire.h (modified) * code/branches/presentationHS15/src/modules/weapons/weaponmodes/RocketFireOld.cc (modified) * code/branches/presentationHS15/src/modules/weapons/weaponmodes/SimpleRocketFire.cc (modified) * code/branches/presentationHS15/src/modules/weapons/weaponmodes/SplitGun.cc (modified) * code/branches/presentationHS15/src/orxonox/OrxonoxPrereqs.h (modified) * code/branches/presentationHS15/src/orxonox/controllers/HumanController.cc (modified) * code/branches/presentationHS15/src/orxonox/infos/PlayerInfo.cc (modified) * code/branches/presentationHS15/src/orxonox/overlays/OrxonoxOverlay.cc (modified) * code/branches/presentationHS15/src/orxonox/overlays/OrxonoxOverlay.h (modified) * code/branches/presentationHS15/src/orxonox/weaponsystem/CMakeLists.txt (modified) * code/branches/presentationHS15/src/orxonox/weaponsystem/Munition.cc (modified) * code/branches/presentationHS15/src/orxonox/weaponsystem/Munition.h (modified) * code/branches/presentationHS15/src/orxonox/weaponsystem/ReplenishingMunition.cc (copied) * code/branches/presentationHS15/src/orxonox/weaponsystem/ReplenishingMunition.h (copied) * code/branches/presentationHS15/src/orxonox/weaponsystem/Weapon.cc (modified) * code/branches/presentationHS15/src/orxonox/weaponsystem/Weapon.h (modified) * code/branches/presentationHS15/src/orxonox/weaponsystem/WeaponMode.cc (modified) * code/branches/presentationHS15/src/orxonox/weaponsystem/WeaponMode.h (modified) * code/branches/presentationHS15/src/orxonox/weaponsystem/WeaponPack.cc (modified) * code/branches/presentationHS15/src/orxonox/weaponsystem/WeaponPack.h (modified) * code/branches/presentationHS15/src/orxonox/weaponsystem/WeaponSystem.cc (modified) * code/branches/presentationHS15/src/orxonox/weaponsystem/WeaponSystem.h (modified) * code/branches/presentationHS15/src/orxonox/worldentities/MobileEntity.h (modified) * code/branches/presentationHS15/src/orxonox/worldentities/StaticEntity.h (modified) * code/branches/presentationHS15/src/orxonox/worldentities/pawns/Pawn.cc (modified) * code/branches/presentationHS15/src/orxonox/worldentities/pawns/Pawn.h (modified) * code/branches/presentationHS15/src/orxonox/worldentities/pawns/SpaceShip.cc (modified) * code/branches/presentationHS15/src/orxonox/worldentities/pawns/SpaceShip.h (modified) Merged presentation and fabiens branch. Had to modify hoverHUD and ... Wed, 09 Dec 2015 11:47:30 GMT maxima [10960] * code/branches/presentationHS15 (modified) * code/branches/presentationHS15/data/levels/Hover.oxw (copied) * code/branches/presentationHS15/data/levels/includes/weaponSettingsHover.oxi (copied) * code/branches/presentationHS15/data/levels/templates/spaceshipHover.oxt (copied) * code/branches/presentationHS15/data/overlays/HoverHUD.oxo (copied) * code/branches/presentationHS15/src/modules/CMakeLists.txt (modified) * code/branches/presentationHS15/src/modules/hover (copied) * code/branches/presentationHS15/src/modules/hover/CMakeLists.txt (copied) * code/branches/presentationHS15/src/modules/hover/FlagHUD.cc (copied) * code/branches/presentationHS15/src/modules/hover/FlagHUD.h (copied) * code/branches/presentationHS15/src/modules/hover/Hover.cc (copied) * code/branches/presentationHS15/src/modules/hover/Hover.h (copied) * code/branches/presentationHS15/src/modules/hover/HoverFlag.cc (copied) * code/branches/presentationHS15/src/modules/hover/HoverFlag.h (copied) * code/branches/presentationHS15/src/modules/hover/HoverOrigin.cc (copied) * code/branches/presentationHS15/src/modules/hover/HoverOrigin.h (copied) * code/branches/presentationHS15/src/modules/hover/HoverPrereqs.h (copied) * code/branches/presentationHS15/src/modules/hover/HoverShip.cc (copied) * code/branches/presentationHS15/src/modules/hover/HoverShip.h (copied) * code/branches/presentationHS15/src/modules/hover/HoverWall.cc (copied) * code/branches/presentationHS15/src/modules/hover/HoverWall.h (copied) * code/branches/presentationHS15/src/modules/hover/TimeHUD.cc (copied) * code/branches/presentationHS15/src/modules/hover/TimeHUD.h (copied) Merged presentation and hover branches. Hover minigame works fine. Wed, 09 Dec 2015 11:14:46 GMT maxima [10959] * code/branches/presentationHS15 (copied) New branch for PPS-presentation Sat, 31 Oct 2015 10:06:37 GMT landauf [10727] * code/trunk/src/libraries/tools/Shader.cc (modified) * code/trunk/src/libraries/tools/Shader.h (modified) * code/trunk/src/modules/pong/PongAI.cc (modified) * code/trunk/src/modules/towerdefense/TowerDefense.cc (modified) * code/trunk/src/modules/towerdefense/TowerDefenseTower.cc (modified) * code/trunk/src/modules/weapons/projectiles/SplitGunProjectile.cc (modified) * code/trunk/src/orxonox/Scene.cc (modified) fixed warnings with MSVC14