# # ChangeLog for / # # Generated by Trac 1.0.9 # Nov 29, 2024, 10:53:00 AM Sat, 28 May 2011 14:15:12 GMT landauf [8635] * code/branches/presentation/data/particle/Shield.particle (modified) * code/branches/presentation/src/modules/weapons/projectiles/BasicProjectile.cc (modified) the shield effect is now attached to the ship Sat, 28 May 2011 09:19:02 GMT dafrick [8634] * code/branches/tutoriallevel3/src/orxonox/gametypes/Gametype.cc (modified) * code/branches/tutoriallevel3/src/orxonox/gametypes/Gametype.h (modified) * code/branches/tutoriallevel3/src/orxonox/infos/GametypeInfo.cc (modified) * code/branches/tutoriallevel3/src/orxonox/infos/GametypeInfo.h (modified) * code/branches/tutoriallevel3/src/orxonox/interfaces/NotificationListener.cc (modified) Gametype status notifications now working. Sat, 28 May 2011 00:49:58 GMT rgrieder [8633] * code/branches/unity_build/src/BuildUnitsConfigGCC.cmake (copied) * code/branches/unity_build/src/BuildUnitsConfigMSVC.cmake (moved) * code/branches/unity_build/src/OrxonoxConfig.cmake (modified) Optimised build units for MSVC too by splitting the config file in ... Fri, 27 May 2011 21:35:05 GMT dafrick [8632] * code/branches/presentation/src/modules/objects/CMakeLists.txt (modified) * code/branches/presentation/src/modules/objects/ObjectsPrereqs.h (modified) * code/branches/presentation/src/modules/objects/SpaceBoundaries.cc (moved) * code/branches/presentation/src/modules/objects/SpaceBoundaries.h (moved) * code/branches/presentation/src/orxonox/worldentities/CMakeLists.txt (modified) Moving space bounaries into modules/objects Fri, 27 May 2011 21:09:00 GMT dafrick [8631] * code/branches/presentation (modified) * code/branches/presentation/data/levels/spaceRace.oxw (copied) * code/branches/presentation/src/modules/CMakeLists.txt (modified) * code/branches/presentation/src/modules/gametypes (copied) * code/branches/presentation/src/modules/gametypes/CMakeLists.txt (copied) * code/branches/presentation/src/modules/gametypes/GametypesPrecompiledHeaders.h (copied) * code/branches/presentation/src/modules/gametypes/GametypesPrereqs.h (copied) * code/branches/presentation/src/modules/gametypes/RaceCheckPoint.cc (copied) * code/branches/presentation/src/modules/gametypes/RaceCheckPoint.h (copied) * code/branches/presentation/src/modules/gametypes/SpaceRace.cc (copied) * code/branches/presentation/src/modules/gametypes/SpaceRace.h (copied) * code/branches/presentation/src/orxonox/gametypes/Gametype.cc (modified) Merging spacerace branch into presentation branch. Fri, 27 May 2011 21:01:24 GMT dafrick [8630] * code/branches/spacerace/data/levels/spaceRace.oxw (modified) * code/branches/spacerace/src/modules/gametypes/RaceCheckPoint.cc (modified) * code/branches/spacerace/src/modules/gametypes/RaceCheckPoint.h (modified) * code/branches/spacerace/src/modules/gametypes/SpaceRace.cc (modified) * code/branches/spacerace/src/modules/gametypes/SpaceRace.h (modified) Cleanup. Fri, 27 May 2011 20:59:15 GMT rgrieder [8629] * code/branches/unity_build/src/BuildUnitsConfig.cmake (modified) Some more build unit optimisations Fri, 27 May 2011 20:54:34 GMT dafrick [8628] * code/branches/presentation/data/levels/presentationFS11.oxw (modified) * code/branches/presentation/src/modules/portals/PortalEndPoint.cc (modified) * code/branches/presentation/src/modules/portals/PortalEndPoint.h (modified) Some changes in prsentation level. Making PortalEndPoints radar viewable. Fri, 27 May 2011 19:54:03 GMT landauf [8627] * code/branches/presentation/data/gui/scripts/SheetManager.lua (modified) * code/branches/presentation/data/levels/templates/lodInformation.oxt (modified) * code/branches/presentation/src/libraries/core/GUIManager.cc (modified) * code/branches/presentation/src/libraries/core/GUIManager.h (modified) merged revisions 8527-8530 from trunk to presentation branch: - ... Fri, 27 May 2011 17:39:36 GMT rgrieder [8626] * code/branches/unity_build/cmake/tools/BuildUnits.cmake (modified) * code/branches/unity_build/src/BuildUnitsConfig.cmake (modified) Optimised unit builds a little Fri, 27 May 2011 16:28:58 GMT rgrieder [8625] * code/branches/unity_build/src/external/ois/CMakeLists.txt (modified) * code/branches/unity_build/src/external/ois/linux/CMakeLists.txt (modified) * code/branches/unity_build/src/external/ois/mac/CMakeLists.txt (modified) * code/branches/unity_build/src/external/ois/win32/CMakeLists.txt (modified) Enable single build unit compiling for OIS too (doesn't work on OS X ... Fri, 27 May 2011 16:20:34 GMT msalomon [8624] * code/branches/spacerace/src/modules/gametypes/SpaceRace.cc (modified) The last few little changes to the code. Fri, 27 May 2011 15:12:41 GMT rgrieder [8623] * code/branches/unity_build/cmake/tools/BuildUnits.cmake (modified) * code/branches/unity_build/cmake/tools/TargetUtilities.cmake (modified) Disable precompiled header files for targets with a single build unit. Fri, 27 May 2011 03:38:43 GMT rgrieder [8622] * code/branches/unity_build/cmake/tools/BuildUnits.cmake (added) * code/branches/unity_build/cmake/tools/TargetUtilities.cmake (modified) * code/branches/unity_build/src/BuildUnitsConfig.cmake (added) * code/branches/unity_build/src/OrxonoxConfig.cmake (modified) Added implementation of full build units. Please refer to r8569 or ... Fri, 27 May 2011 03:34:48 GMT rgrieder [8621] * code/branches/unity_build/src/orxonox/controllers/DroneController.cc (modified) Addendum to the last commit (r8620): Added missing change (file was ... Fri, 27 May 2011 03:33:04 GMT rgrieder [8620] * code/branches/unity_build/src/orxonox/controllers/AIController.cc (modified) * code/branches/unity_build/src/orxonox/controllers/AIController.h (modified) * code/branches/unity_build/src/orxonox/controllers/DroneController.h (modified) Moved two constants to the class they belong to. Fri, 27 May 2011 03:28:59 GMT rgrieder [8619] * code/branches/unity_build/src/modules/overlays/hud/GametypeFadingMessage.h (modified) * code/branches/unity_build/src/modules/pickup/PickupCollectionIdentifier.h (modified) Fixed include guards. Thu, 26 May 2011 20:30:10 GMT msalomon [8618] * data/trunk/materials/raceCheckPoint.material (added) * data/trunk/models/raceCheckPoint.mesh (added) The new model and material of the check points Thu, 26 May 2011 20:27:55 GMT msalomon [8617] * code/branches/spacerace/data/levels/spaceRace.oxw (modified) * code/branches/spacerace/src/modules/gametypes/RaceCheckPoint.cc (modified) Changed the model of the check point. Thu, 26 May 2011 20:03:32 GMT msalomon [8616] * code/branches/spacerace/data/levels/spaceRace.oxw (modified) * code/branches/spacerace/src/modules/gametypes/RaceCheckPoint.cc (modified) * code/branches/spacerace/src/modules/gametypes/RaceCheckPoint.h (modified) * code/branches/spacerace/src/modules/gametypes/SpaceRace.cc (modified) * code/branches/spacerace/src/modules/gametypes/SpaceRace.h (modified) RaceCheckPoints with a time limit and the version of the level for ... Thu, 26 May 2011 16:01:34 GMT landauf [8615] * code/branches/presentation/src/libraries/core/command/Shell.cc (modified) * code/branches/presentation/src/libraries/util/Math.h (modified) turns out the mod(x,y) function was fucked up all the time. we need ... Thu, 26 May 2011 15:40:16 GMT dafrick [8614] * code/branches/presentation (modified) * code/branches/presentation/data/levels/myTestLevel.oxw (modified) * code/branches/presentation/src/orxonox/graphics/Billboard.cc (modified) * code/branches/presentation/src/orxonox/graphics/Billboard.h (modified) * code/branches/presentation/src/orxonox/worldentities/SpaceBoundaries.cc (modified) * code/branches/presentation/src/orxonox/worldentities/SpaceBoundaries.h (modified) Merging spaceboundaries2 branch into presentation branch. Thu, 26 May 2011 15:23:31 GMT dafrick [8613] * code/branches/spaceboundaries2/src/orxonox/worldentities/SpaceBoundaries.cc (modified) * code/branches/spaceboundaries2/src/orxonox/worldentities/SpaceBoundaries.h (modified) Cleanup. Thu, 26 May 2011 15:16:39 GMT landauf [8612] * code/branches/presentation/src/libraries/network/synchronisable/Serialise.h (modified) * code/branches/presentation/src/orxonox/gametypes/LastTeamStanding.cc (modified) * code/branches/presentation/src/orxonox/weaponsystem/Munition.cc (modified) fixed possible bug in LastTeamStanding Thu, 26 May 2011 15:09:03 GMT landauf [8611] * code/branches/presentation/src/libraries/core/Game.cc (modified) fixed the oldest warning in orxonox Thu, 26 May 2011 15:08:27 GMT kmaurus [8610] * data/trunk/materials/Grid.material (modified) Thu, 26 May 2011 15:08:09 GMT kmaurus [8609] * code/branches/spaceboundaries2/src/orxonox/worldentities/SpaceBoundaries.cc (modified) * code/branches/spaceboundaries2/src/orxonox/worldentities/SpaceBoundaries.h (modified) endversion Thu, 26 May 2011 14:58:18 GMT landauf [8608] * code/branches/presentation/src/orxonox/MoodManager.cc (modified) * code/branches/presentation/src/orxonox/MoodManager.h (modified) * code/branches/presentation/src/orxonox/sound/AmbientSound.cc (modified) removed some redundant code in MoodManager Thu, 26 May 2011 14:38:07 GMT rgrieder [8607] * code/branches/presentation/src/orxonox/worldentities/pawns/SpaceShip.cc (modified) Calling the destructor doesn't really take care of the memory ... Thu, 26 May 2011 14:36:08 GMT kmaurus [8606] * data/trunk/materials/Grid.material (added) Thu, 26 May 2011 14:35:46 GMT dafrick [8605] * code/branches/presentation (modified) * code/branches/presentation/data/levels/portals.oxw (modified) * code/branches/presentation/doc/api/Groups.dox (modified) * code/branches/presentation/doc/api/groups/Portals.dox (copied) * code/branches/presentation/src/modules/portals/PortalEndPoint.cc (modified) * code/branches/presentation/src/modules/portals/PortalEndPoint.h (modified) * code/branches/presentation/src/modules/portals/PortalLink.cc (modified) * code/branches/presentation/src/modules/portals/PortalLink.h (modified) Merging portals2 branch into presentation branch. Thu, 26 May 2011 14:35:18 GMT kmaurus [8604] * code/branches/spaceboundaries2/data/levels/myTestLevel.oxw (modified) * code/branches/spaceboundaries2/doc/api/Groups.dox (modified) * code/branches/spaceboundaries2/src/orxonox/graphics/Billboard.cc (modified) * code/branches/spaceboundaries2/src/orxonox/graphics/Billboard.h (modified) * code/branches/spaceboundaries2/src/orxonox/worldentities/SpaceBoundaries.cc (modified) * code/branches/spaceboundaries2/src/orxonox/worldentities/SpaceBoundaries.h (modified) Thu, 26 May 2011 14:34:54 GMT landauf [8603] * code/branches/presentation/src/libraries/core/ConfigValueContainer.h (modified) * code/branches/presentation/src/libraries/core/CoreIncludes.h (modified) * code/branches/presentation/src/libraries/core/Super.h (modified) * code/branches/presentation/src/libraries/core/command/Functor.h (modified) * code/branches/presentation/src/libraries/util/Convert.h (modified) * code/branches/presentation/src/libraries/util/MultiTypeValue.h (modified) * code/branches/presentation/src/libraries/util/ScopedSingletonManager.h (modified) * code/branches/presentation/src/libraries/util/Serialise.h (modified) removed some parameter names where the parameter is not actually used Thu, 26 May 2011 14:19:25 GMT dafrick [8602] * data/trunk/images/textures/stunweapon.png (added) * data/trunk/materials/stunweapon.material (added) * data/trunk/models/stunweapon.mesh (added) Adding stunweapon model. Thu, 26 May 2011 14:18:12 GMT smerkli [8601] * code/branches/presentation/data/levels/presentationFS11.oxw (modified) presentation level now has docking thingy added Thu, 26 May 2011 13:56:04 GMT dafrick [8600] * code/branches/portals2/src/modules/portals/PortalEndPoint.cc (modified) * code/branches/portals2/src/modules/portals/PortalLink.cc (modified) Some cleanup. Thu, 26 May 2011 13:44:07 GMT anbueche [8599] * code/branches/portals2/data/levels/portals.oxw (modified) * code/branches/portals2/doc/api/groups/Portals.dox (modified) * code/branches/portals2/src/modules/portals/PortalEndPoint.cc (modified) * code/branches/portals2/src/modules/portals/PortalEndPoint.h (modified) * code/branches/portals2/src/modules/portals/PortalLink.cc (modified) * code/branches/portals2/src/modules/portals/PortalLink.h (modified) comments and license added Thu, 26 May 2011 12:56:54 GMT dafrick [8598] * code/branches/presentation/data/levels/templates/lodInformation.oxt (modified) Adding HydroHarvester to lodInformation, to disable LOD. Thu, 26 May 2011 12:29:03 GMT dafrick [8597] * code/branches/presentation (modified) * code/branches/presentation/data/levels/includes/weaponSettingsAssff.oxi (modified) * code/branches/presentation/data/levels/templates/spaceshipAssff.oxt (modified) * code/branches/presentation/data/levels/templates/spaceshipAssff2.oxt (modified) * code/branches/presentation/src/orxonox/worldentities/MobileEntity.cc (modified) * code/branches/presentation/src/orxonox/worldentities/pawns/SpaceShip.cc (modified) * code/branches/presentation/src/orxonox/worldentities/pawns/SpaceShip.h (modified) Merging steering branch into presentation branch. Thu, 26 May 2011 12:22:22 GMT smerkli [8596] * code/branches/presentation/data/levels/presentationFS11.oxw (modified) working on the presentation level Thu, 26 May 2011 12:02:05 GMT dafrick [8595] * code/branches/steering/src/orxonox/worldentities/pawns/SpaceShip.cc (modified) * code/branches/steering/src/orxonox/worldentities/pawns/SpaceShip.h (modified) Cleanup. Replacing tabs with spaces. Thu, 26 May 2011 11:57:01 GMT landauf [8594] * code/branches/presentation/src/libraries/core/Identifier.h (modified) * code/branches/presentation/src/libraries/util/Exception.h (modified) * code/branches/presentation/src/modules/overlays/hud/HUDNavigation.cc (modified) * code/branches/presentation/src/modules/pickup/PickupManager.h (modified) * code/branches/presentation/src/orxonox/worldentities/pawns/SpaceShip.h (modified) fixed a few warnings that were only visible with ... Thu, 26 May 2011 11:53:52 GMT dafrick [8593] * code/branches/presentation/data/levels/emptyLevel.oxw (modified) * code/branches/presentation/data/levels/templates/spaceshipAssff2.oxt (modified) Adjusting Assff2 to fit new engines. Thu, 26 May 2011 11:44:06 GMT dafrick [8592] * code/branches/presentation (modified) * code/branches/presentation/data/levels/includes/weaponSettingsAssff.oxi (modified) * code/branches/presentation/data/levels/includes/weaponSettingsAssff2.oxi (copied) * code/branches/presentation/data/levels/templates/spaceshipAssff2.oxt (copied) * code/branches/presentation/data/particle/weaponflare.particle (copied) * code/branches/presentation/data/particle/weaponshoot.particle (copied) Merging weapons branch into presentation branch. Thu, 26 May 2011 11:38:58 GMT dafrick [8591] * code/branches/weapons/data/levels/emptyLevel.oxw (modified) * code/branches/weapons/data/levels/includes/weaponSettingsAssff.oxi (modified) * code/branches/weapons/data/levels/includes/weaponSettingsAssff2.oxi (added) * code/branches/weapons/data/levels/templates/spaceshipAssff2.oxt (added) Moving new weapon model to Assff2. Thu, 26 May 2011 09:02:55 GMT jonas [8590] * code/branches/weapons/data/particle/weaponflare.particle (added) * code/branches/weapons/data/particle/weaponshoot.particle (added) naechster versuch Wed, 25 May 2011 22:58:09 GMT dafrick [8589] * code/branches/presentation (modified) * code/branches/presentation/data/levels/templates/spaceshipAssff.oxt (modified) * code/branches/presentation/data/levels/templates/spaceshipGhost.oxt (modified) * code/branches/presentation/data/levels/templates/spaceshipH2.oxt (modified) * code/branches/presentation/data/levels/templates/spaceshipHXY.oxt (modified) * code/branches/presentation/data/levels/templates/spaceshipHXYSL.oxt (modified) * code/branches/presentation/data/levels/templates/spaceshipPirate.oxt (modified) * code/branches/presentation/data/levels/templates/spaceshipSwallow.oxt (modified) * code/branches/presentation/data/levels/templates/spaceshipTransporter.oxt (modified) * code/branches/presentation/data/levels/templates/spaceshipTransporterSL.oxt (modified) * code/branches/presentation/src/modules/overlays/hud/HUDSpeedBar.cc (modified) * code/branches/presentation/src/orxonox/controllers/HumanController.cc (modified) * code/branches/presentation/src/orxonox/gametypes/Dynamicmatch.cc (modified) * code/branches/presentation/src/orxonox/gametypes/Dynamicmatch.h (modified) * code/branches/presentation/src/orxonox/items/Engine.cc (modified) * code/branches/presentation/src/orxonox/items/Engine.h (modified) * code/branches/presentation/src/orxonox/worldentities/MobileEntity.cc (modified) * code/branches/presentation/src/orxonox/worldentities/MobileEntity.h (modified) * code/branches/presentation/src/orxonox/worldentities/pawns/SpaceShip.cc (modified) * code/branches/presentation/src/orxonox/worldentities/pawns/SpaceShip.h (modified) Merging bigships branch into presentation branch. Wed, 25 May 2011 22:04:42 GMT dafrick [8588] * code/branches/bigships/src/orxonox/gametypes/Dynamicmatch.cc (modified) * code/branches/bigships/src/orxonox/gametypes/Dynamicmatch.h (modified) * code/branches/bigships/src/orxonox/items/Engine.cc (modified) * code/branches/bigships/src/orxonox/items/Engine.h (modified) * code/branches/bigships/src/orxonox/worldentities/MobileEntity.cc (modified) * code/branches/bigships/src/orxonox/worldentities/MobileEntity.h (modified) * code/branches/bigships/src/orxonox/worldentities/pawns/SpaceShip.cc (modified) * code/branches/bigships/src/orxonox/worldentities/pawns/SpaceShip.h (modified) Converting tabs to spaces. Wed, 25 May 2011 21:44:04 GMT dafrick [8587] * code/branches/presentation/src/orxonox/graphics/Camera.cc (modified) * code/branches/presentation/src/orxonox/graphics/Camera.h (modified) * code/branches/presentation/src/orxonox/worldentities/pawns/SpaceShip.cc (modified) The Camera doesn't need to be a MovableEntity, which also averts ... Wed, 25 May 2011 21:07:46 GMT rgrieder [8586] * code/branches/presentation/src/modules/docking/DockingController.h (modified) * code/branches/presentation/src/modules/docking/DockingPrereqs.h (modified) * code/branches/presentation/src/modules/tetris/Tetris.cc (modified) Fixed MSVC build (dllexport problems) and warnings. Wed, 25 May 2011 21:06:31 GMT rgrieder [8585] * code/branches/presentation/src/libraries/util/SubString.h (modified) Found two more typos in SubString! Wed, 25 May 2011 21:02:50 GMT dafrick [8584] * code/branches/presentation/data/gui/scripts/SheetManager.lua (modified) Apparently this bug was already fixed by landauf in the trunk. So ... Wed, 25 May 2011 20:52:36 GMT dafrick [8583] * code/branches/presentation/src/orxonox/worldentities/pawns/SpaceShip.cc (modified) Fixing possible bug. Wed, 25 May 2011 20:10:09 GMT dafrick [8582] * code/branches/presentation/src/orxonox/worldentities/pawns/SpaceShip.cc (modified) * code/branches/presentation/src/orxonox/worldentities/pawns/SpaceShip.h (modified) Fixing segfault, that occured when a SpaceShip was created without a ... Wed, 25 May 2011 19:42:29 GMT dafrick [8581] * code/branches/presentation/data/gui/scripts/SheetManager.lua (modified) Fixing bug in SheetManager.lua Wed, 25 May 2011 19:41:29 GMT dafrick [8580] * code/branches/presentation (modified) * code/branches/presentation/data/defaultConfig/keybindings.ini (modified) * code/branches/presentation/data/levels/includes/weaponSettingsAssff.oxi (modified) * code/branches/presentation/data/levels/includes/weaponSettingsImmTest.oxi (copied) * code/branches/presentation/data/levels/shieldTest.oxw (copied) * code/branches/presentation/data/levels/templates/spaceshipAssff.oxt (modified) * code/branches/presentation/data/levels/templates/spaceshipImmTest.oxt (copied) * code/branches/presentation/data/particle/Shield.particle (copied) * code/branches/presentation/src/modules/weapons/projectiles/BasicProjectile.cc (copied) * code/branches/presentation/src/modules/weapons/projectiles/BasicProjectile.h (copied) * code/branches/presentation/src/modules/weapons/projectiles/CMakeLists.txt (modified) * code/branches/presentation/src/modules/weapons/projectiles/Projectile.cc (modified) * code/branches/presentation/src/modules/weapons/projectiles/Projectile.h (modified) * code/branches/presentation/src/modules/weapons/projectiles/Rocket.cc (modified) * code/branches/presentation/src/modules/weapons/projectiles/Rocket.h (modified) * code/branches/presentation/src/modules/weapons/projectiles/SimpleRocket.cc (modified) * code/branches/presentation/src/modules/weapons/projectiles/SimpleRocket.h (modified) * code/branches/presentation/src/modules/weapons/weaponmodes/EnergyDrink.cc (modified) * code/branches/presentation/src/modules/weapons/weaponmodes/FusionFire.cc (modified) * code/branches/presentation/src/modules/weapons/weaponmodes/HsW01.cc (modified) * code/branches/presentation/src/modules/weapons/weaponmodes/LaserFire.cc (modified) * code/branches/presentation/src/modules/weapons/weaponmodes/LightningGun.cc (modified) * code/branches/presentation/src/modules/weapons/weaponmodes/RocketFire.cc (modified) * code/branches/presentation/src/modules/weapons/weaponmodes/SimpleRocketFire.cc (modified) * code/branches/presentation/src/orxonox/controllers/Controller.h (modified) * code/branches/presentation/src/orxonox/controllers/HumanController.cc (modified) * code/branches/presentation/src/orxonox/controllers/HumanController.h (modified) * code/branches/presentation/src/orxonox/graphics/Camera.cc (modified) * code/branches/presentation/src/orxonox/graphics/Camera.h (modified) * code/branches/presentation/src/orxonox/items/Engine.cc (modified) * code/branches/presentation/src/orxonox/weaponsystem/WeaponMode.cc (modified) * code/branches/presentation/src/orxonox/weaponsystem/WeaponMode.h (modified) * code/branches/presentation/src/orxonox/worldentities/ControllableEntity.cc (modified) * code/branches/presentation/src/orxonox/worldentities/ControllableEntity.h (modified) * code/branches/presentation/src/orxonox/worldentities/pawns/Pawn.cc (modified) * code/branches/presentation/src/orxonox/worldentities/pawns/Pawn.h (modified) * code/branches/presentation/src/orxonox/worldentities/pawns/SpaceShip.cc (modified) * code/branches/presentation/src/orxonox/worldentities/pawns/SpaceShip.h (modified) Merging game immersion branch into presentation branch. Wed, 25 May 2011 19:28:29 GMT dafrick [8579] * code/branches/presentation/data/defaultConfig/keybindings.ini (modified) * code/branches/presentation/data/levels/includes/weaponSettingsAssff.oxi (modified) * code/branches/presentation/data/levels/includes/weaponSettingsImmTest.oxi (deleted) * code/branches/presentation/data/levels/shieldTest.oxw (deleted) * code/branches/presentation/data/levels/templates/spaceshipAssff.oxt (modified) * code/branches/presentation/data/levels/templates/spaceshipImmTest.oxt (deleted) * code/branches/presentation/data/particle/Shield.particle (deleted) * code/branches/presentation/src/modules/weapons/projectiles/BasicProjectile.cc (deleted) * code/branches/presentation/src/modules/weapons/projectiles/BasicProjectile.h (deleted) * code/branches/presentation/src/modules/weapons/projectiles/CMakeLists.txt (modified) * code/branches/presentation/src/modules/weapons/projectiles/Projectile.cc (modified) * code/branches/presentation/src/modules/weapons/projectiles/Projectile.h (modified) * code/branches/presentation/src/modules/weapons/projectiles/Rocket.cc (modified) * code/branches/presentation/src/modules/weapons/projectiles/Rocket.h (modified) * code/branches/presentation/src/modules/weapons/projectiles/SimpleRocket.cc (modified) * code/branches/presentation/src/modules/weapons/projectiles/SimpleRocket.h (modified) * code/branches/presentation/src/modules/weapons/weaponmodes/EnergyDrink.cc (modified) * code/branches/presentation/src/modules/weapons/weaponmodes/FusionFire.cc (modified) * code/branches/presentation/src/modules/weapons/weaponmodes/HsW01.cc (modified) * code/branches/presentation/src/modules/weapons/weaponmodes/LaserFire.cc (modified) * code/branches/presentation/src/modules/weapons/weaponmodes/LightningGun.cc (modified) * code/branches/presentation/src/modules/weapons/weaponmodes/RocketFire.cc (modified) * code/branches/presentation/src/modules/weapons/weaponmodes/SimpleRocketFire.cc (modified) * code/branches/presentation/src/orxonox/controllers/Controller.h (modified) * code/branches/presentation/src/orxonox/controllers/HumanController.cc (modified) * code/branches/presentation/src/orxonox/controllers/HumanController.h (modified) * code/branches/presentation/src/orxonox/graphics/Camera.cc (modified) * code/branches/presentation/src/orxonox/graphics/Camera.h (modified) * code/branches/presentation/src/orxonox/items/Engine.cc (modified) * code/branches/presentation/src/orxonox/weaponsystem/WeaponMode.cc (modified) * code/branches/presentation/src/orxonox/weaponsystem/WeaponMode.h (modified) * code/branches/presentation/src/orxonox/worldentities/ControllableEntity.cc (modified) * code/branches/presentation/src/orxonox/worldentities/ControllableEntity.h (modified) * code/branches/presentation/src/orxonox/worldentities/pawns/Pawn.cc (modified) * code/branches/presentation/src/orxonox/worldentities/pawns/Pawn.h (modified) * code/branches/presentation/src/orxonox/worldentities/pawns/SpaceShip.cc (modified) * code/branches/presentation/src/orxonox/worldentities/pawns/SpaceShip.h (modified) Reverse merge to revert last, failed, merge. Apparently you can't ... Wed, 25 May 2011 19:22:53 GMT dafrick [8578] * code/branches/presentation/data/defaultConfig/keybindings.ini (modified) * code/branches/presentation/data/levels/includes/weaponSettingsAssff.oxi (modified) * code/branches/presentation/data/levels/includes/weaponSettingsImmTest.oxi (copied) * code/branches/presentation/data/levels/shieldTest.oxw (copied) * code/branches/presentation/data/levels/templates/spaceshipAssff.oxt (modified) * code/branches/presentation/data/levels/templates/spaceshipImmTest.oxt (copied) * code/branches/presentation/data/particle/Shield.particle (copied) * code/branches/presentation/src/modules/weapons/projectiles/BasicProjectile.cc (copied) * code/branches/presentation/src/modules/weapons/projectiles/BasicProjectile.h (copied) * code/branches/presentation/src/modules/weapons/projectiles/CMakeLists.txt (modified) * code/branches/presentation/src/modules/weapons/projectiles/Projectile.cc (modified) * code/branches/presentation/src/modules/weapons/projectiles/Projectile.h (modified) * code/branches/presentation/src/modules/weapons/projectiles/Rocket.cc (modified) * code/branches/presentation/src/modules/weapons/projectiles/Rocket.h (modified) * code/branches/presentation/src/modules/weapons/projectiles/SimpleRocket.cc (modified) * code/branches/presentation/src/modules/weapons/projectiles/SimpleRocket.h (modified) * code/branches/presentation/src/modules/weapons/weaponmodes/EnergyDrink.cc (modified) * code/branches/presentation/src/modules/weapons/weaponmodes/FusionFire.cc (modified) * code/branches/presentation/src/modules/weapons/weaponmodes/HsW01.cc (modified) * code/branches/presentation/src/modules/weapons/weaponmodes/LaserFire.cc (modified) * code/branches/presentation/src/modules/weapons/weaponmodes/LightningGun.cc (modified) * code/branches/presentation/src/modules/weapons/weaponmodes/RocketFire.cc (modified) * code/branches/presentation/src/modules/weapons/weaponmodes/SimpleRocketFire.cc (modified) * code/branches/presentation/src/orxonox/controllers/Controller.h (modified) * code/branches/presentation/src/orxonox/controllers/HumanController.cc (modified) * code/branches/presentation/src/orxonox/controllers/HumanController.h (modified) * code/branches/presentation/src/orxonox/graphics/Camera.cc (modified) * code/branches/presentation/src/orxonox/graphics/Camera.h (modified) * code/branches/presentation/src/orxonox/items/Engine.cc (modified) * code/branches/presentation/src/orxonox/weaponsystem/WeaponMode.cc (modified) * code/branches/presentation/src/orxonox/weaponsystem/WeaponMode.h (modified) * code/branches/presentation/src/orxonox/worldentities/ControllableEntity.cc (modified) * code/branches/presentation/src/orxonox/worldentities/ControllableEntity.h (modified) * code/branches/presentation/src/orxonox/worldentities/pawns/Pawn.cc (modified) * code/branches/presentation/src/orxonox/worldentities/pawns/Pawn.h (modified) * code/branches/presentation/src/orxonox/worldentities/pawns/SpaceShip.cc (modified) * code/branches/presentation/src/orxonox/worldentities/pawns/SpaceShip.h (modified) Merging game immersion branch into presentation branch. Wed, 25 May 2011 19:07:17 GMT dafrick [8577] * code/branches/gameimmersion/data/levels/includes/weaponSettingsAssff.oxi (modified) * code/branches/gameimmersion/data/levels/shieldTest.oxw (moved) * code/branches/gameimmersion/data/levels/templates/spaceshipAssff.oxt (modified) * code/branches/gameimmersion/src/orxonox/graphics/Camera.cc (modified) * code/branches/gameimmersion/src/orxonox/graphics/Camera.h (modified) * code/branches/gameimmersion/src/orxonox/weaponsystem/WeaponMode.cc (modified) * code/branches/gameimmersion/src/orxonox/weaponsystem/WeaponMode.h (modified) * code/branches/gameimmersion/src/orxonox/worldentities/pawns/Pawn.cc (modified) * code/branches/gameimmersion/src/orxonox/worldentities/pawns/Pawn.h (modified) * code/branches/gameimmersion/src/orxonox/worldentities/pawns/SpaceShip.cc (modified) Cleanup. Adding shield and boost shaking to Assff. Wed, 25 May 2011 17:03:45 GMT dafrick [8576] * code/branches/gameimmersion/src/orxonox/controllers/HumanController.cc (modified) * code/branches/gameimmersion/src/orxonox/controllers/HumanController.h (modified) Boost is now truly toggled. Wed, 25 May 2011 17:02:08 GMT dafrick [8575] * code/branches/gameimmersion/src/orxonox/worldentities/pawns/Pawn.cc (modified) * code/branches/gameimmersion/src/orxonox/worldentities/pawns/SpaceShip.cc (modified) * code/branches/gameimmersion/src/orxonox/worldentities/pawns/SpaceShip.h (modified) Replacing tabs with spaces, renaming member variables to conform with ... Wed, 25 May 2011 16:23:51 GMT dafrick [8574] * code/branches/gameimmersion/data/defaultConfig/keybindings.ini (modified) * code/branches/gameimmersion/src/orxonox/controllers/HumanController.cc (modified) * code/branches/gameimmersion/src/orxonox/controllers/HumanController.h (modified) * code/branches/gameimmersion/src/orxonox/worldentities/pawns/SpaceShip.cc (modified) Reverting boost changes. Wed, 25 May 2011 16:08:21 GMT dafrick [8573] * code/branches/spacerace/data/levels/spaceRace.oxw (modified) * code/branches/spacerace/src/modules/gametypes/CMakeLists.txt (modified) * code/branches/spacerace/src/modules/gametypes/SpaceRace.cc (modified) Fixing Space Race. Wed, 25 May 2011 16:08:06 GMT dafrick [8572] * code/branches/spacerace/src/modules/objects/triggers/Trigger.cc (modified) Adding some useful debug output. Wed, 25 May 2011 16:07:35 GMT dafrick [8571] * code/branches/spacerace/src/orxonox/gametypes/Gametype.cc (modified) Fixing possible bug in Gametype. Wed, 25 May 2011 09:02:54 GMT dafrick [8570] * code/branches/presentation/data/levels/presentationFS11.oxw (modified) * code/branches/presentation/data/particle/RingExp.particle (added) * code/branches/presentation/data/particle/RingExp2.particle (added) * code/branches/presentation/data/particle/RingExp3.particle (added) Adding ring explosion particle effect to presentation level. Wed, 25 May 2011 00:20:29 GMT rgrieder [8569] * code/branches/unity_build/cmake/tools/TargetUtilities.cmake (modified) * code/branches/unity_build/src/CMakeLists.txt (modified) * code/branches/unity_build/src/OrxonoxConfig.cmake (modified) Changed binary CMake option DISABLE_BUILD_UNITS to string option ... Tue, 24 May 2011 20:41:43 GMT dafrick [8568] * code/branches/presentation/data/gui/scripts/DockingDialog.lua (modified) * code/branches/presentation/src/modules/docking/DockToShip.cc (modified) * code/branches/presentation/src/modules/docking/DockToShip.h (modified) * code/branches/presentation/src/modules/docking/DockingAnimation.cc (modified) * code/branches/presentation/src/modules/docking/DockingAnimation.h (modified) * code/branches/presentation/src/modules/docking/DockingController.cc (modified) * code/branches/presentation/src/modules/docking/DockingController.h (modified) * code/branches/presentation/src/modules/docking/DockingEffect.cc (modified) * code/branches/presentation/src/modules/docking/DockingTarget.cc (modified) * code/branches/presentation/src/modules/docking/DockingTarget.h (modified) * code/branches/presentation/src/modules/docking/MoveToDockingTarget.cc (modified) Renaming member variables to adhere to styleguide, initialize values, ... Tue, 24 May 2011 20:17:10 GMT dafrick [8567] * code/branches/presentation/src/modules/tetris/Tetris.cc (modified) * code/branches/presentation/src/modules/tetris/Tetris.h (modified) Some simplification. Tue, 24 May 2011 20:12:42 GMT dafrick [8566] * code/branches/presentation/src/modules/tetris/Tetris.cc (modified) * code/branches/presentation/src/modules/tetris/Tetris.h (modified) * code/branches/presentation/src/modules/tetris/TetrisStone.cc (modified) Fixing another bug. Tue, 24 May 2011 19:59:01 GMT dafrick [8565] * code/branches/presentation/src/modules/tetris/Tetris.cc (modified) * code/branches/presentation/src/modules/tetris/Tetris.h (modified) Fixing bug in tetris. Tue, 24 May 2011 19:24:39 GMT dafrick [8564] * code/branches/presentation (modified) * code/branches/presentation/data/levels/tetris.oxw (copied) * code/branches/presentation/src/modules/CMakeLists.txt (modified) * code/branches/presentation/src/modules/pong/PongBat.h (modified) * code/branches/presentation/src/modules/tetris (copied) * code/branches/presentation/src/modules/tetris/CMakeLists.txt (copied) * code/branches/presentation/src/modules/tetris/Tetris.cc (copied) * code/branches/presentation/src/modules/tetris/Tetris.h (copied) * code/branches/presentation/src/modules/tetris/TetrisCenterpoint.cc (copied) * code/branches/presentation/src/modules/tetris/TetrisCenterpoint.h (copied) * code/branches/presentation/src/modules/tetris/TetrisPrereqs.h (copied) * code/branches/presentation/src/modules/tetris/TetrisStone.cc (copied) * code/branches/presentation/src/modules/tetris/TetrisStone.h (copied) Merging tetris branch into presentation branch. Tue, 24 May 2011 19:07:33 GMT dafrick [8563] * code/branches/tetris/src/modules/tetris/Tetris.cc (modified) * code/branches/tetris/src/modules/tetris/Tetris.h (modified) * code/branches/tetris/src/modules/tetris/TetrisStone.cc (modified) * code/branches/tetris/src/modules/tetris/TetrisStone.h (modified) Works now. Tue, 24 May 2011 17:52:02 GMT msalomon [8562] * data/trunk/materials/checkPoint.material (modified) * data/trunk/models/checkPoint.mesh (modified) New check point model and material. Tue, 24 May 2011 14:44:39 GMT dafrick [8561] * code/branches/presentation (modified) * code/branches/presentation/data/gui/layouts/DockingDialog.layout (copied) * code/branches/presentation/data/gui/scripts/DockingDialog.lua (copied) * code/branches/presentation/data/levels/docking.oxw (copied) * code/branches/presentation/src/modules/CMakeLists.txt (modified) * code/branches/presentation/src/modules/docking (copied) * code/branches/presentation/src/modules/docking/CMakeLists.txt (copied) * code/branches/presentation/src/modules/docking/Dock.cc (copied) * code/branches/presentation/src/modules/docking/Dock.h (copied) * code/branches/presentation/src/modules/docking/DockToShip.cc (copied) * code/branches/presentation/src/modules/docking/DockToShip.h (copied) * code/branches/presentation/src/modules/docking/DockingAnimation.cc (copied) * code/branches/presentation/src/modules/docking/DockingAnimation.h (copied) * code/branches/presentation/src/modules/docking/DockingController.cc (copied) * code/branches/presentation/src/modules/docking/DockingController.h (copied) * code/branches/presentation/src/modules/docking/DockingEffect.cc (copied) * code/branches/presentation/src/modules/docking/DockingEffect.h (copied) * code/branches/presentation/src/modules/docking/DockingPrecompiledHeaders.h (copied) * code/branches/presentation/src/modules/docking/DockingPrereqs.h (copied) * code/branches/presentation/src/modules/docking/DockingTarget.cc (copied) * code/branches/presentation/src/modules/docking/DockingTarget.h (copied) * code/branches/presentation/src/modules/docking/MoveToDockingTarget.cc (copied) * code/branches/presentation/src/modules/docking/MoveToDockingTarget.h (copied) * code/branches/presentation/src/modules/objects/triggers/MultiTrigger.cc (modified) * code/branches/presentation/src/orxonox/controllers/ArtificialController.cc (modified) * code/branches/presentation/src/orxonox/controllers/ArtificialController.h (modified) * code/branches/presentation/src/orxonox/infos/PlayerInfo.cc (modified) * code/branches/presentation/src/orxonox/infos/PlayerInfo.h (modified) Merging dockingsystem2 branch to presentation branch. Tue, 24 May 2011 14:33:48 GMT dafrick [8560] * code/branches/dockingsystem2/data/levels/docking.oxw (modified) * code/branches/dockingsystem2/src/modules/docking/Dock.cc (modified) * code/branches/dockingsystem2/src/modules/docking/DockToShip.cc (modified) * code/branches/dockingsystem2/src/modules/docking/DockingController.cc (modified) * code/branches/dockingsystem2/src/modules/docking/DockingTarget.cc (modified) Some cleanup. Tue, 24 May 2011 12:50:24 GMT landauf [8559] * data/trunk/gui/imagesets/PickupInventory.imageset (modified) fixed imageset Tue, 24 May 2011 02:15:19 GMT rgrieder [8558] * code/branches/unity_build/cmake/tools/SourceFileUtilities.cmake (modified) * code/branches/unity_build/cmake/tools/TargetUtilities.cmake (modified) * code/branches/unity_build/src/CMakeLists.txt (modified) * code/branches/unity_build/src/OrxonoxConfig.cmake (modified) * code/branches/unity_build/src/external/bullet/BulletCollision/CMakeLists.txt (modified) * code/branches/unity_build/src/external/bullet/BulletDynamics/CMakeLists.txt (modified) * code/branches/unity_build/src/external/bullet/LinearMath/CMakeLists.txt (modified) * code/branches/unity_build/src/external/enet/CMakeLists.txt (modified) * code/branches/unity_build/src/external/ogreceguirenderer/CMakeLists.txt (modified) * code/branches/unity_build/src/external/ois/CMakeLists.txt (modified) * code/branches/unity_build/src/external/ois/linux/CMakeLists.txt (modified) * code/branches/unity_build/src/external/ois/mac/CMakeLists.txt (modified) * code/branches/unity_build/src/external/ois/win32/CMakeLists.txt (modified) * code/branches/unity_build/src/external/tinyxml/CMakeLists.txt (modified) * code/branches/unity_build/src/libraries/core/CMakeLists.txt (modified) * code/branches/unity_build/src/libraries/network/packet/CMakeLists.txt (modified) * code/branches/unity_build/src/libraries/tools/CMakeLists.txt (modified) * code/branches/unity_build/src/libraries/util/CMakeLists.txt (modified) * code/branches/unity_build/src/modules/pong/CMakeLists.txt (modified) * code/branches/unity_build/src/orxonox/CMakeLists.txt (modified) * code/branches/unity_build/src/orxonox/graphics/CMakeLists.txt (modified) Renamed the infamous 'Compilation' to 'BuildUnit' which definitely ... Mon, 23 May 2011 22:28:31 GMT marwegma [8557] * code/branches/environment2/WorldEntityShader.cpp (added) * code/branches/environment2/src/libraries/tools/Shader.h (modified) * code/branches/environment2/src/orxonox/OrxonoxPrereqs.h (modified) * code/branches/environment2/src/orxonox/graphics/CMakeLists.txt (modified) * code/branches/environment2/src/orxonox/graphics/GlobalShader.h (modified) * code/branches/environment2/src/orxonox/graphics/GodrayShader.cc (moved) * code/branches/environment2/src/orxonox/graphics/GodrayShader.h (moved) * code/branches/environment2/src/orxonox/graphics/WorldEntityShader.h (added) * code/branches/environment2/src/orxonox/worldentities/WorldEntity.cc (modified) * code/branches/environment2/src/orxonox/worldentities/WorldEntity.h (modified) Godrays: Safety commit. 90017 N8 Mon, 23 May 2011 21:40:58 GMT dafrick [8556] * code/branches/presentation (modified) * code/branches/presentation/data/levels/includes/pickups.oxi (modified) * code/branches/presentation/data/levels/pickups.oxw (modified) * code/branches/presentation/data/levels/templates/pickupRepresentationTemplates.oxt (modified) * code/branches/presentation/src/libraries/util/SubString.h (modified) * code/branches/presentation/src/modules/objects/collisionshapes/BoxCollisionShape.cc (modified) * code/branches/presentation/src/modules/objects/collisionshapes/BoxCollisionShape.h (modified) * code/branches/presentation/src/modules/objects/collisionshapes/ConeCollisionShape.cc (modified) * code/branches/presentation/src/modules/objects/collisionshapes/ConeCollisionShape.h (modified) * code/branches/presentation/src/modules/objects/collisionshapes/PlaneCollisionShape.cc (modified) * code/branches/presentation/src/modules/objects/collisionshapes/PlaneCollisionShape.h (modified) * code/branches/presentation/src/modules/objects/collisionshapes/SphereCollisionShape.cc (modified) * code/branches/presentation/src/modules/objects/collisionshapes/SphereCollisionShape.h (modified) * code/branches/presentation/src/modules/pickup/PickupPrereqs.h (modified) * code/branches/presentation/src/modules/pickup/items/CMakeLists.txt (modified) * code/branches/presentation/src/modules/pickup/items/ShrinkPickup.cc (copied) * code/branches/presentation/src/modules/pickup/items/ShrinkPickup.h (copied) * code/branches/presentation/src/orxonox/collisionshapes/CollisionShape.cc (modified) * code/branches/presentation/src/orxonox/collisionshapes/CollisionShape.h (modified) * code/branches/presentation/src/orxonox/collisionshapes/CompoundCollisionShape.cc (modified) * code/branches/presentation/src/orxonox/collisionshapes/CompoundCollisionShape.h (modified) * code/branches/presentation/src/orxonox/worldentities/WorldEntity.cc (modified) Merging pickup branch into presentation branch. Mon, 23 May 2011 21:37:17 GMT dafrick [8555] * code/branches/pickup/src/modules/pickup/items/ShrinkPickup.cc (modified) Some additional cleanup. Mon, 23 May 2011 21:26:08 GMT dafrick [8554] * code/branches/pickup/data/levels/includes/pickups.oxi (modified) * code/branches/pickup/data/levels/pickups.oxw (modified) * code/branches/pickup/data/levels/templates/pickupRepresentationTemplates.oxt (modified) * code/branches/pickup/src/libraries/util/SubString.h (modified) * code/branches/pickup/src/modules/objects/collisionshapes/BoxCollisionShape.h (modified) * code/branches/pickup/src/modules/objects/collisionshapes/ConeCollisionShape.h (modified) * code/branches/pickup/src/modules/objects/collisionshapes/PlaneCollisionShape.h (modified) * code/branches/pickup/src/modules/objects/collisionshapes/SphereCollisionShape.h (modified) * code/branches/pickup/src/modules/pickup/PickupPrereqs.h (modified) * code/branches/pickup/src/modules/pickup/items/ShrinkPickup.cc (modified) * code/branches/pickup/src/modules/pickup/items/ShrinkPickup.h (modified) * code/branches/pickup/src/orxonox/collisionshapes/CompoundCollisionShape.cc (modified) * code/branches/pickup/src/orxonox/collisionshapes/CompoundCollisionShape.h (modified) * code/branches/pickup/src/orxonox/worldentities/WorldEntity.cc (modified) Some cleanup. Ready for merge. Mon, 23 May 2011 16:41:25 GMT simonmie [8553] * code/branches/gameimmersion/src/orxonox/worldentities/pawns/Pawn.cc (modified) added more comments, removed code marks, changed strange (wrong?) hit ... Mon, 23 May 2011 16:35:35 GMT msalomon [8552] * code/branches/spacerace/data/levels/spaceRace.oxw (modified) * code/branches/spacerace/src/modules/gametypes/RaceCheckPoint.cc (modified) * code/branches/spacerace/src/modules/gametypes/SpaceRace.cc (modified) * code/branches/spacerace/src/modules/gametypes/SpaceRace.h (modified) Mon, 23 May 2011 16:19:59 GMT simonmie [8551] * code/branches/gameimmersion/src/orxonox/worldentities/pawns/Pawn.cc (modified) added missing server variable transfer registration Mon, 23 May 2011 15:59:48 GMT simonmie [8550] * code/branches/gameimmersion/src/modules/weapons/projectiles/BasicProjectile.cc (modified) again comments for BasicProjectile Mon, 23 May 2011 15:46:47 GMT simonmie [8549] * code/branches/gameimmersion/data/levels/includes/weaponSettingsImmTest.oxi (modified) * code/branches/gameimmersion/src/modules/weapons/weaponmodes/EnergyDrink.cc (modified) * code/branches/gameimmersion/src/modules/weapons/weaponmodes/FusionFire.cc (modified) * code/branches/gameimmersion/src/modules/weapons/weaponmodes/HsW01.cc (modified) * code/branches/gameimmersion/src/modules/weapons/weaponmodes/LaserFire.cc (modified) * code/branches/gameimmersion/src/modules/weapons/weaponmodes/LightningGun.cc (modified) * code/branches/gameimmersion/src/modules/weapons/weaponmodes/RocketFire.cc (modified) * code/branches/gameimmersion/src/modules/weapons/weaponmodes/SimpleRocketFire.cc (modified) * code/branches/gameimmersion/src/orxonox/worldentities/pawns/Pawn.cc (modified) some more comments, fixed initial damage missetting Mon, 23 May 2011 15:20:40 GMT msalomon [8548] * code/branches/spacerace/data/levels/spaceRace.oxw (modified) * code/branches/spacerace/src/modules/gametypes/RaceCheckPoint.cc (modified) * code/branches/spacerace/src/modules/gametypes/RaceCheckPoint.h (modified) Mon, 23 May 2011 15:16:00 GMT simonmie [8547] * code/branches/gameimmersion/src/modules/weapons/weaponmodes/RocketFire.cc (modified) * code/branches/gameimmersion/src/modules/weapons/weaponmodes/SimpleRocketFire.cc (modified) added set/get shield/health-damage functionality to RocketFire and ... Mon, 23 May 2011 14:14:57 GMT youngk [8546] * code/branches/presentation/data/levels/presentationFS11.oxw (modified) Minor changes to the realism of planets in the presentation level. Mon, 23 May 2011 14:12:44 GMT mastalde [8545] * code/branches/steering/data/levels/templates/spaceshipAssff.oxt (modified) * code/branches/steering/src/orxonox/worldentities/pawns/SpaceShip.cc (modified) cleaded code and added some comments Mon, 23 May 2011 14:12:27 GMT sven [8544] * code/branches/dockingsystem2/data/levels/docking.oxw (modified) * code/branches/dockingsystem2/src/modules/docking/DockingController.cc (modified) * code/branches/dockingsystem2/src/modules/docking/DockingController.h (modified) * code/branches/dockingsystem2/src/modules/docking/MoveToDockingTarget.cc (modified) * code/branches/dockingsystem2/src/modules/docking/MoveToDockingTarget.h (modified) * code/branches/dockingsystem2/src/orxonox/infos/PlayerInfo.cc (modified) * code/branches/dockingsystem2/src/orxonox/infos/PlayerInfo.h (modified) Spaceships attach now to the dock, fixed DockingController. Mon, 23 May 2011 14:01:49 GMT ssgier [8543] * code/branches/pickup/data/levels/includes/pickups.oxi (modified) * code/branches/pickup/data/levels/pickups.oxw (modified) * code/branches/pickup/data/levels/templates/pickupRepresentationTemplates.oxt (modified) copypasted templates for medium and huge in ... Mon, 23 May 2011 13:54:40 GMT simonmie [8542] * code/branches/gameimmersion/src/modules/weapons/projectiles/BasicProjectile.cc (modified) * code/branches/gameimmersion/src/modules/weapons/projectiles/BasicProjectile.h (modified) * code/branches/gameimmersion/src/modules/weapons/projectiles/Projectile.cc (modified) * code/branches/gameimmersion/src/modules/weapons/projectiles/Projectile.h (modified) * code/branches/gameimmersion/src/modules/weapons/projectiles/Rocket.cc (modified) * code/branches/gameimmersion/src/modules/weapons/projectiles/Rocket.h (modified) * code/branches/gameimmersion/src/modules/weapons/projectiles/SimpleRocket.cc (modified) * code/branches/gameimmersion/src/modules/weapons/projectiles/SimpleRocket.h (modified) * code/branches/gameimmersion/src/modules/weapons/weaponmodes/EnergyDrink.cc (modified) * code/branches/gameimmersion/src/modules/weapons/weaponmodes/FusionFire.cc (modified) * code/branches/gameimmersion/src/modules/weapons/weaponmodes/HsW01.cc (modified) * code/branches/gameimmersion/src/modules/weapons/weaponmodes/LaserFire.cc (modified) * code/branches/gameimmersion/src/modules/weapons/weaponmodes/LightningGun.cc (modified) * code/branches/gameimmersion/src/modules/weapons/weaponmodes/RocketFire.cc (modified) comments added, unused parts removed, some spam messages removed Mon, 23 May 2011 13:50:13 GMT dboehi [8541] * code/branches/gameimmersion/data/defaultConfig/keybindings.ini (modified) * code/branches/gameimmersion/data/levels/templates/spaceshipImmTest.oxt (modified) * code/branches/gameimmersion/src/orxonox/controllers/HumanController.cc (modified) * code/branches/gameimmersion/src/orxonox/controllers/HumanController.h (modified) * code/branches/gameimmersion/src/orxonox/worldentities/pawns/SpaceShip.cc (modified) Changed boost to start on key press and stop on key release Mon, 23 May 2011 13:47:17 GMT youngk [8540] * data/trunk/images/effects/asterisk.png (moved) * data/trunk/images/effects/triplespiral.png (modified) * data/trunk/materials/Shrink.material (added) More stuff for the shrink pickup. Mon, 23 May 2011 13:30:34 GMT youngk [8539] * data/trunk/gui/imagesets/PickupInventory.imageset (modified) * data/trunk/images/effects/triplespiral.png (added) * data/trunk/images/gui/pickup.png (modified) Added pickup image for the shrink pickup. Mon, 23 May 2011 13:09:07 GMT simonmie [8538] * code/branches/gameimmersion/data/levels/includes/weaponSettingsImmTest.oxi (modified) * code/branches/gameimmersion/src/modules/weapons/projectiles/BasicProjectile.cc (modified) * code/branches/gameimmersion/src/modules/weapons/projectiles/BasicProjectile.h (modified) * code/branches/gameimmersion/src/modules/weapons/projectiles/Projectile.cc (modified) * code/branches/gameimmersion/src/modules/weapons/projectiles/Projectile.h (modified) * code/branches/gameimmersion/src/modules/weapons/projectiles/Rocket.cc (modified) * code/branches/gameimmersion/src/modules/weapons/projectiles/Rocket.h (modified) * code/branches/gameimmersion/src/modules/weapons/projectiles/SimpleRocket.cc (modified) * code/branches/gameimmersion/src/modules/weapons/projectiles/SimpleRocket.h (modified) some comments in test-Weaponsettings made Mon, 23 May 2011 13:06:08 GMT catherine [8537] * code/branches/tetris/data/levels/tetris.oxw (modified) * code/branches/tetris/src/modules/tetris/Tetris.cc (modified) * code/branches/tetris/src/modules/tetris/Tetris.h (modified) * code/branches/tetris/src/modules/tetris/TetrisCenterpoint.cc (modified) * code/branches/tetris/src/modules/tetris/TetrisStone.cc (modified) * code/branches/tetris/src/modules/tetris/TetrisStone.h (modified) Almost working. Mon, 23 May 2011 12:52:25 GMT ssgier [8536] * code/branches/pickup/src/modules/pickup/items/ShrinkPickup.h (modified) added comments