# # ChangeLog for code/branches # # Generated by Trac 1.0.9 # Nov 29, 2024, 3:29:51 AM 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 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 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: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 Mon, 23 May 2011 12:39:49 GMT ssgier [8535] * code/branches/pickup/src/modules/pickup/items/ShrinkPickup.cc (modified) * code/branches/pickup/src/modules/pickup/items/ShrinkPickup.h (modified) corrected comments Mon, 23 May 2011 12:37:08 GMT ssgier [8534] * code/branches/pickup/data/levels/pickups.oxw (modified) * code/branches/pickup/src/modules/pickup/items/ShrinkPickup.cc (modified) * code/branches/pickup/src/modules/pickup/items/ShrinkPickup.h (modified) finished code for ShrinkPickup, adapted XML file\ Mon, 23 May 2011 12:26:25 GMT simonmie [8533] * code/branches/gameimmersion/src/modules/weapons/projectiles/Projectile.cc (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/orxonox/weaponsystem/WeaponMode.h (modified) * code/branches/gameimmersion/src/orxonox/worldentities/pawns/Pawn.cc (modified) SimpleRocket and Rocket are now BasicProjectiles - damage is working ... Sat, 21 May 2011 02:47:22 GMT rgrieder [8525] * code/branches/unity_build/src/orxonox/sound/BaseSound.cc (modified) Another hierarchy initialisation bug: BaseSound d'tor was always ... Sat, 21 May 2011 02:23:19 GMT rgrieder [8524] * code/branches/unity_build/src/libraries/core/ConfigValueIncludes.h (modified) * code/branches/unity_build/src/libraries/core/Core.cc (modified) * code/branches/unity_build/src/libraries/core/Core.h (modified) * code/branches/unity_build/src/libraries/core/command/Shell.cc (modified) * code/branches/unity_build/src/libraries/core/command/Shell.h (modified) * code/branches/unity_build/src/libraries/util/OutputHandler.h (modified) Fixed a serious problem with the debug levels for the Shells by ... Fri, 20 May 2011 21:32:34 GMT rgrieder [8523] * code/branches/unity_build/src/libraries/core/command/IOConsolePOSIX.cc (modified) Enabled text colouring again for the POSIX IO console. Please check ... Fri, 20 May 2011 14:05:32 GMT rgrieder [8522] * code/branches/unity_build/src/libraries/core/command/IOConsoleWindows.cc (modified) * code/branches/unity_build/src/libraries/core/command/Shell.h (modified) * code/branches/unity_build/src/libraries/util/Debug.h (modified) * code/branches/unity_build/src/libraries/util/OutputHandler.h (modified) * code/branches/unity_build/src/orxonox/overlays/InGameConsole.cc (modified) Added new output macro: DOUT. Use this instead of COUT(0) to produce ... Fri, 20 May 2011 03:51:21 GMT rgrieder [8520] * code/branches/unity_build/src/libraries/core/CommandLineParser.cc (modified) * code/branches/unity_build/src/libraries/core/CommandLineParser.h (modified) * code/branches/unity_build/src/libraries/core/Core.cc (modified) * code/branches/unity_build/src/libraries/core/PathConfig.cc (modified) Removed useless and possibly confusion feature: specifying a file ... Fri, 20 May 2011 03:27:39 GMT rgrieder [8519] * code/branches/unity_build/src/libraries/core/Core.cc (modified) * code/branches/unity_build/src/libraries/core/Core.h (modified) Changing the Core::bDevMode_ should also change the log levels to ... Fri, 20 May 2011 03:24:52 GMT rgrieder [8518] * code/branches/unity_build/src/libraries/core/Core.cc (modified) * code/branches/unity_build/src/libraries/core/Core.h (modified) * code/branches/unity_build/src/libraries/core/command/Shell.cc (modified) * code/branches/unity_build/src/libraries/core/command/Shell.h (modified) * code/branches/unity_build/src/libraries/util/Debug.h (modified) * code/branches/unity_build/src/libraries/util/OutputHandler.cc (modified) * code/branches/unity_build/src/libraries/util/OutputHandler.h (modified) Sorted out log level handling on startup and transferred its control ... Fri, 20 May 2011 03:18:08 GMT rgrieder [8517] * code/branches/unity_build/src/libraries/core/Core.cc (modified) * code/branches/unity_build/src/libraries/util/OutputHandler.cc (modified) * code/branches/unity_build/src/libraries/util/OutputHandler.h (modified) Improved logging to a file by rewriting the log according to the ... Fri, 20 May 2011 01:58:29 GMT rgrieder [8516] * code/branches/unity_build/src/libraries/util/OutputHandler.cc (modified) * code/branches/unity_build/src/libraries/util/OutputHandler.h (modified) Separate method in OutputHandler for updating the global debug level ... Fri, 20 May 2011 01:53:21 GMT rgrieder [8515] * code/branches/unity_build/src/libraries/core/command/Shell.cc (modified) * code/branches/unity_build/src/libraries/util/OutputHandler.cc (modified) * code/branches/unity_build/src/libraries/util/OutputHandler.h (modified) * code/branches/unity_build/src/orxonox/overlays/InGameConsole.cc (modified) The output listener writing to the memory as buffer should record ... Thu, 19 May 2011 14:16:55 GMT kmaurus [8513] * code/branches/spaceboundaries2/data/levels/myTestLevel.oxw (modified) * code/branches/spaceboundaries2/src/orxonox/worldentities/SpaceBoundaries.cc (modified) * code/branches/spaceboundaries2/src/orxonox/worldentities/SpaceBoundaries.h (modified) third reactionMode added Thu, 19 May 2011 14:13:10 GMT smerkli [8512] * code/branches/presentation/data/levels/presentationFS11.oxw (modified) changed presentation level a little Thu, 19 May 2011 14:01:34 GMT anbueche [8511] * code/branches/portals2/data/levels/portals.oxw (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) added reenter delay, added comments Thu, 19 May 2011 11:47:01 GMT kmaurus [8506] * code/branches/spaceboundaries2/src/orxonox/worldentities/SpaceBoundaries.cc (modified) * code/branches/spaceboundaries2/src/orxonox/worldentities/SpaceBoundaries.h (modified) Wed, 18 May 2011 13:19:47 GMT rgrieder [8504] * code/branches/bigships/src/orxonox/worldentities/pawns/SpaceShip.cc (modified) Destructor code should be enclosed in this->isInitialized(). Wed, 18 May 2011 10:54:25 GMT dafrick [8503] * code/branches/bigships/src/orxonox/worldentities/pawns/SpaceShip.cc (modified) Values that are needed in the destructor need to be initialized ... Wed, 18 May 2011 10:36:59 GMT dafrick [8502] * code/branches/pickup/data/levels/pickups.oxw (modified) * code/branches/pickup/src/modules/pickup/items/ShrinkPickup.cc (modified) * code/branches/pickup/src/modules/pickup/items/ShrinkPickup.h (modified) Minor changes. Wed, 18 May 2011 09:33:28 GMT dafrick [8501] * code/branches/dockingsystem2/data/gui/scripts/DockingDialog.lua (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/DockToShip.h (modified) * code/branches/dockingsystem2/src/modules/docking/DockingAnimation.cc (modified) * code/branches/dockingsystem2/src/modules/docking/DockingController.cc (modified) * code/branches/dockingsystem2/src/modules/docking/DockingEffect.cc (modified) * code/branches/dockingsystem2/src/modules/docking/DockingPrereqs.h (modified) * code/branches/dockingsystem2/src/modules/docking/DockingTarget.cc (modified) * code/branches/dockingsystem2/src/modules/docking/DockingTarget.h (modified) * code/branches/dockingsystem2/src/modules/docking/MoveToDockingTarget.cc (modified) * code/branches/dockingsystem2/src/orxonox/controllers/ArtificialController.cc (modified) * code/branches/dockingsystem2/src/orxonox/controllers/ArtificialController.h (modified) Minor changes. Wed, 18 May 2011 09:03:13 GMT dafrick [8500] * code/branches/dockingsystem2/data/gui/scripts/DockingDialog.lua (modified) Adding menu navigation do DockingDialog. Wed, 18 May 2011 08:57:00 GMT dafrick [8499] * code/branches/presentation (copied) Creating new presentation branch. Mon, 16 May 2011 22:44:32 GMT marwegma [8497] * code/branches/environment2/src/orxonox/graphics/GlobalGodrayShader.cc (modified) * code/branches/environment2/src/orxonox/graphics/GlobalGodrayShader.h (modified) * code/branches/environment2/src/orxonox/graphics/GlobalShader.cc (modified) Godrays: Implementing in progress. Mon, 16 May 2011 18:07:11 GMT msalomon [8494] * code/branches/spacerace/data/levels/spaceRace.oxw (added) * code/branches/spacerace/src/modules/gametypes/RaceCheckPoint.cc (added) * code/branches/spacerace/src/modules/gametypes/RaceCheckPoint.h (added) RaceCheckPoint type and test level for the spaceRace gametype. Mon, 16 May 2011 16:21:05 GMT sven [8493] * code/branches/dockingsystem2/data/gui/scripts/DockingDialog.lua (modified) * code/branches/dockingsystem2/data/levels/docking.oxw (modified) * code/branches/dockingsystem2/src/modules/docking/CMakeLists.txt (modified) * code/branches/dockingsystem2/src/modules/docking/Dock.cc (modified) * code/branches/dockingsystem2/src/modules/docking/Dock.h (modified) * code/branches/dockingsystem2/src/modules/docking/DockToShip.cc (modified) * code/branches/dockingsystem2/src/modules/docking/DockToShip.h (modified) * code/branches/dockingsystem2/src/modules/docking/DockingAnimation.cc (added) * code/branches/dockingsystem2/src/modules/docking/DockingAnimation.h (added) * code/branches/dockingsystem2/src/modules/docking/DockingController.cc (added) * code/branches/dockingsystem2/src/modules/docking/DockingController.h (added) * code/branches/dockingsystem2/src/modules/docking/DockingEffect.cc (modified) * code/branches/dockingsystem2/src/modules/docking/DockingEffect.h (modified) * code/branches/dockingsystem2/src/modules/docking/DockingPrereqs.h (modified) * code/branches/dockingsystem2/src/modules/docking/MoveToDockingTarget.cc (added) * code/branches/dockingsystem2/src/modules/docking/MoveToDockingTarget.h (added) * code/branches/dockingsystem2/src/orxonox/controllers/ArtificialController.cc (modified) * code/branches/dockingsystem2/src/orxonox/controllers/ArtificialController.h (modified) Added docking animations, skeletton for DockingController.. Mon, 16 May 2011 15:25:00 GMT simonmie [8492] * code/branches/gameimmersion/data/levels/includes/weaponSettingsImmTest.oxi (modified) * code/branches/gameimmersion/data/particle/Shield.particle (added) * code/branches/gameimmersion/src/modules/weapons/projectiles/BasicProjectile.cc (added) * code/branches/gameimmersion/src/modules/weapons/projectiles/BasicProjectile.h (added) * code/branches/gameimmersion/src/modules/weapons/projectiles/CMakeLists.txt (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/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) New Shield effect added (from tibork), first working BasicProjectile ... Mon, 16 May 2011 14:34:19 GMT marwegma [8491] * code/branches/environment2/src/orxonox/graphics/GlobalGodrayShader.cc (modified) * code/branches/environment2/src/orxonox/graphics/GlobalGodrayShader.h (modified) * code/branches/environment2/src/orxonox/graphics/GlobalShader.cc (modified) Safety Commit Mon, 16 May 2011 13:52:31 GMT dboehi [8490] * code/branches/gameimmersion/src/orxonox/worldentities/pawns/SpaceShip.cc (modified) * code/branches/gameimmersion/src/orxonox/worldentities/pawns/SpaceShip.h (modified) Updated version of the camera shake effect, now based on sin. Mon, 16 May 2011 13:49:59 GMT ssgier [8489] * code/branches/pickup/src/modules/pickup/items/ShrinkPickup.cc (modified) * code/branches/pickup/src/modules/pickup/items/ShrinkPickup.h (modified) finished code for shrinking and growing Mon, 16 May 2011 13:13:56 GMT youngk [8488] * code/branches/tetris/src/modules/tetris/Tetris.cc (modified) * code/branches/tetris/src/modules/tetris/Tetris.h (modified) Created a skeleton for the position validation of a stone. Mon, 16 May 2011 11:39:51 GMT sven [8487] * code/branches/dockingsystem2/data/gui/scripts/DockingDialog.lua (modified) * code/branches/dockingsystem2/data/levels/docking.oxw (modified) * code/branches/dockingsystem2/src/modules/docking/DockingEffect.cc (modified) * code/branches/dockingsystem2/src/modules/docking/DockingEffect.h (modified) Mon, 16 May 2011 11:27:03 GMT dafrick [8486] * code/branches/pickup/src/modules/pickup/items/ShrinkPickup.cc (modified) ... Sat, 14 May 2011 11:06:57 GMT anbueche [8483] * code/branches/portals2/doc/api/groups/Portals.dox (added) improved portals documentation Sat, 14 May 2011 02:32:39 GMT rgrieder [8478] * code/branches/unity_build/src/libraries/core/Game.cc (modified) Added forgotten detail in revision 8423 (trunk). Thu, 12 May 2011 14:36:30 GMT kmaurus [8468] * code/branches/spaceboundaries2/data/levels/myTestLevel.oxw (modified) * code/branches/spaceboundaries2/doc/api/Groups.dox (modified) * code/branches/spaceboundaries2/src/orxonox/worldentities/SpaceBoundaries.cc (modified) * code/branches/spaceboundaries2/src/orxonox/worldentities/SpaceBoundaries.h (modified) several small improvements Thu, 12 May 2011 14:15:36 GMT anbueche [8466] * code/branches/portals2/doc/api/Groups.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.h (modified) comments added Thu, 12 May 2011 12:24:39 GMT smerkli [8460] * code/branches/portals2 (copied) created. Thu, 12 May 2011 12:24:26 GMT smerkli [8459] * code/branches/spaceboundaries2 (copied) Thu, 12 May 2011 11:22:55 GMT anbueche [8455] * code/branches/portals/src/modules/portals/PortalEndPoint.h (modified) * code/branches/portals/src/modules/portals/PortalLink.cc (modified) * code/branches/portals/src/modules/portals/PortalLink.h (modified) comments added Thu, 12 May 2011 11:17:38 GMT anbueche [8454] * code/branches/portals/data/levels/portals.oxw (modified) * code/branches/portals/src/modules/portals/PortalEndPoint.cc (modified) * code/branches/portals/src/modules/portals/PortalEndPoint.h (modified) comments added Wed, 11 May 2011 22:31:23 GMT dafrick [8453] * code/branches/tutoriallevel3 (modified) * code/branches/tutoriallevel3/data/gui/layouts/QuestGUI.layout (modified) * code/branches/tutoriallevel3/data/gui/scripts/NotificationLayer.lua (modified) * code/branches/tutoriallevel3/data/gui/scripts/QuestGUI.lua (modified) * code/branches/tutoriallevel3/data/gui/scripts/SingleplayerMenu.lua (modified) * code/branches/tutoriallevel3/data/levels/quests.oxw (copied) * code/branches/tutoriallevel3/data/overlays/debug.oxo (modified) * code/branches/tutoriallevel3/doc/api/groups/Triggers.dox (modified) * code/branches/tutoriallevel3/src/libraries/core/GUIManager.cc (modified) * code/branches/tutoriallevel3/src/libraries/core/GUIManager.h (modified) * code/branches/tutoriallevel3/src/libraries/network/synchronisable/Synchronisable.cc (modified) * code/branches/tutoriallevel3/src/libraries/util/SubString.h (modified) * code/branches/tutoriallevel3/src/modules/notifications/CMakeLists.txt (modified) * code/branches/tutoriallevel3/src/modules/notifications/Notification.cc (deleted) * code/branches/tutoriallevel3/src/modules/notifications/Notification.h (deleted) * code/branches/tutoriallevel3/src/modules/notifications/NotificationDispatcher.cc (modified) * code/branches/tutoriallevel3/src/modules/notifications/NotificationManager.cc (modified) * code/branches/tutoriallevel3/src/modules/notifications/NotificationManager.h (modified) * code/branches/tutoriallevel3/src/modules/notifications/NotificationQueue.cc (modified) * code/branches/tutoriallevel3/src/modules/notifications/NotificationQueue.h (modified) * code/branches/tutoriallevel3/src/modules/notifications/NotificationQueueCEGUI.cc (copied) * code/branches/tutoriallevel3/src/modules/notifications/NotificationQueueCEGUI.h (copied) * code/branches/tutoriallevel3/src/modules/objects/triggers/DistanceTrigger.cc (modified) * code/branches/tutoriallevel3/src/modules/objects/triggers/DistanceTrigger.h (modified) * code/branches/tutoriallevel3/src/modules/objects/triggers/EventTrigger.h (modified) * code/branches/tutoriallevel3/src/modules/objects/triggers/MultiTrigger.cc (modified) * code/branches/tutoriallevel3/src/modules/objects/triggers/TriggerBase.h (modified) * code/branches/tutoriallevel3/src/modules/overlays/hud/CMakeLists.txt (modified) * code/branches/tutoriallevel3/src/modules/overlays/hud/GametypeStatus.cc (deleted) * code/branches/tutoriallevel3/src/modules/overlays/hud/GametypeStatus.h (deleted) * code/branches/tutoriallevel3/src/modules/questsystem/QuestDescription.cc (modified) * code/branches/tutoriallevel3/src/modules/questsystem/QuestManager.cc (modified) * code/branches/tutoriallevel3/src/modules/questsystem/QuestManager.h (modified) * code/branches/tutoriallevel3/src/orxonox/LevelManager.cc (modified) * 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/CMakeLists.txt (modified) * code/branches/tutoriallevel3/src/orxonox/interfaces/InterfaceCompilation.cc (modified) * code/branches/tutoriallevel3/src/orxonox/interfaces/NotificationListener.cc (copied) * code/branches/tutoriallevel3/src/orxonox/interfaces/NotificationListener.h (modified) Merging tutoriallevel2 branch into tutoriallevel3 branch. Wed, 11 May 2011 22:17:26 GMT dafrick [8452] * code/branches/tutoriallevel3 (copied) New tutoriallevel branch to start testing network in, since in the ... Wed, 11 May 2011 22:15:05 GMT dafrick [8451] * code/branches/tutoriallevel2/src/modules/notifications/NotificationManager.cc (modified) Modifying the currently active notification queues. Wed, 11 May 2011 22:11:53 GMT dafrick [8450] * code/branches/tutoriallevel2/data/overlays/debug.oxo (modified) * code/branches/tutoriallevel2/src/modules/notifications/NotificationQueueCEGUI.cc (modified) * code/branches/tutoriallevel2/src/modules/notifications/NotificationQueueCEGUI.h (modified) * code/branches/tutoriallevel2/src/modules/overlays/hud/CMakeLists.txt (modified) * code/branches/tutoriallevel2/src/modules/overlays/hud/GametypeStatus.cc (deleted) * code/branches/tutoriallevel2/src/modules/overlays/hud/GametypeStatus.h (deleted) * code/branches/tutoriallevel2/src/orxonox/gametypes/Gametype.cc (modified) * code/branches/tutoriallevel2/src/orxonox/gametypes/Gametype.h (modified) * code/branches/tutoriallevel2/src/orxonox/infos/GametypeInfo.cc (modified) * code/branches/tutoriallevel2/src/orxonox/infos/GametypeInfo.h (modified) Replacing GametypeStatus overlay with notifications. Wed, 11 May 2011 20:55:30 GMT dafrick [8449] * code/branches/tutoriallevel2/src/modules/notifications/CMakeLists.txt (modified) * code/branches/tutoriallevel2/src/modules/notifications/Notification.cc (deleted) * code/branches/tutoriallevel2/src/modules/notifications/Notification.h (deleted) * code/branches/tutoriallevel2/src/modules/notifications/NotificationManager.cc (modified) * code/branches/tutoriallevel2/src/modules/notifications/NotificationManager.h (modified) * code/branches/tutoriallevel2/src/modules/notifications/NotificationQueue.cc (modified) * code/branches/tutoriallevel2/src/modules/notifications/NotificationQueueCEGUI.cc (modified) Moving the Notification class int NotificationManager, since it is ...