# # ChangeLog for code/branches/presentation # # Generated by Trac 1.0.9 # May 19, 2024, 7:17:17 PM 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 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 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. 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 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 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. 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 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. 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 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. Thu, 19 May 2011 14:13:10 GMT smerkli [8512] * code/branches/presentation/data/levels/presentationFS11.oxw (modified) changed presentation level a little Wed, 18 May 2011 08:57:00 GMT dafrick [8499] * code/branches/presentation (copied) Creating new presentation branch. Wed, 18 May 2011 08:55:36 GMT dafrick [8498] * code/trunk/data/levels/earth.oxw (modified) * code/trunk/data/levels/planets.oxw (modified) Removing some tags because the cause warnings for now, might be re- ...