# # ChangeLog for code/branches/presentationFS14 # # Generated by Trac 1.0.9 # Mar 28, 2024, 2:14:00 PM Sat, 31 Jan 2015 16:31:23 GMT landauf [10215] * code/branches/presentationFS14/src/modules/jump/Jump.cc (modified) * code/branches/presentationFS14/src/modules/jump/JumpBoots.cc (modified) * code/branches/presentationFS14/src/modules/jump/JumpEnemy.cc (modified) * code/branches/presentationFS14/src/modules/jump/JumpFigure.cc (modified) * code/branches/presentationFS14/src/modules/jump/JumpFigure.h (modified) * code/branches/presentationFS14/src/modules/jump/JumpItem.cc (modified) * code/branches/presentationFS14/src/modules/jump/JumpPlatform.cc (modified) * code/branches/presentationFS14/src/modules/jump/JumpPlatformDisappear.cc (modified) * code/branches/presentationFS14/src/modules/jump/JumpPlatformDisappear.h (modified) * code/branches/presentationFS14/src/modules/jump/JumpPlatformFake.h (modified) * code/branches/presentationFS14/src/modules/jump/JumpPlatformHMove.cc (modified) * code/branches/presentationFS14/src/modules/jump/JumpPlatformHMove.h (modified) * code/branches/presentationFS14/src/modules/jump/JumpPlatformStatic.cc (modified) * code/branches/presentationFS14/src/modules/jump/JumpPlatformStatic.h (modified) * code/branches/presentationFS14/src/modules/jump/JumpPlatformTimer.cc (modified) * code/branches/presentationFS14/src/modules/jump/JumpPlatformTimer.h (modified) * code/branches/presentationFS14/src/modules/jump/JumpPlatformVMove.cc (modified) * code/branches/presentationFS14/src/modules/jump/JumpPlatformVMove.h (modified) * code/branches/presentationFS14/src/modules/jump/JumpProjectile.cc (modified) * code/branches/presentationFS14/src/modules/jump/JumpPropeller.cc (modified) * code/branches/presentationFS14/src/modules/jump/JumpRocket.cc (modified) * code/branches/presentationFS14/src/modules/jump/JumpScore.cc (modified) * code/branches/presentationFS14/src/modules/jump/JumpShield.cc (modified) * code/branches/presentationFS14/src/modules/jump/JumpSpring.cc (modified) * code/branches/presentationFS14/src/modules/objects/controllers/TeamTargetProxy.cc (modified) * code/branches/presentationFS14/src/modules/objects/controllers/TeamTargetProxy.h (modified) * code/branches/presentationFS14/src/modules/objects/controllers/TurretController.cc (modified) * code/branches/presentationFS14/src/modules/objects/controllers/TurretController.h (modified) * code/branches/presentationFS14/src/orxonox/controllers/ControllerDirector.cc (modified) * code/branches/presentationFS14/src/orxonox/controllers/ControllerDirector.h (modified) replaced tabs with spaces. no changes in code. Sat, 31 Jan 2015 15:54:16 GMT landauf [10214] * code/branches/presentationFS14/src/orxonox/items/PartDestructionEvent.cc (modified) * code/branches/presentationFS14/src/orxonox/worldentities/pawns/SpaceShip.cc (modified) fixed segfault. after removing the engine from the ship, we need to ... Sat, 31 Jan 2015 15:21:49 GMT landauf [10213] * code/branches/presentationFS14/src/orxonox/worldentities/pawns/ModularSpaceShip.cc (modified) * code/branches/presentationFS14/src/orxonox/worldentities/pawns/ModularSpaceShip.h (modified) removed attach() from ModularSpaceShip because it shadows the non- ... Sat, 31 Jan 2015 15:14:57 GMT landauf [10212] * code/branches/presentationFS14/src/orxonox/worldentities/WorldEntity.h (modified) * code/branches/presentationFS14/src/orxonox/worldentities/pawns/ModularSpaceShip.cc (modified) * code/branches/presentationFS14/src/orxonox/worldentities/pawns/ModularSpaceShip.h (modified) removed detach() from ModularSpaceShip which was just copy-pasted ... Sat, 31 Jan 2015 14:51:08 GMT landauf [10211] * code/branches/presentationFS14/src/orxonox/worldentities/pawns/ModularSpaceShip.cc (modified) * code/branches/presentationFS14/src/orxonox/worldentities/pawns/ModularSpaceShip.h (modified) * code/branches/presentationFS14/src/orxonox/worldentities/pawns/SpaceShip.cc (modified) * code/branches/presentationFS14/src/orxonox/worldentities/pawns/SpaceShip.h (modified) made SpaceShip::engineList_ private again. moved function from ... Sun, 25 Jan 2015 23:22:57 GMT landauf [10205] * code/branches/presentationFS14/src/orxonox/collisionshapes/CollisionShape.cc (modified) the previous commit was not correct. re-added the call to ... Sun, 25 Jan 2015 22:32:17 GMT landauf [10204] * code/branches/presentationFS14/src/orxonox/collisionshapes/CompoundCollisionShape.cc (modified) i think this can be removed as well. the user pointer was probably ... Sun, 25 Jan 2015 22:15:24 GMT landauf [10203] * code/branches/presentationFS14/src/external/bullet/BulletCollision/CollisionDispatch/btCompoundCollisionAlgorithm.cpp (modified) * code/branches/presentationFS14/src/orxonox/Scene.h (modified) * code/branches/presentationFS14/src/orxonox/collisionshapes/CollisionShape.h (modified) * code/branches/presentationFS14/src/orxonox/collisionshapes/CompoundCollisionShape.cc (modified) * code/branches/presentationFS14/src/orxonox/collisionshapes/CompoundCollisionShape.h (modified) * code/branches/presentationFS14/src/orxonox/worldentities/StaticEntity.cc (modified) * code/branches/presentationFS14/src/orxonox/worldentities/WorldEntity.cc (modified) * code/branches/presentationFS14/src/orxonox/worldentities/WorldEntity.h (modified) * code/branches/presentationFS14/src/orxonox/worldentities/pawns/Pawn.cc (modified) * code/branches/presentationFS14/src/orxonox/worldentities/pawns/Pawn.h (modified) removed unused code and debug output Sun, 25 Jan 2015 14:43:11 GMT landauf [10199] * code/branches/presentationFS14/data/levels/templates/spaceshipTurret.oxt (copied) reverted spaceshipTurret.oxt to the old (and correct) version of r10071 Sun, 25 Jan 2015 14:39:30 GMT landauf [10198] * code/branches/presentationFS14/data/levels/templates/standardTurret.oxt (modified) * code/branches/presentationFS14/src/orxonox/worldentities/WorldEntity.cc (modified) disabled physics for turret -> removed attachment-hack in WorldEntity Tue, 27 May 2014 08:35:27 GMT smerkli [10078] * code/branches/presentationFS14/data/levels/jump.oxw (added) * code/branches/presentationFS14/data/overlays/jumpHUD.oxo (added) * code/branches/presentationFS14/src/modules/CMakeLists.txt (modified) * code/branches/presentationFS14/src/modules/invader/InvaderWeapon.cc (modified) * code/branches/presentationFS14/src/modules/jump (added) * code/branches/presentationFS14/src/modules/jump/CMakeLists.txt (added) * code/branches/presentationFS14/src/modules/jump/Jump.cc (added) * code/branches/presentationFS14/src/modules/jump/Jump.h (added) * code/branches/presentationFS14/src/modules/jump/JumpBoots.cc (added) * code/branches/presentationFS14/src/modules/jump/JumpBoots.h (added) * code/branches/presentationFS14/src/modules/jump/JumpCenterpoint.cc (added) * code/branches/presentationFS14/src/modules/jump/JumpCenterpoint.h (added) * code/branches/presentationFS14/src/modules/jump/JumpEnemy.cc (added) * code/branches/presentationFS14/src/modules/jump/JumpEnemy.h (added) * code/branches/presentationFS14/src/modules/jump/JumpFigure.cc (added) * code/branches/presentationFS14/src/modules/jump/JumpFigure.h (added) * code/branches/presentationFS14/src/modules/jump/JumpItem.cc (added) * code/branches/presentationFS14/src/modules/jump/JumpItem.h (added) * code/branches/presentationFS14/src/modules/jump/JumpPlatform.cc (added) * code/branches/presentationFS14/src/modules/jump/JumpPlatform.h (added) * code/branches/presentationFS14/src/modules/jump/JumpPlatformDisappear.cc (added) * code/branches/presentationFS14/src/modules/jump/JumpPlatformDisappear.h (added) * code/branches/presentationFS14/src/modules/jump/JumpPlatformFake.cc (added) * code/branches/presentationFS14/src/modules/jump/JumpPlatformFake.h (added) * code/branches/presentationFS14/src/modules/jump/JumpPlatformHMove.cc (added) * code/branches/presentationFS14/src/modules/jump/JumpPlatformHMove.h (added) * code/branches/presentationFS14/src/modules/jump/JumpPlatformStatic.cc (added) * code/branches/presentationFS14/src/modules/jump/JumpPlatformStatic.h (added) * code/branches/presentationFS14/src/modules/jump/JumpPlatformTimer.cc (added) * code/branches/presentationFS14/src/modules/jump/JumpPlatformTimer.h (added) * code/branches/presentationFS14/src/modules/jump/JumpPlatformVMove.cc (added) * code/branches/presentationFS14/src/modules/jump/JumpPlatformVMove.h (added) * code/branches/presentationFS14/src/modules/jump/JumpPrereqs.h (added) * code/branches/presentationFS14/src/modules/jump/JumpProjectile.cc (added) * code/branches/presentationFS14/src/modules/jump/JumpProjectile.h (added) * code/branches/presentationFS14/src/modules/jump/JumpPropeller.cc (added) * code/branches/presentationFS14/src/modules/jump/JumpPropeller.h (added) * code/branches/presentationFS14/src/modules/jump/JumpRocket.cc (added) * code/branches/presentationFS14/src/modules/jump/JumpRocket.h (added) * code/branches/presentationFS14/src/modules/jump/JumpScore.cc (added) * code/branches/presentationFS14/src/modules/jump/JumpScore.h (added) * code/branches/presentationFS14/src/modules/jump/JumpShield.cc (added) * code/branches/presentationFS14/src/modules/jump/JumpShield.h (added) * code/branches/presentationFS14/src/modules/jump/JumpSpring.cc (added) * code/branches/presentationFS14/src/modules/jump/JumpSpring.h (added) Merged Jump minigame, tested, works. Tue, 27 May 2014 07:54:25 GMT smerkli [10077] * code/branches/presentationFS14/data/levels/templates/spaceshipTurret.oxt (added) * code/branches/presentationFS14/src/orxonox/controllers/ControllerDirector.cc (modified) * code/branches/presentationFS14/src/orxonox/controllers/ScriptController.cc (modified) Removed some verbose output from default output and re-added a file ... Thu, 22 May 2014 13:59:14 GMT smerkli [10076] * code/branches/presentationFS14 (modified) * code/branches/presentationFS14/data/gui/scripts/testscript.lua (copied) * code/branches/presentationFS14/data/levels/levelTry.oxw (copied) * code/branches/presentationFS14/data/levels/michaelstestfile.lua (copied) * code/branches/presentationFS14/data/levels/scriptController.oxw (copied) * code/branches/presentationFS14/src/orxonox/CMakeLists.txt (modified) * code/branches/presentationFS14/src/orxonox/controllers/CMakeLists.txt (modified) * code/branches/presentationFS14/src/orxonox/controllers/ControllerDirector.cc (copied) * code/branches/presentationFS14/src/orxonox/controllers/ControllerDirector.h (copied) * code/branches/presentationFS14/src/orxonox/controllers/ScriptController.cc (copied) * code/branches/presentationFS14/src/orxonox/controllers/ScriptController.h (copied) * code/branches/presentationFS14/src/orxonox/controllers/testscript.lua (copied) Merged scriptcontroller branch Thu, 22 May 2014 12:49:16 GMT smerkli [10073] * code/branches/presentationFS14 (modified) * code/branches/presentationFS14/data/levels/ModularShipsTest0.oxw (copied) * code/branches/presentationFS14/data/levels/ModularShipsTest1.oxw (copied) * code/branches/presentationFS14/data/levels/templates/HeavyCruiser.oxt (modified) * code/branches/presentationFS14/data/levels/templates/ModularSpaceShipTest.oxt (copied) * code/branches/presentationFS14/src/external/bullet/BulletCollision/CollisionDispatch/btCompoundCollisionAlgorithm.cpp (modified) * code/branches/presentationFS14/src/modules/weapons/projectiles/BasicProjectile.cc (modified) * code/branches/presentationFS14/src/modules/weapons/projectiles/BasicProjectile.h (modified) * code/branches/presentationFS14/src/modules/weapons/projectiles/Projectile.cc (modified) * code/branches/presentationFS14/src/modules/weapons/projectiles/Projectile.h (modified) * code/branches/presentationFS14/src/modules/weapons/projectiles/Rocket.cc (modified) * code/branches/presentationFS14/src/modules/weapons/projectiles/Rocket.h (modified) * code/branches/presentationFS14/src/modules/weapons/projectiles/SimpleRocket.cc (modified) * code/branches/presentationFS14/src/modules/weapons/projectiles/SimpleRocket.h (modified) * code/branches/presentationFS14/src/orxonox/CMakeLists.txt (modified) * code/branches/presentationFS14/src/orxonox/OrxonoxPrereqs.h (modified) * code/branches/presentationFS14/src/orxonox/Scene.cc (modified) * code/branches/presentationFS14/src/orxonox/Scene.h (modified) * code/branches/presentationFS14/src/orxonox/ShipPartManager.cc (copied) * code/branches/presentationFS14/src/orxonox/ShipPartManager.h (copied) * code/branches/presentationFS14/src/orxonox/collisionshapes/CollisionShape.h (modified) * code/branches/presentationFS14/src/orxonox/collisionshapes/CompoundCollisionShape.cc (modified) * code/branches/presentationFS14/src/orxonox/collisionshapes/CompoundCollisionShape.h (modified) * code/branches/presentationFS14/src/orxonox/controllers/NewHumanController.cc (modified) * code/branches/presentationFS14/src/orxonox/items/CMakeLists.txt (modified) * code/branches/presentationFS14/src/orxonox/items/PartDestructionEvent.cc (copied) * code/branches/presentationFS14/src/orxonox/items/PartDestructionEvent.h (copied) * code/branches/presentationFS14/src/orxonox/items/ShipPart.cc (copied) * code/branches/presentationFS14/src/orxonox/items/ShipPart.h (copied) * code/branches/presentationFS14/src/orxonox/worldentities/MovableEntity.cc (modified) * code/branches/presentationFS14/src/orxonox/worldentities/MovableEntity.h (modified) * code/branches/presentationFS14/src/orxonox/worldentities/StaticEntity.cc (modified) * code/branches/presentationFS14/src/orxonox/worldentities/WorldEntity.cc (modified) * code/branches/presentationFS14/src/orxonox/worldentities/WorldEntity.h (modified) * code/branches/presentationFS14/src/orxonox/worldentities/pawns/CMakeLists.txt (modified) * code/branches/presentationFS14/src/orxonox/worldentities/pawns/ModularSpaceShip.cc (copied) * code/branches/presentationFS14/src/orxonox/worldentities/pawns/ModularSpaceShip.h (copied) * code/branches/presentationFS14/src/orxonox/worldentities/pawns/Pawn.cc (modified) * code/branches/presentationFS14/src/orxonox/worldentities/pawns/Pawn.h (modified) * code/branches/presentationFS14/src/orxonox/worldentities/pawns/SpaceShip.h (modified) Merged modularships branch Thu, 22 May 2014 12:35:02 GMT smerkli [10072] * code/branches/presentationFS14 (modified) * code/branches/presentationFS14/data/levels/includes/weaponSettingsTurret.oxi (modified) * code/branches/presentationFS14/data/levels/templates/spaceshipTurret.oxt (deleted) * code/branches/presentationFS14/data/levels/templates/standardTurret.oxt (copied) * code/branches/presentationFS14/data/levels/turretTest.oxw (modified) * code/branches/presentationFS14/src/modules/objects/CMakeLists.txt (modified) * code/branches/presentationFS14/src/modules/objects/Turret.cc (modified) * code/branches/presentationFS14/src/modules/objects/Turret.h (modified) * code/branches/presentationFS14/src/modules/objects/controllers (copied) * code/branches/presentationFS14/src/modules/objects/controllers/CMakeLists.txt (copied) * code/branches/presentationFS14/src/modules/objects/controllers/TeamTargetProxy.cc (copied) * code/branches/presentationFS14/src/modules/objects/controllers/TeamTargetProxy.h (copied) * code/branches/presentationFS14/src/modules/objects/controllers/TurretController.cc (copied) * code/branches/presentationFS14/src/modules/objects/controllers/TurretController.h (copied) * code/branches/presentationFS14/src/orxonox/controllers/ArtificialController.cc (modified) * code/branches/presentationFS14/src/orxonox/worldentities/WorldEntity.cc (modified) Merged turretFS14 branch Thu, 22 May 2014 11:36:06 GMT smerkli [10069] * code/branches/presentationFS14 (copied) Created a presentation branch