# # ChangeLog for code/branches/fabienHS15/data # # Generated by Trac 1.0.9 # Nov 14, 2024, 8:16:57 PM Fri, 27 Nov 2015 17:49:54 GMT fvultier [10878] * code/branches/fabienHS15/data/levels/includes/weaponSettingsAssff.oxi (modified) * code/branches/fabienHS15/data/levels/includes/weaponSettingsAssff2.oxi (modified) * code/branches/fabienHS15/data/levels/includes/weaponSettingsCollateral.oxi (modified) * code/branches/fabienHS15/data/levels/includes/weaponSettingsEscort.oxi (modified) * code/branches/fabienHS15/data/levels/includes/weaponSettingsFPS.oxi (modified) * code/branches/fabienHS15/data/levels/includes/weaponSettingsFPS_HS14.oxi (modified) * code/branches/fabienHS15/data/levels/includes/weaponSettingsFS15.oxi (modified) * code/branches/fabienHS15/data/levels/includes/weaponSettingsGhost.oxi (modified) * code/branches/fabienHS15/data/levels/includes/weaponSettingsH2.oxi (modified) * code/branches/fabienHS15/data/levels/includes/weaponSettingsHXY.oxi (modified) * code/branches/fabienHS15/data/levels/includes/weaponSettingsHeartAttack.oxi (modified) * code/branches/fabienHS15/data/levels/includes/weaponSettingsHeavyCruiser.oxi (modified) * code/branches/fabienHS15/data/levels/includes/weaponSettingsHeavyCruiserBody.oxi (modified) * code/branches/fabienHS15/data/levels/includes/weaponSettingsImmTest.oxi (modified) * code/branches/fabienHS15/data/levels/includes/weaponSettingsPirate.oxi (modified) * code/branches/fabienHS15/data/levels/includes/weaponSettingsRing.oxi (modified) * code/branches/fabienHS15/data/levels/includes/weaponSettingsSpacecruiser.oxi (modified) * code/branches/fabienHS15/data/levels/includes/weaponSettingsSwallow.oxi (modified) * code/branches/fabienHS15/data/levels/includes/weaponSettingsTransporter.oxi (modified) * code/branches/fabienHS15/data/levels/includes/weaponSettingsTurret.oxi (modified) * code/branches/fabienHS15/data/levels/includes/weaponSettingsTurret1.oxi (modified) * code/branches/fabienHS15/data/levels/includes/weaponSettingsbigship.oxi (modified) * code/branches/fabienHS15/src/modules/overlays/hud/HUDEnemyShieldBar.cc (modified) * code/branches/fabienHS15/src/modules/overlays/hud/HUDWeaponMode.cc (modified) * code/branches/fabienHS15/src/modules/weapons/munitions/FusionMunition.cc (modified) * code/branches/fabienHS15/src/modules/weapons/munitions/GravityBombMunition.cc (modified) * code/branches/fabienHS15/src/modules/weapons/munitions/IceMunition.cc (modified) * code/branches/fabienHS15/src/modules/weapons/munitions/LaserMunition.cc (modified) * code/branches/fabienHS15/src/modules/weapons/munitions/LightningMunition.cc (modified) * code/branches/fabienHS15/src/modules/weapons/munitions/RocketMunition.cc (modified) * code/branches/fabienHS15/src/modules/weapons/munitions/SplitMunition.cc (modified) * code/branches/fabienHS15/src/orxonox/controllers/HumanController.cc (modified) * code/branches/fabienHS15/src/orxonox/weaponsystem/Munition.cc (modified) * code/branches/fabienHS15/src/orxonox/weaponsystem/Munition.h (modified) * code/branches/fabienHS15/src/orxonox/weaponsystem/ReplenishingMunition.cc (modified) * code/branches/fabienHS15/src/orxonox/weaponsystem/ReplenishingMunition.h (modified) Mon, 23 Nov 2015 16:45:13 GMT fvultier [10842] * code/branches/fabienHS15/data/levels/templates/spaceshipAssff2.oxt (modified) * code/branches/fabienHS15/data/overlays/HUDTemplates3.oxo (modified) * code/branches/fabienHS15/src/modules/overlays/OverlaysPrereqs.h (modified) * code/branches/fabienHS15/src/modules/overlays/hud/CMakeLists.txt (modified) * code/branches/fabienHS15/src/modules/overlays/hud/HUDEnemyShieldBar.cc (added) * code/branches/fabienHS15/src/modules/overlays/hud/HUDEnemyShieldBar.h (added) * code/branches/fabienHS15/src/modules/overlays/hud/HUDShieldBar.cc (modified) * code/branches/fabienHS15/src/modules/overlays/hud/HUDShieldBar.h (modified) Tue, 17 Nov 2015 21:30:24 GMT fvultier [10814] * code/branches/fabienHS15/data/levels/FPS_Level_HS14.oxw (modified) * code/branches/fabienHS15/data/levels/iJohnVane_TriptoArea51.oxw (modified) * code/branches/fabienHS15/data/levels/includes/weaponSettingsAssff.oxi (modified) * code/branches/fabienHS15/data/levels/includes/weaponSettingsAssff2.oxi (modified) * code/branches/fabienHS15/data/levels/includes/weaponSettingsCollateral.oxi (modified) * code/branches/fabienHS15/data/levels/includes/weaponSettingsFS15.oxi (modified) * code/branches/fabienHS15/data/levels/includes/weaponSettingsHeartAttack.oxi (modified) * code/branches/fabienHS15/data/levels/includes/weaponSettingsHeavyCruiser.oxi (modified) * code/branches/fabienHS15/data/levels/includes/weaponSettingsHeavyCruiserBody.oxi (modified) * code/branches/fabienHS15/data/levels/includes/weaponSettingsImmTest.oxi (modified) * code/branches/fabienHS15/data/levels/includes/weaponSettingsSpacecruiser.oxi (modified) * code/branches/fabienHS15/data/levels/includes/weaponSettingsbigship.oxi (modified) * code/branches/fabienHS15/data/levels/missionOne.oxw (modified) * code/branches/fabienHS15/data/levels/presentationHS13.oxw (modified) * code/branches/fabienHS15/data/levels/shieldTest.oxw (modified) * code/branches/fabienHS15/data/levels/templates/HeavyCruiser.oxt (modified) * code/branches/fabienHS15/data/levels/templates/HeavyCruiserBody.oxt (modified) * code/branches/fabienHS15/data/levels/templates/ModularSpaceShipTest.oxt (modified) * code/branches/fabienHS15/data/levels/templates/bigship.oxt (modified) * code/branches/fabienHS15/data/levels/templates/enemyInvader.oxt (modified) * code/branches/fabienHS15/data/levels/templates/spaceshipAssff.oxt (modified) * code/branches/fabienHS15/data/levels/templates/spaceshipAssff2.oxt (modified) * code/branches/fabienHS15/data/levels/templates/spaceshipCollateralDamage.oxt (modified) * code/branches/fabienHS15/data/levels/templates/spaceshipDodgeRace.oxt (modified) * code/branches/fabienHS15/data/levels/templates/spaceshipEscort.oxt (modified) * code/branches/fabienHS15/data/levels/templates/spaceshipFS15.oxt (modified) * code/branches/fabienHS15/data/levels/templates/spaceshipGhost.oxt (modified) * code/branches/fabienHS15/data/levels/templates/spaceshipHeartAttack.oxt (modified) * code/branches/fabienHS15/data/levels/templates/spaceshipInvader.oxt (modified) * code/branches/fabienHS15/data/levels/templates/spaceshipPirate.oxt (modified) * code/branches/fabienHS15/data/levels/templates/spaceshipRace.oxt (modified) * code/branches/fabienHS15/data/levels/templates/spaceshipRing.oxt (modified) * code/branches/fabienHS15/data/levels/templates/spaceshipSpacecruiser.oxt (modified) * code/branches/fabienHS15/data/levels/templates/spaceshipSwallow.oxt (modified) * code/branches/fabienHS15/data/levels/templates/spaceshipTurret.oxt (modified) * code/branches/fabienHS15/data/levels/templates/towerdefensetower.oxt (modified) * code/branches/fabienHS15/data/levels/towerDefense.oxw (modified) * code/branches/fabienHS15/data/overlays/HUDTemplates3.oxo (modified) * code/branches/fabienHS15/src/modules/overlays/CMakeLists.txt (modified) * code/branches/fabienHS15/src/modules/overlays/OverlaysPrereqs.h (modified) * code/branches/fabienHS15/src/modules/overlays/hud/CMakeLists.txt (modified) * code/branches/fabienHS15/src/modules/overlays/hud/HUDRocketFuelBar.cc (added) * code/branches/fabienHS15/src/modules/overlays/hud/HUDRocketFuelBar.h (added) * code/branches/fabienHS15/src/modules/weapons/WeaponsPrereqs.h (modified) * code/branches/fabienHS15/src/modules/weapons/projectiles/Rocket.cc (modified) * code/branches/fabienHS15/src/modules/weapons/projectiles/Rocket.h (modified) * code/branches/fabienHS15/src/modules/weapons/weaponmodes/RocketFire.cc (modified) * code/branches/fabienHS15/src/modules/weapons/weaponmodes/RocketFire.h (modified) * code/branches/fabienHS15/src/modules/weapons/weaponmodes/SplitGun.cc (modified) * code/branches/fabienHS15/src/orxonox/OrxonoxPrereqs.h (modified) * code/branches/fabienHS15/src/orxonox/infos/PlayerInfo.cc (modified) * code/branches/fabienHS15/src/orxonox/worldentities/pawns/Pawn.cc (modified) * code/branches/fabienHS15/src/orxonox/worldentities/pawns/Pawn.h (modified) Tue, 10 Nov 2015 18:47:39 GMT fvultier [10794] * code/branches/fabienHS15/data/overlays/jumpHUD.oxo (modified) * code/branches/fabienHS15/src/modules/overlays/hud/HUDWeapon.cc (modified) * code/branches/fabienHS15/src/modules/overlays/hud/HUDWeaponMode.cc (modified) * code/branches/fabienHS15/src/modules/overlays/hud/HUDWeaponSystem.cc (modified) * code/branches/fabienHS15/src/modules/weapons/projectiles/Rocket.cc (modified) * code/branches/fabienHS15/src/modules/weapons/projectiles/SimpleRocket.cc (modified) * code/branches/fabienHS15/src/modules/weapons/weaponmodes/RocketFire.cc (modified) * code/branches/fabienHS15/src/modules/weapons/weaponmodes/SimpleRocketFire.cc (modified) * code/branches/fabienHS15/src/orxonox/weaponsystem/Munition.h (modified) bug in the WeaponHUD fixed. Mon, 09 Nov 2015 16:55:42 GMT fvultier [10791] * code/branches/fabienHS15/data/levels/includes/invaderWeapon.oxi (modified) * code/branches/fabienHS15/data/levels/includes/invaderWeaponEnemy.oxi (modified) * code/branches/fabienHS15/data/levels/includes/towerWeaponSettings.oxi (deleted) * code/branches/fabienHS15/data/levels/includes/weaponSettingsAssff.oxi (modified) * code/branches/fabienHS15/data/levels/includes/weaponSettingsAssff2.oxi (modified) * code/branches/fabienHS15/data/levels/includes/weaponSettingsCollateral.oxi (modified) * code/branches/fabienHS15/data/levels/includes/weaponSettingsEscort.oxi (modified) * code/branches/fabienHS15/data/levels/includes/weaponSettingsFPS.oxi (modified) * code/branches/fabienHS15/data/levels/includes/weaponSettingsFPS_HS14.oxi (modified) * code/branches/fabienHS15/data/levels/includes/weaponSettingsFS15.oxi (modified) * code/branches/fabienHS15/data/levels/includes/weaponSettingsGhost.oxi (modified) * code/branches/fabienHS15/data/levels/includes/weaponSettingsH2.oxi (modified) * code/branches/fabienHS15/data/levels/includes/weaponSettingsHXY.oxi (modified) * code/branches/fabienHS15/data/levels/includes/weaponSettingsHeartAttack.oxi (modified) * code/branches/fabienHS15/data/levels/includes/weaponSettingsHeavyCruiser.oxi (modified) * code/branches/fabienHS15/data/levels/includes/weaponSettingsHeavyCruiserBody.oxi (modified) * code/branches/fabienHS15/data/levels/includes/weaponSettingsImmTest.oxi (modified) * code/branches/fabienHS15/data/levels/includes/weaponSettingsPirate.oxi (modified) * code/branches/fabienHS15/data/levels/includes/weaponSettingsRing.oxi (modified) * code/branches/fabienHS15/data/levels/includes/weaponSettingsSpacecruiser.oxi (modified) * code/branches/fabienHS15/data/levels/includes/weaponSettingsSwallow.oxi (modified) * code/branches/fabienHS15/data/levels/includes/weaponSettingsTransporter.oxi (modified) * code/branches/fabienHS15/data/levels/includes/weaponSettingsTurret.oxi (modified) * code/branches/fabienHS15/data/levels/includes/weaponSettingsTurret1.oxi (modified) * code/branches/fabienHS15/data/levels/includes/weaponSettingsbigship.oxi (modified) * code/branches/fabienHS15/data/levels/templates/pickupRepresentationTemplates.oxt (modified) * code/branches/fabienHS15/data/levels/towerDefense.oxw (modified) * code/branches/fabienHS15/src/modules/overlays/hud/HUDWeaponMode.cc (modified) * code/branches/fabienHS15/src/modules/weapons/munitions/FusionMunition.cc (modified) * code/branches/fabienHS15/src/modules/weapons/munitions/FusionMunition.h (modified) * code/branches/fabienHS15/src/modules/weapons/munitions/GravityBombMunition.cc (modified) * code/branches/fabienHS15/src/modules/weapons/munitions/GravityBombMunition.h (modified) * code/branches/fabienHS15/src/modules/weapons/munitions/IceMunition.cc (modified) * code/branches/fabienHS15/src/modules/weapons/munitions/IceMunition.h (modified) * code/branches/fabienHS15/src/modules/weapons/munitions/LaserMunition.cc (modified) * code/branches/fabienHS15/src/modules/weapons/munitions/LaserMunition.h (modified) * code/branches/fabienHS15/src/modules/weapons/munitions/LightningMunition.cc (modified) * code/branches/fabienHS15/src/modules/weapons/munitions/LightningMunition.h (modified) * code/branches/fabienHS15/src/modules/weapons/munitions/RocketMunition.cc (modified) * code/branches/fabienHS15/src/modules/weapons/munitions/RocketMunition.h (modified) * code/branches/fabienHS15/src/modules/weapons/munitions/SplitMunition.cc (modified) * code/branches/fabienHS15/src/modules/weapons/munitions/SplitMunition.h (modified) * code/branches/fabienHS15/src/orxonox/weaponsystem/Munition.cc (modified) * code/branches/fabienHS15/src/orxonox/weaponsystem/Munition.h (modified) * code/branches/fabienHS15/src/orxonox/weaponsystem/ReplenishingMunition.cc (modified) * code/branches/fabienHS15/src/orxonox/weaponsystem/ReplenishingMunition.h (modified) * code/branches/fabienHS15/src/orxonox/weaponsystem/Weapon.cc (modified) * code/branches/fabienHS15/src/orxonox/weaponsystem/Weapon.h (modified) * code/branches/fabienHS15/src/orxonox/weaponsystem/WeaponMode.cc (modified) * code/branches/fabienHS15/src/orxonox/weaponsystem/WeaponMode.h (modified) * code/branches/fabienHS15/src/orxonox/weaponsystem/WeaponPack.cc (modified) * code/branches/fabienHS15/src/orxonox/weaponsystem/WeaponPack.h (modified) * code/branches/fabienHS15/src/orxonox/weaponsystem/WeaponSystem.cc (modified) * code/branches/fabienHS15/src/orxonox/weaponsystem/WeaponSystem.h (modified) * code/branches/fabienHS15/src/orxonox/worldentities/MobileEntity.h (modified) * code/branches/fabienHS15/src/orxonox/worldentities/StaticEntity.h (modified) * code/branches/fabienHS15/src/orxonox/worldentities/pawns/Pawn.cc (modified) * code/branches/fabienHS15/src/orxonox/worldentities/pawns/Pawn.h (modified) * code/branches/fabienHS15/src/orxonox/worldentities/pawns/SpaceShip.h (modified) Munition may and must now be defined for each pawn separately. This ... Sun, 01 Nov 2015 21:25:57 GMT fvultier [10746] * code/branches/fabienHS15/data/levels/pickups.oxw (modified) * code/branches/fabienHS15/data/levels/templates/pickupRepresentationTemplates.oxt (modified) * code/branches/fabienHS15/data/overlays/HUDTemplates3.oxo (modified) * code/branches/fabienHS15/src/modules/overlays/hud/CMakeLists.txt (modified) * code/branches/fabienHS15/src/modules/overlays/hud/HUDShieldBar.cc (added) * code/branches/fabienHS15/src/modules/overlays/hud/HUDShieldBar.h (added) * code/branches/fabienHS15/src/modules/pickup/items/MunitionPickup.h (modified) * code/branches/fabienHS15/src/orxonox/worldentities/pawns/Pawn.cc (modified) * code/branches/fabienHS15/src/orxonox/worldentities/pawns/Pawn.h (modified) * code/branches/fabienHS15/src/orxonox/worldentities/pawns/SpaceShip.h (modified) Sun, 01 Nov 2015 12:05:54 GMT fvultier [10739] * code/branches/fabienHS15/data/gui/layouts/InGameMenu.layout (modified) * code/branches/fabienHS15/data/gui/scripts/InGameMenu.lua (modified) * code/branches/fabienHS15/data/overlays/HUDTemplates3.oxo (modified) * code/branches/fabienHS15/src/modules/overlays/hud/HUDBar.cc (modified) * code/branches/fabienHS15/src/modules/overlays/hud/HUDBar.h (modified) * code/branches/fabienHS15/src/modules/overlays/hud/HUDBoostBar.cc (modified) * code/branches/fabienHS15/src/modules/overlays/hud/HUDHealthBar.cc (modified) * code/branches/fabienHS15/src/modules/overlays/hud/HUDHealthBar.h (modified) * code/branches/fabienHS15/src/modules/overlays/hud/HUDWeapon.cc (modified) * code/branches/fabienHS15/src/modules/overlays/hud/HUDWeapon.h (modified) * code/branches/fabienHS15/src/modules/overlays/hud/HUDWeaponMode.cc (modified) * code/branches/fabienHS15/src/modules/overlays/hud/HUDWeaponMode.h (modified) * code/branches/fabienHS15/src/modules/overlays/hud/HUDWeaponSystem.cc (modified) * code/branches/fabienHS15/src/modules/towerdefense/TowerDefenseTower.cc (modified) * code/branches/fabienHS15/src/modules/weapons/projectiles/BasicProjectile.cc (modified) * code/branches/fabienHS15/src/orxonox/worldentities/pawns/Pawn.cc (modified) * code/branches/fabienHS15/src/orxonox/worldentities/pawns/Pawn.h (modified) HUD improved. Corrected text rescaling. Renamed reload to ... Fri, 30 Oct 2015 18:51:49 GMT fvultier [10724] * code/branches/fabienHS15/data/levels/includes/pickups.oxi (modified) * code/branches/fabienHS15/data/levels/includes/weaponSettingsCollateral.oxi (modified) * code/branches/fabienHS15/data/levels/includes/weaponSettingsEscort.oxi (modified) * code/branches/fabienHS15/data/levels/includes/weaponSettingsGhost.oxi (modified) * code/branches/fabienHS15/data/levels/includes/weaponSettingsH2.oxi (modified) * code/branches/fabienHS15/data/levels/includes/weaponSettingsHeartAttack.oxi (modified) * code/branches/fabienHS15/data/levels/includes/weaponSettingsHeavyCruiser.oxi (modified) * code/branches/fabienHS15/data/levels/includes/weaponSettingsHeavyCruiserBody.oxi (modified) * code/branches/fabienHS15/data/levels/includes/weaponSettingsPirate.oxi (modified) * code/branches/fabienHS15/data/levels/includes/weaponSettingsRing.oxi (modified) * code/branches/fabienHS15/data/levels/includes/weaponSettingsSpacecruiser.oxi (modified) * code/branches/fabienHS15/data/levels/includes/weaponSettingsSwallow.oxi (modified) * code/branches/fabienHS15/data/levels/includes/weaponSettingsTransporter.oxi (modified) * code/branches/fabienHS15/data/levels/includes/weaponSettingsbigship.oxi (modified) * code/branches/fabienHS15/data/levels/pickups.oxw (modified) * code/branches/fabienHS15/data/levels/templates/pickupRepresentationTemplates.oxt (modified) * code/branches/fabienHS15/data/overlays/HUDTemplates3.oxo (modified) * code/branches/fabienHS15/src/modules/overlays/hud/HUDWeapon.cc (modified) * code/branches/fabienHS15/src/modules/overlays/hud/HUDWeapon.h (modified) * code/branches/fabienHS15/src/modules/overlays/hud/HUDWeaponMode.cc (modified) * code/branches/fabienHS15/src/modules/overlays/hud/HUDWeaponMode.h (modified) * code/branches/fabienHS15/src/modules/overlays/hud/HUDWeaponSystem.cc (modified) * code/branches/fabienHS15/src/modules/overlays/hud/HUDWeaponSystem.h (modified) * code/branches/fabienHS15/src/modules/pickup/items/BoostPickup.cc (added) * code/branches/fabienHS15/src/modules/pickup/items/BoostPickup.h (added) * code/branches/fabienHS15/src/modules/pickup/items/CMakeLists.txt (modified) * code/branches/fabienHS15/src/modules/pickup/items/MunitionPickup.cc (modified) * code/branches/fabienHS15/src/modules/weapons/munitions/LaserMunition.cc (modified) * code/branches/fabienHS15/src/orxonox/overlays/OrxonoxOverlay.cc (modified) * code/branches/fabienHS15/src/orxonox/overlays/OrxonoxOverlay.h (modified) * code/branches/fabienHS15/src/orxonox/weaponsystem/Munition.cc (modified) * code/branches/fabienHS15/src/orxonox/weaponsystem/Munition.h (modified) * code/branches/fabienHS15/src/orxonox/worldentities/pawns/SpaceShip.cc (modified) * code/branches/fabienHS15/src/orxonox/worldentities/pawns/SpaceShip.h (modified) The weapon system HUD rescales properly if the window size changes. Thu, 29 Oct 2015 22:27:32 GMT fvultier [10721] * code/branches/fabienHS15/data/levels/includes/weaponSettingsRing.oxi (modified) * code/branches/fabienHS15/data/levels/templates/pickupRepresentationTemplates.oxt (modified) * code/branches/fabienHS15/data/overlays/HUDTemplates3.oxo (modified) * code/branches/fabienHS15/src/modules/overlays/hud/HUDWeapon.cc (modified) * code/branches/fabienHS15/src/modules/overlays/hud/HUDWeapon.h (modified) * code/branches/fabienHS15/src/modules/overlays/hud/HUDWeaponMode.cc (modified) * code/branches/fabienHS15/src/modules/overlays/hud/HUDWeaponMode.h (modified) * code/branches/fabienHS15/src/modules/overlays/hud/HUDWeaponSystem.cc (modified) * code/branches/fabienHS15/src/modules/overlays/hud/HUDWeaponSystem.h (modified) * code/branches/fabienHS15/src/modules/pickup/items/MunitionContainer.cc (added) * code/branches/fabienHS15/src/modules/pickup/items/MunitionContainer.h (added) * code/branches/fabienHS15/src/modules/pickup/items/MunitionPickup.cc (modified) * code/branches/fabienHS15/src/orxonox/overlays/OrxonoxOverlay.h (modified) * code/branches/fabienHS15/src/orxonox/weaponsystem/Munition.cc (modified) Tue, 27 Oct 2015 20:08:40 GMT fvultier [10715] * code/branches/fabienHS15/data/levels/templates/pickupRepresentationTemplates.oxt (modified) * code/branches/fabienHS15/src/modules/overlays/hud/HUDWeapon.cc (modified) * code/branches/fabienHS15/src/modules/pickup/PickupPrereqs.h (modified) * code/branches/fabienHS15/src/modules/pickup/items/CMakeLists.txt (modified) * code/branches/fabienHS15/src/modules/pickup/items/MunitionPickup.cc (modified) * code/branches/fabienHS15/src/modules/pickup/items/MunitionPickup.h (modified) * code/branches/fabienHS15/src/modules/weapons/munitions/IceMunition.cc (modified) * code/branches/fabienHS15/src/modules/weapons/munitions/RocketMunition.cc (modified) * code/branches/fabienHS15/src/modules/weapons/munitions/SplitMunition.cc (modified) Sun, 25 Oct 2015 18:09:11 GMT fvultier [10692] * code/branches/fabienHS15/data/levels/includes/pickups.oxi (modified) * code/branches/fabienHS15/data/levels/pickups.oxw (modified) * code/branches/fabienHS15/data/levels/templates/pickupRepresentationTemplates.oxt (modified) * code/branches/fabienHS15/src/modules/pickup/PickupRepresentation.cc (modified) * code/branches/fabienHS15/src/modules/pickup/items/CMakeLists.txt (modified) * code/branches/fabienHS15/src/modules/pickup/items/DronePickup.h (modified) * code/branches/fabienHS15/src/modules/pickup/items/MunitionPickup.cc (added) * code/branches/fabienHS15/src/modules/pickup/items/MunitionPickup.h (added) * code/branches/fabienHS15/src/orxonox/worldentities/pawns/Pawn.cc (modified) * code/branches/fabienHS15/src/orxonox/worldentities/pawns/Pawn.h (modified) Sat, 24 Oct 2015 20:51:18 GMT fvultier [10688] * code/branches/fabienHS15/data/levels/includes/weaponSettingsAssff.oxi (modified) * code/branches/fabienHS15/data/levels/includes/weaponSettingsAssff2.oxi (modified) * code/branches/fabienHS15/data/levels/includes/weaponSettingsSwallow.oxi (modified) * code/branches/fabienHS15/data/overlays/HUDTemplates3.oxo (modified) * code/branches/fabienHS15/src/modules/overlays/hud/CMakeLists.txt (modified) * code/branches/fabienHS15/src/modules/overlays/hud/HUDWeapon.cc (added) * code/branches/fabienHS15/src/modules/overlays/hud/HUDWeapon.h (added) * code/branches/fabienHS15/src/modules/overlays/hud/HUDWeaponMode.cc (added) * code/branches/fabienHS15/src/modules/overlays/hud/HUDWeaponMode.h (added) * code/branches/fabienHS15/src/modules/overlays/hud/HUDWeaponSystem.cc (added) * code/branches/fabienHS15/src/modules/overlays/hud/HUDWeaponSystem.h (added) * code/branches/fabienHS15/src/modules/weapons/munitions/CMakeLists.txt (modified) * code/branches/fabienHS15/src/modules/weapons/munitions/FusionMunition.cc (modified) * code/branches/fabienHS15/src/modules/weapons/munitions/GravityBombMunition.cc (modified) * code/branches/fabienHS15/src/modules/weapons/munitions/IceMunition.cc (modified) * code/branches/fabienHS15/src/modules/weapons/munitions/LaserMunition.cc (modified) * code/branches/fabienHS15/src/modules/weapons/munitions/LaserMunition.h (modified) * code/branches/fabienHS15/src/modules/weapons/munitions/LightningMunition.cc (added) * code/branches/fabienHS15/src/modules/weapons/munitions/LightningMunition.h (added) * code/branches/fabienHS15/src/modules/weapons/munitions/ReplenishingMunition.cc (deleted) * code/branches/fabienHS15/src/modules/weapons/munitions/ReplenishingMunition.h (deleted) * code/branches/fabienHS15/src/modules/weapons/munitions/RocketMunition.cc (modified) * code/branches/fabienHS15/src/modules/weapons/munitions/SplitMunition.cc (modified) * code/branches/fabienHS15/src/modules/weapons/projectiles/GravityBombField.cc (modified) * code/branches/fabienHS15/src/modules/weapons/weaponmodes/EnergyDrink.cc (modified) * code/branches/fabienHS15/src/modules/weapons/weaponmodes/FusionFire.cc (modified) * code/branches/fabienHS15/src/modules/weapons/weaponmodes/GravityBombFire.cc (modified) * code/branches/fabienHS15/src/modules/weapons/weaponmodes/HsW01.cc (modified) * code/branches/fabienHS15/src/modules/weapons/weaponmodes/IceGun.cc (modified) * code/branches/fabienHS15/src/modules/weapons/weaponmodes/LaserFire.cc (modified) * code/branches/fabienHS15/src/modules/weapons/weaponmodes/LightningGun.cc (modified) * code/branches/fabienHS15/src/modules/weapons/weaponmodes/RocketFire.cc (modified) * code/branches/fabienHS15/src/modules/weapons/weaponmodes/RocketFireOld.cc (modified) * code/branches/fabienHS15/src/modules/weapons/weaponmodes/SimpleRocketFire.cc (modified) * code/branches/fabienHS15/src/modules/weapons/weaponmodes/SplitGun.cc (modified) * code/branches/fabienHS15/src/orxonox/weaponsystem/CMakeLists.txt (modified) * code/branches/fabienHS15/src/orxonox/weaponsystem/Munition.cc (modified) * code/branches/fabienHS15/src/orxonox/weaponsystem/Munition.h (modified) * code/branches/fabienHS15/src/orxonox/weaponsystem/ReplenishingMunition.cc (added) * code/branches/fabienHS15/src/orxonox/weaponsystem/ReplenishingMunition.h (added) * code/branches/fabienHS15/src/orxonox/weaponsystem/Weapon.cc (modified) * code/branches/fabienHS15/src/orxonox/weaponsystem/Weapon.h (modified) * code/branches/fabienHS15/src/orxonox/weaponsystem/WeaponMode.cc (modified) * code/branches/fabienHS15/src/orxonox/weaponsystem/WeaponMode.h (modified) * code/branches/fabienHS15/src/orxonox/weaponsystem/WeaponPack.cc (modified) * code/branches/fabienHS15/src/orxonox/weaponsystem/WeaponPack.h (modified) * code/branches/fabienHS15/src/orxonox/weaponsystem/WeaponSystem.cc (modified) * code/branches/fabienHS15/src/orxonox/weaponsystem/WeaponSystem.h (modified) * code/branches/fabienHS15/src/orxonox/worldentities/pawns/Pawn.cc (modified) * code/branches/fabienHS15/src/orxonox/worldentities/pawns/Pawn.h (modified) There is now a HUD that shows the status of the weapon system: all ... Sat, 24 Oct 2015 19:46:36 GMT fvultier [10685] * code/branches/fabienHS15 (copied) Mon, 19 Oct 2015 20:49:41 GMT fvultier [10677] * code/trunk/data/levels/includes/weaponSettingsAssff.oxi (modified) * code/trunk/data/levels/includes/weaponSettingsAssff2.oxi (modified) Fixed minor issue in the WeaponsettingsASSF: The left and the right ...