# # ChangeLog for code/trunk/data/levels # # Generated by Trac 1.0.9 # Nov 30, 2024, 3:36:00 AM Sun, 22 Oct 2017 22:23:21 GMT patricwi [11495] * code/trunk (modified) * code/trunk/data/levels/Hover.oxw (modified) * code/trunk/data/levels/includes/weaponSettingsHover.oxi (modified) * code/trunk/data/levels/templates/spaceshipHover.oxt (modified) * code/trunk/data/overlays/HoverHUD.oxo (modified) * code/trunk/src/modules/hover/CMakeLists.txt (modified) * code/trunk/src/modules/hover/Hover.cc (modified) * code/trunk/src/modules/hover/Hover.h (modified) * code/trunk/src/modules/hover/HoverFlag.cc (modified) * code/trunk/src/modules/hover/HoverOrigin.cc (modified) * code/trunk/src/modules/hover/HoverOrigin.h (modified) * code/trunk/src/modules/hover/HoverShip.cc (modified) * code/trunk/src/modules/hover/HoverShip.h (modified) * code/trunk/src/modules/hover/TFlagsLivesLevelHUD.cc (deleted) * code/trunk/src/modules/hover/TFlagsLivesLevelHUD.h (deleted) * code/trunk/src/modules/weapons/weaponmodes/HsW01.cc (modified) * code/trunk/src/modules/weapons/weaponmodes/HsW01.h (modified) reverted commit from merge with tgidronFS16 because failed to compile Mon, 16 Oct 2017 14:07:37 GMT patricwi [11493] * code/trunk (modified) * code/trunk/data/levels/Hover.oxw (modified) * code/trunk/data/levels/includes/weaponSettingsHover.oxi (modified) * code/trunk/data/levels/templates/spaceshipHover.oxt (modified) * code/trunk/data/overlays/HoverHUD.oxo (modified) * code/trunk/src/modules/hover/CMakeLists.txt (modified) * code/trunk/src/modules/hover/Hover.cc (modified) * code/trunk/src/modules/hover/Hover.h (modified) * code/trunk/src/modules/hover/HoverFlag.cc (modified) * code/trunk/src/modules/hover/HoverOrigin.cc (modified) * code/trunk/src/modules/hover/HoverOrigin.h (modified) * code/trunk/src/modules/hover/HoverShip.cc (modified) * code/trunk/src/modules/hover/HoverShip.h (modified) * code/trunk/src/modules/hover/TFlagsLivesLevelHUD.cc (copied) * code/trunk/src/modules/hover/TFlagsLivesLevelHUD.h (copied) * code/trunk/src/modules/weapons/weaponmodes/HsW01.cc (modified) * code/trunk/src/modules/weapons/weaponmodes/HsW01.h (modified) Merged tgidronFS16 Wed, 11 Oct 2017 14:11:29 GMT patricwi [11451] * code/trunk (modified) * code/trunk/data/gui/layouts/Dialogue.layout (copied) * code/trunk/data/gui/scripts/Dialogue.lua (copied) * code/trunk/data/gui/scripts/TestDialogButttons.lua (copied) * code/trunk/data/levels/DialogueShowcase.oxw (copied) * code/trunk/data/levels/events.oxw (modified) * code/trunk/data/overlays/HUDTemplates3.oxo (modified) * code/trunk/src/modules/CMakeLists.txt (modified) * code/trunk/src/modules/dialogue (copied) Dialogue merged without core modifications Wed, 11 Oct 2017 14:07:20 GMT patricwi [11450] * code/trunk (modified) * code/trunk/data/gui/layouts/Dialogue.layout (deleted) * code/trunk/data/gui/scripts/Dialogue.lua (deleted) * code/trunk/data/gui/scripts/TestDialogButttons.lua (deleted) * code/trunk/data/levels/DialogueShowcase.oxw (deleted) * code/trunk/data/levels/events.oxw (modified) * code/trunk/data/overlays/HUDTemplates3.oxo (modified) * code/trunk/data/tcl/core (deleted) * code/trunk/src/modules/CMakeLists.txt (modified) * code/trunk/src/modules/dialogue (deleted) reverted merge Dialogue Mon, 02 Oct 2017 13:04:31 GMT patricwi [11449] * code/trunk (modified) * code/trunk/data/levels/SOB.oxw (added) * code/trunk/data/overlays/SOBHUD.oxo (copied) * code/trunk/src/modules/CMakeLists.txt (modified) * code/trunk/src/modules/superorxobros (copied) SuperOrxoBros added Mon, 02 Oct 2017 12:49:47 GMT patricwi [11448] * code/trunk (modified) * code/trunk/data/levels/MilleniumFalconTest.oxw (copied) * code/trunk/data/levels/includes/MFalconWeapon.oxi (copied) * code/trunk/data/levels/templates/MFalcon.oxt (copied) Millenium Falcon merged Mon, 02 Oct 2017 12:32:11 GMT patricwi [11447] * code/trunk (modified) * code/trunk/data/gui/layouts/Dialogue.layout (copied) * code/trunk/data/gui/scripts/Dialogue.lua (copied) * code/trunk/data/gui/scripts/TestDialogButttons.lua (copied) * code/trunk/data/levels/DialogueShowcase.oxw (copied) * code/trunk/data/levels/events.oxw (modified) * code/trunk/data/overlays/HUDTemplates3.oxo (modified) * code/trunk/data/tcl/core (copied) * code/trunk/src/modules/CMakeLists.txt (modified) * code/trunk/src/modules/dialogue (copied) Dialogue merged Thu, 09 Mar 2017 15:30:11 GMT patricwi [11359] * code/trunk (modified) * code/trunk/data/gui/layouts/CampaignMenu.layout (modified) * code/trunk/data/gui/schemes/OrxonoxHUDWidgets.scheme (modified) * code/trunk/data/gui/schemes/OrxonoxLook.scheme (modified) * code/trunk/data/gui/schemes/OrxonoxMenuWidgets.scheme (modified) * code/trunk/data/gui/schemes/TaharezGreenHUDWidgets.scheme (modified) * code/trunk/data/gui/schemes/TaharezGreenLook.scheme (modified) * code/trunk/data/gui/schemes/TaharezGreenMenuWidgets.scheme (modified) * code/trunk/data/gui/schemes/TaharezLook.scheme (modified) * code/trunk/data/gui/scripts/CampaignMenu.lua (modified) * code/trunk/data/gui/scripts/SingleplayerMenu.lua (modified) * code/trunk/data/levels/StoryModeMap.oxw (copied) * code/trunk/data/levels/templates/StoryMode.oxt (copied) * code/trunk/data/overlays/StoryModeHUD.oxo (copied) * code/trunk/src/orxonox/gametypes/CMakeLists.txt (modified) * code/trunk/src/orxonox/gametypes/StoryMode.cc (copied) * code/trunk/src/orxonox/gametypes/StoryMode.h (copied) story mode map merged Thu, 09 Mar 2017 15:22:19 GMT patricwi [11358] * code/trunk (modified) * code/trunk/data/levels/Spacerace2.oxw (deleted) * code/trunk/data/levels/SurfaceRacePresentation.oxw (deleted) * code/trunk/data/levels/newnewnewspacerace.oxw (copied) * code/trunk/data/levels/spaceRace.oxw (deleted) * code/trunk/data/levels/surfaceRace.oxw (deleted) * code/trunk/data/levels/templates/fastship.oxt (copied) * code/trunk/src/modules/gametypes/CMakeLists.txt (modified) * code/trunk/src/modules/gametypes/OldRaceCheckPoint.cc (deleted) * code/trunk/src/modules/gametypes/OldRaceCheckPoint.h (deleted) * code/trunk/src/modules/gametypes/OldSpaceRace.cc (deleted) * code/trunk/src/modules/gametypes/OldSpaceRace.h (deleted) * code/trunk/src/modules/gametypes/SpaceRace.cc (modified) * code/trunk/src/modules/gametypes/SpaceRace.h (modified) * code/trunk/src/modules/gametypes/SpaceRaceBot.cc (modified) * code/trunk/src/modules/gametypes/SpaceRaceBot.h (modified) * code/trunk/src/modules/gametypes/SpaceRaceController.cc (modified) * code/trunk/src/orxonox/controllers/HumanController.h (modified) * code/trunk/src/orxonox/gametypes/Gametype.cc (modified) * code/trunk/src/orxonox/infos/Bot.cc (modified) * code/trunk/src/orxonox/infos/GametypeInfo.h (modified) * code/trunk/src/orxonox/sound/WorldAmbientSound.cc (modified) space race merged Thu, 09 Mar 2017 15:09:27 GMT patricwi [11357] * code/trunk (modified) * code/trunk/data/levels/Endurancefinal.oxw (copied) * code/trunk/data/levels/HeavyCruiser.oxw (modified) * code/trunk/data/levels/emptyLevel.oxw (modified) * code/trunk/data/levels/templates/endurancetest_template.oxt (copied) * code/trunk/data/levels/templates/test11.oxt (copied) * code/trunk/src/test.txt (copied) big ship merged Thu, 09 Mar 2017 13:50:27 GMT patricwi [11354] * code/trunk (modified) * code/trunk/data/levels/pickups.oxw (modified) * code/trunk/data/overlays/HUDPickupTemplate.oxo (copied) * code/trunk/data/overlays/HUDTemplates3.oxo (modified) * code/trunk/src/modules/overlays/hud/HUDPickupSystem.cc (modified) * code/trunk/src/modules/overlays/hud/HUDPickupSystem.h (modified) merged updated HUD branch to trunk Thu, 04 Feb 2016 22:54:04 GMT fvultier [11108] * code/trunk/data/levels/includes/weaponSettingsFPS.oxi (modified) * code/trunk/data/levels/includes/weaponSettingsGhost.oxi (modified) * code/trunk/data/levels/templates/pickupRepresentationTemplates.oxt (modified) * code/trunk/src/modules/weapons/munitions/CMakeLists.txt (modified) * code/trunk/src/modules/weapons/munitions/FlameMunition.cc (added) * code/trunk/src/modules/weapons/munitions/FlameMunition.h (added) * code/trunk/src/modules/weapons/munitions/LaserMunition.cc (modified) * code/trunk/src/modules/weapons/projectiles/BasicProjectile.cc (modified) * code/trunk/src/modules/weapons/projectiles/BasicProjectile.h (modified) * code/trunk/src/modules/weapons/projectiles/CMakeLists.txt (modified) * code/trunk/src/modules/weapons/projectiles/FlameGunProjectile.cc (added) * code/trunk/src/modules/weapons/projectiles/FlameGunProjectile.h (added) * code/trunk/src/modules/weapons/projectiles/LightningGunProjectile.cc (modified) * code/trunk/src/modules/weapons/projectiles/ParticleProjectile.cc (modified) * code/trunk/src/modules/weapons/projectiles/ParticleProjectile.h (modified) * code/trunk/src/modules/weapons/projectiles/Projectile.cc (modified) * code/trunk/src/modules/weapons/projectiles/SplitGunProjectile.cc (modified) * code/trunk/src/modules/weapons/projectiles/SplitGunProjectile.h (modified) * code/trunk/src/modules/weapons/weaponmodes/CMakeLists.txt (modified) * code/trunk/src/modules/weapons/weaponmodes/EnergyDrink.cc (modified) * code/trunk/src/modules/weapons/weaponmodes/EnergyDrink.h (modified) * code/trunk/src/modules/weapons/weaponmodes/FlameGun.cc (added) * code/trunk/src/modules/weapons/weaponmodes/FlameGun.h (added) * code/trunk/src/modules/weapons/weaponmodes/FusionFire.cc (modified) * code/trunk/src/modules/weapons/weaponmodes/GravityBombFire.cc (modified) * code/trunk/src/modules/weapons/weaponmodes/HsW01.cc (modified) * code/trunk/src/modules/weapons/weaponmodes/IceGun.cc (modified) * code/trunk/src/modules/weapons/weaponmodes/LaserFire.cc (modified) * code/trunk/src/modules/weapons/weaponmodes/LightningGun.cc (modified) * code/trunk/src/modules/weapons/weaponmodes/MineGun.cc (modified) * code/trunk/src/modules/weapons/weaponmodes/SimpleRocketFire.cc (modified) * code/trunk/src/modules/weapons/weaponmodes/SplitGun.cc (modified) * code/trunk/src/orxonox/weaponsystem/WeaponMode.cc (modified) * code/trunk/src/orxonox/weaponsystem/WeaponMode.h (modified) A few modifications in the weapon system: WeaponModes may play a ... Sun, 31 Jan 2016 22:42:11 GMT fvultier [11104] * code/trunk/data/levels/FPSTest.oxw (modified) * code/trunk/data/levels/FPS_Level_HS14.oxw (modified) * code/trunk/data/levels/InsideSpaceStation.oxw (modified) * code/trunk/data/levels/dockingToASpaceStation.oxw (modified) * code/trunk/data/levels/expeditionSector.oxw (modified) * code/trunk/data/levels/includes/weaponSettingsFPS_HS14.oxi (deleted) * code/trunk/data/levels/levelTry.oxw (modified) * code/trunk/data/levels/presentationFS102.oxw (modified) * code/trunk/data/levels/presentationFS10Ed.oxw (modified) * code/trunk/data/levels/presentationHS13.oxw (modified) * code/trunk/data/levels/shuttleAttack.oxw (modified) * code/trunk/data/levels/shuttleRetaliation.oxw (modified) * code/trunk/data/levels/templates/FPS.oxt (modified) * code/trunk/data/levels/templates/FPS_HS14.oxt (deleted) * code/trunk/data/overlays/HUDTemplatesFPS.oxo (modified) Some HUDs (Health, Shield, Weapons, EnemyHealth, EnemyShield) are ... Sun, 24 Jan 2016 21:40:10 GMT landauf [11094] * code/trunk/data/levels/cityLevelHS15.oxw (modified) added night-mode in city level (with city-lights and darker skybox) Sun, 24 Jan 2016 20:21:18 GMT landauf [11091] * code/trunk/data/levels/cityLevelHS15.oxw (moved) renamed city-level, removed planet and portals, using real skybox ... Tue, 19 Jan 2016 22:27:40 GMT landauf [11080] * code/trunk (modified) * code/trunk/data/levels/shadertest.oxw (copied) * code/trunk/src/libraries/tools/Mesh.cc (modified) * code/trunk/src/libraries/tools/Mesh.h (modified) * code/trunk/src/orxonox/CMakeLists.txt (modified) * code/trunk/src/orxonox/OrxonoxPrereqs.h (modified) * code/trunk/src/orxonox/RenderQueueListener.cc (copied) * code/trunk/src/orxonox/RenderQueueListener.h (copied) * code/trunk/src/orxonox/Scene.cc (modified) * code/trunk/src/orxonox/Scene.h (modified) * code/trunk/src/orxonox/graphics/Billboard.cc (modified) * code/trunk/src/orxonox/graphics/Billboard.h (modified) * code/trunk/src/orxonox/graphics/CMakeLists.txt (modified) * code/trunk/src/orxonox/graphics/LensFlare.cc (copied) * code/trunk/src/orxonox/graphics/LensFlare.h (copied) * code/trunk/src/orxonox/graphics/Model.cc (modified) * code/trunk/src/orxonox/graphics/Model.h (modified) merged shaders back to trunk (pps project from HS 2012) Sat, 09 Jan 2016 17:26:20 GMT landauf [11052] * code/trunk (modified) * code/trunk/data/defaultConfig/orxonox.ini (modified) * code/trunk/data/gui/layouts/CampaignMenu.layout (modified) * code/trunk/data/gui/layouts/InGameMenu.layout (modified) * code/trunk/data/gui/scripts/CampaignMenu.lua (modified) * code/trunk/data/gui/scripts/InGameMenu.lua (modified) * code/trunk/data/gui/scripts/SheetManager.lua (modified) * code/trunk/data/levels/AITest.oxw (copied) * code/trunk/data/levels/FPS_Level_HS14.oxw (modified) * code/trunk/data/levels/HeavyCruiser.oxw (modified) * code/trunk/data/levels/Hover.oxw (copied) * code/trunk/data/levels/emptyLevel.oxw (modified) * code/trunk/data/levels/expeditionSector.oxw (copied) * code/trunk/data/levels/iJohnVane_TriptoArea51.oxw (modified) * code/trunk/data/levels/iiiJohnVane_EscapeTheBastards.oxw (modified) * code/trunk/data/levels/includes/invaderWeapon.oxi (modified) * code/trunk/data/levels/includes/invaderWeaponEnemy.oxi (modified) * code/trunk/data/levels/includes/pickups.oxi (modified) * code/trunk/data/levels/includes/towerWeaponSettings.oxi (deleted) * code/trunk/data/levels/includes/weaponSettingsAssff.oxi (modified) * code/trunk/data/levels/includes/weaponSettingsAssff2.oxi (modified) * code/trunk/data/levels/includes/weaponSettingsCollateral.oxi (modified) * code/trunk/data/levels/includes/weaponSettingsEscort.oxi (modified) * code/trunk/data/levels/includes/weaponSettingsEscortMine.oxi (copied) * code/trunk/data/levels/includes/weaponSettingsFPS.oxi (modified) * code/trunk/data/levels/includes/weaponSettingsFPS_HS14.oxi (modified) * code/trunk/data/levels/includes/weaponSettingsFS15.oxi (modified) * code/trunk/data/levels/includes/weaponSettingsGhost.oxi (modified) * code/trunk/data/levels/includes/weaponSettingsH2.oxi (modified) * code/trunk/data/levels/includes/weaponSettingsHXY.oxi (modified) * code/trunk/data/levels/includes/weaponSettingsHeartAttack.oxi (modified) * code/trunk/data/levels/includes/weaponSettingsHeavyCruiser.oxi (modified) * code/trunk/data/levels/includes/weaponSettingsHeavyCruiserBody.oxi (modified) * code/trunk/data/levels/includes/weaponSettingsHover.oxi (copied) * code/trunk/data/levels/includes/weaponSettingsImmTest.oxi (modified) * code/trunk/data/levels/includes/weaponSettingsPirate.oxi (modified) * code/trunk/data/levels/includes/weaponSettingsRing.oxi (modified) * code/trunk/data/levels/includes/weaponSettingsSpacecruiser.oxi (modified) * code/trunk/data/levels/includes/weaponSettingsSwallow.oxi (modified) * code/trunk/data/levels/includes/weaponSettingsTransporter.oxi (modified) * code/trunk/data/levels/includes/weaponSettingsTurret.oxi (modified) * code/trunk/data/levels/includes/weaponSettingsTurret1.oxi (modified) * code/trunk/data/levels/includes/weaponSettingsbigship.oxi (modified) * code/trunk/data/levels/kecks.oxw (modified) * code/trunk/data/levels/mineLevel.oxw (copied) * code/trunk/data/levels/missionOne.oxw (modified) * code/trunk/data/levels/notifications.oxw (modified) * code/trunk/data/levels/pickups.oxw (modified) * code/trunk/data/levels/planetLevelHS15.oxw (copied) * code/trunk/data/levels/presentationHS13.oxw (modified) * code/trunk/data/levels/shieldTest.oxw (modified) * code/trunk/data/levels/shuttleAttack.oxw (copied) * code/trunk/data/levels/shuttleRetaliation.oxw (copied) * code/trunk/data/levels/templates/FPS.oxt (modified) * code/trunk/data/levels/templates/FPS_HS14.oxt (modified) * code/trunk/data/levels/templates/HeavyCruiser.oxt (modified) * code/trunk/data/levels/templates/HeavyCruiserBody.oxt (modified) * code/trunk/data/levels/templates/ModularSpaceShipTest.oxt (modified) * code/trunk/data/levels/templates/bigship.oxt (modified) * code/trunk/data/levels/templates/enemyInvader.oxt (modified) * code/trunk/data/levels/templates/pickupRepresentationTemplates.oxt (modified) * code/trunk/data/levels/templates/spaceshipAssff.oxt (modified) * code/trunk/data/levels/templates/spaceshipAssff2.oxt (modified) * code/trunk/data/levels/templates/spaceshipCollateralDamage.oxt (modified) * code/trunk/data/levels/templates/spaceshipDodgeRace.oxt (modified) * code/trunk/data/levels/templates/spaceshipEscort.oxt (modified) * code/trunk/data/levels/templates/spaceshipEscortMine.oxt (copied) * code/trunk/data/levels/templates/spaceshipGhost.oxt (modified) * code/trunk/data/levels/templates/spaceshipH2.oxt (modified) * code/trunk/data/levels/templates/spaceshipHXY.oxt (modified) * code/trunk/data/levels/templates/spaceshipHXYSL.oxt (modified) * code/trunk/data/levels/templates/spaceshipHeartAttack.oxt (modified) * code/trunk/data/levels/templates/spaceshipHover.oxt (copied) * code/trunk/data/levels/templates/spaceshipInvader.oxt (modified) * code/trunk/data/levels/templates/spaceshipPirate.oxt (modified) * code/trunk/data/levels/templates/spaceshipRace.oxt (modified) * code/trunk/data/levels/templates/spaceshipRing.oxt (modified) * code/trunk/data/levels/templates/spaceshipShuttle.oxt (copied) * code/trunk/data/levels/templates/spaceshipSpacecruiser.oxt (modified) * code/trunk/data/levels/templates/spaceshipSwallow.oxt (modified) * code/trunk/data/levels/templates/spaceshipTransporter.oxt (modified) * code/trunk/data/levels/templates/spaceshipTransporterSL.oxt (modified) * code/trunk/data/levels/templates/spaceshipTurret.oxt (modified) * code/trunk/data/levels/templates/towerdefensetower.oxt (modified) * code/trunk/data/levels/towerDefense.oxw (modified) * code/trunk/data/overlays/HUDTemplates3.oxo (modified) * code/trunk/data/overlays/HoverHUD.oxo (copied) * code/trunk/data/overlays/InvaderHUD.oxo (modified) * code/trunk/data/overlays/jumpHUD.oxo (modified) * code/trunk/data/particle/MineExpl.particle (copied) * code/trunk/data/particle/MineExpl1.particle (copied) * code/trunk/data/particle/MineExpl2.particle (copied) * code/trunk/data/particle/engine.particle (copied) * code/trunk/data/particle/engineglow.particle (modified) * code/trunk/data/particle/ice.particle (copied) * code/trunk/data/particle/mineparticle.particle (copied) * code/trunk/data/particle/psygun.particle (copied) * code/trunk/data/particle/rocketfire.particle (modified) * code/trunk/src/libraries/core/CoreConfig.cc (modified) * code/trunk/src/libraries/core/CoreConfig.h (modified) * code/trunk/src/libraries/core/GUIManager.cc (modified) * code/trunk/src/libraries/core/GUIManager.h (modified) * code/trunk/src/libraries/core/GameConfig.cc (modified) * code/trunk/src/libraries/core/GameConfig.h (modified) * code/trunk/src/libraries/core/command/ArgumentCompletionFunctions.h (modified) * code/trunk/src/libraries/core/command/ConsoleCommandIncludes.cc (modified) * code/trunk/src/libraries/core/command/ConsoleCommandManager.cc (modified) * code/trunk/src/libraries/core/commandline/CMakeLists.txt (modified) * code/trunk/src/libraries/core/input/KeyBinder.cc (modified) * code/trunk/src/libraries/core/input/KeyBinder.h (modified) * code/trunk/src/libraries/core/singleton/ScopedSingletonIncludes.cc (modified) * code/trunk/src/libraries/core/singleton/ScopedSingletonIncludes.h (modified) * code/trunk/src/libraries/network/NetworkFunctionIncludes.cc (modified) * code/trunk/src/libraries/network/NetworkFunctionIncludes.h (modified) * code/trunk/src/libraries/network/NetworkFunctionManager.cc (modified) * code/trunk/src/libraries/network/NetworkFunctionManager.h (modified) * code/trunk/src/libraries/tools/ParticleInterface.cc (modified) * code/trunk/src/libraries/tools/ParticleInterface.h (modified) * code/trunk/src/libraries/util/Math.cc (modified) * code/trunk/src/libraries/util/Math.h (modified) * code/trunk/src/modules/CMakeLists.txt (modified) * code/trunk/src/modules/docking/DockingController.cc (modified) * code/trunk/src/modules/dodgerace/DodgeRace.cc (modified) * code/trunk/src/modules/dodgerace/DodgeRace.h (modified) * code/trunk/src/modules/hover (copied) * code/trunk/src/modules/invader/Invader.cc (modified) * code/trunk/src/modules/notifications/dispatchers/CommandNotification.cc (modified) * code/trunk/src/modules/notifications/dispatchers/CommandNotification.h (modified) * code/trunk/src/modules/objects/Turret.h (modified) * code/trunk/src/modules/overlays/OverlaysPrereqs.h (modified) * code/trunk/src/modules/overlays/hud/CMakeLists.txt (modified) * code/trunk/src/modules/overlays/hud/HUDBar.cc (modified) * code/trunk/src/modules/overlays/hud/HUDBar.h (modified) * code/trunk/src/modules/overlays/hud/HUDBoostBar.cc (modified) * code/trunk/src/modules/overlays/hud/HUDEnemyShieldBar.cc (copied) * code/trunk/src/modules/overlays/hud/HUDEnemyShieldBar.h (copied) * code/trunk/src/modules/overlays/hud/HUDHealthBar.cc (modified) * code/trunk/src/modules/overlays/hud/HUDHealthBar.h (modified) * code/trunk/src/modules/overlays/hud/HUDRadar.cc (modified) * code/trunk/src/modules/overlays/hud/HUDRocketFuelBar.cc (copied) * code/trunk/src/modules/overlays/hud/HUDRocketFuelBar.h (copied) * code/trunk/src/modules/overlays/hud/HUDShieldBar.cc (copied) * code/trunk/src/modules/overlays/hud/HUDShieldBar.h (copied) * code/trunk/src/modules/overlays/hud/HUDWeapon.cc (copied) * code/trunk/src/modules/overlays/hud/HUDWeapon.h (copied) * code/trunk/src/modules/overlays/hud/HUDWeaponMode.cc (copied) * code/trunk/src/modules/overlays/hud/HUDWeaponMode.h (copied) * code/trunk/src/modules/overlays/hud/HUDWeaponSystem.cc (copied) * code/trunk/src/modules/overlays/hud/HUDWeaponSystem.h (copied) * code/trunk/src/modules/pickup/PickupPrereqs.h (modified) * code/trunk/src/modules/pickup/PickupRepresentation.cc (modified) * code/trunk/src/modules/pickup/items/BoostPickup.cc (copied) * code/trunk/src/modules/pickup/items/BoostPickup.h (copied) * code/trunk/src/modules/pickup/items/CMakeLists.txt (modified) * code/trunk/src/modules/pickup/items/DronePickup.h (modified) * code/trunk/src/modules/pickup/items/MunitionContainer.cc (copied) * code/trunk/src/modules/pickup/items/MunitionContainer.h (copied) * code/trunk/src/modules/pickup/items/MunitionPickup.cc (copied) * code/trunk/src/modules/pickup/items/MunitionPickup.h (copied) * code/trunk/src/modules/towerdefense/TowerDefenseField.cc (modified) * code/trunk/src/modules/towerdefense/TowerDefenseField.h (modified) * code/trunk/src/modules/towerdefense/TowerDefenseSelecter.cc (modified) * code/trunk/src/modules/towerdefense/TowerDefenseTower.cc (modified) * code/trunk/src/modules/weapons/IceGunFreezer.cc (modified) * code/trunk/src/modules/weapons/IceGunFreezer.h (modified) * code/trunk/src/modules/weapons/WeaponsPrereqs.h (modified) * code/trunk/src/modules/weapons/munitions/CMakeLists.txt (modified) * code/trunk/src/modules/weapons/munitions/FusionMunition.cc (modified) * code/trunk/src/modules/weapons/munitions/FusionMunition.h (modified) * code/trunk/src/modules/weapons/munitions/GravityBombMunition.cc (modified) * code/trunk/src/modules/weapons/munitions/GravityBombMunition.h (modified) * code/trunk/src/modules/weapons/munitions/IceMunition.cc (modified) * code/trunk/src/modules/weapons/munitions/IceMunition.h (modified) * code/trunk/src/modules/weapons/munitions/LaserMunition.cc (modified) * code/trunk/src/modules/weapons/munitions/LaserMunition.h (modified) * code/trunk/src/modules/weapons/munitions/LightningMunition.cc (copied) * code/trunk/src/modules/weapons/munitions/LightningMunition.h (copied) * code/trunk/src/modules/weapons/munitions/MineMunition.cc (copied) * code/trunk/src/modules/weapons/munitions/MineMunition.h (copied) * code/trunk/src/modules/weapons/munitions/ReplenishingMunition.cc (deleted) * code/trunk/src/modules/weapons/munitions/ReplenishingMunition.h (deleted) * code/trunk/src/modules/weapons/munitions/RocketMunition.cc (modified) * code/trunk/src/modules/weapons/munitions/RocketMunition.h (modified) * code/trunk/src/modules/weapons/munitions/SplitMunition.cc (modified) * code/trunk/src/modules/weapons/munitions/SplitMunition.h (modified) * code/trunk/src/modules/weapons/projectiles/BasicProjectile.cc (modified) * code/trunk/src/modules/weapons/projectiles/CMakeLists.txt (modified) * code/trunk/src/modules/weapons/projectiles/GravityBombField.cc (modified) * code/trunk/src/modules/weapons/projectiles/IceGunProjectile.cc (modified) * code/trunk/src/modules/weapons/projectiles/IceGunProjectile.h (modified) * code/trunk/src/modules/weapons/projectiles/MineProjectile.cc (copied) * code/trunk/src/modules/weapons/projectiles/MineProjectile.h (copied) * code/trunk/src/modules/weapons/projectiles/Projectile.h (modified) * code/trunk/src/modules/weapons/projectiles/Rocket.cc (modified) * code/trunk/src/modules/weapons/projectiles/Rocket.h (modified) * code/trunk/src/modules/weapons/projectiles/SimpleRocket.cc (modified) * code/trunk/src/modules/weapons/projectiles/SplitGunProjectile.cc (modified) * code/trunk/src/modules/weapons/projectiles/SplitGunProjectile.h (modified) * 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 (modified) * code/trunk/src/modules/weapons/weaponmodes/HsW01.cc (modified) * code/trunk/src/modules/weapons/weaponmodes/IceGun.cc (modified) * code/trunk/src/modules/weapons/weaponmodes/IceGun.h (modified) * code/trunk/src/modules/weapons/weaponmodes/LaserFire.cc (modified) * code/trunk/src/modules/weapons/weaponmodes/LightningGun.cc (modified) * code/trunk/src/modules/weapons/weaponmodes/MineGun.cc (copied) * code/trunk/src/modules/weapons/weaponmodes/MineGun.h (copied) * code/trunk/src/modules/weapons/weaponmodes/RocketFire.cc (modified) * code/trunk/src/modules/weapons/weaponmodes/RocketFire.h (modified) * code/trunk/src/modules/weapons/weaponmodes/RocketFireOld.cc (modified) * code/trunk/src/modules/weapons/weaponmodes/SimpleRocketFire.cc (modified) * code/trunk/src/modules/weapons/weaponmodes/SplitGun.cc (modified) * code/trunk/src/modules/weapons/weaponmodes/SplitGun.h (modified) * code/trunk/src/orxonox/OrxonoxPrereqs.h (modified) * code/trunk/src/orxonox/controllers/ActionpointController.cc (copied) * code/trunk/src/orxonox/controllers/ActionpointController.h (copied) * code/trunk/src/orxonox/controllers/ArtificialController.cc (modified) * code/trunk/src/orxonox/controllers/CMakeLists.txt (modified) * code/trunk/src/orxonox/controllers/CommonController.cc (copied) * code/trunk/src/orxonox/controllers/CommonController.h (copied) * code/trunk/src/orxonox/controllers/DivisionController.cc (copied) * code/trunk/src/orxonox/controllers/DivisionController.h (copied) * code/trunk/src/orxonox/controllers/FightingController.cc (copied) * code/trunk/src/orxonox/controllers/FightingController.h (copied) * code/trunk/src/orxonox/controllers/FlyingController.cc (copied) * code/trunk/src/orxonox/controllers/FlyingController.h (copied) * code/trunk/src/orxonox/controllers/FormationController.cc (modified) * code/trunk/src/orxonox/controllers/HumanController.cc (modified) * code/trunk/src/orxonox/controllers/MasterController.cc (copied) * code/trunk/src/orxonox/controllers/MasterController.h (copied) * code/trunk/src/orxonox/controllers/SectionController.cc (copied) * code/trunk/src/orxonox/controllers/SectionController.h (copied) * code/trunk/src/orxonox/controllers/WingmanController.cc (copied) * code/trunk/src/orxonox/controllers/WingmanController.h (copied) * code/trunk/src/orxonox/gametypes/Dynamicmatch.cc (modified) * code/trunk/src/orxonox/gametypes/Dynamicmatch.h (modified) * code/trunk/src/orxonox/infos/PlayerInfo.cc (modified) * code/trunk/src/orxonox/items/ShipPart.cc (modified) * code/trunk/src/orxonox/overlays/OrxonoxOverlay.cc (modified) * code/trunk/src/orxonox/overlays/OrxonoxOverlay.h (modified) * code/trunk/src/orxonox/overlays/OverlayGroup.cc (modified) * code/trunk/src/orxonox/weaponsystem/CMakeLists.txt (modified) * code/trunk/src/orxonox/weaponsystem/Munition.cc (modified) * code/trunk/src/orxonox/weaponsystem/Munition.h (modified) * code/trunk/src/orxonox/weaponsystem/ReplenishingMunition.cc (copied) * code/trunk/src/orxonox/weaponsystem/ReplenishingMunition.h (copied) * code/trunk/src/orxonox/weaponsystem/Weapon.cc (modified) * code/trunk/src/orxonox/weaponsystem/Weapon.h (modified) * code/trunk/src/orxonox/weaponsystem/WeaponMode.cc (modified) * code/trunk/src/orxonox/weaponsystem/WeaponMode.h (modified) * code/trunk/src/orxonox/weaponsystem/WeaponPack.cc (modified) * code/trunk/src/orxonox/weaponsystem/WeaponPack.h (modified) * code/trunk/src/orxonox/weaponsystem/WeaponSystem.cc (modified) * code/trunk/src/orxonox/weaponsystem/WeaponSystem.h (modified) * code/trunk/src/orxonox/worldentities/Actionpoint.cc (copied) * code/trunk/src/orxonox/worldentities/Actionpoint.h (copied) * code/trunk/src/orxonox/worldentities/BigExplosion.cc (deleted) * code/trunk/src/orxonox/worldentities/BigExplosion.h (deleted) * code/trunk/src/orxonox/worldentities/CMakeLists.txt (modified) * code/trunk/src/orxonox/worldentities/ExplosionPart.cc (copied) * code/trunk/src/orxonox/worldentities/ExplosionPart.h (copied) * code/trunk/src/orxonox/worldentities/MobileEntity.h (modified) * code/trunk/src/orxonox/worldentities/SpawnPoint.h (modified) * code/trunk/src/orxonox/worldentities/StaticEntity.h (modified) * code/trunk/src/orxonox/worldentities/TeamSpawnPoint.cc (modified) * code/trunk/src/orxonox/worldentities/TeamSpawnPoint.h (modified) * code/trunk/src/orxonox/worldentities/pawns/Pawn.cc (modified) * code/trunk/src/orxonox/worldentities/pawns/Pawn.h (modified) * code/trunk/src/orxonox/worldentities/pawns/SpaceShip.cc (modified) * code/trunk/src/orxonox/worldentities/pawns/SpaceShip.h (modified) * code/trunk/test/core/class/IdentifierNestedClassHierarchyTest.cc (modified) * code/trunk/test/util/MathTest.cc (modified) merged branch presentationHS15 back to trunk Fri, 20 Nov 2015 17:11:25 GMT fvultier [10820] * code/trunk/data/levels/templates/spaceshipFS15.oxt (deleted) deleted useless file: spaceshipFS15 is the same as spaceshipHeartAttack Fri, 20 Nov 2015 17:10:41 GMT fvultier [10819] * code/trunk/data/levels/presentationFS15.oxw (modified) deleted useless file: spaceshipFS15 is the same as spaceshipHeartAttack Sat, 14 Nov 2015 12:32:57 GMT jo [10801] * code/trunk/data/levels/jump.oxw (modified) More straight forward jump level description. 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 ... Mon, 12 Oct 2015 20:57:00 GMT fvultier [10650] * code/trunk/data/levels/includes/weaponSettingsRing.oxi (modified) * code/trunk/src/orxonox/weaponsystem/Weapon.cc (modified) * code/trunk/src/orxonox/weaponsystem/Weapon.h (modified) * code/trunk/src/orxonox/weaponsystem/WeaponMode.cc (modified) * code/trunk/src/orxonox/weaponsystem/WeaponMode.h (modified) * code/trunk/src/orxonox/weaponsystem/WeaponPack.cc (modified) * code/trunk/src/orxonox/weaponsystem/WeaponSet.cc (modified) * code/trunk/src/orxonox/weaponsystem/WeaponSlot.h (modified) * code/trunk/src/orxonox/weaponsystem/WeaponSystem.cc (modified) * code/trunk/src/orxonox/weaponsystem/WeaponSystem.h (modified) * code/trunk/src/orxonox/worldentities/pawns/Pawn.cc (modified) There is now a spaceship that uses the gravity bomb. Minor ... Mon, 12 Oct 2015 16:28:15 GMT fvultier [10648] * code/trunk/data/levels/includes/weaponSettingsAssff.oxi (modified) * code/trunk/data/levels/includes/weaponSettingsAssff2.oxi (modified) * code/trunk/src/orxonox/weaponsystem/WeaponSlot.cc (modified) * code/trunk/src/orxonox/weaponsystem/WeaponSlot.h (modified) Removed EnergyDrink Weapon from SpaceshipASSFF. Improved ... Sat, 10 Oct 2015 14:34:26 GMT fvultier [10629] * code/trunk/data/levels/emptyLevel.oxw (modified) * code/trunk/data/levels/includes/weaponSettingsRing.oxi (modified) * code/trunk/data/levels/includes/weaponSettingsSwallow.oxi (modified) * code/trunk/data/levels/jump.oxw (modified) * code/trunk/data/levels/templates/enemytowerdefense.oxt (deleted) * code/trunk/data/levels/towerDefense.oxw (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/TDEnemy.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/TowerDefenseController.cc (deleted) * code/trunk/src/modules/towerdefense/TowerDefenseController.h (deleted) * code/trunk/src/modules/towerdefense/TowerDefenseEnemy.cc (modified) * code/trunk/src/modules/towerdefense/TowerDefenseEnemy.h (modified) * code/trunk/src/modules/towerdefense/TowerDefenseField.cc (added) * code/trunk/src/modules/towerdefense/TowerDefenseField.h (added) * code/trunk/src/modules/towerdefense/TowerDefenseHUDController.cc (modified) * code/trunk/src/modules/towerdefense/TowerDefenseSelecter.cc (modified) * code/trunk/src/modules/towerdefense/TowerDefenseSelecter.h (modified) * code/trunk/src/modules/towerdefense/TowerDefenseTower.cc (modified) * code/trunk/src/modules/towerdefense/TowerDefenseTower.h (modified) * code/trunk/src/modules/weapons/CMakeLists.txt (modified) * code/trunk/src/modules/weapons/IceGunFreezer.cc (added) * code/trunk/src/modules/weapons/IceGunFreezer.h (added) * code/trunk/src/modules/weapons/munitions/CMakeLists.txt (modified) * code/trunk/src/modules/weapons/munitions/IceMunition.cc (added) * code/trunk/src/modules/weapons/munitions/IceMunition.h (added) * code/trunk/src/modules/weapons/munitions/SplitMunition.cc (added) * code/trunk/src/modules/weapons/munitions/SplitMunition.h (added) * code/trunk/src/modules/weapons/projectiles/BillboardProjectile.cc (modified) * code/trunk/src/modules/weapons/projectiles/BillboardProjectile.h (modified) * code/trunk/src/modules/weapons/projectiles/CMakeLists.txt (modified) * code/trunk/src/modules/weapons/projectiles/IceGunProjectile.cc (added) * code/trunk/src/modules/weapons/projectiles/IceGunProjectile.h (added) * code/trunk/src/modules/weapons/projectiles/Projectile.cc (modified) * code/trunk/src/modules/weapons/projectiles/Projectile.h (modified) * code/trunk/src/modules/weapons/projectiles/SplitGunProjectile.cc (added) * code/trunk/src/modules/weapons/projectiles/SplitGunProjectile.h (added) * code/trunk/src/modules/weapons/weaponmodes/CMakeLists.txt (modified) * code/trunk/src/modules/weapons/weaponmodes/IceGun.cc (added) * code/trunk/src/modules/weapons/weaponmodes/IceGun.h (added) * code/trunk/src/modules/weapons/weaponmodes/SplitGun.cc (added) * code/trunk/src/modules/weapons/weaponmodes/SplitGun.h (added) Merged towerdefenseFabien branch back to trunk. The towerdefense ... Sun, 04 Oct 2015 19:12:21 GMT landauf [10624] * code/trunk (modified) * code/trunk/CMakeLists.txt (modified) * code/trunk/cmake/InstallConfig.cmake (modified) * code/trunk/cmake/tools/FindVLD.cmake (modified) * code/trunk/cmake/tools/TargetUtilities.cmake (modified) * code/trunk/data/levels/4Dtest.oxw (modified) * code/trunk/data/levels/DodgeRace.oxw (modified) * code/trunk/data/levels/Invaders.oxw (modified) * code/trunk/data/levels/Spacerace2.oxw (modified) * code/trunk/data/levels/SurfaceRacePresentation.oxw (modified) * code/trunk/data/levels/jump.oxw (modified) * code/trunk/data/levels/pong.oxw (modified) * code/trunk/data/levels/presentationHS12.oxw (modified) * code/trunk/data/levels/spaceRace.oxw (modified) * code/trunk/data/levels/surfaceRace.oxw (modified) * code/trunk/data/levels/tetris.oxw (modified) * code/trunk/data/levels/towerDefense.oxw (modified) * code/trunk/src/CMakeLists.txt (modified) * code/trunk/src/SpecialConfig.h.in (modified) * code/trunk/src/libraries/core/ApplicationPaths.cc (copied) * code/trunk/src/libraries/core/ApplicationPaths.h (copied) * code/trunk/src/libraries/core/BaseObject.cc (modified) * code/trunk/src/libraries/core/BaseObject.h (modified) * code/trunk/src/libraries/core/CMakeLists.txt (modified) * code/trunk/src/libraries/core/ClassTreeMask.cc (modified) * code/trunk/src/libraries/core/ConfigurablePaths.cc (copied) * code/trunk/src/libraries/core/ConfigurablePaths.h (copied) * code/trunk/src/libraries/core/Core.cc (modified) * code/trunk/src/libraries/core/Core.h (modified) * code/trunk/src/libraries/core/CoreConfig.cc (copied) * code/trunk/src/libraries/core/CoreConfig.h (copied) * code/trunk/src/libraries/core/CoreIncludes.h (modified) * code/trunk/src/libraries/core/CorePrereqs.h (modified) * code/trunk/src/libraries/core/CoreStaticInitializationHandler.cc (copied) * code/trunk/src/libraries/core/CoreStaticInitializationHandler.h (copied) * code/trunk/src/libraries/core/DynLib.cc (deleted) * code/trunk/src/libraries/core/DynLib.h (deleted) * code/trunk/src/libraries/core/DynLibManager.cc (deleted) * code/trunk/src/libraries/core/DynLibManager.h (deleted) * code/trunk/src/libraries/core/GUIManager.cc (modified) * code/trunk/src/libraries/core/Game.cc (modified) * code/trunk/src/libraries/core/Game.h (modified) * code/trunk/src/libraries/core/GameConfig.cc (copied) * code/trunk/src/libraries/core/GameConfig.h (copied) * code/trunk/src/libraries/core/GraphicsManager.cc (modified) * code/trunk/src/libraries/core/GraphicsManager.h (modified) * code/trunk/src/libraries/core/Language.cc (modified) * code/trunk/src/libraries/core/Language.h (modified) * code/trunk/src/libraries/core/Loader.cc (modified) * code/trunk/src/libraries/core/Loader.h (modified) * code/trunk/src/libraries/core/Namespace.cc (modified) * code/trunk/src/libraries/core/PathConfig.cc (deleted) * code/trunk/src/libraries/core/PathConfig.h (deleted) * code/trunk/src/libraries/core/UpdateListener.cc (copied) * code/trunk/src/libraries/core/UpdateListener.h (copied) * code/trunk/src/libraries/core/ViewportEventListener.cc (modified) * code/trunk/src/libraries/core/WindowEventListener.cc (modified) * code/trunk/src/libraries/core/XMLNameListener.cc (modified) * code/trunk/src/libraries/core/XMLPort.cc (modified) * code/trunk/src/libraries/core/class/Identifiable.cc (modified) * code/trunk/src/libraries/core/class/Identifier.cc (modified) * code/trunk/src/libraries/core/class/Identifier.h (modified) * code/trunk/src/libraries/core/class/IdentifierManager.cc (modified) * code/trunk/src/libraries/core/class/IdentifierManager.h (modified) * code/trunk/src/libraries/core/class/OrxonoxInterface.cc (modified) * code/trunk/src/libraries/core/class/Super.h (modified) * code/trunk/src/libraries/core/command/ArgumentCompletionFunctions.cc (modified) * code/trunk/src/libraries/core/command/CMakeLists.txt (modified) * code/trunk/src/libraries/core/command/CommandEvaluation.cc (modified) * code/trunk/src/libraries/core/command/CommandExecutor.cc (modified) * code/trunk/src/libraries/core/command/ConsoleCommand.cc (modified) * code/trunk/src/libraries/core/command/ConsoleCommand.h (modified) * code/trunk/src/libraries/core/command/ConsoleCommandCompilation.cc (modified) * code/trunk/src/libraries/core/command/ConsoleCommandIncludes.cc (copied) * code/trunk/src/libraries/core/command/ConsoleCommandIncludes.h (copied) * code/trunk/src/libraries/core/command/ConsoleCommandManager.cc (copied) * code/trunk/src/libraries/core/command/ConsoleCommandManager.h (copied) * code/trunk/src/libraries/core/command/IRC.cc (modified) * code/trunk/src/libraries/core/command/Shell.cc (modified) * code/trunk/src/libraries/core/command/Shell.h (modified) * code/trunk/src/libraries/core/command/TclBind.cc (modified) * code/trunk/src/libraries/core/command/TclThreadManager.cc (modified) * code/trunk/src/libraries/core/commandline (copied) * code/trunk/src/libraries/core/config/CMakeLists.txt (modified) * code/trunk/src/libraries/core/config/CommandLineParser.cc (deleted) * code/trunk/src/libraries/core/config/CommandLineParser.h (deleted) * code/trunk/src/libraries/core/config/ConfigFile.cc (modified) * code/trunk/src/libraries/core/config/Configurable.cc (modified) * code/trunk/src/libraries/core/config/SettingsConfigFile.cc (modified) * code/trunk/src/libraries/core/input/InputManager.cc (modified) * code/trunk/src/libraries/core/input/JoyStick.cc (modified) * code/trunk/src/libraries/core/input/JoyStickQuantityListener.cc (modified) * code/trunk/src/libraries/core/input/KeyBinder.cc (modified) * code/trunk/src/libraries/core/input/KeyBinderManager.cc (modified) * code/trunk/src/libraries/core/input/KeyDetector.cc (modified) * code/trunk/src/libraries/core/input/Mouse.cc (modified) * code/trunk/src/libraries/core/module (copied) * code/trunk/src/libraries/core/object/CMakeLists.txt (modified) * code/trunk/src/libraries/core/object/Context.cc (modified) * code/trunk/src/libraries/core/object/Context.h (modified) * code/trunk/src/libraries/core/object/DestroyLaterManager.cc (copied) * code/trunk/src/libraries/core/object/DestroyLaterManager.h (copied) * code/trunk/src/libraries/core/object/Destroyable.cc (modified) * code/trunk/src/libraries/core/object/Destroyable.h (modified) * code/trunk/src/libraries/core/object/Iterator.h (modified) * code/trunk/src/libraries/core/object/IteratorBase.h (modified) * code/trunk/src/libraries/core/object/Listable.cc (modified) * code/trunk/src/libraries/core/object/ObjectList.h (modified) * code/trunk/src/libraries/core/object/ObjectListIterator.h (modified) * code/trunk/src/libraries/core/object/SmartPtr.h (deleted) * code/trunk/src/libraries/core/object/StrongPtr.h (copied) * code/trunk/src/libraries/core/object/WeakPtr.h (modified) * code/trunk/src/libraries/core/singleton (copied) * code/trunk/src/libraries/network/CMakeLists.txt (modified) * code/trunk/src/libraries/network/Client.cc (modified) * code/trunk/src/libraries/network/ClientConnectionListener.cc (modified) * code/trunk/src/libraries/network/FunctionCall.cc (modified) * code/trunk/src/libraries/network/FunctionCall.h (modified) * code/trunk/src/libraries/network/FunctionCallManager.cc (modified) * code/trunk/src/libraries/network/FunctionCallManager.h (modified) * code/trunk/src/libraries/network/Host.cc (modified) * code/trunk/src/libraries/network/LANDiscovery.cc (modified) * code/trunk/src/libraries/network/MasterServer.cc (modified) * code/trunk/src/libraries/network/NetworkFunction.cc (modified) * code/trunk/src/libraries/network/NetworkFunction.h (modified) * code/trunk/src/libraries/network/NetworkFunctionIncludes.cc (copied) * code/trunk/src/libraries/network/NetworkFunctionIncludes.h (copied) * code/trunk/src/libraries/network/NetworkFunctionManager.cc (copied) * code/trunk/src/libraries/network/NetworkFunctionManager.h (copied) * code/trunk/src/libraries/network/NetworkPrereqs.h (modified) * code/trunk/src/libraries/network/NetworkStaticInitializationHandler.cc (copied) * code/trunk/src/libraries/network/NetworkStaticInitializationHandler.h (copied) * code/trunk/src/libraries/network/WANDiscoverable.cc (modified) * code/trunk/src/libraries/network/WANDiscovery.cc (modified) * code/trunk/src/libraries/network/packet/FunctionCalls.cc (modified) * code/trunk/src/libraries/network/packet/FunctionCalls.h (modified) * code/trunk/src/libraries/network/packet/FunctionIDs.cc (modified) * code/trunk/src/libraries/network/synchronisable/CMakeLists.txt (modified) * code/trunk/src/libraries/network/synchronisable/Serialise.h (modified) * code/trunk/src/libraries/network/synchronisable/Synchronisable.cc (modified) * code/trunk/src/libraries/network/synchronisable/SynchronisableVariable.cc (deleted) * code/trunk/src/libraries/network/synchronisable/SynchronisableVariable.h (modified) * code/trunk/src/libraries/tools/ParticleInterface.cc (modified) * code/trunk/src/libraries/tools/ParticleInterface.h (modified) * code/trunk/src/libraries/tools/ResourceLocation.cc (modified) * code/trunk/src/libraries/tools/Timer.cc (modified) * code/trunk/src/libraries/tools/interfaces/ToolsInterfaceCompilation.cc (modified) * code/trunk/src/libraries/util/CMakeLists.txt (modified) * code/trunk/src/libraries/util/Scope.cc (deleted) * code/trunk/src/libraries/util/Scope.h (deleted) * code/trunk/src/libraries/util/ScopedSingletonManager.cc (deleted) * code/trunk/src/libraries/util/ScopedSingletonManager.h (deleted) * code/trunk/src/libraries/util/SharedPtr.h (modified) * code/trunk/src/libraries/util/Singleton.h (modified) * code/trunk/src/libraries/util/UtilPrereqs.h (modified) * code/trunk/src/libraries/util/output/OutputDefinitions.h (modified) * code/trunk/src/modules/designtools/ScreenshotManager.cc (modified) * code/trunk/src/modules/designtools/SkyboxGenerator.cc (modified) * code/trunk/src/modules/docking/Dock.cc (modified) * code/trunk/src/modules/docking/DockingAnimation.cc (modified) * code/trunk/src/modules/docking/DockingEffect.cc (modified) * code/trunk/src/modules/dodgerace/CMakeLists.txt (modified) * code/trunk/src/modules/dodgerace/DodgeRace.cc (modified) * code/trunk/src/modules/dodgerace/DodgeRace.h (modified) * code/trunk/src/modules/dodgerace/DodgeRaceCenterPoint.cc (modified) * code/trunk/src/modules/dodgerace/DodgeRaceCenterPoint.h (modified) * code/trunk/src/modules/dodgerace/DodgeRaceCube.cc (modified) * code/trunk/src/modules/dodgerace/DodgeRaceHUDinfo.cc (modified) * code/trunk/src/modules/dodgerace/DodgeRaceShip.cc (modified) * code/trunk/src/modules/dodgerace/DodgeRaceShip.h (modified) * code/trunk/src/modules/gametypes/CMakeLists.txt (modified) * code/trunk/src/modules/gametypes/OldRaceCheckPoint.cc (modified) * code/trunk/src/modules/gametypes/SpaceRaceManager.cc (modified) * code/trunk/src/modules/invader/CMakeLists.txt (modified) * code/trunk/src/modules/invader/Invader.cc (modified) * code/trunk/src/modules/invader/Invader.h (modified) * code/trunk/src/modules/invader/InvaderCenterPoint.cc (modified) * code/trunk/src/modules/invader/InvaderCenterPoint.h (modified) * code/trunk/src/modules/invader/InvaderEnemy.cc (modified) * code/trunk/src/modules/invader/InvaderEnemy.h (modified) * code/trunk/src/modules/invader/InvaderHUDinfo.cc (modified) * code/trunk/src/modules/invader/InvaderShip.cc (modified) * code/trunk/src/modules/invader/InvaderShip.h (modified) * code/trunk/src/modules/invader/InvaderWeapon.cc (modified) * code/trunk/src/modules/jump/CMakeLists.txt (modified) * code/trunk/src/modules/jump/JumpCenterpoint.cc (modified) * code/trunk/src/modules/jump/JumpCenterpoint.h (modified) * code/trunk/src/modules/jump/JumpEnemy.cc (modified) * code/trunk/src/modules/jump/JumpEnemy.h (modified) * code/trunk/src/modules/jump/JumpItem.cc (modified) * code/trunk/src/modules/jump/JumpItem.h (modified) * code/trunk/src/modules/jump/JumpPlatform.cc (modified) * code/trunk/src/modules/jump/JumpPlatform.h (modified) * code/trunk/src/modules/jump/JumpProjectile.cc (modified) * code/trunk/src/modules/jump/JumpProjectile.h (modified) * code/trunk/src/modules/jump/JumpScore.cc (modified) * code/trunk/src/modules/mini4dgame/CMakeLists.txt (modified) * code/trunk/src/modules/mini4dgame/Mini4Dgame.cc (modified) * code/trunk/src/modules/mini4dgame/Mini4DgameBoard.cc (modified) * code/trunk/src/modules/mini4dgame/Mini4DgameBoard.h (modified) * code/trunk/src/modules/notifications/NotificationDispatcher.cc (modified) * code/trunk/src/modules/notifications/NotificationManager.cc (modified) * code/trunk/src/modules/objects/Planet.cc (modified) * code/trunk/src/modules/objects/Planet.h (modified) * code/trunk/src/modules/objects/Script.cc (modified) * code/trunk/src/modules/objects/SpaceBoundaries.cc (modified) * code/trunk/src/modules/objects/collisionshapes/AbstractRadiusHeightCollisionShape.cc (modified) * code/trunk/src/modules/objects/collisionshapes/BoxCollisionShape.cc (modified) * code/trunk/src/modules/objects/collisionshapes/BoxCollisionShape.h (modified) * code/trunk/src/modules/objects/collisionshapes/ConeCollisionShape.cc (modified) * code/trunk/src/modules/objects/collisionshapes/ConeCollisionShape.h (modified) * code/trunk/src/modules/objects/collisionshapes/CylinderCollisionShape.cc (modified) * code/trunk/src/modules/objects/collisionshapes/CylinderCollisionShape.h (modified) * code/trunk/src/modules/objects/collisionshapes/PlaneCollisionShape.cc (modified) * code/trunk/src/modules/objects/collisionshapes/PlaneCollisionShape.h (modified) * code/trunk/src/modules/objects/collisionshapes/SphereCollisionShape.cc (modified) * code/trunk/src/modules/objects/collisionshapes/SphereCollisionShape.h (modified) * code/trunk/src/modules/objects/triggers/CheckPoint.cc (modified) * code/trunk/src/modules/objects/triggers/DistanceMultiTrigger.cc (modified) * code/trunk/src/modules/objects/triggers/DistanceMultiTrigger.h (modified) * code/trunk/src/modules/objects/triggers/DistanceTrigger.cc (modified) * code/trunk/src/modules/objects/triggers/Trigger.cc (modified) * code/trunk/src/modules/overlays/hud/HUDHealthBar.h (modified) * code/trunk/src/modules/overlays/hud/HUDNavigation.cc (modified) * code/trunk/src/modules/overlays/hud/LastManStandingInfos.cc (modified) * code/trunk/src/modules/overlays/hud/LastTeamStandingInfos.cc (modified) * code/trunk/src/modules/overlays/hud/TeamBaseMatchScore.cc (modified) * code/trunk/src/modules/pickup/CollectiblePickup.cc (modified) * code/trunk/src/modules/pickup/PickupManager.cc (modified) * code/trunk/src/modules/pickup/PickupManager.h (modified) * code/trunk/src/modules/pickup/PickupSpawner.cc (modified) * code/trunk/src/modules/pickup/items/ShrinkPickup.cc (modified) * code/trunk/src/modules/pong/CMakeLists.txt (modified) * code/trunk/src/modules/pong/PongCenterpoint.cc (modified) * code/trunk/src/modules/pong/PongCenterpoint.h (modified) * code/trunk/src/modules/pong/PongScore.cc (modified) * code/trunk/src/modules/questsystem/Quest.cc (modified) * code/trunk/src/modules/questsystem/QuestEffect.cc (modified) * code/trunk/src/modules/questsystem/QuestManager.cc (modified) * code/trunk/src/modules/questsystem/effects/ChangeQuestStatus.cc (modified) * code/trunk/src/modules/tetris/CMakeLists.txt (modified) * code/trunk/src/modules/tetris/Tetris.cc (modified) * code/trunk/src/modules/tetris/Tetris.h (modified) * code/trunk/src/modules/tetris/TetrisBrick.cc (modified) * code/trunk/src/modules/tetris/TetrisCenterpoint.cc (modified) * code/trunk/src/modules/tetris/TetrisCenterpoint.h (modified) * code/trunk/src/modules/tetris/TetrisScore.cc (modified) * code/trunk/src/modules/towerdefense/CMakeLists.txt (modified) * code/trunk/src/modules/towerdefense/TDCoordinate.h (modified) * code/trunk/src/modules/towerdefense/TowerDefense.cc (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/TowerDefenseEnemy.h (modified) * code/trunk/src/modules/towerdefense/TowerDefenseHUDController.cc (modified) * code/trunk/src/modules/weapons/projectiles/ParticleProjectile.cc (modified) * code/trunk/src/orxonox/CMakeLists.txt (modified) * code/trunk/src/orxonox/CameraManager.cc (modified) * code/trunk/src/orxonox/Level.cc (modified) * code/trunk/src/orxonox/Level.h (modified) * code/trunk/src/orxonox/LevelManager.cc (modified) * code/trunk/src/orxonox/Main.cc (modified) * code/trunk/src/orxonox/MoodManager.cc (modified) * code/trunk/src/orxonox/OrxonoxPrereqs.h (modified) * code/trunk/src/orxonox/PawnManager.cc (deleted) * code/trunk/src/orxonox/PawnManager.h (deleted) * code/trunk/src/orxonox/PlayerManager.cc (modified) * code/trunk/src/orxonox/Radar.cc (modified) * code/trunk/src/orxonox/Scene.cc (modified) * code/trunk/src/orxonox/Scene.h (modified) * code/trunk/src/orxonox/ShipPartManager.cc (deleted) * code/trunk/src/orxonox/ShipPartManager.h (deleted) * code/trunk/src/orxonox/Test.cc (modified) * code/trunk/src/orxonox/chat/ChatHistory.cc (modified) * code/trunk/src/orxonox/chat/ChatHistory.h (modified) * code/trunk/src/orxonox/chat/ChatInputHandler.cc (modified) * code/trunk/src/orxonox/chat/ChatManager.cc (modified) * code/trunk/src/orxonox/collisionshapes/CollisionShape.cc (modified) * code/trunk/src/orxonox/collisionshapes/CompoundCollisionShape.cc (modified) * code/trunk/src/orxonox/collisionshapes/WorldEntityCollisionShape.cc (modified) * code/trunk/src/orxonox/collisionshapes/WorldEntityCollisionShape.h (modified) * code/trunk/src/orxonox/controllers/ArtificialController.cc (modified) * code/trunk/src/orxonox/controllers/FormationController.cc (modified) * code/trunk/src/orxonox/controllers/HumanController.cc (modified) * code/trunk/src/orxonox/controllers/HumanController.h (modified) * code/trunk/src/orxonox/controllers/NewHumanController.cc (modified) * code/trunk/src/orxonox/gamestates/GSClient.cc (modified) * code/trunk/src/orxonox/gamestates/GSLevel.cc (modified) * code/trunk/src/orxonox/gamestates/GSLevel.h (modified) * code/trunk/src/orxonox/gamestates/GSMainMenu.cc (modified) * code/trunk/src/orxonox/gamestates/GSRoot.cc (modified) * code/trunk/src/orxonox/gamestates/GSServer.cc (modified) * code/trunk/src/orxonox/gametypes/Dynamicmatch.cc (modified) * code/trunk/src/orxonox/gametypes/Dynamicmatch.h (modified) * code/trunk/src/orxonox/gametypes/Gametype.cc (modified) * code/trunk/src/orxonox/gametypes/Gametype.h (modified) * code/trunk/src/orxonox/gametypes/Mission.cc (modified) * code/trunk/src/orxonox/infos/GametypeInfo.cc (modified) * code/trunk/src/orxonox/infos/HumanPlayer.cc (modified) * code/trunk/src/orxonox/infos/HumanPlayer.h (modified) * code/trunk/src/orxonox/infos/PlayerInfo.cc (modified) * code/trunk/src/orxonox/infos/PlayerInfo.h (modified) * code/trunk/src/orxonox/interfaces/InterfaceCompilation.cc (modified) * code/trunk/src/orxonox/interfaces/NotificationListener.cc (modified) * code/trunk/src/orxonox/interfaces/PickupCarrier.cc (modified) * code/trunk/src/orxonox/interfaces/PickupListener.cc (modified) * code/trunk/src/orxonox/interfaces/Pickupable.cc (modified) * code/trunk/src/orxonox/interfaces/Pickupable.h (modified) * code/trunk/src/orxonox/interfaces/PlayerTrigger.h (modified) * code/trunk/src/orxonox/interfaces/RadarViewable.cc (modified) * code/trunk/src/orxonox/interfaces/RadarViewable.h (modified) * code/trunk/src/orxonox/items/ShipPart.cc (modified) * code/trunk/src/orxonox/items/ShipPart.h (modified) * code/trunk/src/orxonox/overlays/InGameConsole.cc (modified) * code/trunk/src/orxonox/overlays/InGameConsole.h (modified) * code/trunk/src/orxonox/overlays/OrxonoxOverlay.cc (modified) * code/trunk/src/orxonox/overlays/OverlayGroup.cc (modified) * code/trunk/src/orxonox/overlays/OverlayGroup.h (modified) * code/trunk/src/orxonox/sound/AmbientSound.cc (modified) * code/trunk/src/orxonox/sound/BaseSound.cc (modified) * code/trunk/src/orxonox/sound/SoundBuffer.h (modified) * code/trunk/src/orxonox/sound/SoundManager.cc (modified) * code/trunk/src/orxonox/sound/SoundManager.h (modified) * code/trunk/src/orxonox/sound/WorldAmbientSound.cc (modified) * code/trunk/src/orxonox/weaponsystem/WeaponMode.cc (modified) * code/trunk/src/orxonox/worldentities/ControllableEntity.cc (modified) * code/trunk/src/orxonox/worldentities/ControllableEntity.h (modified) * code/trunk/src/orxonox/worldentities/WorldEntity.cc (modified) * code/trunk/src/orxonox/worldentities/pawns/Destroyer.cc (modified) * code/trunk/src/orxonox/worldentities/pawns/ModularSpaceShip.cc (modified) * code/trunk/src/orxonox/worldentities/pawns/Pawn.cc (modified) * code/trunk/src/orxonox/worldentities/pawns/Spectator.cc (modified) * code/trunk/src/orxonox/worldentities/pawns/TeamBaseMatchBase.cc (modified) * code/trunk/test/core/CMakeLists.txt (modified) * code/trunk/test/core/class/IdentifiableTest.cc (modified) * code/trunk/test/core/class/IdentifierClassHierarchyTest.cc (modified) * code/trunk/test/core/class/IdentifierExternalClassHierarchyTest.cc (modified) * code/trunk/test/core/class/IdentifierNestedClassHierarchyTest.cc (copied) * code/trunk/test/core/class/IdentifierSimpleClassHierarchyTest.cc (modified) * code/trunk/test/core/class/IdentifierTest.cc (modified) * code/trunk/test/core/class/OrxonoxClassTest.cc (modified) * code/trunk/test/core/class/OrxonoxInterfaceTest.cc (modified) * code/trunk/test/core/class/SubclassIdentifierTest.cc (modified) * code/trunk/test/core/class/SuperTest.cc (modified) * code/trunk/test/core/command/CommandTest.cc (modified) * code/trunk/test/core/object/ClassFactoryTest.cc (modified) * code/trunk/test/core/object/ContextTest.cc (modified) * code/trunk/test/core/object/IteratorTest.cc (modified) * code/trunk/test/core/object/ListableTest.cc (modified) * code/trunk/test/core/object/ObjectListIteratorTest.cc (modified) * code/trunk/test/core/object/SmartPtrTest.cc (deleted) * code/trunk/test/core/object/StrongPtrTest.cc (copied) * code/trunk/test/core/object/WeakPtrTest.cc (modified) * code/trunk/test/core/singleton (copied) * code/trunk/test/util/CMakeLists.txt (modified) * code/trunk/test/util/ScopeTest.cc (deleted) * code/trunk/test/util/output/ConsoleWriterTest.cc (modified) * code/trunk/test/util/output/LogWriterTest.cc (modified) * code/trunk/test/util/output/MemoryWriterTest.cc (modified) * code/trunk/test/util/output/OutputManagerTest.cc (modified) merged branch core7 back to trunk 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 Sun, 01 Mar 2015 21:11:26 GMT landauf [10297] * code/trunk/data/levels/underAttack.oxw (modified) improved underAttack.oxw - now with lots of turrets attached to the ... Sun, 15 Feb 2015 22:11:59 GMT landauf [10274] * code/trunk/data/levels/iJohnVane_TriptoArea51.oxw (modified) * code/trunk/src/orxonox/worldentities/WorldEntity.cc (modified) fixed #419 http://www.orxonox.net/ticket/419 physics is only ... Fri, 06 Feb 2015 22:30:26 GMT landauf [10262] * code/trunk/data/defaultConfig/orxonox.ini (modified) * code/trunk/data/gui/layouts/CampaignMenu.layout (modified) * code/trunk/data/gui/scripts/CampaignMenu.lua (modified) * code/trunk/data/gui/scripts/testscript.lua (modified) * code/trunk/data/levels/4Dtest.oxw (modified) * code/trunk/data/levels/AnihilationThreat.oxw (modified) * code/trunk/data/levels/DodgeRace.oxw (modified) * code/trunk/data/levels/FPS_Level_HS14.oxw (modified) * code/trunk/data/levels/ModularShipsTest0.oxw (modified) * code/trunk/data/levels/ModularShipsTest1.oxw (modified) * code/trunk/data/levels/collisionShapes.oxw (modified) * code/trunk/data/levels/includes/weaponSettingsFPS_HS14.oxi (modified) * code/trunk/data/levels/includes/weaponSettingsTurret1.oxi (modified) * code/trunk/data/levels/jump.oxw (modified) * code/trunk/data/levels/kecks.oxw (modified) * code/trunk/data/levels/levelTry.oxw (modified) * code/trunk/data/levels/michaelstestfile.lua (modified) * code/trunk/data/levels/scriptController.oxw (modified) * code/trunk/data/levels/templates/DodgeRacePattern.oxt (modified) * code/trunk/data/levels/templates/FPS_HS14.oxt (modified) * code/trunk/data/levels/templates/ModularSpaceShipTest.oxt (modified) * code/trunk/data/levels/templates/enemytowerdefense.oxt (modified) * code/trunk/data/levels/templates/spaceshipDodgeRace.oxt (modified) * code/trunk/data/levels/templates/spacestation_elements.oxt (modified) * code/trunk/data/levels/templates/ss_tube01.oxt (modified) * code/trunk/data/levels/templates/standardTurret.oxt (modified) * code/trunk/data/overlays/DodgeRaceHUD.oxo (modified) * code/trunk/data/overlays/jumpHUD.oxo (modified) * code/trunk/src/libraries/tools/BulletDebugDrawer.cc (modified) * code/trunk/src/libraries/tools/BulletDebugDrawer.h (modified) * code/trunk/src/libraries/tools/DebugDrawer.cc (modified) * code/trunk/src/libraries/tools/DebugDrawer.h (modified) * code/trunk/src/libraries/tools/IcoSphere.cc (modified) * code/trunk/src/libraries/tools/IcoSphere.h (modified) * code/trunk/src/libraries/tools/OgreBulletUtils.h (modified) * code/trunk/src/modules/gametypes/SpaceRaceBot.cc (modified) * code/trunk/src/modules/gametypes/SpaceRaceBot.h (modified) * code/trunk/src/modules/gametypes/SpaceRaceController.cc (modified) * code/trunk/src/modules/gametypes/SpaceRaceController.h (modified) * code/trunk/src/modules/jump/CMakeLists.txt (modified) * code/trunk/src/modules/jump/Jump.cc (modified) * code/trunk/src/modules/jump/Jump.h (modified) * code/trunk/src/modules/jump/JumpBoots.cc (modified) * code/trunk/src/modules/jump/JumpBoots.h (modified) * code/trunk/src/modules/jump/JumpCenterpoint.cc (modified) * code/trunk/src/modules/jump/JumpCenterpoint.h (modified) * code/trunk/src/modules/jump/JumpEnemy.cc (modified) * code/trunk/src/modules/jump/JumpEnemy.h (modified) * code/trunk/src/modules/jump/JumpFigure.cc (modified) * code/trunk/src/modules/jump/JumpFigure.h (modified) * code/trunk/src/modules/jump/JumpItem.cc (modified) * code/trunk/src/modules/jump/JumpItem.h (modified) * code/trunk/src/modules/jump/JumpPlatform.cc (modified) * code/trunk/src/modules/jump/JumpPlatform.h (modified) * code/trunk/src/modules/jump/JumpPlatformDisappear.cc (modified) * code/trunk/src/modules/jump/JumpPlatformDisappear.h (modified) * code/trunk/src/modules/jump/JumpPlatformFake.cc (modified) * code/trunk/src/modules/jump/JumpPlatformFake.h (modified) * code/trunk/src/modules/jump/JumpPlatformHMove.cc (modified) * code/trunk/src/modules/jump/JumpPlatformHMove.h (modified) * code/trunk/src/modules/jump/JumpPlatformStatic.cc (modified) * code/trunk/src/modules/jump/JumpPlatformStatic.h (modified) * code/trunk/src/modules/jump/JumpPlatformTimer.cc (modified) * code/trunk/src/modules/jump/JumpPlatformTimer.h (modified) * code/trunk/src/modules/jump/JumpPlatformVMove.cc (modified) * code/trunk/src/modules/jump/JumpPlatformVMove.h (modified) * code/trunk/src/modules/jump/JumpPrereqs.h (modified) * code/trunk/src/modules/jump/JumpProjectile.cc (modified) * code/trunk/src/modules/jump/JumpProjectile.h (modified) * code/trunk/src/modules/jump/JumpPropeller.cc (modified) * code/trunk/src/modules/jump/JumpPropeller.h (modified) * code/trunk/src/modules/jump/JumpRocket.cc (modified) * code/trunk/src/modules/jump/JumpRocket.h (modified) * code/trunk/src/modules/jump/JumpScore.cc (modified) * code/trunk/src/modules/jump/JumpScore.h (modified) * code/trunk/src/modules/jump/JumpShield.cc (modified) * code/trunk/src/modules/jump/JumpShield.h (modified) * code/trunk/src/modules/jump/JumpSpring.cc (modified) * code/trunk/src/modules/jump/JumpSpring.h (modified) * code/trunk/src/modules/objects/Turret.cc (modified) * code/trunk/src/modules/objects/Turret.h (modified) * code/trunk/src/modules/objects/collisionshapes/CylinderCollisionShape.cc (modified) * code/trunk/src/modules/objects/collisionshapes/CylinderCollisionShape.h (modified) * code/trunk/src/modules/objects/controllers/CMakeLists.txt (modified) * code/trunk/src/modules/objects/controllers/TeamTargetProxy.cc (modified) * code/trunk/src/modules/objects/controllers/TeamTargetProxy.h (modified) * code/trunk/src/modules/objects/controllers/TurretController.cc (modified) * code/trunk/src/modules/objects/controllers/TurretController.h (modified) * code/trunk/src/modules/tetris/TetrisBrick.cc (modified) * code/trunk/src/modules/tetris/TetrisBrick.h (modified) * code/trunk/src/modules/tetris/TetrisScore.cc (modified) * code/trunk/src/modules/tetris/TetrisScore.h (modified) * code/trunk/src/orxonox/ShipPartManager.cc (modified) * code/trunk/src/orxonox/ShipPartManager.h (modified) * code/trunk/src/orxonox/controllers/ControllerDirector.cc (modified) * code/trunk/src/orxonox/controllers/ControllerDirector.h (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/items/PartDestructionEvent.cc (modified) * code/trunk/src/orxonox/items/PartDestructionEvent.h (modified) * code/trunk/src/orxonox/items/ShipPart.cc (modified) * code/trunk/src/orxonox/items/ShipPart.h (modified) * code/trunk/src/orxonox/worldentities/pawns/ModularSpaceShip.cc (modified) * code/trunk/src/orxonox/worldentities/pawns/ModularSpaceShip.h (modified) eol-style native. no changes in code. Fri, 06 Feb 2015 22:03:00 GMT landauf [10260] * code/trunk (modified) * code/trunk/data/levels/jump.oxw (modified) * code/trunk/data/overlays/jumpHUD.oxo (modified) * code/trunk/src/modules/jump/Jump.cc (modified) * code/trunk/src/modules/jump/Jump.h (modified) * code/trunk/src/modules/jump/JumpBoots.cc (modified) * code/trunk/src/modules/jump/JumpBoots.h (modified) * code/trunk/src/modules/jump/JumpFigure.cc (modified) * code/trunk/src/modules/jump/JumpFigure.h (modified) * code/trunk/src/modules/jump/JumpItem.h (modified) * code/trunk/src/modules/jump/JumpPropeller.cc (modified) * code/trunk/src/modules/jump/JumpPropeller.h (modified) * code/trunk/src/modules/jump/JumpRocket.cc (modified) * code/trunk/src/modules/jump/JumpRocket.h (modified) * code/trunk/src/modules/jump/JumpScore.cc (modified) * code/trunk/src/modules/jump/JumpScore.h (modified) * code/trunk/src/modules/jump/JumpShield.cc (modified) * code/trunk/src/modules/jump/JumpShield.h (modified) merged the latest changes from pickupsFS14 to trunk Fri, 06 Feb 2015 21:55:17 GMT landauf [10259] * code/trunk (modified) * code/trunk/data/levels/jump.oxw (modified) * code/trunk/src/modules/jump/Jump.cc (modified) recorded merge of pickupsFS14 up to r10112 (which was already mostly ... Thu, 05 Feb 2015 22:47:13 GMT landauf [10258] * code/trunk (modified) * code/trunk/cmake/LibraryConfig.cmake (modified) * code/trunk/data/defaultConfig/orxonox.ini (copied) * code/trunk/data/gui/layouts/CampaignMenu.layout (copied) * code/trunk/data/gui/layouts/SingleplayerMenu.layout (modified) * code/trunk/data/gui/scripts/CampaignMenu.lua (copied) * code/trunk/data/gui/scripts/SingleplayerMenu.lua (modified) * code/trunk/data/levels/4Dtest.oxw (copied) * code/trunk/data/levels/AnihilationThreat.oxw (copied) * code/trunk/data/levels/DodgeRace.oxw (copied) * code/trunk/data/levels/FPS_Level_HS14.oxw (copied) * code/trunk/data/levels/includes/weaponSettingsFPS_HS14.oxi (copied) * code/trunk/data/levels/includes/weaponSettingsTurret1.oxi (copied) * code/trunk/data/levels/kecks.oxw (copied) * code/trunk/data/levels/presentationHS13.oxw (modified) * code/trunk/data/levels/templates/DodgeRacePattern.oxt (copied) * code/trunk/data/levels/templates/FPS.oxt (modified) * code/trunk/data/levels/templates/FPS_HS14.oxt (copied) * code/trunk/data/levels/templates/enemytowerdefense.oxt (copied) * code/trunk/data/levels/templates/spaceshipDodgeRace.oxt (copied) * code/trunk/data/levels/templates/spacestation_elements.oxt (copied) * code/trunk/data/levels/templates/ss_tube01.oxt (copied) * code/trunk/data/levels/templates/tower.oxt (modified) * code/trunk/data/levels/towerDefense.oxw (modified) * code/trunk/data/overlays/DodgeRaceHUD.oxo (copied) * code/trunk/data/overlays/HUDTemplates3.oxo (modified) * code/trunk/data/overlays/towerdefenseHUD.oxo (modified) * code/trunk/src/modules/CMakeLists.txt (modified) * code/trunk/src/modules/dodgerace (copied) * code/trunk/src/modules/mini4dgame (copied) * code/trunk/src/modules/notifications/NotificationQueueCEGUI.cc (modified) * code/trunk/src/modules/overlays/hud/HUDNavigation.cc (modified) * code/trunk/src/modules/overlays/hud/HUDNavigation.h (modified) * code/trunk/src/modules/towerdefense/CMakeLists.txt (modified) * code/trunk/src/modules/towerdefense/TDCoordinate.cc (copied) * code/trunk/src/modules/towerdefense/TDCoordinate.h (copied) * code/trunk/src/modules/towerdefense/TDEnemy.h (modified) * code/trunk/src/modules/towerdefense/Tower.cc (modified) * code/trunk/src/modules/towerdefense/TowerDefense.cc (modified) * code/trunk/src/modules/towerdefense/TowerDefense.h (modified) * code/trunk/src/modules/towerdefense/TowerDefenseController.cc (modified) * code/trunk/src/modules/towerdefense/TowerDefenseEnemy.cc (copied) * code/trunk/src/modules/towerdefense/TowerDefenseEnemy.h (copied) * code/trunk/src/modules/towerdefense/TowerDefenseHUDController.cc (modified) * code/trunk/src/modules/towerdefense/TowerDefenseHUDController.h (modified) * code/trunk/src/modules/towerdefense/TowerDefensePlayerStats.cc (modified) * code/trunk/src/modules/towerdefense/TowerDefensePlayerStats.h (modified) * code/trunk/src/modules/towerdefense/TowerDefensePrereqs.h (modified) * code/trunk/src/modules/towerdefense/TowerDefenseTower.cc (copied) * code/trunk/src/modules/towerdefense/TowerDefenseTower.h (copied) * code/trunk/src/modules/towerdefense/TowerTurret.cc (copied) * code/trunk/src/modules/towerdefense/TowerTurret.h (copied) * code/trunk/src/modules/weapons/RocketController.cc (modified) * code/trunk/src/orxonox/LevelManager.cc (modified) * code/trunk/src/orxonox/LevelManager.h (modified) * code/trunk/src/orxonox/gametypes/Mission.cc (modified) merged presentationHS14merge back to trunk Sat, 31 Jan 2015 17:03:17 GMT landauf [10216] * code/trunk (modified) * code/trunk/data/gui/scripts/testscript.lua (copied) * code/trunk/data/levels/ModularShipsTest0.oxw (copied) * code/trunk/data/levels/ModularShipsTest1.oxw (copied) * code/trunk/data/levels/includes/weaponSettingsTurret.oxi (modified) * code/trunk/data/levels/jump.oxw (copied) * code/trunk/data/levels/levelTry.oxw (copied) * code/trunk/data/levels/michaelstestfile.lua (copied) * code/trunk/data/levels/scriptController.oxw (copied) * code/trunk/data/levels/templates/HeavyCruiser.oxt (modified) * code/trunk/data/levels/templates/ModularSpaceShipTest.oxt (copied) * code/trunk/data/levels/templates/standardTurret.oxt (copied) * code/trunk/data/levels/turretTest.oxw (modified) * code/trunk/data/overlays/jumpHUD.oxo (copied) * code/trunk/src/modules/CMakeLists.txt (modified) * code/trunk/src/modules/invader/InvaderWeapon.cc (modified) * code/trunk/src/modules/jump (copied) * code/trunk/src/modules/objects/CMakeLists.txt (modified) * code/trunk/src/modules/objects/Turret.cc (modified) * code/trunk/src/modules/objects/Turret.h (modified) * code/trunk/src/modules/objects/controllers (copied) * code/trunk/src/modules/weapons/projectiles/BasicProjectile.cc (modified) * code/trunk/src/modules/weapons/projectiles/BasicProjectile.h (modified) * code/trunk/src/modules/weapons/projectiles/Projectile.cc (modified) * code/trunk/src/modules/weapons/projectiles/Projectile.h (modified) * code/trunk/src/modules/weapons/projectiles/Rocket.cc (modified) * code/trunk/src/modules/weapons/projectiles/Rocket.h (modified) * code/trunk/src/modules/weapons/projectiles/SimpleRocket.cc (modified) * code/trunk/src/modules/weapons/projectiles/SimpleRocket.h (modified) * code/trunk/src/orxonox/CMakeLists.txt (modified) * code/trunk/src/orxonox/OrxonoxPrereqs.h (modified) * code/trunk/src/orxonox/Scene.cc (modified) * code/trunk/src/orxonox/ShipPartManager.cc (copied) * code/trunk/src/orxonox/ShipPartManager.h (copied) * code/trunk/src/orxonox/collisionshapes/CollisionShape.cc (modified) * code/trunk/src/orxonox/controllers/ArtificialController.cc (modified) * code/trunk/src/orxonox/controllers/CMakeLists.txt (modified) * code/trunk/src/orxonox/controllers/ControllerDirector.cc (copied) * code/trunk/src/orxonox/controllers/ControllerDirector.h (copied) * code/trunk/src/orxonox/controllers/NewHumanController.cc (modified) * code/trunk/src/orxonox/controllers/ScriptController.cc (copied) * code/trunk/src/orxonox/controllers/ScriptController.h (copied) * code/trunk/src/orxonox/controllers/testscript.lua (copied) * code/trunk/src/orxonox/items/CMakeLists.txt (modified) * code/trunk/src/orxonox/items/PartDestructionEvent.cc (copied) * code/trunk/src/orxonox/items/PartDestructionEvent.h (copied) * code/trunk/src/orxonox/items/ShipPart.cc (copied) * code/trunk/src/orxonox/items/ShipPart.h (copied) * code/trunk/src/orxonox/worldentities/MovableEntity.cc (modified) * code/trunk/src/orxonox/worldentities/MovableEntity.h (modified) * code/trunk/src/orxonox/worldentities/WorldEntity.h (modified) * code/trunk/src/orxonox/worldentities/pawns/CMakeLists.txt (modified) * code/trunk/src/orxonox/worldentities/pawns/ModularSpaceShip.cc (copied) * code/trunk/src/orxonox/worldentities/pawns/ModularSpaceShip.h (copied) * code/trunk/src/orxonox/worldentities/pawns/Pawn.cc (modified) * code/trunk/src/orxonox/worldentities/pawns/Pawn.h (modified) * code/trunk/src/orxonox/worldentities/pawns/SpaceShip.cc (modified) * code/trunk/src/orxonox/worldentities/pawns/SpaceShip.h (modified) merged branch presentationFS14 back to trunk Sun, 11 Jan 2015 21:06:04 GMT landauf [10193] * code/trunk/data/levels/collisionShapes.oxw (modified) * code/trunk/src/libraries/tools/BulletDebugDrawer.cc (modified) * code/trunk/src/libraries/tools/BulletDebugDrawer.h (modified) * code/trunk/src/libraries/tools/DebugDrawer.cc (modified) * code/trunk/src/libraries/tools/DebugDrawer.h (modified) details, made debug drawer more configurable Sun, 11 Jan 2015 20:28:39 GMT landauf [10191] * code/trunk/data/levels/collisionShapes.oxw (modified) * code/trunk/src/libraries/tools/BulletDebugDrawer.cc (modified) * code/trunk/src/libraries/tools/BulletDebugDrawer.h (modified) * code/trunk/src/libraries/tools/DebugDrawer.cc (modified) * code/trunk/src/libraries/tools/DebugDrawer.h (modified) added customized visualization for cylinders and cones to ... Sun, 11 Jan 2015 14:40:41 GMT landauf [10189] * code/trunk/data/levels/collisionShapes.oxw (added) * code/trunk/src/libraries/core/CoreIncludes.h (modified) * code/trunk/src/modules/objects/ObjectsPrereqs.h (modified) * code/trunk/src/modules/objects/collisionshapes/AbstractRadiusHeightCollisionShape.cc (copied) * code/trunk/src/modules/objects/collisionshapes/AbstractRadiusHeightCollisionShape.h (copied) * code/trunk/src/modules/objects/collisionshapes/CMakeLists.txt (modified) * code/trunk/src/modules/objects/collisionshapes/ConeCollisionShape.cc (modified) * code/trunk/src/modules/objects/collisionshapes/ConeCollisionShape.h (modified) * code/trunk/src/modules/objects/collisionshapes/CylinderCollisionShape.cc (added) * code/trunk/src/modules/objects/collisionshapes/CylinderCollisionShape.h (added) added new collision shape (cylinder) Sat, 01 Feb 2014 17:01:47 GMT jo [9992] * code/trunk/data/levels/iJohnVane_TriptoArea51.oxw (modified) * code/trunk/data/levels/iiJohnVane_Area51UnderFire.oxw (modified) * code/trunk/data/levels/iiiJohnVane_EscapeTheBastards.oxw (modified) The end of Area51UnderFire is ok. Unfortunately the explosion could ... Fri, 31 Jan 2014 22:27:24 GMT jo [9991] * code/trunk/data/levels/iiJohnVane_Area51UnderFire.oxw (modified) * code/trunk/data/levels/iiiJohnVane_EscapeTheBastards.oxw (modified) Removing an error concerning the NotificationQueu in EscapeTheBasterds. Mon, 27 Jan 2014 18:54:29 GMT jo [9990] * code/trunk/data/levels/iiJohnVane_Area51UnderFire.oxw (modified) Some level improvements and clean up. Not finished yet. The quests ... Mon, 20 Jan 2014 19:15:49 GMT jo [9989] * code/trunk/data/levels/iJohnVane_TriptoArea51.oxw (modified) Some details added. Sun, 19 Jan 2014 22:05:20 GMT jo [9988] * code/trunk/data/levels/iJohnVane_TriptoArea51.oxw (modified) Making the level more interesting. Now the player can actually fail ... Sun, 05 Jan 2014 22:59:15 GMT jo [9987] * code/trunk/data/levels/iJohnVane_TriptoArea51.oxw (modified) Improving the portal handling, such that the way to go after passing ... Sun, 05 Jan 2014 13:39:34 GMT jo [9986] * code/trunk/data/levels/iJohnVane_TriptoArea51.oxw (modified) * code/trunk/src/orxonox/gametypes/Mission.cc (modified) Improving the first mission. Two fixes are needed to make it well ... Sun, 05 Jan 2014 09:40:01 GMT jo [9985] * code/trunk/data/levels/events.oxw (modified) * code/trunk/data/levels/missionOne.oxw (modified) Ending missionOne. Fri, 03 Jan 2014 23:59:12 GMT landauf [9968] * code/trunk/data/levels/lastManStanding.oxw (modified) fixed crash while loading lastManStanding.oxw (BigExplosion is now a ... Fri, 03 Jan 2014 14:58:53 GMT landauf [9955] * code/trunk/data/levels (modified) * code/trunk/data/levels/_temp.oxw (deleted) * code/trunk/data/levels/templates (modified) * code/trunk/data/levels/templates/.shipmodels (deleted) removed temporary files and added them to the ignore list Fri, 03 Jan 2014 14:54:05 GMT landauf [9954] * code/trunk/data/levels/Invaders.oxw (modified) * code/trunk/data/levels/templates/enemyInvader.oxt (modified) * code/trunk/data/levels/templates/enemyInvaderShooter.oxt (deleted) moved all invader enemy templates into one file. fixed warning about ... Fri, 03 Jan 2014 11:45:21 GMT landauf [9943] * code/trunk/data/gui/layouts/UndockingDialog.layout (modified) * code/trunk/data/gui/scripts/UndockingDialog.lua (modified) * code/trunk/data/levels/HeavyCruiser.oxw (modified) * code/trunk/data/levels/InsideSpaceStation.oxw (modified) * code/trunk/data/levels/Invaders.oxw (modified) * code/trunk/data/levels/_temp.oxw (modified) * code/trunk/data/levels/dockingToASpaceStation.oxw (modified) * code/trunk/data/levels/iJohnVane_TriptoArea51.oxw (modified) * code/trunk/data/levels/iiJohnVane_Area51UnderFire.oxw (modified) * code/trunk/data/levels/iiiJohnVane_EscapeTheBastards.oxw (modified) * code/trunk/data/levels/includes/HeavyCruiserParts.lua (modified) * code/trunk/data/levels/includes/invaderWeapon.oxi (modified) * code/trunk/data/levels/includes/invaderWeaponEnemy.oxi (modified) * code/trunk/data/levels/includes/weaponSettingsHeavyCruiser.oxi (modified) * code/trunk/data/levels/includes/weaponSettingsHeavyCruiserBody.oxi (modified) * code/trunk/data/levels/presentationHS13.oxw (modified) * code/trunk/data/levels/radar3D_test.oxw (modified) * code/trunk/data/levels/templates/.shipmodels (modified) * code/trunk/data/levels/templates/HeavyCruiser.oxt (modified) * code/trunk/data/levels/templates/HeavyCruiserBody.oxt (modified) * code/trunk/data/levels/templates/enemyInvader.oxt (modified) * code/trunk/data/levels/templates/enemyInvaderShooter.oxt (modified) * code/trunk/data/levels/templates/spaceshipInvader.oxt (modified) * code/trunk/data/overlays/InvaderHUD.oxo (modified) * code/trunk/src/modules/invader/CMakeLists.txt (modified) * code/trunk/src/modules/invader/Invader.cc (modified) * code/trunk/src/modules/invader/Invader.h (modified) * code/trunk/src/modules/invader/InvaderCenterPoint.cc (modified) * code/trunk/src/modules/invader/InvaderCenterPoint.h (modified) * code/trunk/src/modules/invader/InvaderEnemy.cc (modified) * code/trunk/src/modules/invader/InvaderEnemy.h (modified) * code/trunk/src/modules/invader/InvaderEnemyShooter.cc (modified) * code/trunk/src/modules/invader/InvaderEnemyShooter.h (modified) * code/trunk/src/modules/invader/InvaderHUDinfo.cc (modified) * code/trunk/src/modules/invader/InvaderHUDinfo.h (modified) * code/trunk/src/modules/invader/InvaderPrereqs.h (modified) * code/trunk/src/modules/invader/InvaderShip.cc (modified) * code/trunk/src/modules/invader/InvaderShip.h (modified) * code/trunk/src/modules/invader/InvaderWeapon.cc (modified) * code/trunk/src/modules/invader/InvaderWeapon.h (modified) * code/trunk/src/modules/invader/InvaderWeaponEnemy.cc (modified) * code/trunk/src/modules/invader/InvaderWeaponEnemy.h (modified) * code/trunk/src/modules/overlays/debugging/DebugPositionText.cc (modified) * code/trunk/src/modules/overlays/debugging/DebugPositionText.h (modified) * code/trunk/src/modules/overlays/hud/CountDown.cc (modified) * code/trunk/src/modules/overlays/hud/CountDown.h (modified) eol-style native Sun, 29 Dec 2013 19:06:44 GMT jo [9941] * code/trunk/data/gui/layouts/CreditsMenu.layout (modified) * code/trunk/data/gui/scripts/MiscConfigMenu.lua (modified) * code/trunk/data/levels/missionOne.oxw (modified) * code/trunk/data/levels/underAttack.oxw (modified) * code/trunk/src/modules/objects/SpaceBoundaries.cc (modified) * code/trunk/src/orxonox/gametypes/LastTeamStanding.cc (modified) * code/trunk/src/orxonox/gametypes/TeamDeathmatch.cc (modified) * code/trunk/src/orxonox/gametypes/TeamDeathmatch.h (modified) * code/trunk/src/orxonox/gametypes/TeamGametype.cc (modified) * code/trunk/src/orxonox/gametypes/TeamGametype.h (modified) * code/trunk/src/orxonox/gametypes/UnderAttack.cc (modified) * code/trunk/src/orxonox/gametypes/UnderAttack.h (modified) Adding most of the changes that were proposed in the release2012 branch. Sat, 21 Dec 2013 22:38:57 GMT jo [9940] * code/trunk/data/levels/iJohnVane_TriptoArea51.oxw (modified) polishing the first Level - force the target station to be static. Sat, 21 Dec 2013 22:16:54 GMT jo [9939] * code/trunk (modified) * code/trunk/data/defaultConfig/keybindings.ini (modified) * code/trunk/data/gui/layouts/UndockingDialog.layout (copied) * code/trunk/data/gui/scripts/MiscConfigMenu.lua (modified) * code/trunk/data/gui/scripts/UndockingDialog.lua (copied) * code/trunk/data/levels/FPSTest.oxw (modified) * code/trunk/data/levels/HeavyCruiser.oxw (copied) * code/trunk/data/levels/InsideSpaceStation.oxw (copied) * code/trunk/data/levels/Invaders.oxw (copied) * code/trunk/data/levels/Spacerace2.oxw (modified) * code/trunk/data/levels/_temp.oxw (copied) * code/trunk/data/levels/asteroidField.oxw (modified) * code/trunk/data/levels/asteroids.oxw (modified) * code/trunk/data/levels/docking.oxw (modified) * code/trunk/data/levels/dockingToASpaceStation.oxw (copied) * code/trunk/data/levels/dynamicMatch.oxw (modified) * code/trunk/data/levels/gallery.oxw (modified) * code/trunk/data/levels/iJohnVane_TriptoArea51.oxw (copied) * code/trunk/data/levels/iiJohnVane_Area51UnderFire.oxw (copied) * code/trunk/data/levels/iiiJohnVane_EscapeTheBastards.oxw (copied) * code/trunk/data/levels/includes/HeavyCruiserParts.lua (copied) * code/trunk/data/levels/includes/invaderWeapon.oxi (copied) * code/trunk/data/levels/includes/invaderWeaponEnemy.oxi (copied) * code/trunk/data/levels/includes/weaponSettingsHeavyCruiser.oxi (copied) * code/trunk/data/levels/includes/weaponSettingsHeavyCruiserBody.oxi (copied) * code/trunk/data/levels/lastManStanding.oxw (modified) * code/trunk/data/levels/lastTeamStanding.oxw (modified) * code/trunk/data/levels/lastTeamStandingII.oxw (modified) * code/trunk/data/levels/maxim.oxw (modified) * code/trunk/data/levels/missionOne.oxw (modified) * code/trunk/data/levels/pickups.oxw (modified) * code/trunk/data/levels/pirateAttack.oxw (modified) * code/trunk/data/levels/pong.oxw (modified) * code/trunk/data/levels/portals.oxw (modified) * code/trunk/data/levels/presentation.oxw (modified) * code/trunk/data/levels/presentationFS11.oxw (modified) * code/trunk/data/levels/presentationHS13.oxw (copied) * code/trunk/data/levels/quests.oxw (modified) * code/trunk/data/levels/radar3D_test.oxw (copied) * code/trunk/data/levels/spaceRace.oxw (modified) * code/trunk/data/levels/surfaceRace.oxw (modified) * code/trunk/data/levels/teamBaseMatch.oxw (modified) * code/trunk/data/levels/teamDeathMatch.oxw (modified) * code/trunk/data/levels/templates/.shipmodels (copied) * code/trunk/data/levels/templates/HeavyCruiser.oxt (copied) * code/trunk/data/levels/templates/HeavyCruiserBody.oxt (copied) * code/trunk/data/levels/templates/enemyInvader.oxt (copied) * code/trunk/data/levels/templates/enemyInvaderShooter.oxt (copied) * code/trunk/data/levels/templates/lodInformation.oxt (modified) * code/trunk/data/levels/templates/spaceshipAssff.oxt (modified) * code/trunk/data/levels/templates/spaceshipInvader.oxt (copied) * code/trunk/data/levels/turretTest.oxw (modified) * code/trunk/data/levels/underAttack.oxw (modified) * code/trunk/data/overlays/HUD.oxo (modified) * code/trunk/data/overlays/HUDTemplates3.oxo (modified) * code/trunk/data/overlays/InvaderHUD.oxo (copied) * code/trunk/data/overlays/debug.oxo (modified) * code/trunk/src/libraries/util/Math.cc (modified) * code/trunk/src/libraries/util/Math.h (modified) * code/trunk/src/modules/CMakeLists.txt (modified) * code/trunk/src/modules/docking/Dock.cc (modified) * code/trunk/src/modules/docking/Dock.h (modified) * code/trunk/src/modules/docking/MoveToDockingTarget.cc (modified) * code/trunk/src/modules/invader (copied) * code/trunk/src/modules/invader/CMakeLists.txt (copied) * code/trunk/src/modules/invader/Invader.cc (copied) * code/trunk/src/modules/invader/Invader.h (copied) * code/trunk/src/modules/invader/InvaderCenterPoint.cc (copied) * code/trunk/src/modules/invader/InvaderCenterPoint.h (copied) * code/trunk/src/modules/invader/InvaderEnemy.cc (copied) * code/trunk/src/modules/invader/InvaderEnemy.h (copied) * code/trunk/src/modules/invader/InvaderEnemyShooter.cc (copied) * code/trunk/src/modules/invader/InvaderEnemyShooter.h (copied) * code/trunk/src/modules/invader/InvaderHUDinfo.cc (copied) * code/trunk/src/modules/invader/InvaderHUDinfo.h (copied) * code/trunk/src/modules/invader/InvaderPrereqs.h (copied) * code/trunk/src/modules/invader/InvaderShip.cc (copied) * code/trunk/src/modules/invader/InvaderShip.h (copied) * code/trunk/src/modules/invader/InvaderWeapon.cc (copied) * code/trunk/src/modules/invader/InvaderWeapon.h (copied) * code/trunk/src/modules/invader/InvaderWeaponEnemy.cc (copied) * code/trunk/src/modules/invader/InvaderWeaponEnemy.h (copied) * code/trunk/src/modules/objects/ForceField.cc (modified) * code/trunk/src/modules/objects/ForceField.h (modified) * code/trunk/src/modules/overlays/OverlaysPrereqs.h (modified) * code/trunk/src/modules/overlays/debugging/CMakeLists.txt (modified) * code/trunk/src/modules/overlays/debugging/DebugPositionText.cc (copied) * code/trunk/src/modules/overlays/debugging/DebugPositionText.h (copied) * code/trunk/src/modules/overlays/hud/CMakeLists.txt (modified) * code/trunk/src/modules/overlays/hud/CountDown.cc (copied) * code/trunk/src/modules/overlays/hud/CountDown.h (copied) * code/trunk/src/modules/overlays/hud/HUDNavigation.cc (modified) * code/trunk/src/modules/overlays/hud/HUDRadar.cc (modified) * code/trunk/src/modules/overlays/hud/HUDRadar.h (modified) * code/trunk/src/modules/pong/Pong.cc (modified) * code/trunk/src/modules/pong/PongBall.cc (modified) * code/trunk/src/modules/pong/PongBall.h (modified) * code/trunk/src/modules/pong/PongScore.cc (modified) * code/trunk/src/modules/pong/PongScore.h (modified) * code/trunk/src/modules/weapons/weaponmodes/HsW01.h (modified) * code/trunk/src/orxonox/MoodManager.h (modified) * code/trunk/src/orxonox/controllers/NewHumanController.cc (modified) * code/trunk/src/orxonox/gamestates/GSMainMenu.cc (modified) * code/trunk/src/orxonox/gametypes/Gametype.cc (modified) * code/trunk/src/orxonox/graphics/ParticleEmitter.cc (modified) * code/trunk/src/orxonox/graphics/ParticleEmitter.h (modified) * code/trunk/src/orxonox/infos/PlayerInfo.cc (modified) * code/trunk/src/orxonox/interfaces/RadarViewable.h (modified) * code/trunk/src/orxonox/items/MultiStateEngine.cc (modified) * code/trunk/src/orxonox/sound/AmbientSound.cc (modified) * code/trunk/src/orxonox/sound/AmbientSound.h (modified) * code/trunk/src/orxonox/sound/BaseSound.cc (modified) * code/trunk/src/orxonox/sound/SoundManager.cc (modified) * code/trunk/src/orxonox/sound/WorldAmbientSound.cc (modified) * code/trunk/src/orxonox/sound/WorldAmbientSound.h (modified) * code/trunk/src/orxonox/sound/WorldSound.cc (modified) * code/trunk/src/orxonox/weaponsystem/WeaponMode.cc (modified) * code/trunk/src/orxonox/worldentities/BigExplosion.cc (modified) * code/trunk/src/orxonox/worldentities/BigExplosion.h (modified) * code/trunk/src/orxonox/worldentities/pawns/Pawn.cc (modified) * code/trunk/src/orxonox/worldentities/pawns/Pawn.h (modified) presentationHS13 branch merged into trunk Sun, 01 Dec 2013 13:52:08 GMT jo [9832] * code/trunk/data/levels/tetris.oxw (modified) More fancy colored tetris bricks. Thu, 28 Nov 2013 22:16:45 GMT jo [9831] * code/trunk/data/levels/tetris.oxw (modified) Exchanging the tetris model. Thu, 21 Nov 2013 15:43:52 GMT jo [9798] * code/trunk/data/levels/missionOne.oxw (modified) Testing alternative colouring mechanism for pawns -> empty controller. Sun, 10 Nov 2013 19:01:17 GMT landauf [9763] * code/trunk/data/levels/gallery.oxw (modified) * code/trunk/data/levels/includes/weaponSettingsEscort.oxi (modified) * code/trunk/data/levels/templates/lodInformation.oxt (modified) renamed LaserBeam as LaserBeam2 (because there's already another ... Sun, 25 Aug 2013 08:05:10 GMT landauf [9664] * code/trunk/data/levels/bigshipPresentation.oxw (modified) * code/trunk/data/levels/collateralDamageDemo.oxw (modified) * code/trunk/data/levels/gallery.oxw (modified) * code/trunk/data/levels/includes/weaponSettingsCollateral.oxi (modified) * code/trunk/data/levels/includes/weaponSettingsEscort.oxi (modified) * code/trunk/data/levels/includes/weaponSettingsTurret.oxi (modified) * code/trunk/data/levels/includes/weaponSettingsbigship.oxi (modified) * code/trunk/data/levels/maxim.oxw (modified) * code/trunk/data/levels/presentationHS12.oxw (modified) * code/trunk/data/levels/templates/bigship.oxt (modified) * code/trunk/data/levels/templates/spaceshipCollateralDamage.oxt (modified) * code/trunk/data/levels/templates/spaceshipEscort.oxt (modified) * code/trunk/data/levels/templates/spaceshipTurret.oxt (modified) * code/trunk/data/levels/turretTest.oxw (modified) * code/trunk/data/overlays/tetrisHUD.oxo (modified) eol-style native Tue, 21 May 2013 13:12:21 GMT smerkli [9625] * code/trunk (modified) * code/trunk/data/levels/maxim.oxw (copied) * code/trunk/src/orxonox/controllers/Controller.h (modified) * code/trunk/src/orxonox/controllers/FormationController.cc (modified) * code/trunk/src/orxonox/controllers/FormationController.h (modified) * code/trunk/src/orxonox/controllers/HumanController.cc (modified) * code/trunk/src/orxonox/worldentities/pawns/Pawn.cc (modified) * code/trunk/src/orxonox/worldentities/pawns/Pawn.h (modified) Merged Maxim's Branch back into trunk. Tue, 19 Mar 2013 15:12:17 GMT smerkli [9555] * code/trunk/data/levels/lastManStanding.oxw (modified) * code/trunk/src/orxonox/worldentities/pawns/Pawn.cc (modified) Replaced explosion hack with another less ugly hack: - There is now ... Tue, 26 Feb 2013 13:10:33 GMT jo [9532] * code/trunk/data/levels/gallery.oxw (modified) * code/trunk/data/levels/presentationHS12.oxw (modified) Updating the levels. Tue, 19 Feb 2013 09:25:42 GMT jo [9526] * code/trunk (modified) * code/trunk/data/defaultConfig/keybindings.ini (modified) * code/trunk/data/levels/bigshipPresentation.oxw (copied) * code/trunk/data/levels/collateralDamageDemo.oxw (copied) * code/trunk/data/levels/gallery.oxw (modified) * code/trunk/data/levels/includes/weaponSettingsCollateral.oxi (copied) * code/trunk/data/levels/includes/weaponSettingsEscort.oxi (modified) * code/trunk/data/levels/includes/weaponSettingsTurret.oxi (copied) * code/trunk/data/levels/includes/weaponSettingsbigship.oxi (copied) * code/trunk/data/levels/pong.oxw (modified) * code/trunk/data/levels/presentationHS12.oxw (copied) * code/trunk/data/levels/templates/bigship.oxt (copied) * code/trunk/data/levels/templates/lodInformation.oxt (modified) * code/trunk/data/levels/templates/spaceshipCollateralDamage.oxt (copied) * code/trunk/data/levels/templates/spaceshipEscort.oxt (modified) * code/trunk/data/levels/templates/spaceshipTurret.oxt (copied) * code/trunk/data/levels/turretTest.oxw (copied) * code/trunk/data/overlays/HUD.oxo (modified) * code/trunk/data/overlays/HUDTemplates3.oxo (modified) * code/trunk/src/modules/gametypes/CMakeLists.txt (modified) * code/trunk/src/modules/gametypes/GametypesPrereqs.h (modified) * code/trunk/src/modules/gametypes/RaceCheckPoint.cc (modified) * code/trunk/src/modules/gametypes/RaceCheckPoint.h (modified) * code/trunk/src/modules/gametypes/SpaceRace.cc (modified) * code/trunk/src/modules/gametypes/SpaceRaceBot.cc (copied) * code/trunk/src/modules/gametypes/SpaceRaceBot.h (copied) * code/trunk/src/modules/gametypes/SpaceRaceController.cc (copied) * code/trunk/src/modules/gametypes/SpaceRaceController.h (copied) * code/trunk/src/modules/gametypes/SpaceRaceManager.cc (modified) * code/trunk/src/modules/gametypes/SpaceRaceManager.h (modified) * code/trunk/src/modules/objects/CMakeLists.txt (modified) * code/trunk/src/modules/objects/ObjectsPrereqs.h (modified) * code/trunk/src/modules/objects/Turret.cc (copied) * code/trunk/src/modules/objects/Turret.h (copied) * code/trunk/src/modules/overlays/OverlaysPrereqs.h (modified) * code/trunk/src/modules/overlays/hud/HUDNavigation.cc (modified) * code/trunk/src/modules/overlays/hud/HUDNavigation.h (modified) * code/trunk/src/modules/portals/PortalEndPoint.cc (modified) * code/trunk/src/modules/portals/PortalEndPoint.h (modified) * code/trunk/src/modules/weapons/weaponmodes/HsW01.cc (modified) * code/trunk/src/modules/weapons/weaponmodes/HsW01.h (modified) * code/trunk/src/orxonox/interfaces/RadarViewable.cc (modified) * code/trunk/src/orxonox/interfaces/RadarViewable.h (modified) Merging presentationHS12 back to the trunk. Thu, 25 Oct 2012 19:33:56 GMT jo [9416] * code/trunk/data/levels/includes/weaponSettingsEscort.oxi (modified) * code/trunk/data/levels/templates/spaceshipEscort.oxt (modified) Adjusting the Escort ship's collisionshapes. Thu, 25 Oct 2012 18:56:42 GMT jo [9415] * code/trunk/data/levels/emptyLevel.oxw (modified) * code/trunk/data/levels/includes/weaponSettingsEscort.oxi (added) * code/trunk/data/levels/templates/spaceshipEscort.oxt (added) Integrating Felix' EscortShip in the game (new weaponsetting and ... Fri, 31 Aug 2012 15:44:30 GMT jo [9350] * code/trunk/data/levels/gallery.oxw (modified) Added some billboards and a particle emitter. Fri, 31 Aug 2012 15:05:21 GMT jo [9349] * code/trunk/data/levels/gallery.oxw (added) Adding a gallery level. A place to present all important models. Thu, 30 Aug 2012 21:08:17 GMT landauf [9348] * code/trunk (modified) * code/trunk/cmake/tools/BuildUnits.cmake (modified) * code/trunk/data/gui/layouts/GUILayout.xsd (modified) * code/trunk/data/gui/layouts/InGamePickupHUD.layout (modified) * code/trunk/data/gui/layouts/ShipSelectionMenu.layout (copied) * code/trunk/data/gui/layouts/SingleplayerConfigMenu.layout (modified) * code/trunk/data/gui/scripts/AudioMenu.lua (modified) * code/trunk/data/gui/scripts/PickupInventory.lua (modified) * code/trunk/data/gui/scripts/ShipSelectionMenu.lua (copied) * code/trunk/data/gui/scripts/SingleplayerConfigMenu.lua (modified) * code/trunk/data/gui/scripts/SingleplayerMenu.lua (modified) * code/trunk/data/levels/FPSTest.oxw (modified) * code/trunk/data/levels/Spacerace2.oxw (modified) * code/trunk/data/levels/SurfaceRacePresentation.oxw (copied) * code/trunk/data/levels/asteroidField.oxw (modified) * code/trunk/data/levels/asteroids.oxw (modified) * code/trunk/data/levels/docking.oxw (modified) * code/trunk/data/levels/dynamicMatch.oxw (modified) * code/trunk/data/levels/events.oxw (modified) * code/trunk/data/levels/fightInOurBack.oxw (modified) * code/trunk/data/levels/includes/CuboidSpaceStation.lua (modified) * code/trunk/data/levels/includes/asteroidField.lua (modified) * code/trunk/data/levels/includes/pickups.oxi (modified) * code/trunk/data/levels/includes/towerWeaponSettings.oxi (copied) * code/trunk/data/levels/includes/weaponSettingsFPS.oxi (modified) * code/trunk/data/levels/includes/weaponSettingsSpacecruiser.oxi (modified) * code/trunk/data/levels/lastManStanding.oxw (modified) * code/trunk/data/levels/lastTeamStanding.oxw (modified) * code/trunk/data/levels/lastTeamStandingII.oxw (modified) * code/trunk/data/levels/missionOne.oxw (modified) * code/trunk/data/levels/notifications.oxw (modified) * code/trunk/data/levels/old/CuboidSpaceStation.oxw (modified) * code/trunk/data/levels/old/presentationPhysics.oxw (modified) * code/trunk/data/levels/old/princessAeryn.oxw (modified) * code/trunk/data/levels/pickups.oxw (modified) * code/trunk/data/levels/pirateAttack.oxw (modified) * code/trunk/data/levels/planets.oxw (modified) * code/trunk/data/levels/pong.oxw (modified) * code/trunk/data/levels/portals.oxw (modified) * code/trunk/data/levels/presentation09.oxw (modified) * code/trunk/data/levels/presentation09b.oxw (modified) * code/trunk/data/levels/presentationDM.oxw (modified) * code/trunk/data/levels/presentationFS10.oxw (modified) * code/trunk/data/levels/presentationFS102.oxw (modified) * code/trunk/data/levels/presentationFS10Ed.oxw (modified) * code/trunk/data/levels/presentationFS11.oxw (modified) * code/trunk/data/levels/presentationHS09.oxw (modified) * code/trunk/data/levels/presentationHS11.oxw (modified) * code/trunk/data/levels/princessAeryn.oxw (modified) * code/trunk/data/levels/screenshot.oxw (modified) * code/trunk/data/levels/surfaceRace.oxw (copied) * code/trunk/data/levels/teamBaseMatch.oxw (modified) * code/trunk/data/levels/teamDeathMatch.oxw (modified) * code/trunk/data/levels/templates/FPS.oxt (modified) * code/trunk/data/levels/templates/pickupRepresentationTemplates.oxt (modified) * code/trunk/data/levels/templates/spaceshipRace.oxt (copied) * code/trunk/data/levels/templates/spaceshipSpacecruiser.oxt (modified) * code/trunk/data/levels/templates/tower.oxt (copied) * code/trunk/data/levels/testStars.oxw (modified) * code/trunk/data/levels/testSwallow.oxw (modified) * code/trunk/data/levels/tetris.oxw (modified) * code/trunk/data/levels/theTimeMachine.oxw (modified) * code/trunk/data/levels/towerDefense.oxw (copied) * code/trunk/data/levels/tutorial.oxw (modified) * code/trunk/data/levels/underAttack.oxw (modified) * code/trunk/data/levels/waypoints.oxw (modified) * code/trunk/data/overlays/dynamicMatchHUD.oxo (modified) * code/trunk/data/overlays/lastManStandingHUD.oxo (modified) * code/trunk/data/overlays/lastTeamStandingHUD.oxo (modified) * code/trunk/data/overlays/tetrisHUD.oxo (copied) * code/trunk/data/overlays/towerdefenseHUD.oxo (copied) * code/trunk/data/overlays/underAttackHUD.oxo (deleted) * code/trunk/data/particle/smoke1.particle (deleted) * code/trunk/doc/api/groups/Portals.dox (modified) * code/trunk/doc/api/groups/Weapons.dox (modified) * code/trunk/src/BuildUnitsConfigGCC.cmake (modified) * code/trunk/src/BuildUnitsConfigMSVC.cmake (modified) * code/trunk/src/external/enet/VERSION (modified) * code/trunk/src/external/tolua/README_ORXONOX (modified) * code/trunk/src/libraries/core/Super.h (modified) * code/trunk/src/libraries/core/Template.cc (modified) * code/trunk/src/libraries/core/XMLPort.h (modified) * code/trunk/src/libraries/core/command/ConsoleCommand.cc (modified) * code/trunk/src/libraries/core/command/ConsoleCommand.h (modified) * code/trunk/src/libraries/util/output/ConsoleWriter.cc (modified) * code/trunk/src/modules/CMakeLists.txt (modified) * code/trunk/src/modules/docking/DockingController.cc (modified) * code/trunk/src/modules/gametypes/OldRaceCheckPoint.cc (modified) * code/trunk/src/modules/gametypes/OldRaceCheckPoint.h (modified) * code/trunk/src/modules/gametypes/OldSpaceRace.cc (modified) * code/trunk/src/modules/gametypes/OldSpaceRace.h (modified) * code/trunk/src/modules/gametypes/RaceCheckPoint.cc (modified) * code/trunk/src/modules/gametypes/SpaceRace.cc (modified) * code/trunk/src/modules/gametypes/SpaceRaceManager.cc (modified) * code/trunk/src/modules/gametypes/SpaceRaceManager.h (modified) * code/trunk/src/modules/objects/triggers/CheckPoint.cc (modified) * code/trunk/src/modules/overlays/OverlaysPrereqs.h (modified) * code/trunk/src/modules/overlays/hud/CMakeLists.txt (modified) * code/trunk/src/modules/overlays/hud/HUDBoostBar.cc (modified) * code/trunk/src/modules/overlays/hud/HUDBoostBar.h (modified) * code/trunk/src/modules/overlays/hud/HUDEnemyHealthBar.cc (modified) * code/trunk/src/modules/overlays/hud/HUDEnemyHealthBar.h (modified) * code/trunk/src/modules/overlays/hud/HUDNavigation.cc (modified) * code/trunk/src/modules/overlays/hud/HUDNavigation.h (modified) * code/trunk/src/modules/overlays/hud/HUDRadar.cc (modified) * code/trunk/src/modules/overlays/hud/UnderAttackHealthBar.cc (deleted) * code/trunk/src/modules/overlays/hud/UnderAttackHealthBar.h (deleted) * code/trunk/src/modules/pickup/CMakeLists.txt (modified) * code/trunk/src/modules/pickup/CollectiblePickup.cc (modified) * code/trunk/src/modules/pickup/CollectiblePickup.h (modified) * code/trunk/src/modules/pickup/DroppedPickup.cc (deleted) * code/trunk/src/modules/pickup/DroppedPickup.h (deleted) * code/trunk/src/modules/pickup/Pickup.cc (modified) * code/trunk/src/modules/pickup/Pickup.h (modified) * code/trunk/src/modules/pickup/PickupCollection.cc (modified) * code/trunk/src/modules/pickup/PickupCollection.h (modified) * code/trunk/src/modules/pickup/PickupCollectionIdentifier.cc (deleted) * code/trunk/src/modules/pickup/PickupCollectionIdentifier.h (deleted) * code/trunk/src/modules/pickup/PickupManager.cc (modified) * code/trunk/src/modules/pickup/PickupManager.h (modified) * code/trunk/src/modules/pickup/PickupPrereqs.h (modified) * code/trunk/src/modules/pickup/PickupRepresentation.cc (modified) * code/trunk/src/modules/pickup/PickupRepresentation.h (modified) * code/trunk/src/modules/pickup/PickupSpawner.cc (modified) * code/trunk/src/modules/pickup/PickupSpawner.h (modified) * code/trunk/src/modules/pickup/items/CMakeLists.txt (modified) * code/trunk/src/modules/pickup/items/DamageBoostPickup.cc (copied) * code/trunk/src/modules/pickup/items/DamageBoostPickup.h (copied) * code/trunk/src/modules/pickup/items/DronePickup.cc (modified) * code/trunk/src/modules/pickup/items/DronePickup.h (modified) * code/trunk/src/modules/pickup/items/HealthPickup.cc (modified) * code/trunk/src/modules/pickup/items/HealthPickup.h (modified) * code/trunk/src/modules/pickup/items/InvisiblePickup.cc (modified) * code/trunk/src/modules/pickup/items/InvisiblePickup.h (modified) * code/trunk/src/modules/pickup/items/MetaPickup.cc (modified) * code/trunk/src/modules/pickup/items/MetaPickup.h (modified) * code/trunk/src/modules/pickup/items/ShieldPickup.cc (modified) * code/trunk/src/modules/pickup/items/ShieldPickup.h (modified) * code/trunk/src/modules/pickup/items/ShrinkPickup.cc (modified) * code/trunk/src/modules/pickup/items/ShrinkPickup.h (modified) * code/trunk/src/modules/pickup/items/SpeedPickup.cc (modified) * code/trunk/src/modules/pickup/items/SpeedPickup.h (modified) * code/trunk/src/modules/pong/Pong.cc (modified) * code/trunk/src/modules/pong/Pong.h (modified) * code/trunk/src/modules/tetris/CMakeLists.txt (modified) * code/trunk/src/modules/tetris/Tetris.cc (modified) * code/trunk/src/modules/tetris/Tetris.h (modified) * code/trunk/src/modules/tetris/TetrisBrick.cc (copied) * code/trunk/src/modules/tetris/TetrisBrick.h (copied) * code/trunk/src/modules/tetris/TetrisCenterpoint.cc (modified) * code/trunk/src/modules/tetris/TetrisCenterpoint.h (modified) * code/trunk/src/modules/tetris/TetrisPrereqs.h (modified) * code/trunk/src/modules/tetris/TetrisScore.cc (copied) * code/trunk/src/modules/tetris/TetrisScore.h (copied) * code/trunk/src/modules/tetris/TetrisStone.cc (modified) * code/trunk/src/modules/tetris/TetrisStone.h (modified) * code/trunk/src/modules/towerdefense (copied) * code/trunk/src/modules/weapons/RocketController.cc (modified) * code/trunk/src/orxonox/CMakeLists.txt (modified) * code/trunk/src/orxonox/CameraManager.cc (modified) * code/trunk/src/orxonox/LevelInfo.cc (modified) * code/trunk/src/orxonox/LevelInfo.h (modified) * code/trunk/src/orxonox/OrxonoxPrereqs.h (modified) * code/trunk/src/orxonox/Scene.cc (modified) * code/trunk/src/orxonox/controllers/FormationController.cc (modified) * code/trunk/src/orxonox/controllers/FormationController.h (modified) * code/trunk/src/orxonox/controllers/NewHumanController.cc (modified) * code/trunk/src/orxonox/gamestates/GSRoot.cc (modified) * code/trunk/src/orxonox/gametypes/Deathmatch.cc (modified) * code/trunk/src/orxonox/gametypes/Deathmatch.h (modified) * code/trunk/src/orxonox/gametypes/Dynamicmatch.cc (modified) * code/trunk/src/orxonox/gametypes/Dynamicmatch.h (modified) * code/trunk/src/orxonox/gametypes/Gametype.cc (modified) * code/trunk/src/orxonox/gametypes/Gametype.h (modified) * code/trunk/src/orxonox/gametypes/LastManStanding.cc (modified) * code/trunk/src/orxonox/gametypes/LastTeamStanding.cc (modified) * code/trunk/src/orxonox/gametypes/Mission.cc (modified) * code/trunk/src/orxonox/gametypes/Mission.h (modified) * code/trunk/src/orxonox/gametypes/TeamBaseMatch.cc (modified) * code/trunk/src/orxonox/gametypes/TeamBaseMatch.h (modified) * code/trunk/src/orxonox/gametypes/TeamDeathmatch.cc (modified) * code/trunk/src/orxonox/gametypes/TeamDeathmatch.h (modified) * code/trunk/src/orxonox/gametypes/TeamGametype.cc (modified) * code/trunk/src/orxonox/gametypes/TeamGametype.h (modified) * code/trunk/src/orxonox/gametypes/UnderAttack.cc (modified) * code/trunk/src/orxonox/infos/GametypeInfo.cc (modified) * code/trunk/src/orxonox/infos/GametypeInfo.h (modified) * code/trunk/src/orxonox/infos/PlayerInfo.cc (modified) * code/trunk/src/orxonox/interfaces/Pickupable.cc (modified) * code/trunk/src/orxonox/interfaces/Pickupable.h (modified) * code/trunk/src/orxonox/interfaces/RadarViewable.h (modified) * code/trunk/src/orxonox/pickup (deleted) * code/trunk/src/orxonox/worldentities/ControllableEntity.cc (modified) * code/trunk/src/orxonox/worldentities/ControllableEntity.h (modified) * code/trunk/src/orxonox/worldentities/pawns/Pawn.cc (modified) * code/trunk/src/orxonox/worldentities/pawns/Pawn.h (modified) * code/trunk/src/orxonox/worldentities/pawns/SpaceShip.cc (modified) merged branch presentation2012merge back to trunk Mon, 28 May 2012 10:28:44 GMT landauf [9257] * code/trunk/data/levels/missionOne.oxw (modified) * code/trunk/data/levels/underAttack.oxw (modified) * code/trunk/src/modules/overlays/hud/HUDNavigation.cc (modified) * code/trunk/src/orxonox/infos/PlayerInfo.cc (modified) * code/trunk/src/orxonox/interfaces/RadarViewable.cc (modified) * code/trunk/src/orxonox/interfaces/RadarViewable.h (modified) * code/trunk/src/orxonox/worldentities/pawns/Pawn.cc (modified) renamed RVName to radarname cast to RadarViewable instead of ... Wed, 15 Feb 2012 22:51:58 GMT jo [9016] * code/trunk (modified) * code/trunk/data/defaultConfig/keybindings.ini (modified) * code/trunk/data/gui/layouts/CreditsMenu.layout (modified) * code/trunk/data/gui/layouts/MiscConfigMenu.layout (modified) * code/trunk/data/gui/layouts/SingleplayerConfigMenu.layout (copied) * code/trunk/data/gui/layouts/SingleplayerMenu.layout (modified) * code/trunk/data/gui/scripts/CreditsMenu.lua (modified) * code/trunk/data/gui/scripts/InGameMenu.lua (modified) * code/trunk/data/gui/scripts/MiscConfigMenu.lua (modified) * code/trunk/data/gui/scripts/SingleplayerConfigMenu.lua (copied) * code/trunk/data/gui/scripts/SingleplayerMenu.lua (modified) * code/trunk/data/levels/FPSTest.oxw (modified) * code/trunk/data/levels/Spacerace2.oxw (copied) * code/trunk/data/levels/asteroidField.oxw (copied) * code/trunk/data/levels/asteroids.oxw (modified) * code/trunk/data/levels/docking.oxw (modified) * code/trunk/data/levels/dynamicMatch.oxw (modified) * code/trunk/data/levels/earth.oxw (modified) * code/trunk/data/levels/emptyLevel.oxw (modified) * code/trunk/data/levels/events.oxw (modified) * code/trunk/data/levels/fightInOurBack.oxw (modified) * code/trunk/data/levels/includes/asteroidField.lua (copied) * code/trunk/data/levels/includes/weaponSettingsSpacecruiser.oxi (modified) * code/trunk/data/levels/lastManStanding.oxw (modified) * code/trunk/data/levels/lastTeamStanding.oxw (modified) * code/trunk/data/levels/lastTeamStandingII.oxw (modified) * code/trunk/data/levels/missionOne.oxw (modified) * code/trunk/data/levels/myTestLevel.oxw (modified) * code/trunk/data/levels/notifications.oxw (modified) * code/trunk/data/levels/pickups.oxw (modified) * code/trunk/data/levels/pirateAttack.oxw (modified) * code/trunk/data/levels/planets.oxw (modified) * code/trunk/data/levels/pong.oxw (modified) * code/trunk/data/levels/portals.oxw (modified) * code/trunk/data/levels/presentation.oxw (modified) * code/trunk/data/levels/presentation09.oxw (modified) * code/trunk/data/levels/presentation09b.oxw (modified) * code/trunk/data/levels/presentationDM.oxw (modified) * code/trunk/data/levels/presentationFS10.oxw (modified) * code/trunk/data/levels/presentationFS102.oxw (modified) * code/trunk/data/levels/presentationFS10Ed.oxw (modified) * code/trunk/data/levels/presentationFS11.oxw (modified) * code/trunk/data/levels/presentationHS09.oxw (modified) * code/trunk/data/levels/presentationHS09b.oxw (modified) * code/trunk/data/levels/presentationHS11.oxw (copied) * code/trunk/data/levels/princessAeryn.oxw (modified) * code/trunk/data/levels/quests.oxw (modified) * code/trunk/data/levels/screenshot.oxw (modified) * code/trunk/data/levels/shieldTest.oxw (modified) * code/trunk/data/levels/sound.oxw (modified) * code/trunk/data/levels/spaceRace.oxw (modified) * code/trunk/data/levels/teamBaseMatch.oxw (modified) * code/trunk/data/levels/teamDeathMatch.oxw (modified) * code/trunk/data/levels/templates/spaceshipSpacecruiser.oxt (modified) * code/trunk/data/levels/testStars.oxw (modified) * code/trunk/data/levels/testSwallow.oxw (modified) * code/trunk/data/levels/tetris.oxw (modified) * code/trunk/data/levels/theTimeMachine.oxw (modified) * code/trunk/data/levels/tutorial.oxw (modified) * code/trunk/data/levels/underAttack.oxw (modified) * code/trunk/data/levels/waypoints.oxw (modified) * code/trunk/data/overlays/HUDTemplates3.oxo (modified) * code/trunk/data/overlays/underAttackHUD.oxo (modified) * code/trunk/src/libraries/core/GUIManager.cc (modified) * code/trunk/src/libraries/util/SignalHandler.cc (modified) * code/trunk/src/modules/gametypes/CMakeLists.txt (modified) * code/trunk/src/modules/gametypes/GametypesPrereqs.h (modified) * code/trunk/src/modules/gametypes/OldRaceCheckPoint.cc (copied) * code/trunk/src/modules/gametypes/OldRaceCheckPoint.h (copied) * code/trunk/src/modules/gametypes/OldSpaceRace.cc (copied) * code/trunk/src/modules/gametypes/OldSpaceRace.h (copied) * code/trunk/src/modules/gametypes/RaceCheckPoint.cc (modified) * code/trunk/src/modules/gametypes/RaceCheckPoint.h (modified) * code/trunk/src/modules/gametypes/SpaceRace.cc (modified) * code/trunk/src/modules/gametypes/SpaceRace.h (modified) * code/trunk/src/modules/gametypes/SpaceRaceManager.cc (copied) * code/trunk/src/modules/gametypes/SpaceRaceManager.h (copied) * code/trunk/src/modules/objects/triggers/DistanceMultiTrigger.h (modified) * code/trunk/src/modules/objects/triggers/MultiTrigger.h (modified) * code/trunk/src/modules/overlays/hud/CMakeLists.txt (modified) * code/trunk/src/modules/overlays/hud/HUDEnemyHealthBar.cc (copied) * code/trunk/src/modules/overlays/hud/HUDEnemyHealthBar.h (copied) * code/trunk/src/modules/overlays/hud/HUDHealthBar.h (modified) * code/trunk/src/modules/overlays/hud/HUDNavigation.cc (modified) * code/trunk/src/modules/overlays/hud/HUDNavigation.h (modified) * code/trunk/src/modules/pong/Pong.cc (modified) * code/trunk/src/modules/pong/Pong.h (modified) * code/trunk/src/modules/pong/PongAI.h (modified) * code/trunk/src/modules/pong/PongScore.cc (modified) * code/trunk/src/modules/pong/PongScore.h (modified) * code/trunk/src/modules/weapons/projectiles/Rocket.cc (modified) * code/trunk/src/modules/weapons/projectiles/Rocket.h (modified) * code/trunk/src/modules/weapons/weaponmodes/LightningGun.cc (modified) * code/trunk/src/orxonox/Level.cc (modified) * code/trunk/src/orxonox/Level.h (modified) * code/trunk/src/orxonox/LevelInfo.cc (modified) * code/trunk/src/orxonox/LevelInfo.h (modified) * code/trunk/src/orxonox/controllers/AIController.cc (modified) * code/trunk/src/orxonox/controllers/AIController.h (modified) * code/trunk/src/orxonox/controllers/ArtificialController.cc (modified) * code/trunk/src/orxonox/controllers/ArtificialController.h (modified) * code/trunk/src/orxonox/controllers/CMakeLists.txt (modified) * code/trunk/src/orxonox/controllers/FormationController.cc (copied) * code/trunk/src/orxonox/controllers/FormationController.h (copied) * code/trunk/src/orxonox/controllers/HumanController.cc (modified) * code/trunk/src/orxonox/controllers/HumanController.h (modified) * code/trunk/src/orxonox/controllers/NewHumanController.cc (modified) * code/trunk/src/orxonox/controllers/NewHumanController.h (modified) * code/trunk/src/orxonox/controllers/WaypointPatrolController.cc (modified) * code/trunk/src/orxonox/controllers/WaypointPatrolController.h (modified) * code/trunk/src/orxonox/gametypes/CMakeLists.txt (modified) * code/trunk/src/orxonox/gametypes/Gametype.cc (modified) * code/trunk/src/orxonox/gametypes/Gametype.h (modified) * code/trunk/src/orxonox/gametypes/Mission.cc (copied) * code/trunk/src/orxonox/gametypes/Mission.h (copied) * code/trunk/src/orxonox/gametypes/TeamDeathmatch.h (modified) * code/trunk/src/orxonox/gametypes/TeamGametype.cc (copied) * code/trunk/src/orxonox/gametypes/TeamGametype.h (copied) * code/trunk/src/orxonox/gametypes/UnderAttack.cc (modified) * code/trunk/src/orxonox/infos/GametypeInfo.cc (modified) * code/trunk/src/orxonox/infos/GametypeInfo.h (modified) * code/trunk/src/orxonox/infos/PlayerInfo.cc (modified) * code/trunk/src/orxonox/interfaces/RadarViewable.cc (modified) * code/trunk/src/orxonox/interfaces/RadarViewable.h (modified) * code/trunk/src/orxonox/worldentities/ControllableEntity.cc (modified) * code/trunk/src/orxonox/worldentities/ControllableEntity.h (modified) * code/trunk/src/orxonox/worldentities/pawns/FpsPlayer.cc (modified) * code/trunk/src/orxonox/worldentities/pawns/FpsPlayer.h (modified) * code/trunk/src/orxonox/worldentities/pawns/Pawn.cc (modified) * code/trunk/src/orxonox/worldentities/pawns/Pawn.h (modified) Merging presentation2011 branch to trunk. Please check for possible bugs. Wed, 12 Oct 2011 17:50:43 GMT jo [8891] * code/trunk (modified) * code/trunk/data/gui/scripts/QuestGUI.lua (modified) * code/trunk/data/levels/fightInOurBack.oxw (modified) * code/trunk/data/levels/includes/weaponSettingsSpacecruiser.oxi (copied) * code/trunk/data/levels/includes/weaponSettingsSwallow.oxi (modified) * code/trunk/data/levels/includes/weaponSettingsTransporter.oxi (modified) * code/trunk/data/levels/lastTeamStanding.oxw (modified) * code/trunk/data/levels/lastTeamStandingII.oxw (modified) * code/trunk/data/levels/missionOne.oxw (copied) * code/trunk/data/levels/planets.oxw (modified) * code/trunk/data/levels/templates/spaceshipSpacecruiser.oxt (copied) * code/trunk/src/modules/notifications/NotificationDispatcher.cc (modified) * code/trunk/src/modules/notifications/NotificationDispatcher.h (modified) * code/trunk/src/modules/overlays/hud/HUDNavigation.cc (modified) * code/trunk/src/modules/overlays/hud/HUDNavigation.h (modified) * code/trunk/src/modules/overlays/hud/HUDRadar.cc (modified) * code/trunk/src/modules/overlays/hud/HUDRadar.h (modified) * code/trunk/src/modules/pickup/PickupSpawner.cc (modified) * code/trunk/src/modules/questsystem/QuestItem.h (modified) * code/trunk/src/modules/questsystem/QuestManager.cc (modified) * code/trunk/src/modules/weapons/projectiles/Rocket.cc (modified) * code/trunk/src/orxonox/LevelManager.cc (modified) * code/trunk/src/orxonox/controllers/AIController.cc (modified) * code/trunk/src/orxonox/controllers/ArtificialController.cc (modified) * code/trunk/src/orxonox/controllers/ArtificialController.h (modified) * code/trunk/src/orxonox/controllers/DroneController.cc (modified) * code/trunk/src/orxonox/controllers/DroneController.h (modified) * code/trunk/src/orxonox/controllers/WaypointController.cc (modified) * code/trunk/src/orxonox/controllers/WaypointController.h (modified) * code/trunk/src/orxonox/infos/PlayerInfo.cc (modified) * code/trunk/src/orxonox/weaponsystem/WeaponSlot.h (modified) * code/trunk/src/orxonox/worldentities/ControllableEntity.cc (modified) * code/trunk/src/orxonox/worldentities/ControllableEntity.h (modified) * code/trunk/src/orxonox/worldentities/pawns/Pawn.cc (modified) * code/trunk/src/orxonox/worldentities/pawns/Pawn.h (modified) * code/trunk/src/orxonox/worldentities/pawns/SpaceShip.cc (modified) Ai and tutorial improvements merged back to the trunk. AI features: ... Thu, 25 Aug 2011 14:13:24 GMT jo [8868] * code/trunk/data/levels/includes/weaponSettingsAssff.oxi (modified) Thu, 25 Aug 2011 14:10:25 GMT jo [8867] * code/trunk/data/levels/fightInOurBack.oxw (modified) * code/trunk/data/levels/includes/weaponSettingsAssff.oxi (modified) * code/trunk/data/levels/includes/weaponSettingsTransporter.oxi (modified) Transporter's weaponsystem updated. Mon, 22 Aug 2011 23:08:52 GMT landauf [8860] * code/trunk/data/levels/templates/spaceshipAssff.oxt (modified) * code/trunk/data/levels/templates/spaceshipAssff2.oxt (modified) fixed spaceship templates Mon, 22 Aug 2011 22:45:53 GMT landauf [8858] * code/trunk (modified) * code/trunk/CMakeLists.txt (modified) * code/trunk/data/gui/scripts/GameplayMenu.lua (modified) * code/trunk/data/gui/scripts/MultiplayerMenu.lua (modified) * code/trunk/data/gui/scripts/NotificationLayer.lua (modified) * code/trunk/data/gui/scripts/QuestGUI.lua (modified) * code/trunk/data/levels/presentationDM.oxw (modified) * code/trunk/data/levels/templates/FPS.oxt (modified) * code/trunk/data/levels/templates/spaceshipAssff.oxt (modified) * code/trunk/data/levels/templates/spaceshipAssff2.oxt (modified) * code/trunk/data/levels/templates/spaceshipGhost.oxt (modified) * code/trunk/data/levels/templates/spaceshipH2.oxt (modified) * code/trunk/data/levels/templates/spaceshipHXY.oxt (modified) * code/trunk/data/levels/templates/spaceshipHXYSL.oxt (modified) * code/trunk/data/levels/templates/spaceshipPirate.oxt (modified) * code/trunk/data/levels/templates/spaceshipSwallow.oxt (modified) * code/trunk/data/levels/templates/spaceshipTransporter.oxt (modified) * code/trunk/data/levels/templates/spaceshipTransporterSL.oxt (modified) * code/trunk/data/lua/LuaStateInit.lua (modified) * code/trunk/data/overlays/OrxonoxLoading.overlay (deleted) * code/trunk/data/overlays/debug.oxo (modified) * code/trunk/data/tcl/init.tcl (modified) * code/trunk/src/Orxonox.cc (modified) * code/trunk/src/OrxonoxConfig.h.in (modified) * code/trunk/src/libraries/core/BaseObject.cc (modified) * code/trunk/src/libraries/core/CMakeLists.txt (modified) * code/trunk/src/libraries/core/ClassFactory.h (modified) * code/trunk/src/libraries/core/CommandLineParser.cc (modified) * code/trunk/src/libraries/core/CommandLineParser.h (modified) * code/trunk/src/libraries/core/ConfigFileManager.cc (modified) * code/trunk/src/libraries/core/ConfigValueContainer.cc (modified) * code/trunk/src/libraries/core/ConfigValueIncludes.h (modified) * code/trunk/src/libraries/core/Core.cc (modified) * code/trunk/src/libraries/core/Core.h (modified) * code/trunk/src/libraries/core/CoreIncludes.h (modified) * code/trunk/src/libraries/core/CorePrecompiledHeaders.h (modified) * code/trunk/src/libraries/core/DynLib.cc (modified) * code/trunk/src/libraries/core/Event.cc (modified) * code/trunk/src/libraries/core/GUIManager.cc (modified) * code/trunk/src/libraries/core/GUIManager.h (modified) * code/trunk/src/libraries/core/Game.cc (modified) * code/trunk/src/libraries/core/Game.h (modified) * code/trunk/src/libraries/core/GameState.cc (modified) * code/trunk/src/libraries/core/GraphicsManager.cc (modified) * code/trunk/src/libraries/core/GraphicsManager.h (modified) * code/trunk/src/libraries/core/Identifier.cc (modified) * code/trunk/src/libraries/core/Identifier.h (modified) * code/trunk/src/libraries/core/Language.cc (modified) * code/trunk/src/libraries/core/Language.h (modified) * code/trunk/src/libraries/core/Loader.cc (modified) * code/trunk/src/libraries/core/Loader.h (modified) * code/trunk/src/libraries/core/LuaState.cc (modified) * code/trunk/src/libraries/core/LuaState.h (modified) * code/trunk/src/libraries/core/MetaObjectList.cc (modified) * code/trunk/src/libraries/core/NamespaceNode.cc (modified) * code/trunk/src/libraries/core/OrxonoxClass.cc (modified) * code/trunk/src/libraries/core/OrxonoxClass.h (modified) * code/trunk/src/libraries/core/PathConfig.cc (modified) * code/trunk/src/libraries/core/SubclassIdentifier.h (modified) * code/trunk/src/libraries/core/Super.h (modified) * code/trunk/src/libraries/core/Template.cc (modified) * code/trunk/src/libraries/core/WeakPtr.h (modified) * code/trunk/src/libraries/core/XMLPort.cc (modified) * code/trunk/src/libraries/core/XMLPort.h (modified) * code/trunk/src/libraries/core/command/ArgumentCompletionFunctions.cc (modified) * code/trunk/src/libraries/core/command/CommandEvaluation.cc (modified) * code/trunk/src/libraries/core/command/CommandExecutor.cc (modified) * code/trunk/src/libraries/core/command/CommandExecutor.h (modified) * code/trunk/src/libraries/core/command/ConsoleCommand.cc (modified) * code/trunk/src/libraries/core/command/ConsoleCommand.h (modified) * code/trunk/src/libraries/core/command/ConsoleCommandCompilation.cc (modified) * code/trunk/src/libraries/core/command/ConsoleCommandCompilation.h (modified) * code/trunk/src/libraries/core/command/Executor.cc (modified) * code/trunk/src/libraries/core/command/Executor.h (modified) * code/trunk/src/libraries/core/command/Functor.h (modified) * code/trunk/src/libraries/core/command/IOConsolePOSIX.cc (modified) * code/trunk/src/libraries/core/command/IOConsolePOSIX.h (modified) * code/trunk/src/libraries/core/command/IOConsoleWindows.cc (modified) * code/trunk/src/libraries/core/command/IOConsoleWindows.h (modified) * code/trunk/src/libraries/core/command/IRC.cc (modified) * code/trunk/src/libraries/core/command/Shell.cc (modified) * code/trunk/src/libraries/core/command/Shell.h (modified) * code/trunk/src/libraries/core/command/TclBind.cc (modified) * code/trunk/src/libraries/core/command/TclThreadManager.cc (modified) * code/trunk/src/libraries/core/input/Button.cc (modified) * code/trunk/src/libraries/core/input/InputDevice.h (modified) * code/trunk/src/libraries/core/input/InputManager.cc (modified) * code/trunk/src/libraries/core/input/JoyStick.cc (modified) * code/trunk/src/libraries/core/input/KeyBinder.cc (modified) * code/trunk/src/libraries/core/input/KeyBinderManager.cc (modified) * code/trunk/src/libraries/network/CMakeLists.txt (modified) * code/trunk/src/libraries/network/ChatListener.cc (deleted) * code/trunk/src/libraries/network/ChatListener.h (deleted) * code/trunk/src/libraries/network/Client.cc (modified) * code/trunk/src/libraries/network/Client.h (modified) * code/trunk/src/libraries/network/ClientConnection.cc (modified) * code/trunk/src/libraries/network/Connection.cc (modified) * code/trunk/src/libraries/network/GamestateManager.cc (modified) * code/trunk/src/libraries/network/Host.cc (modified) * code/trunk/src/libraries/network/Host.h (modified) * code/trunk/src/libraries/network/LANDiscoverable.cc (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/MasterServerComm.cc (modified) * code/trunk/src/libraries/network/MasterServerComm.h (modified) * code/trunk/src/libraries/network/NetworkChatListener.h (copied) * code/trunk/src/libraries/network/NetworkPrecompiledHeaders.h (modified) * code/trunk/src/libraries/network/NetworkPrereqs.h (modified) * code/trunk/src/libraries/network/PeerList.cc (modified) * code/trunk/src/libraries/network/Server.cc (modified) * code/trunk/src/libraries/network/Server.h (modified) * code/trunk/src/libraries/network/ServerConnection.cc (modified) * code/trunk/src/libraries/network/TrafficControl.cc (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/Acknowledgement.cc (modified) * code/trunk/src/libraries/network/packet/Chat.cc (modified) * code/trunk/src/libraries/network/packet/Chat.h (modified) * code/trunk/src/libraries/network/packet/ClassID.cc (modified) * code/trunk/src/libraries/network/packet/DeleteObjects.cc (modified) * code/trunk/src/libraries/network/packet/FunctionIDs.cc (modified) * code/trunk/src/libraries/network/packet/Gamestate.cc (modified) * code/trunk/src/libraries/network/packet/Packet.cc (modified) * code/trunk/src/libraries/network/packet/Welcome.cc (modified) * code/trunk/src/libraries/network/synchronisable/Synchronisable.cc (modified) * code/trunk/src/libraries/network/synchronisable/Synchronisable.h (modified) * code/trunk/src/libraries/network/synchronisable/SynchronisableVariable.h (modified) * code/trunk/src/libraries/tools/BillboardSet.cc (modified) * code/trunk/src/libraries/tools/Mesh.cc (modified) * code/trunk/src/libraries/tools/ParticleInterface.cc (modified) * code/trunk/src/libraries/tools/ResourceCollection.cc (modified) * code/trunk/src/libraries/tools/ResourceLocation.cc (modified) * code/trunk/src/libraries/tools/Shader.cc (modified) * code/trunk/src/libraries/tools/Timer.h (modified) * code/trunk/src/libraries/util/CMakeLists.txt (modified) * code/trunk/src/libraries/util/Clipboard.cc (modified) * code/trunk/src/libraries/util/Convert.h (modified) * code/trunk/src/libraries/util/Debug.h (deleted) * code/trunk/src/libraries/util/Exception.cc (modified) * code/trunk/src/libraries/util/Exception.h (modified) * code/trunk/src/libraries/util/ExprParser.h (modified) * code/trunk/src/libraries/util/MultiType.h (modified) * code/trunk/src/libraries/util/OrxAssert.h (modified) * code/trunk/src/libraries/util/Output.h (copied) * code/trunk/src/libraries/util/OutputHandler.cc (deleted) * code/trunk/src/libraries/util/OutputHandler.h (deleted) * code/trunk/src/libraries/util/Scope.h (modified) * code/trunk/src/libraries/util/ScopedSingletonManager.h (modified) * code/trunk/src/libraries/util/SignalHandler.cc (modified) * code/trunk/src/libraries/util/Singleton.h (modified) * code/trunk/src/libraries/util/Sleep.cc (modified) * code/trunk/src/libraries/util/StringUtils.cc (modified) * code/trunk/src/libraries/util/StringUtils.h (modified) * code/trunk/src/libraries/util/SubString.cc (modified) * code/trunk/src/libraries/util/SubString.h (modified) * code/trunk/src/libraries/util/UtilPrereqs.h (modified) * code/trunk/src/libraries/util/output (copied) * code/trunk/src/libraries/util/output/BaseWriter.cc (copied) * code/trunk/src/libraries/util/output/BaseWriter.h (copied) * code/trunk/src/libraries/util/output/CMakeLists.txt (copied) * code/trunk/src/libraries/util/output/ConsoleWriter.cc (copied) * code/trunk/src/libraries/util/output/ConsoleWriter.h (copied) * code/trunk/src/libraries/util/output/LogWriter.cc (copied) * code/trunk/src/libraries/util/output/LogWriter.h (copied) * code/trunk/src/libraries/util/output/MemoryWriter.cc (copied) * code/trunk/src/libraries/util/output/MemoryWriter.h (copied) * code/trunk/src/libraries/util/output/OutputDefinitions.h (copied) * code/trunk/src/libraries/util/output/OutputListener.cc (copied) * code/trunk/src/libraries/util/output/OutputListener.h (copied) * code/trunk/src/libraries/util/output/OutputManager.cc (copied) * code/trunk/src/libraries/util/output/OutputManager.h (copied) * code/trunk/src/libraries/util/output/OutputStream.cc (copied) * code/trunk/src/libraries/util/output/OutputStream.h (copied) * code/trunk/src/libraries/util/output/SubcontextOutputListener.cc (copied) * code/trunk/src/libraries/util/output/SubcontextOutputListener.h (copied) * code/trunk/src/modules/designtools/ScreenshotManager.cc (modified) * code/trunk/src/modules/designtools/SkyboxGenerator.cc (modified) * code/trunk/src/modules/docking/Dock.cc (modified) * code/trunk/src/modules/docking/DockToShip.cc (modified) * code/trunk/src/modules/docking/DockingController.cc (modified) * code/trunk/src/modules/docking/DockingTarget.cc (modified) * code/trunk/src/modules/gametypes/RaceCheckPoint.cc (modified) * code/trunk/src/modules/gametypes/SpaceRace.cc (modified) * code/trunk/src/modules/notifications/NotificationDispatcher.cc (modified) * code/trunk/src/modules/notifications/NotificationManager.cc (modified) * code/trunk/src/modules/notifications/NotificationQueue.cc (modified) * code/trunk/src/modules/notifications/NotificationQueueCEGUI.cc (modified) * code/trunk/src/modules/objects/ForceField.cc (modified) * code/trunk/src/modules/objects/Planet.cc (modified) * code/trunk/src/modules/objects/Script.cc (modified) * code/trunk/src/modules/objects/SpaceBoundaries.cc (modified) * code/trunk/src/modules/objects/collisionshapes/BoxCollisionShape.cc (modified) * code/trunk/src/modules/objects/collisionshapes/ConeCollisionShape.cc (modified) * code/trunk/src/modules/objects/collisionshapes/PlaneCollisionShape.cc (modified) * code/trunk/src/modules/objects/collisionshapes/SphereCollisionShape.cc (modified) * code/trunk/src/modules/objects/eventsystem/EventFilter.cc (modified) * code/trunk/src/modules/objects/eventsystem/EventListener.cc (modified) * code/trunk/src/modules/objects/eventsystem/EventTarget.cc (modified) * code/trunk/src/modules/objects/triggers/DistanceMultiTrigger.cc (modified) * code/trunk/src/modules/objects/triggers/DistanceTrigger.cc (modified) * code/trunk/src/modules/objects/triggers/MultiTrigger.cc (modified) * code/trunk/src/modules/objects/triggers/TriggerBase.cc (modified) * code/trunk/src/modules/overlays/GUIOverlay.cc (modified) * code/trunk/src/modules/overlays/hud/ChatOverlay.cc (modified) * code/trunk/src/modules/overlays/hud/ChatOverlay.h (modified) * code/trunk/src/modules/overlays/hud/HUDNavigation.cc (modified) * code/trunk/src/modules/overlays/hud/HUDRadar.cc (modified) * code/trunk/src/modules/pickup/Pickup.cc (modified) * code/trunk/src/modules/pickup/PickupManager.cc (modified) * code/trunk/src/modules/pickup/PickupRepresentation.cc (modified) * code/trunk/src/modules/pickup/PickupSpawner.cc (modified) * code/trunk/src/modules/pickup/items/DronePickup.cc (modified) * code/trunk/src/modules/pickup/items/HealthPickup.cc (modified) * code/trunk/src/modules/pickup/items/InvisiblePickup.cc (modified) * code/trunk/src/modules/pickup/items/MetaPickup.cc (modified) * code/trunk/src/modules/pickup/items/ShieldPickup.cc (modified) * code/trunk/src/modules/pickup/items/ShrinkPickup.h (modified) * code/trunk/src/modules/pickup/items/SpeedPickup.cc (modified) * code/trunk/src/modules/pong/Pong.cc (modified) * code/trunk/src/modules/questsystem/GlobalQuest.cc (modified) * code/trunk/src/modules/questsystem/LocalQuest.cc (modified) * code/trunk/src/modules/questsystem/Quest.cc (modified) * code/trunk/src/modules/questsystem/QuestDescription.cc (modified) * code/trunk/src/modules/questsystem/QuestEffect.cc (modified) * code/trunk/src/modules/questsystem/QuestEffectBeacon.cc (modified) * code/trunk/src/modules/questsystem/QuestHint.cc (modified) * code/trunk/src/modules/questsystem/QuestItem.cc (modified) * code/trunk/src/modules/questsystem/QuestListener.cc (modified) * code/trunk/src/modules/questsystem/QuestManager.cc (modified) * code/trunk/src/modules/questsystem/effects/AddQuest.cc (modified) * code/trunk/src/modules/questsystem/effects/AddQuestHint.cc (modified) * code/trunk/src/modules/questsystem/effects/AddReward.cc (modified) * code/trunk/src/modules/questsystem/effects/ChangeQuestStatus.cc (modified) * code/trunk/src/modules/questsystem/effects/CompleteQuest.cc (modified) * code/trunk/src/modules/questsystem/effects/FailQuest.cc (modified) * code/trunk/src/modules/tetris/Tetris.cc (modified) * code/trunk/src/modules/weapons/RocketController.cc (modified) * code/trunk/src/modules/weapons/projectiles/BasicProjectile.h (modified) * code/trunk/src/modules/weapons/projectiles/SimpleRocket.cc (modified) * code/trunk/src/orxonox/CMakeLists.txt (modified) * code/trunk/src/orxonox/ChatHistory.cc (deleted) * code/trunk/src/orxonox/ChatHistory.h (deleted) * code/trunk/src/orxonox/ChatInputHandler.cc (deleted) * code/trunk/src/orxonox/ChatInputHandler.h (deleted) * code/trunk/src/orxonox/Level.cc (modified) * code/trunk/src/orxonox/LevelInfo.cc (modified) * code/trunk/src/orxonox/LevelManager.cc (modified) * code/trunk/src/orxonox/Main.cc (modified) * code/trunk/src/orxonox/MoodManager.cc (modified) * code/trunk/src/orxonox/OrxonoxPrereqs.h (modified) * code/trunk/src/orxonox/PlayerManager.cc (modified) * code/trunk/src/orxonox/Radar.cc (modified) * code/trunk/src/orxonox/Scene.cc (modified) * code/trunk/src/orxonox/Test.cc (modified) * code/trunk/src/orxonox/Test.h (modified) * code/trunk/src/orxonox/chat (copied) * code/trunk/src/orxonox/chat/CMakeLists.txt (copied) * code/trunk/src/orxonox/chat/ChatHistory.cc (copied) * code/trunk/src/orxonox/chat/ChatHistory.h (copied) * code/trunk/src/orxonox/chat/ChatInputHandler.cc (copied) * code/trunk/src/orxonox/chat/ChatInputHandler.h (copied) * code/trunk/src/orxonox/chat/ChatListener.h (copied) * code/trunk/src/orxonox/chat/ChatManager.cc (copied) * code/trunk/src/orxonox/chat/ChatManager.h (copied) * code/trunk/src/orxonox/collisionshapes/CollisionShape.cc (modified) * code/trunk/src/orxonox/collisionshapes/CompoundCollisionShape.cc (modified) * code/trunk/src/orxonox/controllers/ArtificialController.cc (modified) * code/trunk/src/orxonox/controllers/HumanController.cc (modified) * code/trunk/src/orxonox/controllers/NewHumanController.cc (modified) * code/trunk/src/orxonox/gamestates/GSClient.cc (modified) * code/trunk/src/orxonox/gamestates/GSLevel.cc (modified) * code/trunk/src/orxonox/gamestates/GSMainMenu.cc (modified) * code/trunk/src/orxonox/gamestates/GSMasterServer.cc (modified) * code/trunk/src/orxonox/gamestates/GSRoot.cc (modified) * code/trunk/src/orxonox/gamestates/GSServer.cc (modified) * code/trunk/src/orxonox/gametypes/Asteroids.cc (modified) * code/trunk/src/orxonox/gametypes/Deathmatch.cc (modified) * code/trunk/src/orxonox/gametypes/Dynamicmatch.cc (modified) * code/trunk/src/orxonox/gametypes/Gametype.cc (modified) * code/trunk/src/orxonox/gametypes/LastManStanding.cc (modified) * code/trunk/src/orxonox/gametypes/LastTeamStanding.cc (modified) * code/trunk/src/orxonox/gametypes/TeamBaseMatch.cc (modified) * code/trunk/src/orxonox/gametypes/UnderAttack.cc (modified) * code/trunk/src/orxonox/graphics/AnimatedModel.cc (modified) * code/trunk/src/orxonox/graphics/AnimatedModel.h (modified) * code/trunk/src/orxonox/graphics/CEGuiSample.cc (deleted) * code/trunk/src/orxonox/graphics/CEGuiSample.h (deleted) * code/trunk/src/orxonox/graphics/Model.cc (modified) * code/trunk/src/orxonox/graphics/ParticleEmitter.cc (modified) * code/trunk/src/orxonox/infos/GametypeInfo.cc (modified) * code/trunk/src/orxonox/interfaces/PickupCarrier.cc (modified) * code/trunk/src/orxonox/interfaces/Pickupable.cc (modified) * code/trunk/src/orxonox/interfaces/RadarViewable.cc (modified) * code/trunk/src/orxonox/items/Engine.cc (modified) * code/trunk/src/orxonox/overlays/InGameConsole.cc (modified) * code/trunk/src/orxonox/overlays/InGameConsole.h (modified) * code/trunk/src/orxonox/overlays/OrxonoxOverlay.cc (modified) * code/trunk/src/orxonox/pickup/PickupIdentifier.cc (modified) * code/trunk/src/orxonox/sound/AmbientSound.cc (modified) * code/trunk/src/orxonox/sound/BaseSound.cc (modified) * code/trunk/src/orxonox/sound/SoundBuffer.cc (modified) * code/trunk/src/orxonox/sound/SoundManager.cc (modified) * code/trunk/src/orxonox/sound/SoundStreamer.cc (modified) * code/trunk/src/orxonox/sound/WorldSound.cc (modified) * code/trunk/src/orxonox/weaponsystem/WeaponMode.cc (modified) * code/trunk/src/orxonox/worldentities/BigExplosion.cc (modified) * code/trunk/src/orxonox/worldentities/ControllableEntity.cc (modified) * code/trunk/src/orxonox/worldentities/ExplosionChunk.cc (modified) * code/trunk/src/orxonox/worldentities/MobileEntity.cc (modified) * code/trunk/src/orxonox/worldentities/SpawnPoint.cc (modified) * code/trunk/src/orxonox/worldentities/StaticEntity.cc (modified) * code/trunk/src/orxonox/worldentities/WorldEntity.cc (modified) * code/trunk/src/orxonox/worldentities/pawns/FpsPlayer.cc (modified) * code/trunk/src/orxonox/worldentities/pawns/SpaceShip.cc (modified) merged output branch back to trunk. Changes: - you have to ... Mon, 22 Aug 2011 13:55:43 GMT dafrick [8857] * code/trunk/data/levels/includes/weaponSettingsGhost.oxi (modified) * code/trunk/data/levels/templates/spaceshipAssff.oxt (modified) * code/trunk/data/levels/templates/spaceshipAssff2.oxt (modified) * code/trunk/data/levels/templates/spaceshipGhost.oxt (modified) * code/trunk/data/levels/templates/spaceshipImmTest.oxt (deleted) * code/trunk/data/levels/templates/spaceshipPirate.oxt (modified) * code/trunk/data/levels/templates/spaceshipSwallow.oxt (modified) Adding shields and boost to some spaceships. Wed, 13 Jul 2011 17:53:31 GMT jo [8756] * code/trunk/data/levels/fightInOurBack.oxw (modified) Updating 'Fight in our back'. Spaceship is steerable now. New ... Wed, 13 Jul 2011 17:31:00 GMT jo [8755] * code/trunk/data/levels/includes/weaponSettingsFPS.oxi (modified) * code/trunk/data/levels/includes/weaponSettingsHXY.oxi (modified) * code/trunk/data/levels/includes/weaponSettingsSwallow.oxi (modified) * code/trunk/data/levels/includes/weaponSettingsTransporter.oxi (modified) Updating the weaponsettings. Swallow and further spaceships deal ... Sun, 03 Jul 2011 15:42:19 GMT dafrick [8727] * code/trunk/data/levels/templates/spaceshipAssff.oxt (modified) * code/trunk/data/levels/templates/spaceshipAssff2.oxt (modified) * code/trunk/src/modules/pickup/items/SpeedPickup.cc (modified) * code/trunk/src/modules/pickup/items/SpeedPickup.h (modified) * code/trunk/src/orxonox/gametypes/Dynamicmatch.cc (modified) * code/trunk/src/orxonox/gametypes/Dynamicmatch.h (modified) * code/trunk/src/orxonox/items/Engine.cc (modified) * code/trunk/src/orxonox/items/Engine.h (modified) * code/trunk/src/orxonox/items/MultiStateEngine.cc (modified) * code/trunk/src/orxonox/items/MultiStateEngine.h (modified) * code/trunk/src/orxonox/worldentities/MobileEntity.cc (modified) * code/trunk/src/orxonox/worldentities/MobileEntity.h (modified) * code/trunk/src/orxonox/worldentities/pawns/SpaceShip.cc (modified) * code/trunk/src/orxonox/worldentities/pawns/SpaceShip.h (modified) Cleaning up in SpaceShip and Engine. Fixed several bugs. Kicked ... Mon, 27 Jun 2011 08:45:15 GMT dafrick [8713] * code/trunk/data/levels/includes/pickups.oxi (modified) * code/trunk/src/modules/pickup/PickupRepresentation.cc (modified) * code/trunk/src/modules/pickup/items/ShrinkPickup.cc (modified) * code/trunk/src/modules/pickup/items/ShrinkPickup.h (modified) Cleaning up ShrinkPickup. Tue, 14 Jun 2011 18:53:28 GMT dafrick [8706] * code/trunk (modified) * code/trunk/data/defaultConfig/keybindings.ini (modified) * code/trunk/data/gui/layouts/DockingDialog.layout (copied) * code/trunk/data/gui/layouts/QuestGUI.layout (modified) * code/trunk/data/gui/scripts/DockingDialog.lua (copied) * code/trunk/data/gui/scripts/NotificationLayer.lua (modified) * code/trunk/data/gui/scripts/QuestGUI.lua (modified) * code/trunk/data/gui/scripts/SingleplayerMenu.lua (modified) * code/trunk/data/levels/FPSTest.oxw (modified) * code/trunk/data/levels/asteroids.oxw (modified) * code/trunk/data/levels/docking.oxw (copied) * code/trunk/data/levels/dynamicMatch.oxw (modified) * code/trunk/data/levels/earth.oxw (modified) * code/trunk/data/levels/emptyLevel.oxw (modified) * code/trunk/data/levels/events.oxw (modified) * code/trunk/data/levels/fightInOurBack.oxw (modified) * code/trunk/data/levels/includes/notifications.oxi (copied) * code/trunk/data/levels/includes/pickups.oxi (modified) * code/trunk/data/levels/includes/weaponSettingsAssff.oxi (modified) * code/trunk/data/levels/includes/weaponSettingsAssff2.oxi (copied) * code/trunk/data/levels/includes/weaponSettingsImmTest.oxi (copied) * code/trunk/data/levels/lastManStanding.oxw (modified) * code/trunk/data/levels/lastTeamStanding.oxw (modified) * code/trunk/data/levels/lastTeamStandingII.oxw (modified) * code/trunk/data/levels/myTestLevel.oxw (modified) * code/trunk/data/levels/notifications.oxw (modified) * code/trunk/data/levels/pickups.oxw (modified) * code/trunk/data/levels/pirateAttack.oxw (modified) * code/trunk/data/levels/planets.oxw (modified) * code/trunk/data/levels/pong.oxw (modified) * code/trunk/data/levels/portals.oxw (modified) * code/trunk/data/levels/presentation.oxw (modified) * code/trunk/data/levels/presentation09.oxw (modified) * code/trunk/data/levels/presentation09b.oxw (modified) * code/trunk/data/levels/presentationDM.oxw (modified) * code/trunk/data/levels/presentationFS10.oxw (modified) * code/trunk/data/levels/presentationFS102.oxw (modified) * code/trunk/data/levels/presentationFS10Ed.oxw (modified) * code/trunk/data/levels/presentationFS11.oxw (modified) * code/trunk/data/levels/presentationHS09.oxw (modified) * code/trunk/data/levels/presentationHS09b.oxw (modified) * code/trunk/data/levels/princessAeryn.oxw (modified) * code/trunk/data/levels/quests.oxw (copied) * code/trunk/data/levels/screenshot.oxw (modified) * code/trunk/data/levels/shieldTest.oxw (copied) * code/trunk/data/levels/sound.oxw (modified) * code/trunk/data/levels/spaceRace.oxw (copied) * code/trunk/data/levels/teamBaseMatch.oxw (modified) * code/trunk/data/levels/teamDeathMatch.oxw (modified) * code/trunk/data/levels/templates/lodInformation.oxt (modified) * code/trunk/data/levels/templates/pickupRepresentationTemplates.oxt (modified) * code/trunk/data/levels/templates/spaceshipAssff.oxt (modified) * code/trunk/data/levels/templates/spaceshipAssff2.oxt (copied) * code/trunk/data/levels/templates/spaceshipGhost.oxt (modified) * code/trunk/data/levels/templates/spaceshipH2.oxt (modified) * code/trunk/data/levels/templates/spaceshipHXY.oxt (modified) * code/trunk/data/levels/templates/spaceshipHXYSL.oxt (modified) * code/trunk/data/levels/templates/spaceshipImmTest.oxt (copied) * code/trunk/data/levels/templates/spaceshipPirate.oxt (modified) * code/trunk/data/levels/templates/spaceshipSwallow.oxt (modified) * code/trunk/data/levels/templates/spaceshipTransporter.oxt (modified) * code/trunk/data/levels/templates/spaceshipTransporterSL.oxt (modified) * code/trunk/data/levels/testStars.oxw (modified) * code/trunk/data/levels/testSwallow.oxw (modified) * code/trunk/data/levels/tetris.oxw (copied) * code/trunk/data/levels/theTimeMachine.oxw (modified) * code/trunk/data/levels/tutorial.oxw (modified) * code/trunk/data/levels/underAttack.oxw (modified) * code/trunk/data/levels/waypoints.oxw (modified) * code/trunk/data/overlays/HUDTemplates3.oxo (modified) * code/trunk/data/overlays/debug.oxo (modified) * code/trunk/data/particle/RingExp.particle (copied) * code/trunk/data/particle/RingExp2.particle (copied) * code/trunk/data/particle/RingExp3.particle (copied) * code/trunk/data/particle/Shield.particle (copied) * code/trunk/data/particle/weaponflare.particle (copied) * code/trunk/data/particle/weaponshoot.particle (copied) * code/trunk/doc/api/Groups.dox (modified) * code/trunk/doc/api/groups/Portals.dox (copied) * code/trunk/doc/api/groups/Triggers.dox (modified) * code/trunk/src/libraries/core/BaseObject.cc (modified) * code/trunk/src/libraries/core/ConfigValueContainer.h (modified) * code/trunk/src/libraries/core/CoreIncludes.h (modified) * code/trunk/src/libraries/core/GUIManager.cc (modified) * code/trunk/src/libraries/core/GUIManager.h (modified) * code/trunk/src/libraries/core/Game.cc (modified) * code/trunk/src/libraries/core/GraphicsManager.h (modified) * code/trunk/src/libraries/core/Identifier.h (modified) * code/trunk/src/libraries/core/Super.h (modified) * code/trunk/src/libraries/core/ThreadWin.cc (modified) * code/trunk/src/libraries/core/command/Functor.h (modified) * code/trunk/src/libraries/core/command/Shell.cc (modified) * code/trunk/src/libraries/network/LANDiscovery.cc (modified) * code/trunk/src/libraries/network/Server.cc (modified) * code/trunk/src/libraries/network/packet/Welcome.cc (modified) * code/trunk/src/libraries/network/packet/Welcome.h (modified) * code/trunk/src/libraries/network/synchronisable/Serialise.h (modified) * code/trunk/src/libraries/network/synchronisable/Synchronisable.cc (modified) * code/trunk/src/libraries/network/synchronisable/Synchronisable.h (modified) * code/trunk/src/libraries/util/Convert.h (modified) * code/trunk/src/libraries/util/Exception.h (modified) * code/trunk/src/libraries/util/Math.h (modified) * code/trunk/src/libraries/util/MultiTypeValue.h (modified) * code/trunk/src/libraries/util/ScopedSingletonManager.h (modified) * code/trunk/src/libraries/util/Serialise.h (modified) * code/trunk/src/libraries/util/SubString.h (modified) * code/trunk/src/modules/CMakeLists.txt (modified) * code/trunk/src/modules/docking (copied) * code/trunk/src/modules/docking/CMakeLists.txt (copied) * code/trunk/src/modules/docking/Dock.cc (copied) * code/trunk/src/modules/docking/Dock.h (copied) * code/trunk/src/modules/docking/DockToShip.cc (copied) * code/trunk/src/modules/docking/DockToShip.h (copied) * code/trunk/src/modules/docking/DockingAnimation.cc (copied) * code/trunk/src/modules/docking/DockingAnimation.h (copied) * code/trunk/src/modules/docking/DockingController.cc (copied) * code/trunk/src/modules/docking/DockingController.h (copied) * code/trunk/src/modules/docking/DockingEffect.cc (copied) * code/trunk/src/modules/docking/DockingEffect.h (copied) * code/trunk/src/modules/docking/DockingPrecompiledHeaders.h (copied) * code/trunk/src/modules/docking/DockingPrereqs.h (copied) * code/trunk/src/modules/docking/DockingTarget.cc (copied) * code/trunk/src/modules/docking/DockingTarget.h (copied) * code/trunk/src/modules/docking/MoveToDockingTarget.cc (copied) * code/trunk/src/modules/docking/MoveToDockingTarget.h (copied) * code/trunk/src/modules/gametypes (copied) * code/trunk/src/modules/gametypes/CMakeLists.txt (copied) * code/trunk/src/modules/gametypes/GametypesPrecompiledHeaders.h (copied) * code/trunk/src/modules/gametypes/GametypesPrereqs.h (copied) * code/trunk/src/modules/gametypes/RaceCheckPoint.cc (copied) * code/trunk/src/modules/gametypes/RaceCheckPoint.h (copied) * code/trunk/src/modules/gametypes/SpaceRace.cc (copied) * code/trunk/src/modules/gametypes/SpaceRace.h (copied) * code/trunk/src/modules/notifications/CMakeLists.txt (modified) * code/trunk/src/modules/notifications/Notification.cc (deleted) * code/trunk/src/modules/notifications/Notification.h (deleted) * code/trunk/src/modules/notifications/NotificationDispatcher.cc (modified) * code/trunk/src/modules/notifications/NotificationManager.cc (modified) * code/trunk/src/modules/notifications/NotificationManager.h (modified) * code/trunk/src/modules/notifications/NotificationQueue.cc (modified) * code/trunk/src/modules/notifications/NotificationQueue.h (modified) * code/trunk/src/modules/notifications/NotificationQueueCEGUI.cc (copied) * code/trunk/src/modules/notifications/NotificationQueueCEGUI.h (copied) * code/trunk/src/modules/notifications/dispatchers/SimpleNotification.cc (modified) * code/trunk/src/modules/objects/CMakeLists.txt (modified) * code/trunk/src/modules/objects/ObjectsPrereqs.h (modified) * code/trunk/src/modules/objects/Script.cc (modified) * code/trunk/src/modules/objects/SpaceBoundaries.cc (copied) * code/trunk/src/modules/objects/SpaceBoundaries.h (copied) * code/trunk/src/modules/objects/collisionshapes/BoxCollisionShape.cc (modified) * code/trunk/src/modules/objects/collisionshapes/BoxCollisionShape.h (modified) * code/trunk/src/modules/objects/collisionshapes/ConeCollisionShape.cc (modified) * code/trunk/src/modules/objects/collisionshapes/ConeCollisionShape.h (modified) * code/trunk/src/modules/objects/collisionshapes/PlaneCollisionShape.cc (modified) * code/trunk/src/modules/objects/collisionshapes/PlaneCollisionShape.h (modified) * code/trunk/src/modules/objects/collisionshapes/SphereCollisionShape.cc (modified) * code/trunk/src/modules/objects/collisionshapes/SphereCollisionShape.h (modified) * code/trunk/src/modules/objects/triggers/DistanceMultiTrigger.cc (modified) * code/trunk/src/modules/objects/triggers/DistanceMultiTrigger.h (modified) * code/trunk/src/modules/objects/triggers/DistanceTrigger.cc (modified) * code/trunk/src/modules/objects/triggers/DistanceTrigger.h (modified) * code/trunk/src/modules/objects/triggers/EventTrigger.h (modified) * code/trunk/src/modules/objects/triggers/MultiTrigger.cc (modified) * code/trunk/src/modules/objects/triggers/MultiTriggerContainer.cc (modified) * code/trunk/src/modules/objects/triggers/Trigger.cc (modified) * code/trunk/src/modules/objects/triggers/TriggerBase.cc (modified) * code/trunk/src/modules/objects/triggers/TriggerBase.h (modified) * code/trunk/src/modules/overlays/OverlaysPrereqs.h (modified) * code/trunk/src/modules/overlays/hud/CMakeLists.txt (modified) * code/trunk/src/modules/overlays/hud/GametypeStatus.cc (deleted) * code/trunk/src/modules/overlays/hud/GametypeStatus.h (deleted) * code/trunk/src/modules/overlays/hud/HUDBar.cc (modified) * code/trunk/src/modules/overlays/hud/HUDBar.h (modified) * code/trunk/src/modules/overlays/hud/HUDBoostBar.cc (copied) * code/trunk/src/modules/overlays/hud/HUDBoostBar.h (copied) * code/trunk/src/modules/overlays/hud/HUDNavigation.cc (modified) * code/trunk/src/modules/overlays/hud/HUDSpeedBar.cc (modified) * code/trunk/src/modules/pickup/PickupManager.h (modified) * code/trunk/src/modules/pickup/PickupPrereqs.h (modified) * code/trunk/src/modules/pickup/PickupRepresentation.cc (modified) * code/trunk/src/modules/pickup/items/CMakeLists.txt (modified) * code/trunk/src/modules/pickup/items/ShrinkPickup.cc (copied) * code/trunk/src/modules/pickup/items/ShrinkPickup.h (copied) * code/trunk/src/modules/pong/PongBat.h (modified) * code/trunk/src/modules/portals/CMakeLists.txt (modified) * code/trunk/src/modules/portals/PortalEndPoint.cc (modified) * code/trunk/src/modules/portals/PortalEndPoint.h (modified) * code/trunk/src/modules/portals/PortalLink.cc (modified) * code/trunk/src/modules/portals/PortalLink.h (modified) * code/trunk/src/modules/portals/PortalsPrecompiledHeaders.h (modified) * code/trunk/src/modules/portals/PortalsPrereqs.h (modified) * code/trunk/src/modules/questsystem/QuestDescription.cc (modified) * code/trunk/src/modules/questsystem/QuestEffectBeacon.cc (modified) * code/trunk/src/modules/questsystem/QuestManager.cc (modified) * code/trunk/src/modules/questsystem/QuestManager.h (modified) * code/trunk/src/modules/tetris (copied) * code/trunk/src/modules/tetris/CMakeLists.txt (copied) * code/trunk/src/modules/tetris/Tetris.cc (copied) * code/trunk/src/modules/tetris/Tetris.h (copied) * code/trunk/src/modules/tetris/TetrisCenterpoint.cc (copied) * code/trunk/src/modules/tetris/TetrisCenterpoint.h (copied) * code/trunk/src/modules/tetris/TetrisPrereqs.h (copied) * code/trunk/src/modules/tetris/TetrisStone.cc (copied) * code/trunk/src/modules/tetris/TetrisStone.h (copied) * code/trunk/src/modules/weapons/projectiles/BasicProjectile.cc (copied) * code/trunk/src/modules/weapons/projectiles/BasicProjectile.h (copied) * code/trunk/src/modules/weapons/projectiles/CMakeLists.txt (modified) * code/trunk/src/modules/weapons/projectiles/Projectile.cc (modified) * code/trunk/src/modules/weapons/projectiles/Projectile.h (modified) * code/trunk/src/modules/weapons/projectiles/Rocket.cc (modified) * code/trunk/src/modules/weapons/projectiles/Rocket.h (modified) * code/trunk/src/modules/weapons/projectiles/SimpleRocket.cc (modified) * code/trunk/src/modules/weapons/projectiles/SimpleRocket.h (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/HsW01.cc (modified) * code/trunk/src/modules/weapons/weaponmodes/LaserFire.cc (modified) * code/trunk/src/modules/weapons/weaponmodes/LightningGun.cc (modified) * code/trunk/src/modules/weapons/weaponmodes/RocketFire.cc (modified) * code/trunk/src/modules/weapons/weaponmodes/SimpleRocketFire.cc (modified) * code/trunk/src/orxonox/LevelManager.cc (modified) * code/trunk/src/orxonox/MoodManager.cc (modified) * code/trunk/src/orxonox/MoodManager.h (modified) * code/trunk/src/orxonox/collisionshapes/CollisionShape.cc (modified) * code/trunk/src/orxonox/collisionshapes/CollisionShape.h (modified) * code/trunk/src/orxonox/collisionshapes/CompoundCollisionShape.cc (modified) * code/trunk/src/orxonox/collisionshapes/CompoundCollisionShape.h (modified) * code/trunk/src/orxonox/collisionshapes/WorldEntityCollisionShape.cc (modified) * code/trunk/src/orxonox/controllers/ArtificialController.cc (modified) * code/trunk/src/orxonox/controllers/ArtificialController.h (modified) * code/trunk/src/orxonox/controllers/Controller.h (modified) * code/trunk/src/orxonox/controllers/HumanController.cc (modified) * code/trunk/src/orxonox/controllers/HumanController.h (modified) * code/trunk/src/orxonox/gamestates/GSRoot.cc (modified) * code/trunk/src/orxonox/gamestates/GSRoot.h (modified) * code/trunk/src/orxonox/gametypes/Dynamicmatch.cc (modified) * code/trunk/src/orxonox/gametypes/Dynamicmatch.h (modified) * code/trunk/src/orxonox/gametypes/Gametype.cc (modified) * code/trunk/src/orxonox/gametypes/Gametype.h (modified) * code/trunk/src/orxonox/gametypes/LastTeamStanding.cc (modified) * code/trunk/src/orxonox/graphics/Billboard.cc (modified) * code/trunk/src/orxonox/graphics/Billboard.h (modified) * code/trunk/src/orxonox/graphics/Camera.cc (modified) * code/trunk/src/orxonox/graphics/Camera.h (modified) * code/trunk/src/orxonox/infos/GametypeInfo.cc (modified) * code/trunk/src/orxonox/infos/GametypeInfo.h (modified) * code/trunk/src/orxonox/infos/PlayerInfo.cc (modified) * code/trunk/src/orxonox/infos/PlayerInfo.h (modified) * code/trunk/src/orxonox/interfaces/CMakeLists.txt (modified) * code/trunk/src/orxonox/interfaces/InterfaceCompilation.cc (modified) * code/trunk/src/orxonox/interfaces/NotificationListener.cc (copied) * code/trunk/src/orxonox/interfaces/NotificationListener.h (modified) * code/trunk/src/orxonox/interfaces/PlayerTrigger.h (modified) * code/trunk/src/orxonox/items/Engine.cc (modified) * code/trunk/src/orxonox/items/Engine.h (modified) * code/trunk/src/orxonox/overlays/OrxonoxOverlay.cc (modified) * code/trunk/src/orxonox/overlays/OrxonoxOverlay.h (modified) * code/trunk/src/orxonox/sound/AmbientSound.cc (modified) * code/trunk/src/orxonox/weaponsystem/Munition.cc (modified) * code/trunk/src/orxonox/weaponsystem/WeaponMode.cc (modified) * code/trunk/src/orxonox/weaponsystem/WeaponMode.h (modified) * code/trunk/src/orxonox/weaponsystem/WeaponSlot.cc (modified) * code/trunk/src/orxonox/worldentities/CMakeLists.txt (modified) * code/trunk/src/orxonox/worldentities/CameraPosition.cc (modified) * code/trunk/src/orxonox/worldentities/ControllableEntity.cc (modified) * code/trunk/src/orxonox/worldentities/ControllableEntity.h (modified) * code/trunk/src/orxonox/worldentities/MobileEntity.cc (modified) * code/trunk/src/orxonox/worldentities/MobileEntity.h (modified) * code/trunk/src/orxonox/worldentities/SpaceBoundaries.cc (deleted) * code/trunk/src/orxonox/worldentities/SpaceBoundaries.h (deleted) * code/trunk/src/orxonox/worldentities/SpawnPoint.cc (modified) * code/trunk/src/orxonox/worldentities/WorldEntity.cc (modified) * code/trunk/src/orxonox/worldentities/pawns/Pawn.cc (modified) * code/trunk/src/orxonox/worldentities/pawns/Pawn.h (modified) * code/trunk/src/orxonox/worldentities/pawns/SpaceShip.cc (modified) * code/trunk/src/orxonox/worldentities/pawns/SpaceShip.h (modified) Merging presentation branch back into trunk. There are many new ... Sun, 22 May 2011 08:41:20 GMT landauf [8528] * code/trunk/data/levels/templates/lodInformation.oxt (modified) disable LOD for some of the debris meshes which cause a crash on old ... Wed, 18 May 2011 08:55:36 GMT dafrick [8498] * code/trunk/data/levels/earth.oxw (modified) * code/trunk/data/levels/planets.oxw (modified) Removing some tags because the cause warnings for now, might be re- ... Mon, 16 May 2011 19:01:09 GMT youngk [8496] * code/trunk/data/levels/earth.oxw (modified) * code/trunk/data/levels/planets.oxw (modified) Adjusted atmosphere size and added collision damage to planets. Thu, 12 May 2011 20:52:39 GMT youngk [8472] * code/trunk/data/levels/earth.oxw (modified) Added portals to earth level. I could not activate the way back (from ... Thu, 12 May 2011 14:00:07 GMT smerkli [8465] * code/trunk/data/levels/presentationFS11.oxw (modified) worked on the presentation level Thu, 12 May 2011 12:48:53 GMT smerkli [8462] * code/trunk/data/levels/presentationFS11.oxw (modified) added presentation level Thu, 12 May 2011 12:38:49 GMT smerkli [8461] * code/trunk/data/levels/presentationFS11.oxw (copied) * code/trunk/src/orxonox/worldentities/SpaceBoundaries.cc (modified) a little less verbosity, a little more action please :D Thu, 12 May 2011 12:23:45 GMT smerkli [8458] * code/trunk (modified) * code/trunk/data/levels/myTestLevel.oxw (copied) * code/trunk/src/orxonox/worldentities/CMakeLists.txt (modified) * code/trunk/src/orxonox/worldentities/SpaceBoundaries.cc (copied) * code/trunk/src/orxonox/worldentities/SpaceBoundaries.h (copied) merged spaceboundaries Thu, 12 May 2011 11:51:18 GMT FelixSchulthess [8457] * code/trunk (modified) * code/trunk/data/levels/portals.oxw (copied) * code/trunk/src/modules/CMakeLists.txt (modified) * code/trunk/src/modules/objects/triggers/MultiTrigger.h (modified) * code/trunk/src/modules/portals (copied) * code/trunk/src/modules/portals/CMakeLists.txt (copied) * code/trunk/src/modules/portals/PortalEndPoint.cc (copied) * code/trunk/src/modules/portals/PortalEndPoint.h (copied) * code/trunk/src/modules/portals/PortalLink.cc (copied) * code/trunk/src/modules/portals/PortalLink.h (copied) * code/trunk/src/modules/portals/PortalsPrecompiledHeaders.h (copied) * code/trunk/src/modules/portals/PortalsPrereqs.h (copied) merged portals branch into trunk Mon, 09 May 2011 16:24:21 GMT youngk [8438] * code/trunk/data/levels/earth.oxw (modified) * code/trunk/data/levels/planets.oxw (modified) Update to planet levels to support new meshes. Tue, 03 May 2011 19:48:01 GMT youngk [8398] * code/trunk/data/levels/earth.oxw (added) * code/trunk/data/levels/templates/spaceshipHXYSL.oxt (modified) Added 1to100 scale model of earth, complete with gravity. Mon, 02 May 2011 21:53:18 GMT youngk [8392] * code/trunk/data/levels/planets.oxw (modified) Planets now have collision shapes and gravitational pull. Have fun. Mon, 02 May 2011 14:35:08 GMT youngk [8385] * code/trunk/data/levels/planets.oxw (modified) Man, Kevin... If you commit something, then please commit the working ... Mon, 02 May 2011 14:27:15 GMT youngk [8384] * code/trunk/data/levels/planets.oxw (modified) Made planet level work. Yet again... Mon, 02 May 2011 13:45:14 GMT youngk [8380] * code/trunk/data/levels/planets.oxw (modified) Updated and cleaned planet level. Thu, 28 Apr 2011 05:15:14 GMT rgrieder [8351] * code/trunk/CMakeLists.txt (modified) * code/trunk/INSTALL (modified) * code/trunk/bin/CMakeLists.txt (modified) * code/trunk/bin/client1.bat.in (modified) * code/trunk/bin/client2.bat.in (modified) * code/trunk/bin/dedicated.bat.in (modified) * code/trunk/bin/dedicatedClient.bat.in (modified) * code/trunk/bin/masterserver.bat.in (modified) * code/trunk/bin/masterserver.in (modified) * code/trunk/bin/run.bat.in (modified) * code/trunk/bin/server.bat.in (modified) * code/trunk/bin/standalone.bat.in (modified) * code/trunk/bin/vld.ini.in (modified) * code/trunk/cmake/BundleConfig.cmake (copied) * code/trunk/cmake/CompilerConfig.cmake (modified) * code/trunk/cmake/CompilerConfigGCC.cmake (modified) * code/trunk/cmake/CompilerConfigMSVC.cmake (modified) * code/trunk/cmake/InstallCheck.cmake (copied) * code/trunk/cmake/InstallConfig.cmake (modified) * code/trunk/cmake/LibraryConfig.cmake (modified) * code/trunk/cmake/LibraryConfigApple.cmake (deleted) * code/trunk/cmake/LibraryConfigTardis.cmake (modified) * code/trunk/cmake/PackageConfig.cmake (modified) * code/trunk/cmake/PackageConfigMSVC.cmake (modified) * code/trunk/cmake/PackageConfigMinGW.cmake (modified) * code/trunk/cmake/PackageConfigOSX.cmake (copied) * code/trunk/cmake/PrepareDevBundle.cmake (copied) * code/trunk/cmake/tools/CheckOGREPlugins.cmake (modified) * code/trunk/cmake/tools/CheckPackageVersion.cmake (copied) * code/trunk/cmake/tools/FindALUT.cmake (modified) * code/trunk/cmake/tools/FindCEGUI.cmake (modified) * code/trunk/cmake/tools/FindLua.cmake (deleted) * code/trunk/cmake/tools/FindLua5.1.cmake (copied) * code/trunk/cmake/tools/FindOGRE.cmake (modified) * code/trunk/cmake/tools/FindOgg.cmake (modified) * code/trunk/cmake/tools/FindPOCO.cmake (modified) * code/trunk/cmake/tools/FindVorbis.cmake (modified) * code/trunk/cmake/tools/GenerateToluaBindings.cmake (modified) * code/trunk/cmake/tools/TargetUtilities.cmake (modified) * code/trunk/contrib/CMakeLists.txt (copied) * code/trunk/contrib/orxonox.desktop (modified) * code/trunk/contrib/orxonox.manpage.xml (modified) * code/trunk/contrib/orxonox.png (copied) * code/trunk/contrib/orxonox_old.svg (copied) * code/trunk/data/CMakeLists.txt (modified) * code/trunk/data/DataInstallScript.cmake (deleted) * code/trunk/data/gui/scripts/AudioMenu.lua (modified) * code/trunk/data/gui/scripts/GUITools.lua (modified) * code/trunk/data/gui/scripts/InitialiseGUI.lua (modified) * code/trunk/data/gui/scripts/NotificationLayer.lua (modified) * code/trunk/data/gui/scripts/SettingsMenu.lua (modified) * code/trunk/data/levels/lastTeamStandingII.oxw (modified) * code/trunk/data/levels/planets.oxw (copied) * code/trunk/data/mac (copied) * code/trunk/data/mac/English.lproj (copied) * code/trunk/data/mac/English.lproj/InfoPlist.strings (copied) * code/trunk/data/mac/English.lproj/MainMenu.nib (copied) * code/trunk/data/mac/English.lproj/MainMenu.nib/designable.nib (copied) * code/trunk/data/mac/English.lproj/MainMenu.nib/keyedobjects.nib (copied) * code/trunk/data/mac/English.lproj/MainMenu.xib (copied) * code/trunk/data/mac/Icon.icns (copied) * code/trunk/data/mac/Orxonox-Info.plist (copied) * code/trunk/data/overlays/lastTeamStandingHUD.oxo (modified) * code/trunk/doc/api/doxy.config.in (modified) * code/trunk/doc/api/groups/Notifications.dox (modified) * code/trunk/doc/api/groups/Pickup.dox (modified) * code/trunk/doc/api/groups/Questsystem.dox (modified) * code/trunk/doc/api/groups/Triggers.dox (modified) * code/trunk/src/CMakeLists.txt (modified) * code/trunk/src/Orxonox.cc (modified) * code/trunk/src/OrxonoxConfig.cmake (modified) * code/trunk/src/OrxonoxConfig.h.in (modified) * code/trunk/src/OrxonoxMac.h (copied) * code/trunk/src/OrxonoxMac.mm (copied) * code/trunk/src/SpecialConfig.h.in (modified) * code/trunk/src/external/CMakeLists.txt (modified) * code/trunk/src/external/bullet/Bullet-C-Api.h (modified) * code/trunk/src/external/bullet/BulletCollision/BroadphaseCollision/btAxisSweep3.h (modified) * code/trunk/src/external/bullet/BulletCollision/BroadphaseCollision/btBroadphaseInterface.h (modified) * code/trunk/src/external/bullet/BulletCollision/BroadphaseCollision/btBroadphaseProxy.h (modified) * code/trunk/src/external/bullet/BulletCollision/BroadphaseCollision/btDbvt.cpp (modified) * code/trunk/src/external/bullet/BulletCollision/BroadphaseCollision/btDbvt.h (modified) * code/trunk/src/external/bullet/BulletCollision/BroadphaseCollision/btDbvtBroadphase.cpp (modified) * code/trunk/src/external/bullet/BulletCollision/BroadphaseCollision/btDbvtBroadphase.h (modified) * code/trunk/src/external/bullet/BulletCollision/BroadphaseCollision/btDispatcher.h (modified) * code/trunk/src/external/bullet/BulletCollision/BroadphaseCollision/btMultiSapBroadphase.h (modified) * code/trunk/src/external/bullet/BulletCollision/BroadphaseCollision/btOverlappingPairCache.cpp (modified) * code/trunk/src/external/bullet/BulletCollision/BroadphaseCollision/btOverlappingPairCache.h (modified) * code/trunk/src/external/bullet/BulletCollision/BroadphaseCollision/btQuantizedBvh.cpp (modified) * code/trunk/src/external/bullet/BulletCollision/BroadphaseCollision/btQuantizedBvh.h (modified) * code/trunk/src/external/bullet/BulletCollision/BroadphaseCollision/btSimpleBroadphase.cpp (modified) * code/trunk/src/external/bullet/BulletCollision/BroadphaseCollision/btSimpleBroadphase.h (modified) * code/trunk/src/external/bullet/BulletCollision/CMakeLists.txt (modified) * code/trunk/src/external/bullet/BulletCollision/CollisionDispatch/SphereTriangleDetector.cpp (modified) * code/trunk/src/external/bullet/BulletCollision/CollisionDispatch/SphereTriangleDetector.h (modified) * code/trunk/src/external/bullet/BulletCollision/CollisionDispatch/btBox2dBox2dCollisionAlgorithm.cpp (copied) * code/trunk/src/external/bullet/BulletCollision/CollisionDispatch/btBox2dBox2dCollisionAlgorithm.h (copied) * code/trunk/src/external/bullet/BulletCollision/CollisionDispatch/btBoxBoxCollisionAlgorithm.cpp (modified) * code/trunk/src/external/bullet/BulletCollision/CollisionDispatch/btBoxBoxDetector.cpp (modified) * code/trunk/src/external/bullet/BulletCollision/CollisionDispatch/btCollisionDispatcher.cpp (modified) * code/trunk/src/external/bullet/BulletCollision/CollisionDispatch/btCollisionDispatcher.h (modified) * code/trunk/src/external/bullet/BulletCollision/CollisionDispatch/btCollisionObject.cpp (modified) * code/trunk/src/external/bullet/BulletCollision/CollisionDispatch/btCollisionObject.h (modified) * code/trunk/src/external/bullet/BulletCollision/CollisionDispatch/btCollisionWorld.cpp (modified) * code/trunk/src/external/bullet/BulletCollision/CollisionDispatch/btCollisionWorld.h (modified) * code/trunk/src/external/bullet/BulletCollision/CollisionDispatch/btCompoundCollisionAlgorithm.cpp (modified) * code/trunk/src/external/bullet/BulletCollision/CollisionDispatch/btConvex2dConvex2dAlgorithm.cpp (copied) * code/trunk/src/external/bullet/BulletCollision/CollisionDispatch/btConvex2dConvex2dAlgorithm.h (copied) * code/trunk/src/external/bullet/BulletCollision/CollisionDispatch/btConvexConcaveCollisionAlgorithm.cpp (modified) * code/trunk/src/external/bullet/BulletCollision/CollisionDispatch/btConvexConvexAlgorithm.cpp (modified) * code/trunk/src/external/bullet/BulletCollision/CollisionDispatch/btConvexConvexAlgorithm.h (modified) * code/trunk/src/external/bullet/BulletCollision/CollisionDispatch/btConvexPlaneCollisionAlgorithm.cpp (modified) * code/trunk/src/external/bullet/BulletCollision/CollisionDispatch/btConvexPlaneCollisionAlgorithm.h (modified) * code/trunk/src/external/bullet/BulletCollision/CollisionDispatch/btDefaultCollisionConfiguration.cpp (modified) * code/trunk/src/external/bullet/BulletCollision/CollisionDispatch/btDefaultCollisionConfiguration.h (modified) * code/trunk/src/external/bullet/BulletCollision/CollisionDispatch/btGhostObject.h (modified) * code/trunk/src/external/bullet/BulletCollision/CollisionDispatch/btInternalEdgeUtility.cpp (copied) * code/trunk/src/external/bullet/BulletCollision/CollisionDispatch/btInternalEdgeUtility.h (copied) * code/trunk/src/external/bullet/BulletCollision/CollisionDispatch/btManifoldResult.cpp (modified) * code/trunk/src/external/bullet/BulletCollision/CollisionDispatch/btManifoldResult.h (modified) * code/trunk/src/external/bullet/BulletCollision/CollisionDispatch/btSimulationIslandManager.cpp (modified) * code/trunk/src/external/bullet/BulletCollision/CollisionDispatch/btSphereTriangleCollisionAlgorithm.cpp (modified) * code/trunk/src/external/bullet/BulletCollision/CollisionDispatch/btUnionFind.cpp (modified) * code/trunk/src/external/bullet/BulletCollision/CollisionDispatch/btUnionFind.h (modified) * code/trunk/src/external/bullet/BulletCollision/CollisionShapes/btBox2dShape.cpp (copied) * code/trunk/src/external/bullet/BulletCollision/CollisionShapes/btBox2dShape.h (copied) * code/trunk/src/external/bullet/BulletCollision/CollisionShapes/btBoxShape.cpp (modified) * code/trunk/src/external/bullet/BulletCollision/CollisionShapes/btBoxShape.h (modified) * code/trunk/src/external/bullet/BulletCollision/CollisionShapes/btBvhTriangleMeshShape.cpp (modified) * code/trunk/src/external/bullet/BulletCollision/CollisionShapes/btBvhTriangleMeshShape.h (modified) * code/trunk/src/external/bullet/BulletCollision/CollisionShapes/btCapsuleShape.cpp (modified) * code/trunk/src/external/bullet/BulletCollision/CollisionShapes/btCapsuleShape.h (modified) * code/trunk/src/external/bullet/BulletCollision/CollisionShapes/btCollisionMargin.h (modified) * code/trunk/src/external/bullet/BulletCollision/CollisionShapes/btCollisionShape.cpp (modified) * code/trunk/src/external/bullet/BulletCollision/CollisionShapes/btCollisionShape.h (modified) * code/trunk/src/external/bullet/BulletCollision/CollisionShapes/btCompoundShape.cpp (modified) * code/trunk/src/external/bullet/BulletCollision/CollisionShapes/btCompoundShape.h (modified) * code/trunk/src/external/bullet/BulletCollision/CollisionShapes/btConcaveShape.cpp (modified) * code/trunk/src/external/bullet/BulletCollision/CollisionShapes/btConcaveShape.h (modified) * code/trunk/src/external/bullet/BulletCollision/CollisionShapes/btConeShape.cpp (modified) * code/trunk/src/external/bullet/BulletCollision/CollisionShapes/btConeShape.h (modified) * code/trunk/src/external/bullet/BulletCollision/CollisionShapes/btConvex2dShape.cpp (copied) * code/trunk/src/external/bullet/BulletCollision/CollisionShapes/btConvex2dShape.h (copied) * code/trunk/src/external/bullet/BulletCollision/CollisionShapes/btConvexHullShape.cpp (modified) * code/trunk/src/external/bullet/BulletCollision/CollisionShapes/btConvexHullShape.h (modified) * code/trunk/src/external/bullet/BulletCollision/CollisionShapes/btConvexInternalShape.cpp (modified) * code/trunk/src/external/bullet/BulletCollision/CollisionShapes/btConvexInternalShape.h (modified) * code/trunk/src/external/bullet/BulletCollision/CollisionShapes/btConvexPointCloudShape.cpp (modified) * code/trunk/src/external/bullet/BulletCollision/CollisionShapes/btConvexPointCloudShape.h (modified) * code/trunk/src/external/bullet/BulletCollision/CollisionShapes/btConvexShape.cpp (modified) * code/trunk/src/external/bullet/BulletCollision/CollisionShapes/btConvexShape.h (modified) * code/trunk/src/external/bullet/BulletCollision/CollisionShapes/btConvexTriangleMeshShape.cpp (modified) * code/trunk/src/external/bullet/BulletCollision/CollisionShapes/btConvexTriangleMeshShape.h (modified) * code/trunk/src/external/bullet/BulletCollision/CollisionShapes/btCylinderShape.cpp (modified) * code/trunk/src/external/bullet/BulletCollision/CollisionShapes/btCylinderShape.h (modified) * code/trunk/src/external/bullet/BulletCollision/CollisionShapes/btEmptyShape.cpp (modified) * code/trunk/src/external/bullet/BulletCollision/CollisionShapes/btEmptyShape.h (modified) * code/trunk/src/external/bullet/BulletCollision/CollisionShapes/btHeightfieldTerrainShape.cpp (modified) * code/trunk/src/external/bullet/BulletCollision/CollisionShapes/btHeightfieldTerrainShape.h (modified) * code/trunk/src/external/bullet/BulletCollision/CollisionShapes/btMaterial.h (modified) * code/trunk/src/external/bullet/BulletCollision/CollisionShapes/btMinkowskiSumShape.cpp (modified) * code/trunk/src/external/bullet/BulletCollision/CollisionShapes/btMinkowskiSumShape.h (modified) * code/trunk/src/external/bullet/BulletCollision/CollisionShapes/btMultiSphereShape.cpp (modified) * code/trunk/src/external/bullet/BulletCollision/CollisionShapes/btMultiSphereShape.h (modified) * code/trunk/src/external/bullet/BulletCollision/CollisionShapes/btMultimaterialTriangleMeshShape.cpp (modified) * code/trunk/src/external/bullet/BulletCollision/CollisionShapes/btMultimaterialTriangleMeshShape.h (modified) * code/trunk/src/external/bullet/BulletCollision/CollisionShapes/btOptimizedBvh.cpp (modified) * code/trunk/src/external/bullet/BulletCollision/CollisionShapes/btOptimizedBvh.h (modified) * code/trunk/src/external/bullet/BulletCollision/CollisionShapes/btPolyhedralConvexShape.cpp (modified) * code/trunk/src/external/bullet/BulletCollision/CollisionShapes/btPolyhedralConvexShape.h (modified) * code/trunk/src/external/bullet/BulletCollision/CollisionShapes/btScaledBvhTriangleMeshShape.cpp (modified) * code/trunk/src/external/bullet/BulletCollision/CollisionShapes/btScaledBvhTriangleMeshShape.h (modified) * code/trunk/src/external/bullet/BulletCollision/CollisionShapes/btShapeHull.cpp (modified) * code/trunk/src/external/bullet/BulletCollision/CollisionShapes/btShapeHull.h (modified) * code/trunk/src/external/bullet/BulletCollision/CollisionShapes/btSphereShape.cpp (modified) * code/trunk/src/external/bullet/BulletCollision/CollisionShapes/btSphereShape.h (modified) * code/trunk/src/external/bullet/BulletCollision/CollisionShapes/btStaticPlaneShape.cpp (modified) * code/trunk/src/external/bullet/BulletCollision/CollisionShapes/btStaticPlaneShape.h (modified) * code/trunk/src/external/bullet/BulletCollision/CollisionShapes/btStridingMeshInterface.cpp (modified) * code/trunk/src/external/bullet/BulletCollision/CollisionShapes/btStridingMeshInterface.h (modified) * code/trunk/src/external/bullet/BulletCollision/CollisionShapes/btTetrahedronShape.cpp (modified) * code/trunk/src/external/bullet/BulletCollision/CollisionShapes/btTetrahedronShape.h (modified) * code/trunk/src/external/bullet/BulletCollision/CollisionShapes/btTriangleBuffer.cpp (modified) * code/trunk/src/external/bullet/BulletCollision/CollisionShapes/btTriangleBuffer.h (modified) * code/trunk/src/external/bullet/BulletCollision/CollisionShapes/btTriangleCallback.cpp (modified) * code/trunk/src/external/bullet/BulletCollision/CollisionShapes/btTriangleCallback.h (modified) * code/trunk/src/external/bullet/BulletCollision/CollisionShapes/btTriangleIndexVertexArray.cpp (modified) * code/trunk/src/external/bullet/BulletCollision/CollisionShapes/btTriangleIndexVertexArray.h (modified) * code/trunk/src/external/bullet/BulletCollision/CollisionShapes/btTriangleIndexVertexMaterialArray.cpp (modified) * code/trunk/src/external/bullet/BulletCollision/CollisionShapes/btTriangleIndexVertexMaterialArray.h (modified) * code/trunk/src/external/bullet/BulletCollision/CollisionShapes/btTriangleInfoMap.h (copied) * code/trunk/src/external/bullet/BulletCollision/CollisionShapes/btTriangleMesh.cpp (modified) * code/trunk/src/external/bullet/BulletCollision/CollisionShapes/btTriangleMesh.h (modified) * code/trunk/src/external/bullet/BulletCollision/CollisionShapes/btTriangleMeshShape.cpp (modified) * code/trunk/src/external/bullet/BulletCollision/CollisionShapes/btTriangleMeshShape.h (modified) * code/trunk/src/external/bullet/BulletCollision/CollisionShapes/btTriangleShape.h (modified) * code/trunk/src/external/bullet/BulletCollision/CollisionShapes/btUniformScalingShape.cpp (modified) * code/trunk/src/external/bullet/BulletCollision/CollisionShapes/btUniformScalingShape.h (modified) * code/trunk/src/external/bullet/BulletCollision/Gimpact (deleted) * code/trunk/src/external/bullet/BulletCollision/NarrowPhaseCollision/btContinuousConvexCollision.cpp (modified) * code/trunk/src/external/bullet/BulletCollision/NarrowPhaseCollision/btConvexCast.h (modified) * code/trunk/src/external/bullet/BulletCollision/NarrowPhaseCollision/btConvexPenetrationDepthSolver.h (modified) * code/trunk/src/external/bullet/BulletCollision/NarrowPhaseCollision/btDiscreteCollisionDetectorInterface.h (modified) * code/trunk/src/external/bullet/BulletCollision/NarrowPhaseCollision/btGjkEpa2.cpp (modified) * code/trunk/src/external/bullet/BulletCollision/NarrowPhaseCollision/btGjkEpa2.h (modified) * code/trunk/src/external/bullet/BulletCollision/NarrowPhaseCollision/btGjkEpaPenetrationDepthSolver.cpp (modified) * code/trunk/src/external/bullet/BulletCollision/NarrowPhaseCollision/btGjkEpaPenetrationDepthSolver.h (modified) * code/trunk/src/external/bullet/BulletCollision/NarrowPhaseCollision/btGjkPairDetector.cpp (modified) * code/trunk/src/external/bullet/BulletCollision/NarrowPhaseCollision/btGjkPairDetector.h (modified) * code/trunk/src/external/bullet/BulletCollision/NarrowPhaseCollision/btManifoldPoint.h (modified) * code/trunk/src/external/bullet/BulletCollision/NarrowPhaseCollision/btMinkowskiPenetrationDepthSolver.cpp (modified) * code/trunk/src/external/bullet/BulletCollision/NarrowPhaseCollision/btMinkowskiPenetrationDepthSolver.h (modified) * code/trunk/src/external/bullet/BulletCollision/NarrowPhaseCollision/btPersistentManifold.cpp (modified) * code/trunk/src/external/bullet/BulletCollision/NarrowPhaseCollision/btPersistentManifold.h (modified) * code/trunk/src/external/bullet/BulletCollision/NarrowPhaseCollision/btPointCollector.h (modified) * code/trunk/src/external/bullet/BulletCollision/NarrowPhaseCollision/btSubSimplexConvexCast.cpp (modified) * code/trunk/src/external/bullet/BulletCollision/NarrowPhaseCollision/btVoronoiSimplexSolver.cpp (modified) * code/trunk/src/external/bullet/BulletCollision/NarrowPhaseCollision/btVoronoiSimplexSolver.h (modified) * code/trunk/src/external/bullet/BulletDynamics/CMakeLists.txt (modified) * code/trunk/src/external/bullet/BulletDynamics/Character/btCharacterControllerInterface.h (modified) * code/trunk/src/external/bullet/BulletDynamics/Character/btKinematicCharacterController.cpp (modified) * code/trunk/src/external/bullet/BulletDynamics/Character/btKinematicCharacterController.h (modified) * code/trunk/src/external/bullet/BulletDynamics/ConstraintSolver/btConeTwistConstraint.cpp (modified) * code/trunk/src/external/bullet/BulletDynamics/ConstraintSolver/btConeTwistConstraint.h (modified) * code/trunk/src/external/bullet/BulletDynamics/ConstraintSolver/btContactConstraint.cpp (modified) * code/trunk/src/external/bullet/BulletDynamics/ConstraintSolver/btContactConstraint.h (modified) * code/trunk/src/external/bullet/BulletDynamics/ConstraintSolver/btContactSolverInfo.h (modified) * code/trunk/src/external/bullet/BulletDynamics/ConstraintSolver/btGeneric6DofConstraint.cpp (modified) * code/trunk/src/external/bullet/BulletDynamics/ConstraintSolver/btGeneric6DofConstraint.h (modified) * code/trunk/src/external/bullet/BulletDynamics/ConstraintSolver/btGeneric6DofSpringConstraint.cpp (copied) * code/trunk/src/external/bullet/BulletDynamics/ConstraintSolver/btGeneric6DofSpringConstraint.h (copied) * code/trunk/src/external/bullet/BulletDynamics/ConstraintSolver/btHinge2Constraint.cpp (copied) * code/trunk/src/external/bullet/BulletDynamics/ConstraintSolver/btHinge2Constraint.h (copied) * code/trunk/src/external/bullet/BulletDynamics/ConstraintSolver/btHingeConstraint.cpp (modified) * code/trunk/src/external/bullet/BulletDynamics/ConstraintSolver/btHingeConstraint.h (modified) * code/trunk/src/external/bullet/BulletDynamics/ConstraintSolver/btJacobianEntry.h (modified) * code/trunk/src/external/bullet/BulletDynamics/ConstraintSolver/btPoint2PointConstraint.cpp (modified) * code/trunk/src/external/bullet/BulletDynamics/ConstraintSolver/btPoint2PointConstraint.h (modified) * code/trunk/src/external/bullet/BulletDynamics/ConstraintSolver/btSequentialImpulseConstraintSolver.cpp (modified) * code/trunk/src/external/bullet/BulletDynamics/ConstraintSolver/btSequentialImpulseConstraintSolver.h (modified) * code/trunk/src/external/bullet/BulletDynamics/ConstraintSolver/btSliderConstraint.cpp (modified) * code/trunk/src/external/bullet/BulletDynamics/ConstraintSolver/btSliderConstraint.h (modified) * code/trunk/src/external/bullet/BulletDynamics/ConstraintSolver/btSolverBody.h (modified) * code/trunk/src/external/bullet/BulletDynamics/ConstraintSolver/btSolverConstraint.h (modified) * code/trunk/src/external/bullet/BulletDynamics/ConstraintSolver/btTypedConstraint.cpp (modified) * code/trunk/src/external/bullet/BulletDynamics/ConstraintSolver/btTypedConstraint.h (modified) * code/trunk/src/external/bullet/BulletDynamics/ConstraintSolver/btUniversalConstraint.cpp (copied) * code/trunk/src/external/bullet/BulletDynamics/ConstraintSolver/btUniversalConstraint.h (copied) * code/trunk/src/external/bullet/BulletDynamics/Dynamics/Bullet-C-API.cpp (modified) * code/trunk/src/external/bullet/BulletDynamics/Dynamics/btActionInterface.h (modified) * code/trunk/src/external/bullet/BulletDynamics/Dynamics/btContinuousDynamicsWorld.cpp (modified) * code/trunk/src/external/bullet/BulletDynamics/Dynamics/btDiscreteDynamicsWorld.cpp (modified) * code/trunk/src/external/bullet/BulletDynamics/Dynamics/btDiscreteDynamicsWorld.h (modified) * code/trunk/src/external/bullet/BulletDynamics/Dynamics/btDynamicsWorld.h (modified) * code/trunk/src/external/bullet/BulletDynamics/Dynamics/btRigidBody.cpp (modified) * code/trunk/src/external/bullet/BulletDynamics/Dynamics/btRigidBody.h (modified) * code/trunk/src/external/bullet/BulletDynamics/Dynamics/btSimpleDynamicsWorld.cpp (modified) * code/trunk/src/external/bullet/BulletDynamics/Dynamics/btSimpleDynamicsWorld.h (modified) * code/trunk/src/external/bullet/BulletDynamics/Vehicle/btRaycastVehicle.cpp (modified) * code/trunk/src/external/bullet/BulletDynamics/Vehicle/btRaycastVehicle.h (modified) * code/trunk/src/external/bullet/BulletDynamics/Vehicle/btWheelInfo.h (modified) * code/trunk/src/external/bullet/BulletLicense.txt (modified) * code/trunk/src/external/bullet/CMakeLists.txt (modified) * code/trunk/src/external/bullet/ChangeLog (modified) * code/trunk/src/external/bullet/LinearMath/CMakeLists.txt (modified) * code/trunk/src/external/bullet/LinearMath/btAlignedAllocator.cpp (modified) * code/trunk/src/external/bullet/LinearMath/btAlignedObjectArray.h (modified) * code/trunk/src/external/bullet/LinearMath/btConvexHull.cpp (modified) * code/trunk/src/external/bullet/LinearMath/btConvexHull.h (modified) * code/trunk/src/external/bullet/LinearMath/btDefaultMotionState.h (modified) * code/trunk/src/external/bullet/LinearMath/btHashMap.h (modified) * code/trunk/src/external/bullet/LinearMath/btIDebugDraw.h (modified) * code/trunk/src/external/bullet/LinearMath/btMatrix3x3.h (modified) * code/trunk/src/external/bullet/LinearMath/btMinMax.h (modified) * code/trunk/src/external/bullet/LinearMath/btPoolAllocator.h (modified) * code/trunk/src/external/bullet/LinearMath/btQuaternion.h (modified) * code/trunk/src/external/bullet/LinearMath/btQuickprof.cpp (modified) * code/trunk/src/external/bullet/LinearMath/btQuickprof.h (modified) * code/trunk/src/external/bullet/LinearMath/btScalar.h (modified) * code/trunk/src/external/bullet/LinearMath/btSerializer.cpp (copied) * code/trunk/src/external/bullet/LinearMath/btSerializer.h (copied) * code/trunk/src/external/bullet/LinearMath/btTransform.h (modified) * code/trunk/src/external/bullet/LinearMath/btTransformUtil.h (modified) * code/trunk/src/external/bullet/LinearMath/btVector3.h (modified) * code/trunk/src/external/bullet/NEWS (modified) * code/trunk/src/external/bullet/README (modified) * code/trunk/src/external/bullet/VERSION (modified) * code/trunk/src/external/bullet/btBulletCollisionCommon.h (modified) * code/trunk/src/external/bullet/btBulletDynamicsCommon.h (modified) * code/trunk/src/external/bullet/changes_orxonox.diff (modified) * code/trunk/src/external/ceguilua (deleted) * code/trunk/src/external/cpptcl/changes_orxonox.diff (modified) * code/trunk/src/external/cpptcl/cpptcl.cc (modified) * code/trunk/src/external/enet/CMakeLists.txt (modified) * code/trunk/src/external/enet/patches/0001-Add-IPv6-support-to-Enet.patch (modified) * code/trunk/src/external/enet/win32.c (modified) * code/trunk/src/external/ogreceguirenderer/CMakeLists.txt (modified) * code/trunk/src/external/ogreceguirenderer/OgreCEGUIRenderer.cpp (modified) * code/trunk/src/external/ogreceguirenderer/VERSION (modified) * code/trunk/src/external/ogreceguirenderer/changes_orxonox.diff (modified) * code/trunk/src/external/ois/CMakeLists.txt (modified) * code/trunk/src/external/ois/OIS.h (modified) * code/trunk/src/external/ois/OISConfig.h (modified) * code/trunk/src/external/ois/OISInputManager.cpp (modified) * code/trunk/src/external/ois/OISKeyboard.h (modified) * code/trunk/src/external/ois/OISMultiTouch.h (copied) * code/trunk/src/external/ois/OISPrereqs.h (modified) * code/trunk/src/external/ois/ReadMe.txt (modified) * code/trunk/src/external/ois/VERSION (modified) * code/trunk/src/external/ois/changes_orxonox.diff (modified) * code/trunk/src/external/ois/linux/LinuxInputManager.cpp (modified) * code/trunk/src/external/ois/linux/LinuxInputManager.h (modified) * code/trunk/src/external/ois/linux/LinuxJoyStickEvents.cpp (modified) * code/trunk/src/external/ois/linux/LinuxKeyboard.cpp (modified) * code/trunk/src/external/ois/linux/LinuxKeyboard.h (modified) * code/trunk/src/external/ois/linux/LinuxMouse.cpp (modified) * code/trunk/src/external/ois/linux/LinuxPrereqs.h (modified) * code/trunk/src/external/ois/mac/CMakeLists.txt (modified) * code/trunk/src/external/ois/mac/MacHIDManager.cpp (modified) * code/trunk/src/external/ois/mac/MacHIDManager.h (modified) * code/trunk/src/external/ois/mac/MacInputManager.cpp (modified) * code/trunk/src/external/ois/mac/MacJoyStick.cpp (copied) * code/trunk/src/external/ois/mac/MacJoyStick.h (copied) * code/trunk/src/external/ois/mac/MacKeyboard.cpp (modified) * code/trunk/src/external/ois/win32/Win32ForceFeedback.cpp (modified) * code/trunk/src/external/ois/win32/Win32ForceFeedback.h (modified) * code/trunk/src/external/ois/win32/Win32InputManager.cpp (modified) * code/trunk/src/external/ois/win32/Win32InputManager.h (modified) * code/trunk/src/external/ois/win32/Win32JoyStick.cpp (modified) * code/trunk/src/external/ois/win32/Win32JoyStick.h (modified) * code/trunk/src/external/ois/win32/Win32KeyBoard.cpp (modified) * code/trunk/src/external/ois/win32/Win32KeyBoard.h (modified) * code/trunk/src/external/ois/win32/Win32Mouse.cpp (modified) * code/trunk/src/external/ois/win32/Win32Mouse.h (modified) * code/trunk/src/external/ois/win32/Win32Prereqs.h (modified) * code/trunk/src/external/tinyxml/CMakeLists.txt (modified) * code/trunk/src/external/tinyxml/VERSION (modified) * code/trunk/src/external/tinyxml/changes_orxonox.diff (modified) * code/trunk/src/external/tinyxml/ticpp.cpp (modified) * code/trunk/src/external/tinyxml/ticpp.h (modified) * code/trunk/src/external/tolua/CMakeLists.txt (modified) * code/trunk/src/external/tolua/README_ORXONOX (copied) * code/trunk/src/external/tolua/VERSION (modified) * code/trunk/src/external/tolua/all-5.0.lua (deleted) * code/trunk/src/external/tolua/changes_orxonox.diff (modified) * code/trunk/src/external/tolua/lua/package.lua (modified) * code/trunk/src/external/tolua/tolua++.h (deleted) * code/trunk/src/external/tolua/tolua_event.c (deleted) * code/trunk/src/external/tolua/tolua_event.h (deleted) * code/trunk/src/external/tolua/tolua_is.c (deleted) * code/trunk/src/external/tolua/tolua_map.c (deleted) * code/trunk/src/external/tolua/tolua_push.c (deleted) * code/trunk/src/external/tolua/tolua_to.c (deleted) * code/trunk/src/libraries/core/CMakeLists.txt (modified) * code/trunk/src/libraries/core/ConfigValueContainer.cc (modified) * code/trunk/src/libraries/core/Core.cc (modified) * code/trunk/src/libraries/core/CorePrereqs.h (modified) * code/trunk/src/libraries/core/DynLib.cc (modified) * code/trunk/src/libraries/core/DynLib.h (modified) * code/trunk/src/libraries/core/GUIManager.cc (modified) * code/trunk/src/libraries/core/GUIManager.h (modified) * code/trunk/src/libraries/core/Game.cc (modified) * code/trunk/src/libraries/core/GraphicsManager.cc (modified) * code/trunk/src/libraries/core/GraphicsManager.h (modified) * code/trunk/src/libraries/core/Identifier.h (modified) * code/trunk/src/libraries/core/LuaState.cc (modified) * code/trunk/src/libraries/core/LuaState.h (modified) * code/trunk/src/libraries/core/MemoryArchive.cc (deleted) * code/trunk/src/libraries/core/MemoryArchive.h (deleted) * code/trunk/src/libraries/core/OrxonoxClass.h (modified) * code/trunk/src/libraries/core/PathConfig.cc (modified) * code/trunk/src/libraries/core/PathConfig.h (modified) * code/trunk/src/libraries/core/Resource.cc (modified) * code/trunk/src/libraries/core/Resource.h (modified) * code/trunk/src/libraries/core/Super.h (modified) * code/trunk/src/libraries/core/command/ArgumentCompletionFunctions.cc (modified) * code/trunk/src/libraries/core/command/TclThreadManager.cc (modified) * code/trunk/src/libraries/core/input/InputDevice.h (modified) * code/trunk/src/libraries/core/input/InputManager.cc (modified) * code/trunk/src/libraries/core/input/InputState.h (modified) * code/trunk/src/libraries/core/input/KeyBinder.cc (modified) * code/trunk/src/libraries/network/CMakeLists.txt (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/MasterServerComm.cc (modified) * code/trunk/src/libraries/network/MasterServerComm.h (modified) * code/trunk/src/libraries/network/MasterServerProtocol.h (modified) * code/trunk/src/libraries/network/NetworkPrecompiledHeaders.h (modified) * code/trunk/src/libraries/network/NetworkPrereqs.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/FunctionCalls.cc (modified) * code/trunk/src/libraries/network/packet/ServerInformation.cc (modified) * code/trunk/src/libraries/network/packet/ServerInformation.h (modified) * code/trunk/src/libraries/tools/BulletConversions.h (modified) * code/trunk/src/libraries/tools/CMakeLists.txt (modified) * code/trunk/src/libraries/tools/Mesh.cc (modified) * code/trunk/src/libraries/tools/ResourceCollection.cc (modified) * code/trunk/src/libraries/tools/ToolsPrereqs.h (modified) * code/trunk/src/libraries/util/CMakeLists.txt (modified) * code/trunk/src/libraries/util/Convert.h (modified) * code/trunk/src/libraries/util/Exception.cc (modified) * code/trunk/src/libraries/util/ExprParser.cc (modified) * code/trunk/src/libraries/util/ExprParser.h (modified) * code/trunk/src/libraries/util/Math.h (modified) * code/trunk/src/libraries/util/MathConvert.h (modified) * code/trunk/src/libraries/util/SharedPtr.h (modified) * code/trunk/src/libraries/util/SignalHandler.cc (modified) * code/trunk/src/libraries/util/SignalHandler.h (modified) * code/trunk/src/libraries/util/UtilPrereqs.h (modified) * code/trunk/src/modules/designtools/CreateStars.cc (modified) * code/trunk/src/modules/designtools/DesignToolsPrereqs.h (modified) * code/trunk/src/modules/designtools/ScreenshotManager.cc (modified) * code/trunk/src/modules/designtools/SkyboxGenerator.cc (modified) * code/trunk/src/modules/notifications/NotificationsPrereqs.h (modified) * code/trunk/src/modules/objects/ObjectsPrereqs.h (modified) * code/trunk/src/modules/overlays/OverlaysPrereqs.h (modified) * code/trunk/src/modules/overlays/hud/LastTeamStandingInfos.cc (modified) * code/trunk/src/modules/pickup/PickupCollection.h (modified) * code/trunk/src/modules/pickup/PickupPrereqs.h (modified) * code/trunk/src/modules/pong/Pong.h (modified) * code/trunk/src/modules/pong/PongPrereqs.h (modified) * code/trunk/src/modules/questsystem/QuestEffect.cc (modified) * code/trunk/src/modules/questsystem/QuestEffectBeacon.cc (modified) * code/trunk/src/modules/questsystem/QuestsystemPrereqs.h (modified) * code/trunk/src/modules/questsystem/effects/AddReward.cc (modified) * code/trunk/src/modules/questsystem/effects/CMakeLists.txt (modified) * code/trunk/src/modules/weapons/WeaponsPrereqs.h (modified) * code/trunk/src/orxonox-main.vcxproj.user.in (copied) * code/trunk/src/orxonox/CMakeLists.txt (modified) * code/trunk/src/orxonox/MoodManager.cc (modified) * code/trunk/src/orxonox/OrxonoxPrereqs.h (modified) * code/trunk/src/orxonox/PawnManager.cc (modified) * code/trunk/src/orxonox/PawnManager.h (modified) * code/trunk/src/orxonox/controllers/ArtificialController.cc (modified) * code/trunk/src/orxonox/controllers/NewHumanController.cc (modified) * code/trunk/src/orxonox/gametypes/LastTeamStanding.cc (modified) * code/trunk/src/orxonox/gametypes/LastTeamStanding.h (modified) * code/trunk/src/orxonox/graphics/BlinkingBillboard.cc (modified) * code/trunk/src/orxonox/graphics/BlinkingBillboard.h (modified) * code/trunk/src/orxonox/interfaces/PickupCarrier.cc (modified) * code/trunk/src/orxonox/interfaces/PickupListener.cc (modified) * code/trunk/src/orxonox/interfaces/PickupListener.h (modified) * code/trunk/src/orxonox/overlays/OrxonoxOverlay.cc (modified) * code/trunk/src/orxonox/sound/AmbientSound.cc (modified) * code/trunk/src/orxonox/sound/SoundBuffer.cc (modified) * code/trunk/src/orxonox/sound/SoundManager.cc (modified) * code/trunk/src/orxonox/sound/SoundManager.h (modified) * code/trunk/src/orxonox/sound/WorldSound.cc (modified) * code/trunk/src/orxonox/worldentities/pawns/Pawn.cc (modified) Merged kicklib2 branch back to trunk (includes former branches ... Tue, 19 Apr 2011 09:51:31 GMT youngk [8265] * code/trunk/data/levels/planets.oxw (modified) Updated Planets level. Works perfectly now. Mon, 18 Apr 2011 21:51:18 GMT youngk [8263] * code/trunk/data/levels/planets.oxw (modified) Changing planets level Mon, 18 Apr 2011 13:38:20 GMT sladojem [8253] * code/trunk/data/levels/planets.oxw (added) Planets level file updated. Sat, 09 Apr 2011 13:33:06 GMT dafrick [8213] * code/trunk/data/levels/fightInOurBack.oxw (modified) * code/trunk/data/levels/pirateAttack.oxw (modified) * code/trunk/data/levels/theTimeMachine.oxw (modified) * code/trunk/doc/api/groups/Triggers.dox (modified) * code/trunk/src/modules/objects/triggers/DistanceMultiTrigger.cc (modified) * code/trunk/src/modules/objects/triggers/DistanceMultiTrigger.h (modified) * code/trunk/src/modules/objects/triggers/DistanceTrigger.cc (modified) * code/trunk/src/modules/objects/triggers/DistanceTrigger.h (modified) * code/trunk/src/modules/objects/triggers/EventMultiTrigger.h (modified) * code/trunk/src/modules/objects/triggers/EventTrigger.cc (modified) * code/trunk/src/modules/objects/triggers/EventTrigger.h (modified) * code/trunk/src/modules/objects/triggers/MultiTrigger.cc (modified) * code/trunk/src/modules/objects/triggers/MultiTrigger.h (modified) * code/trunk/src/modules/objects/triggers/Trigger.cc (modified) * code/trunk/src/modules/objects/triggers/Trigger.h (modified) * code/trunk/src/modules/objects/triggers/TriggerBase.h (modified) Adding changes made to DistanceTrigger also in trunk. Also ... Sun, 03 Apr 2011 18:05:30 GMT rgrieder [8179] * code/trunk/data/levels/lastTeamStanding.oxw (modified) Hopefully fixed XML parsing errors at startup (can't test right now, ... Sun, 03 Apr 2011 17:56:47 GMT jo [8178] * code/trunk (modified) * code/trunk/data/levels/lastManStanding.oxw (modified) * code/trunk/data/levels/lastTeamStanding.oxw (copied) * code/trunk/data/levels/lastTeamStandingII.oxw (copied) * code/trunk/data/overlays/lastManStandingHUD.oxo (modified) * code/trunk/data/overlays/lastTeamStandingHUD.oxo (copied) * code/trunk/src/modules/overlays/hud/CMakeLists.txt (modified) * code/trunk/src/modules/overlays/hud/GametypeStatus.cc (modified) * code/trunk/src/modules/overlays/hud/GametypeStatus.h (modified) * code/trunk/src/modules/overlays/hud/LastTeamStandingInfos.cc (copied) * code/trunk/src/modules/overlays/hud/LastTeamStandingInfos.h (copied) * code/trunk/src/orxonox/OrxonoxPrereqs.h (modified) * code/trunk/src/orxonox/gametypes/CMakeLists.txt (modified) * code/trunk/src/orxonox/gametypes/Gametype.h (modified) * code/trunk/src/orxonox/gametypes/LastTeamStanding.cc (copied) * code/trunk/src/orxonox/gametypes/LastTeamStanding.h (copied) Merged lastmastanding3 into trunk. There's an xml parsing error that ...