# # ChangeLog for code/branches # # Generated by Trac 1.0.9 # Nov 22, 2024, 9:43:19 PM Wed, 21 May 2014 09:45:35 GMT smerkli [10064] * code/branches/ScriptableController/src/orxonox/controllers/ScriptController.cc (modified) Test commit to see if committing still works Tue, 20 May 2014 08:21:20 GMT muemart [10063] * code/branches/turretFS14/data/levels/turretTest.oxw (modified) * code/branches/turretFS14/src/modules/objects/Turret.cc (modified) * code/branches/turretFS14/src/modules/objects/Turret.h (modified) Comment out all the raytest stuff. Needs more work and/or knowledge Tue, 20 May 2014 07:03:19 GMT muemart [10062] * code/branches/turretFS14/src/modules/objects/controllers/TurretController.cc (modified) Commit the right file this time Tue, 20 May 2014 07:02:05 GMT muemart [10061] * code/branches/turretFS14/src/modules/objects/Turret.cc (modified) Lower means better means lower means better... Thu, 15 May 2014 15:10:55 GMT muemart [10060] * code/branches/turretFS14/data/levels/turretTest.oxw (modified) * code/branches/turretFS14/src/modules/objects/Turret.cc (modified) * code/branches/turretFS14/src/modules/objects/Turret.h (modified) * code/branches/turretFS14/src/modules/objects/controllers/TeamTargetProxy.cc (modified) * code/branches/turretFS14/src/modules/objects/controllers/TeamTargetProxy.h (modified) * code/branches/turretFS14/src/modules/objects/controllers/TurretController.cc (modified) * code/branches/turretFS14/src/modules/objects/controllers/TurretController.h (modified) * code/branches/turretFS14/src/orxonox/worldentities/WorldEntity.cc (modified) Fix team acquisition, edit test level and start to try to make a raytest Thu, 15 May 2014 15:09:35 GMT samuezu [10059] * code/branches/ScriptableController/data/levels/levelTry.oxw (modified) * code/branches/ScriptableController/src/orxonox/controllers/ControllerDirector.cc (modified) * code/branches/ScriptableController/src/orxonox/controllers/ScriptController.cc (modified) * code/branches/ScriptableController/src/orxonox/controllers/ScriptController.h (modified) works more or less, but big trouble accessing the ... Thu, 15 May 2014 13:53:11 GMT noep [10058] * code/branches/modularships/data/levels/templates/HeavyCruiser.oxt (modified) * code/branches/modularships/src/orxonox/controllers/NewHumanController.cc (modified) * code/branches/modularships/src/orxonox/items/PartDestructionEvent.cc (modified) * code/branches/modularships/src/orxonox/items/PartDestructionEvent.h (modified) * code/branches/modularships/src/orxonox/items/ShipPart.cc (modified) * code/branches/modularships/src/orxonox/items/ShipPart.h (modified) * code/branches/modularships/src/orxonox/worldentities/StaticEntity.cc (modified) * code/branches/modularships/src/orxonox/worldentities/pawns/ModularSpaceShip.cc (modified) * code/branches/modularships/src/orxonox/worldentities/pawns/ModularSpaceShip.h (modified) * code/branches/modularships/src/orxonox/worldentities/pawns/SpaceShip.h (modified) Expanded functionality of PartDestructionEvents, fixed cursor not ... Thu, 15 May 2014 12:18:08 GMT mkronig [10057] * code/branches/ScriptableController/data/gui/scripts/testscript.lua (modified) * code/branches/ScriptableController/data/levels/levelTry.oxw (modified) * code/branches/ScriptableController/src/orxonox/controllers/ControllerDirector.cc (modified) * code/branches/ScriptableController/src/orxonox/controllers/ScriptController.cc (modified) Thu, 15 May 2014 09:12:30 GMT smerkli [10056] * code/branches/ScriptableController/src/orxonox/controllers/ScriptController.cc (modified) Added a check whether the eventlist is empty, this fixes the segfault. Wed, 14 May 2014 18:25:08 GMT noep [10055] * code/branches/modularships/data/levels/ModularShipsTest1.oxw (modified) * code/branches/modularships/data/levels/templates/HeavyCruiser.oxt (modified) * code/branches/modularships/src/orxonox/items/PartDestructionEvent.cc (modified) * code/branches/modularships/src/orxonox/items/PartDestructionEvent.h (modified) * code/branches/modularships/src/orxonox/items/ShipPart.cc (modified) * code/branches/modularships/src/orxonox/items/ShipPart.h (modified) * code/branches/modularships/src/orxonox/worldentities/pawns/ModularSpaceShip.cc (modified) * code/branches/modularships/src/orxonox/worldentities/pawns/ModularSpaceShip.h (modified) Cleaned up code. Added console command "ModularSpaceShip killshippart ... Tue, 13 May 2014 10:38:37 GMT noep [10054] * code/branches/modularships/data/levels/templates/ModularSpaceShipTest.oxt (modified) * code/branches/modularships/src/orxonox/worldentities/pawns/ModularSpaceShip.cc (modified) * code/branches/modularships/src/orxonox/worldentities/pawns/ModularSpaceShip.h (modified) Fixed CollisionShapes of ShipParts reappearing at their spawnposition ... Tue, 13 May 2014 09:45:47 GMT noep [10053] * code/branches/modularships/data/levels/ModularShipsTest0.oxw (added) * code/branches/modularships/data/levels/ModularShipsTest1.oxw (added) * code/branches/modularships/data/levels/emptyLevel.oxw (modified) * code/branches/modularships/data/levels/templates/HeavyCruiser.oxt (modified) * code/branches/modularships/data/levels/templates/ModularSpaceShipTest.oxt (added) * code/branches/modularships/src/external/bullet/BulletCollision/CollisionDispatch/btCompoundCollisionAlgorithm.cpp (modified) * code/branches/modularships/src/orxonox/Scene.cc (modified) * code/branches/modularships/src/orxonox/items/PartDestructionEvent.cc (modified) * code/branches/modularships/src/orxonox/items/PartDestructionEvent.h (modified) * code/branches/modularships/src/orxonox/items/ShipPart.cc (modified) * code/branches/modularships/src/orxonox/items/ShipPart.h (modified) * code/branches/modularships/src/orxonox/worldentities/WorldEntity.cc (modified) * code/branches/modularships/src/orxonox/worldentities/pawns/ModularSpaceShip.cc (modified) Fixed yet another segfault (which we hadn't seen yet). Cleared ... Thu, 08 May 2014 14:20:26 GMT noep [10052] * code/branches/modularships/data/levels/templates/HeavyCruiser.oxt (modified) * code/branches/modularships/src/orxonox/OrxonoxPrereqs.h (modified) * code/branches/modularships/src/orxonox/items/CMakeLists.txt (modified) * code/branches/modularships/src/orxonox/items/PartDestructionEvent.cc (added) * code/branches/modularships/src/orxonox/items/PartDestructionEvent.h (added) * code/branches/modularships/src/orxonox/items/ShipPart.cc (modified) * code/branches/modularships/src/orxonox/items/ShipPart.h (modified) * code/branches/modularships/src/orxonox/worldentities/WorldEntity.cc (modified) * code/branches/modularships/src/orxonox/worldentities/pawns/ModularSpaceShip.cc (modified) Added PartDestructionEvent, possibly fixed one out of two runtimeerrors Thu, 08 May 2014 14:16:59 GMT fvultier [10051] * code/branches/pickupsFS14/data/levels/Jump.oxw (deleted) * code/branches/pickupsFS14/data/levels/jump.oxw (added) * code/branches/pickupsFS14/data/overlays/jumpHUD.oxo (added) * code/branches/pickupsFS14/src/modules/jump/JumpCenterPoint.cc (deleted) * code/branches/pickupsFS14/src/modules/jump/JumpCenterPoint.h (deleted) * code/branches/pickupsFS14/src/modules/jump/JumpShip.cc (deleted) * code/branches/pickupsFS14/src/modules/jump/JumpShip.h (deleted) Removed a few more files I don't need anymore Thu, 08 May 2014 14:14:31 GMT fvultier [10050] * code/branches/pickupsFS14/src/modules/jump/CMakeLists.txt (modified) * code/branches/pickupsFS14/src/modules/jump/Jump.cc (modified) * code/branches/pickupsFS14/src/modules/jump/Jump.h (modified) * code/branches/pickupsFS14/src/modules/jump/JumpCenterpoint.cc (added) * code/branches/pickupsFS14/src/modules/jump/JumpCenterpoint.h (added) * code/branches/pickupsFS14/src/modules/jump/JumpEnemy.cc (added) * code/branches/pickupsFS14/src/modules/jump/JumpEnemy.h (added) * code/branches/pickupsFS14/src/modules/jump/JumpFigure.cc (added) * code/branches/pickupsFS14/src/modules/jump/JumpFigure.h (added) * code/branches/pickupsFS14/src/modules/jump/JumpItem.cc (added) * code/branches/pickupsFS14/src/modules/jump/JumpItem.h (added) * code/branches/pickupsFS14/src/modules/jump/JumpPlatform.cc (modified) * code/branches/pickupsFS14/src/modules/jump/JumpPlatform.h (modified) * code/branches/pickupsFS14/src/modules/jump/JumpPlatformDisappear.cc (added) * code/branches/pickupsFS14/src/modules/jump/JumpPlatformDisappear.h (added) * code/branches/pickupsFS14/src/modules/jump/JumpPlatformFake.cc (added) * code/branches/pickupsFS14/src/modules/jump/JumpPlatformFake.h (added) * code/branches/pickupsFS14/src/modules/jump/JumpPlatformHMove.cc (added) * code/branches/pickupsFS14/src/modules/jump/JumpPlatformHMove.h (added) * code/branches/pickupsFS14/src/modules/jump/JumpPlatformStatic.cc (added) * code/branches/pickupsFS14/src/modules/jump/JumpPlatformStatic.h (added) * code/branches/pickupsFS14/src/modules/jump/JumpPlatformTimer.cc (added) * code/branches/pickupsFS14/src/modules/jump/JumpPlatformTimer.h (added) * code/branches/pickupsFS14/src/modules/jump/JumpPlatformVMove.cc (added) * code/branches/pickupsFS14/src/modules/jump/JumpPlatformVMove.h (added) * code/branches/pickupsFS14/src/modules/jump/JumpPrereqs.h (modified) * code/branches/pickupsFS14/src/modules/jump/JumpProjectile.cc (added) * code/branches/pickupsFS14/src/modules/jump/JumpProjectile.h (added) * code/branches/pickupsFS14/src/modules/jump/JumpScore.cc (added) * code/branches/pickupsFS14/src/modules/jump/JumpScore.h (added) * code/branches/pickupsFS14/svn-commit.tmp (added) Added a whole bunch of code Thu, 08 May 2014 14:04:53 GMT muemart [10049] * code/branches/turretFS14/data/levels/includes/weaponSettingsTurret.oxi (modified) * code/branches/turretFS14/data/levels/includes/weaponSettingsTurretTest.oxi (deleted) * code/branches/turretFS14/data/levels/templates/spaceshipTurret.oxt (deleted) * code/branches/turretFS14/data/levels/templates/spaceshipTurretTest.oxt (deleted) * code/branches/turretFS14/data/levels/templates/standardTurret.oxt (added) * code/branches/turretFS14/data/levels/turretTest.oxw (modified) * code/branches/turretFS14/src/modules/objects/Turret.cc (modified) * code/branches/turretFS14/src/modules/objects/Turret.h (modified) * code/branches/turretFS14/src/modules/objects/controllers/CMakeLists.txt (modified) * code/branches/turretFS14/src/modules/objects/controllers/TeamTargetProxy.cc (added) * code/branches/turretFS14/src/modules/objects/controllers/TeamTargetProxy.h (added) * code/branches/turretFS14/src/modules/objects/controllers/TurretController.cc (modified) * code/branches/turretFS14/src/modules/objects/controllers/TurretController.h (modified) Delete the old turret templates and make new ones. Adjust the weapon ... Thu, 08 May 2014 13:59:26 GMT samuezu [10048] * code/branches/ScriptableController/data/gui/scripts/testscript.lua (modified) * code/branches/ScriptableController/src/orxonox/controllers/ScriptController.cc (modified) * code/branches/ScriptableController/src/orxonox/controllers/ScriptController.h (modified) created struct event, an eventlist and the functions eventscheduler ... Thu, 08 May 2014 08:16:23 GMT smerkli [10047] * code/branches/ScriptableController/data/gui/scripts/testscript.lua (modified) * code/branches/ScriptableController/src/orxonox/controllers/ControllerDirector.cc (modified) * code/branches/ScriptableController/src/orxonox/controllers/ControllerDirector.h (modified) * code/branches/ScriptableController/src/orxonox/controllers/ScriptController.cc (modified) * code/branches/ScriptableController/src/orxonox/controllers/ScriptController.h (modified) Controller switching works now, however lua script execution is ... Wed, 07 May 2014 12:03:18 GMT smerkli [10046] * code/branches/ScriptableController/data/gui/scripts/testscript.lua (modified) * code/branches/ScriptableController/src/orxonox/controllers/ControllerDirector.cc (modified) * code/branches/ScriptableController/src/orxonox/controllers/ScriptController.cc (modified) * code/branches/ScriptableController/src/orxonox/controllers/ScriptController.h (modified) Fixed some more things. What works now: - Setting an ID for the ... Tue, 06 May 2014 14:02:07 GMT smerkli [10045] * code/branches/ScriptableController/data/gui/scripts/testscript.lua (modified) * code/branches/ScriptableController/src/orxonox/CMakeLists.txt (modified) * code/branches/ScriptableController/src/orxonox/controllers/ScriptController.cc (modified) * code/branches/ScriptableController/src/orxonox/controllers/ScriptController.h (modified) Fixed the lua stuff, can now call ScriptController functions from lua. Tue, 06 May 2014 09:07:07 GMT muemart [10044] * code/branches/turretFS14/data/levels/includes/weaponSettingsTurretTest.oxi (modified) * code/branches/turretFS14/data/levels/templates/spaceshipAssff.oxt (modified) * code/branches/turretFS14/data/levels/templates/spaceshipTurretTest.oxt (modified) * code/branches/turretFS14/data/levels/turretTest.oxw (modified) * code/branches/turretFS14/src/modules/objects/Turret.cc (modified) * code/branches/turretFS14/src/modules/objects/Turret.h (modified) * code/branches/turretFS14/src/modules/objects/controllers/TurretController.cc (modified) * code/branches/turretFS14/src/modules/objects/controllers/TurretController.h (modified) Move everything back to the Turret class, set the correct team, and ... Tue, 29 Apr 2014 09:31:23 GMT muemart [10043] * code/branches/turretFS14/src/orxonox/controllers/FormationController.cc (modified) Revert changes to FormationController... keep the dirt to myself Tue, 29 Apr 2014 09:16:16 GMT muemart [10042] * code/branches/turretFS14/data/levels/turretTest.oxw (modified) * code/branches/turretFS14/src/modules/objects/Turret.cc (modified) * code/branches/turretFS14/src/modules/objects/controllers/TurretController.cc (modified) * code/branches/turretFS14/src/modules/objects/controllers/TurretController.h (modified) Fix rotation if parent is already rotated. Everything hopefully now ... Tue, 22 Apr 2014 15:32:37 GMT fvultier [10041] * code/branches/pickupsFS14/src/modules/jump/CMakeLists.txt (modified) * code/branches/pickupsFS14/src/modules/jump/Jump.cc (modified) * code/branches/pickupsFS14/src/modules/jump/Jump.h (modified) * code/branches/pickupsFS14/src/modules/jump/JumpPlatform.cc (modified) * code/branches/pickupsFS14/src/modules/jump/JumpPlatform.h (modified) * code/branches/pickupsFS14/src/modules/jump/JumpPrereqs.h (modified) * code/branches/pickupsFS14/src/orxonox/worldentities/WorldEntity.h (modified) Level wird zufaellig generiert, HUD funktionier(Punkte werden ... Thu, 17 Apr 2014 14:29:25 GMT fvultier [10040] * code/branches/pickupsFS14/src/modules/jump/CMakeLists.txt (modified) * code/branches/pickupsFS14/src/modules/jump/Jump.cc (modified) * code/branches/pickupsFS14/src/modules/jump/Jump.h (modified) * code/branches/pickupsFS14/src/modules/jump/JumpPlatform.cc (modified) * code/branches/pickupsFS14/src/modules/jump/JumpPlatform.h (modified) * code/branches/pickupsFS14/src/modules/jump/JumpPrereqs.h (modified) Bewegung mit WASD und Absprung von einer Platform in der Mitte ... Thu, 17 Apr 2014 14:05:06 GMT muemart [10039] * code/branches/turretFS14/data/levels/templates/spaceshipAssff.oxt (modified) * code/branches/turretFS14/data/levels/turretTest.oxw (modified) * code/branches/turretFS14/src/libraries/core/input/InputManager.cc (modified) * code/branches/turretFS14/src/modules/objects/Turret.cc (modified) * code/branches/turretFS14/src/modules/objects/Turret.h (modified) * code/branches/turretFS14/src/modules/objects/controllers/TurretController.cc (modified) * code/branches/turretFS14/src/modules/objects/controllers/TurretController.h (modified) * code/branches/turretFS14/src/orxonox/controllers/ArtificialController.cc (modified) * code/branches/turretFS14/src/orxonox/controllers/FormationController.cc (modified) * code/branches/turretFS14/src/orxonox/worldentities/WorldEntity.cc (modified) Move logic into controller, don't use bullet for rotations, and use ... Thu, 17 Apr 2014 14:04:50 GMT samuezu [10038] * code/branches/ScriptableController/src/orxonox/controllers/ScriptController.cc (modified) scriptcontroller slightly modified Thu, 17 Apr 2014 14:00:49 GMT mkronig [10037] * code/branches/ScriptableController/data/gui/scripts/testscript.lua (modified) * code/branches/ScriptableController/data/levels/levelTry.oxw (modified) tried to access a function of ScriptController. Failed. Put a ... Thu, 17 Apr 2014 13:41:17 GMT noep [10036] * code/branches/modularships/src/orxonox/Scene.cc (modified) * code/branches/modularships/src/orxonox/collisionshapes/CompoundCollisionShape.cc (modified) * code/branches/modularships/src/orxonox/worldentities/pawns/ModularSpaceShip.cc (modified) * code/branches/modularships/src/orxonox/worldentities/pawns/ModularSpaceShip.h (modified) Tried to prevent the StaticEntities & Collisionshapes from getting ... Thu, 17 Apr 2014 12:27:35 GMT mkronig [10035] * code/branches/ScriptableController/data/gui/scripts/testscript.lua (added) * code/branches/ScriptableController/data/levels/levelTry.oxw (modified) * code/branches/ScriptableController/src/orxonox/controllers/ControllerDirector.cc (modified) * code/branches/ScriptableController/src/orxonox/controllers/testscript.lua (added) changes on controllerDirector and added some new lua scripts Thu, 17 Apr 2014 12:24:12 GMT samuezu [10034] * code/branches/ScriptableController/src/orxonox/controllers/ScriptController.cc (modified) * code/branches/ScriptableController/src/orxonox/controllers/ScriptController.h (modified) orxout in sc fct movetoposition Wed, 16 Apr 2014 18:59:17 GMT noep [10033] * code/branches/modularships/src/orxonox/collisionshapes/CompoundCollisionShape.cc (modified) * code/branches/modularships/src/orxonox/items/ShipPart.cc (modified) * code/branches/modularships/src/orxonox/worldentities/WorldEntity.cc (modified) * code/branches/modularships/src/orxonox/worldentities/WorldEntity.h (modified) * code/branches/modularships/src/orxonox/worldentities/pawns/ModularSpaceShip.cc (modified) * code/branches/modularships/src/orxonox/worldentities/pawns/ModularSpaceShip.h (modified) Tried to find&solve the segfault. The detach-process itself is not ... Fri, 11 Apr 2014 10:07:05 GMT fvultier [10032] * code/branches/pickupsFS14/data/levels/Jump.oxw (modified) * code/branches/pickupsFS14/src/modules/jump/Jump.cc (modified) * code/branches/pickupsFS14/src/modules/jump/Jump.h (modified) * code/branches/pickupsFS14/src/modules/jump/JumpPlatform.cc (modified) * code/branches/pickupsFS14/src/modules/jump/JumpPlatform.h (modified) * code/branches/pickupsFS14/src/modules/jump/JumpPrereqs.h (modified) * code/branches/pickupsFS14/src/modules/jump/JumpShip.cc (modified) * code/branches/pickupsFS14/src/modules/jump/JumpShip.h (modified) Neue Platformen werden zur Laufzeit hinzugefugt, wenn sich die ... Thu, 10 Apr 2014 14:06:03 GMT muemart [10031] * code/branches/turretFS14/data/levels/templates/spaceshipAssff.oxt (modified) * code/branches/turretFS14/data/levels/templates/spaceshipTurretTest.oxt (modified) * code/branches/turretFS14/data/levels/turretTest.oxw (modified) * code/branches/turretFS14/src/modules/objects/Turret.cc (modified) * code/branches/turretFS14/src/modules/objects/Turret.h (modified) * code/branches/turretFS14/src/modules/objects/controllers/TurretController.cc (modified) * code/branches/turretFS14/src/modules/objects/controllers/TurretController.h (modified) * code/branches/turretFS14/src/orxonox/worldentities/WorldEntity.cc (modified) Limit turret's rotation (another method...), work a bit on the ... Thu, 10 Apr 2014 13:57:29 GMT mkronig [10030] * code/branches/ScriptableController/src/orxonox/controllers/ControllerDirector.cc (modified) last commit from 10.4.14 Thu, 10 Apr 2014 13:45:56 GMT noep [10029] * code/branches/modularships/data/levels/emptyLevel.oxw (modified) * code/branches/modularships/data/levels/templates/HeavyCruiser.oxt (modified) * code/branches/modularships/src/orxonox/worldentities/WorldEntity.h (modified) * code/branches/modularships/src/orxonox/worldentities/pawns/ModularSpaceShip.cc (modified) Fixed a bug where part-entity-assignments were not created. Thu, 10 Apr 2014 13:40:57 GMT samuezu [10028] * code/branches/ScriptableController/src/orxonox/controllers/ScriptController.cc (modified) * code/branches/ScriptableController/src/orxonox/controllers/ScriptController.h (modified) compiles now Thu, 10 Apr 2014 13:39:32 GMT mkronig [10027] * code/branches/ScriptableController/src/orxonox/controllers/ControllerDirector.h (modified) changes on controllerDirector e.g. lua part Thu, 10 Apr 2014 13:18:32 GMT mkronig [10026] * code/branches/ScriptableController/data/levels/levelTry.oxw (modified) * code/branches/ScriptableController/data/levels/michaelstestfile.lua (added) * code/branches/ScriptableController/src/orxonox/controllers/ControllerDirector.cc (modified) Added an initial test for lua execution. Not tested yet. Thu, 10 Apr 2014 11:19:01 GMT samuezu [10025] * code/branches/ScriptableController/src/orxonox/controllers/ScriptController.cc (modified) * code/branches/ScriptableController/src/orxonox/controllers/ScriptController.h (modified) created scriptcontroller header and *.cc file Thu, 10 Apr 2014 11:15:58 GMT mkronig [10024] * code/branches/ScriptableController/data/levels/levelTry.oxw (modified) * code/branches/ScriptableController/src/orxonox/controllers/ControllerDirector.cc (modified) * code/branches/ScriptableController/src/orxonox/controllers/ControllerDirector.h (modified) changes on controllerDirector project Wed, 09 Apr 2014 19:50:45 GMT noep [10023] * code/branches/modularships/data/levels/emptyLevel.oxw (modified) * code/branches/modularships/data/levels/templates/HeavyCruiser.oxt (modified) * code/branches/modularships/src/orxonox/OrxonoxPrereqs.h (modified) * code/branches/modularships/src/orxonox/items/ShipPart.cc (modified) * code/branches/modularships/src/orxonox/items/ShipPart.h (modified) * code/branches/modularships/src/orxonox/worldentities/pawns/ModularSpaceShip.cc (modified) * code/branches/modularships/src/orxonox/worldentities/pawns/ModularSpaceShip.h (modified) * code/branches/modularships/src/orxonox/worldentities/pawns/Pawn.cc (modified) * code/branches/modularships/src/orxonox/worldentities/pawns/Pawn.h (modified) ShipParts can "die" and detach the corresponding Entity while doing ... Thu, 03 Apr 2014 14:05:52 GMT fvultier [10022] * code/branches/pickupsFS14/src/modules/jump/Jump.cc (modified) * code/branches/pickupsFS14/src/modules/jump/Jump.h (modified) * code/branches/pickupsFS14/src/modules/jump/JumpPlatform.cc (modified) * code/branches/pickupsFS14/src/modules/jump/JumpPlatform.h (modified) * code/branches/pickupsFS14/src/modules/jump/JumpShip.cc (modified) * code/branches/pickupsFS14/src/modules/jump/JumpShip.h (modified) Anzeigen eines .mesh files funktioniert. Es wird nicht im Level-File ... Thu, 03 Apr 2014 14:04:32 GMT muemart [10021] * code/branches/turretFS14/data/levels/templates/spaceshipTurretTest.oxt (modified) * code/branches/turretFS14/src/modules/objects/Turret.cc (modified) * code/branches/turretFS14/src/modules/objects/Turret.h (modified) Turret: Move the turret up in the hierarchy, edit the template ... Thu, 03 Apr 2014 13:59:48 GMT samuezu [10020] * code/branches/ScriptableController/src/orxonox/controllers/ControllerDirector.h (modified) * code/branches/ScriptableController/src/orxonox/controllers/ScriptController.cc (modified) * code/branches/ScriptableController/src/orxonox/controllers/ScriptController.h (modified) created scriptcontroller header and *.cc file Thu, 03 Apr 2014 13:45:50 GMT noep [10019] * code/branches/modularships/data/levels/templates/HeavyCruiser.oxt (modified) * code/branches/modularships/src/orxonox/CMakeLists.txt (modified) * code/branches/modularships/src/orxonox/ShipPart.cc (deleted) * code/branches/modularships/src/orxonox/ShipPart.h (deleted) * code/branches/modularships/src/orxonox/items/CMakeLists.txt (modified) * code/branches/modularships/src/orxonox/items/ShipPart.cc (added) * code/branches/modularships/src/orxonox/items/ShipPart.h (added) * code/branches/modularships/src/orxonox/worldentities/pawns/ModularSpaceShip.cc (modified) * code/branches/modularships/src/orxonox/worldentities/pawns/ModularSpaceShip.h (modified) * code/branches/modularships/src/orxonox/worldentities/pawns/Pawn.h (modified) Continued working on ShipPart and ModularSpaceShip implementation Thu, 03 Apr 2014 12:57:05 GMT muemart [10018] * code/branches/turretFS14/data/levels/templates/spaceshipTurretTest.oxt (modified) * code/branches/turretFS14/data/levels/turretTest.oxw (modified) * code/branches/turretFS14/src/modules/objects/Turret.cc (modified) * code/branches/turretFS14/src/modules/objects/Turret.h (modified) * code/branches/turretFS14/src/modules/objects/controllers/TurretController.cc (modified) * code/branches/turretFS14/src/modules/objects/controllers/TurretController.h (modified) Turret: Limit turret's rotation (not really precise though) & ... Thu, 03 Apr 2014 12:35:54 GMT fvultier [10017] * code/branches/pickupsFS14/data/levels/Jump.oxw (modified) * code/branches/pickupsFS14/data/levels/templates/spaceshipJump.oxt (added) * code/branches/pickupsFS14/src/Orxonox.cc (modified) * code/branches/pickupsFS14/src/modules/jump/CMakeLists.txt (modified) * code/branches/pickupsFS14/src/modules/jump/Jump.cc (modified) * code/branches/pickupsFS14/src/modules/jump/JumpCenterPoint.cc (modified) * code/branches/pickupsFS14/src/modules/jump/JumpPlatform.cc (added) * code/branches/pickupsFS14/src/modules/jump/JumpPlatform.h (added) * code/branches/pickupsFS14/src/modules/jump/JumpShip.cc (modified) * code/branches/pickupsFS14/src/modules/jump/JumpShip.h (modified) Steuerung funktioniert Thu, 03 Apr 2014 12:19:49 GMT mkronig [10016] * code/branches/ScriptableController/src/orxonox/controllers/ControllerDirector.cc (modified) Thu, 03 Apr 2014 11:57:32 GMT samuezu [10015] * code/branches/ScriptableController/src/orxonox/controllers/CMakeLists.txt (modified) removed the temporary script controller entry in the CMakelists Thu, 03 Apr 2014 11:55:14 GMT samuezu [10014] * code/branches/ScriptableController/src/orxonox/controllers/ScriptController.cc (added) * code/branches/ScriptableController/src/orxonox/controllers/ScriptController.h (added) re-added the scriptcontroller files Thu, 03 Apr 2014 11:46:08 GMT samuezu [10013] * code/branches/ScriptableController/src/orxonox/controllers/ScriptController.cc (deleted) * code/branches/ScriptableController/src/orxonox/controllers/ScriptController.h (deleted) * code/branches/ScriptableController/src/orxonox/controllers/ScriptController_00.cc (deleted) * code/branches/ScriptableController/src/orxonox/controllers/ScriptController_00.h (deleted) adding ControllerDirector files Thu, 03 Apr 2014 11:21:01 GMT mkronig [10012] * code/branches/ScriptableController/data/levels/scriptController.oxw (added) * code/branches/ScriptableController/src/orxonox/controllers/ControllerDirector.cc (added) * code/branches/ScriptableController/src/orxonox/controllers/ControllerDirector.h (added) * code/branches/ScriptableController/src/orxonox/controllers/ScriptController.cc (modified) * code/branches/ScriptableController/src/orxonox/controllers/ScriptController.h (modified) commit 3.4.2014 Wed, 02 Apr 2014 18:38:07 GMT noep [10011] * code/branches/modularships/data/levels/emptyLevel.oxw (modified) * code/branches/modularships/data/levels/templates/HeavyCruiser.oxt (modified) * code/branches/modularships/src/modules/weapons/projectiles/BasicProjectile.cc (modified) * code/branches/modularships/src/modules/weapons/projectiles/BasicProjectile.h (modified) * code/branches/modularships/src/modules/weapons/projectiles/Projectile.cc (modified) * code/branches/modularships/src/modules/weapons/projectiles/Projectile.h (modified) * code/branches/modularships/src/modules/weapons/projectiles/Rocket.cc (modified) * code/branches/modularships/src/modules/weapons/projectiles/Rocket.h (modified) * code/branches/modularships/src/modules/weapons/projectiles/SimpleRocket.cc (modified) * code/branches/modularships/src/modules/weapons/projectiles/SimpleRocket.h (modified) * code/branches/modularships/src/orxonox/CMakeLists.txt (modified) * code/branches/modularships/src/orxonox/Scene.cc (modified) * code/branches/modularships/src/orxonox/ShipPart.cc (modified) * code/branches/modularships/src/orxonox/ShipPart.h (modified) * code/branches/modularships/src/orxonox/worldentities/MovableEntity.cc (modified) * code/branches/modularships/src/orxonox/worldentities/MovableEntity.h (modified) * code/branches/modularships/src/orxonox/worldentities/WorldEntity.h (modified) * code/branches/modularships/src/orxonox/worldentities/pawns/CMakeLists.txt (modified) * code/branches/modularships/src/orxonox/worldentities/pawns/ModularSpaceShip.cc (added) * code/branches/modularships/src/orxonox/worldentities/pawns/ModularSpaceShip.h (added) * code/branches/modularships/src/orxonox/worldentities/pawns/Pawn.cc (modified) * code/branches/modularships/src/orxonox/worldentities/pawns/Pawn.h (modified) Cleaned up the process passing the collisionshape which was hit to ... Thu, 27 Mar 2014 15:15:55 GMT samuezu [10010] * code/branches/ScriptableController/src/orxonox/controllers/CMakeLists.txt (modified) added ControllerDirector Class, without any implementation Thu, 27 Mar 2014 15:13:16 GMT mkronig [10009] * code/branches/ScriptableController/data/levels/levelTry.oxw (modified) * code/branches/ScriptableController/src/orxonox/controllers/ScriptController_00.cc (modified) edited comments in levelTry.oxw file and scriptableController_00.cc Thu, 27 Mar 2014 14:52:59 GMT muemart [10008] * code/branches/turretFS14/data/levels/templates/spaceshipTurretTest.oxt (modified) * code/branches/turretFS14/data/levels/turretTest.oxw (modified) * code/branches/turretFS14/src/modules/objects/CMakeLists.txt (modified) * code/branches/turretFS14/src/modules/objects/Turret.cc (modified) * code/branches/turretFS14/src/modules/objects/Turret.h (modified) * code/branches/turretFS14/src/modules/objects/controllers (added) * code/branches/turretFS14/src/modules/objects/controllers/CMakeLists.txt (added) * code/branches/turretFS14/src/modules/objects/controllers/TurretController.cc (added) * code/branches/turretFS14/src/modules/objects/controllers/TurretController.h (added) Start a new controller and investigate rotations Thu, 27 Mar 2014 14:49:50 GMT noep [10007] * code/branches/modularships/src/orxonox/ShipPart.cc (added) * code/branches/modularships/src/orxonox/ShipPart.h (added) * code/branches/modularships/src/orxonox/worldentities/pawns/Pawn.cc (modified) * code/branches/modularships/src/orxonox/worldentities/pawns/Pawn.h (modified) More research done on collisionshape-entity-structure, and started ... Thu, 27 Mar 2014 14:23:27 GMT mkronig [10006] * code/branches/ScriptableController/data/levels/levelTry.oxw (added) * code/branches/ScriptableController/src/modules/docking/Unsaved Document 1 (added) * code/branches/ScriptableController/src/orxonox/controllers/CMakeLists.txt (modified) * code/branches/ScriptableController/src/orxonox/controllers/ScriptController_00.cc (added) * code/branches/ScriptableController/src/orxonox/controllers/ScriptController_00.h (added) first try with scriptable controller Thu, 27 Mar 2014 13:10:12 GMT fvultier [10005] * code/branches/pickupsFS14/data/levels/Jump.oxw (added) * code/branches/pickupsFS14/src/modules/CMakeLists.txt (modified) * code/branches/pickupsFS14/src/modules/jump (added) * code/branches/pickupsFS14/src/modules/jump/CMakeLists.txt (added) * code/branches/pickupsFS14/src/modules/jump/Jump.cc (added) * code/branches/pickupsFS14/src/modules/jump/Jump.h (added) * code/branches/pickupsFS14/src/modules/jump/JumpCenterPoint.cc (added) * code/branches/pickupsFS14/src/modules/jump/JumpCenterPoint.h (added) * code/branches/pickupsFS14/src/modules/jump/JumpPrereqs.h (added) * code/branches/pickupsFS14/src/modules/jump/JumpShip.cc (added) * code/branches/pickupsFS14/src/modules/jump/JumpShip.h (added) Initial checkin Thu, 27 Mar 2014 12:36:50 GMT muemart [10004] * code/branches/turretFS14/data/levels/includes/weaponSettingsTurretTest.oxi (added) * code/branches/turretFS14/data/levels/templates/spaceshipTurretTest.oxt (added) * code/branches/turretFS14/data/levels/turretTest.oxw (modified) * code/branches/turretFS14/src/modules/objects/Turret.cc (modified) * code/branches/turretFS14/src/modules/objects/Turret.h (modified) first experiments with the turret Thu, 20 Mar 2014 14:46:06 GMT noep [10003] * code/branches/modularships/data/levels/emptyLevel.oxw (modified) * code/branches/modularships/src/orxonox/collisionshapes/CompoundCollisionShape.cc (modified) * code/branches/modularships/src/orxonox/worldentities/WorldEntity.cc (modified) * code/branches/modularships/src/orxonox/worldentities/pawns/Pawn.cc (modified) * code/branches/modularships/src/orxonox/worldentities/pawns/Pawn.h (modified) A Pawn being hit now prints it's Collisionshape-Structure, as well as ... Wed, 19 Mar 2014 15:07:48 GMT noep [10002] * code/branches/modularships/src/orxonox/worldentities/pawns/Pawn.cc (modified) * code/branches/modularships/src/orxonox/worldentities/pawns/Pawn.h (modified) Output (printing) of CollisionShape-Structure now works. It uses the ... Thu, 13 Mar 2014 14:52:23 GMT noep [10001] * code/branches/modularships/data/levels/emptyLevel.oxw (modified) * code/branches/modularships/src/orxonox/collisionshapes/CollisionShape.h (modified) * code/branches/modularships/src/orxonox/collisionshapes/CompoundCollisionShape.h (modified) * code/branches/modularships/src/orxonox/worldentities/pawns/Pawn.cc (modified) * code/branches/modularships/src/orxonox/worldentities/pawns/Pawn.h (modified) Tried (and failed) to fix output of CollisionShape-structure Thu, 13 Mar 2014 12:39:51 GMT smerkli [10000] * code/branches/pickupsFS14 (copied) Created a branch for the pickups extension. Happy 10000 commits!! ... Thu, 13 Mar 2014 12:34:29 GMT smerkli [9999] * code/branches/ScriptableController (copied) Created a branch for the scriptable controller Thu, 13 Mar 2014 12:33:09 GMT smerkli [9998] * code/branches/turretFS14 (copied) Created branch for turret extension Wed, 12 Mar 2014 17:39:46 GMT noep [9997] * code/branches/modularships/data/levels/emptyLevel.oxw (modified) * code/branches/modularships/src/orxonox/collisionshapes/CollisionShape.h (modified) * code/branches/modularships/src/orxonox/collisionshapes/CompoundCollisionShape.cc (modified) * code/branches/modularships/src/orxonox/collisionshapes/CompoundCollisionShape.h (modified) * code/branches/modularships/src/orxonox/worldentities/WorldEntity.h (modified) * code/branches/modularships/src/orxonox/worldentities/pawns/Pawn.cc (modified) * code/branches/modularships/src/orxonox/worldentities/pawns/Pawn.h (modified) Added functions to print the collisionshape-structure of a Pawn which ... Sun, 09 Mar 2014 21:34:08 GMT noep [9996] * code/branches/modularships/data/levels/emptyLevel.oxw (modified) * code/branches/modularships/src/orxonox/Scene.cc (modified) * code/branches/modularships/src/orxonox/worldentities/pawns/Pawn.cc (modified) Fixed the method outputting the projectile's CollisionBox instead of ... Sun, 09 Mar 2014 20:01:44 GMT noep [9995] * code/branches/modularships/data/levels/emptyLevel.oxw (modified) * code/branches/modularships/src/modules/weapons/projectiles/BasicProjectile.cc (modified) * code/branches/modularships/src/modules/weapons/projectiles/BasicProjectile.h (modified) * code/branches/modularships/src/modules/weapons/projectiles/Projectile.cc (modified) * code/branches/modularships/src/modules/weapons/projectiles/Projectile.h (modified) * code/branches/modularships/src/modules/weapons/projectiles/Rocket.cc (modified) * code/branches/modularships/src/modules/weapons/projectiles/Rocket.h (modified) * code/branches/modularships/src/modules/weapons/projectiles/SimpleRocket.cc (modified) * code/branches/modularships/src/modules/weapons/projectiles/SimpleRocket.h (modified) * code/branches/modularships/src/orxonox/Scene.cc (modified) * code/branches/modularships/src/orxonox/Scene.h (modified) * code/branches/modularships/src/orxonox/worldentities/MovableEntity.cc (modified) * code/branches/modularships/src/orxonox/worldentities/MovableEntity.h (modified) * code/branches/modularships/src/orxonox/worldentities/WorldEntity.h (modified) * code/branches/modularships/src/orxonox/worldentities/pawns/Pawn.cc (modified) * code/branches/modularships/src/orxonox/worldentities/pawns/Pawn.h (modified) Modified collision-detecting-process, such that collisions can be ... Thu, 06 Mar 2014 13:38:47 GMT smerkli [9994] * code/branches/modularships (copied) Added a branch for Noe's modular ships Thu, 06 Mar 2014 09:19:17 GMT smerkli [9993] * code/branches/tutorial4/cmake/LibraryConfigTardis.cmake (modified) Backported a library fix I did in the trunk a while ago so the ... Fri, 20 Dec 2013 10:08:13 GMT jo [9938] * code/branches/presentationHS13/data/levels/presentationHS13.oxw (modified) Heavy Cruiser in presentation Level Thu, 19 Dec 2013 12:59:07 GMT jo [9937] * code/branches/presentationHS13/data/levels/InsideSpaceStation.oxw (added) * code/branches/presentationHS13/data/levels/presentationHS13.oxw (added) * code/branches/presentationHS13/data/overlays/debug.oxo (modified) * code/branches/presentationHS13/src/modules/overlays/debugging/CMakeLists.txt (modified) * code/branches/presentationHS13/src/modules/overlays/debugging/DebugPositionText.cc (added) * code/branches/presentationHS13/src/modules/overlays/debugging/DebugPositionText.h (added) Adding the presentation level and improving the debug-HUD Wed, 18 Dec 2013 23:04:25 GMT jo [9935] * code/branches/presentationHS13/data/levels/gallery.oxw (modified) * code/branches/presentationHS13/data/levels/templates/lodInformation.oxt (modified) Fixing spind error due to lod. Wed, 18 Dec 2013 22:07:09 GMT jo [9934] * code/branches/presentationHS13/data/levels/gallery.oxw (modified) * code/branches/presentationHS13/data/levels/templates/lodInformation.oxt (modified) Fixing loading error, due to lod. ? Wed, 18 Dec 2013 18:48:49 GMT jo [9932] * code/branches/presentationHS13/data/levels/EntryTest.oxw (deleted) * code/branches/presentationHS13/data/levels/EscapeTheBastards.oxw (deleted) * code/branches/presentationHS13/data/levels/Spacefight.oxw (deleted) removing obsolete levels Wed, 18 Dec 2013 17:29:04 GMT jo [9930] * code/branches/presentationHS13/data/levels/Level_Kaan.oxw (deleted) removing wrong named file Wed, 18 Dec 2013 17:26:28 GMT jo [9929] * code/branches/presentationHS13/data/levels/iiJohnVane_TriptoArea51.oxw (deleted) removing the wrong spelled level Wed, 18 Dec 2013 17:25:40 GMT jo [9928] * code/branches/presentationHS13/data/levels/iJohnVane_TriptoArea51.oxw (added) * code/branches/presentationHS13/data/levels/iiJohnVane_Area51UnderFire.oxw (added) * code/branches/presentationHS13/data/levels/iiJohnVane_TriptoArea51.oxw (added) * code/branches/presentationHS13/data/levels/iiiJohnVane_EscapeTheBastards.oxw (added) New levels added. Wed, 18 Dec 2013 12:46:04 GMT jo [9926] * code/branches/presentationHS13 (modified) * code/branches/presentationHS13/data/levels/Level_Kaan.oxw (copied) * code/branches/presentationHS13/data/levels/maxim.oxw (modified) * code/branches/presentationHS13/data/levels/missionOne.oxw (modified) * code/branches/presentationHS13/data/levels/portals.oxw (modified) * code/branches/presentationHS13/data/levels/presentation.oxw (modified) * code/branches/presentationHS13/data/levels/presentationFS11.oxw (modified) * code/branches/presentationHS13/data/levels/underAttack.oxw (modified) merged levelKaan Wed, 18 Dec 2013 12:20:31 GMT jo [9925] * code/branches/presentationHS13/data/levels/turretTest.oxw (modified) fixed positioning of turret Wed, 18 Dec 2013 12:17:26 GMT jo [9924] * code/branches/presentationHS13 (modified) * code/branches/presentationHS13/data/levels/EscapeTheBastards.oxw (copied) * code/branches/presentationHS13/data/levels/gallery.oxw (modified) * code/branches/presentationHS13/data/levels/missionOne.oxw (modified) * code/branches/presentationHS13/data/levels/pickups.oxw (modified) * code/branches/presentationHS13/data/levels/portals.oxw (modified) * code/branches/presentationHS13/data/levels/presentation.oxw (modified) * code/branches/presentationHS13/data/levels/templates/lodInformation.oxt (modified) * code/branches/presentationHS13/data/levels/turretTest.oxw (modified) merged levelElias Wed, 18 Dec 2013 10:56:37 GMT jo [9923] * code/branches/presentationHS13/data/levels/templates/spaceshipHXYSL.oxt (modified) removed distanceTrigger beacon Wed, 18 Dec 2013 10:43:30 GMT jo [9922] * code/branches/presentationHS13 (modified) * code/branches/presentationHS13/data/levels/Spacefight.oxw (copied) * code/branches/presentationHS13/data/levels/missionOne.oxw (modified) * code/branches/presentationHS13/data/levels/quests.oxw (modified) * code/branches/presentationHS13/data/levels/templates/spaceshipHXYSL.oxt (modified) * code/branches/presentationHS13/src/modules/overlays/OverlaysPrereqs.h (modified) * code/branches/presentationHS13/src/modules/overlays/hud/CMakeLists.txt (modified) * code/branches/presentationHS13/src/modules/overlays/hud/CountDown.cc (copied) * code/branches/presentationHS13/src/modules/overlays/hud/CountDown.h (copied) merged levelMichael Tue, 17 Dec 2013 22:34:01 GMT jo [9920] * code/branches/presentationHS13/src/modules/invader/InvaderShip.cc (modified) hopefully fixed a crash Mon, 16 Dec 2013 15:05:33 GMT georgr [9919] * code/branches/wiimote/src/libraries/core/input/WiiMote.cc (modified) boost mapped to B; roll, steering and acceleration(c/Z) all working. Mon, 16 Dec 2013 14:43:45 GMT smerkli [9918] * code/branches/presentationHS13 (modified) * code/branches/presentationHS13/data/defaultConfig/keybindings.ini (modified) * code/branches/presentationHS13/data/levels/Spacerace2.oxw (modified) * code/branches/presentationHS13/data/levels/asteroidField.oxw (modified) * code/branches/presentationHS13/data/levels/asteroids.oxw (modified) * code/branches/presentationHS13/data/levels/dynamicMatch.oxw (modified) * code/branches/presentationHS13/data/levels/lastManStanding.oxw (modified) * code/branches/presentationHS13/data/levels/lastTeamStanding.oxw (modified) * code/branches/presentationHS13/data/levels/lastTeamStandingII.oxw (modified) * code/branches/presentationHS13/data/levels/maxim.oxw (modified) * code/branches/presentationHS13/data/levels/pirateAttack.oxw (modified) * code/branches/presentationHS13/data/levels/pong.oxw (modified) * code/branches/presentationHS13/data/levels/spaceRace.oxw (modified) * code/branches/presentationHS13/data/levels/surfaceRace.oxw (modified) * code/branches/presentationHS13/data/levels/teamBaseMatch.oxw (modified) * code/branches/presentationHS13/data/levels/teamDeathMatch.oxw (modified) * code/branches/presentationHS13/data/levels/templates/spaceshipAssff.oxt (modified) * code/branches/presentationHS13/data/levels/underAttack.oxw (modified) * code/branches/presentationHS13/src/modules/pong/Pong.cc (modified) * code/branches/presentationHS13/src/modules/pong/PongBall.cc (modified) * code/branches/presentationHS13/src/modules/pong/PongBall.h (modified) * code/branches/presentationHS13/src/modules/pong/PongScore.cc (modified) * code/branches/presentationHS13/src/modules/pong/PongScore.h (modified) * code/branches/presentationHS13/src/orxonox/MoodManager.h (modified) * code/branches/presentationHS13/src/orxonox/gamestates/GSMainMenu.cc (modified) * code/branches/presentationHS13/src/orxonox/items/MultiStateEngine.cc (modified) * code/branches/presentationHS13/src/orxonox/sound/AmbientSound.cc (modified) * code/branches/presentationHS13/src/orxonox/sound/AmbientSound.h (modified) * code/branches/presentationHS13/src/orxonox/sound/BaseSound.cc (modified) * code/branches/presentationHS13/src/orxonox/sound/SoundManager.cc (modified) * code/branches/presentationHS13/src/orxonox/sound/WorldAmbientSound.cc (modified) * code/branches/presentationHS13/src/orxonox/sound/WorldAmbientSound.h (modified) * code/branches/presentationHS13/src/orxonox/sound/WorldSound.cc (modified) * code/branches/presentationHS13/src/orxonox/weaponsystem/WeaponMode.cc (modified) * code/branches/presentationHS13/src/orxonox/worldentities/pawns/Pawn.cc (modified) * code/branches/presentationHS13/src/orxonox/worldentities/pawns/Pawn.h (modified) Merged sfxThilo branch, things seem to be working fine Mon, 16 Dec 2013 14:35:48 GMT georgr [9917] * code/branches/wiimote/src/libraries/core/input/WiiMote.cc (modified) HumanController rotateRoll needs a vector as argument... the moar you ... Mon, 16 Dec 2013 14:11:59 GMT skaan [9915] * code/branches/levelKaan/data/levels/Level_Kaan.oxw (modified) Level finished --> TODO: Meteoriten starten, wenn durch Portal Mon, 16 Dec 2013 14:11:01 GMT thiweber [9913] * code/branches/sfxThilo/data/levels/Spacerace2.oxw (modified) * code/branches/sfxThilo/data/levels/presentationHS12.oxw (modified) * code/branches/sfxThilo/data/levels/spaceRace.oxw (modified) * code/branches/sfxThilo/data/levels/surfaceRace.oxw (modified) iserted start sound Mon, 16 Dec 2013 14:06:08 GMT georgr [9911] * code/branches/wiimote/src/libraries/core/input/InputManager.cc (modified) * code/branches/wiimote/src/libraries/core/input/Mouse.cc (modified) * code/branches/wiimote/src/libraries/core/input/WiiMote.cc (modified) * code/branches/wiimote/src/libraries/core/input/WiiMote.h (modified) watch out for sensitivity! IR input now working, still trying to fix roll Mon, 16 Dec 2013 14:03:17 GMT agermann [9910] * code/branches/presentationHS13/data/levels/templates/lodInformation.oxt (modified) Added additional LOD information for space station Mon, 16 Dec 2013 13:37:00 GMT skaan [9909] * code/branches/levelKaan/data/levels/Level_01.oxw (deleted) * code/branches/levelKaan/data/levels/Level_Kaan.oxw (modified) Bug test Mon, 16 Dec 2013 13:22:45 GMT smerkli [9907] * code/branches/presentationHS13 (modified) * code/branches/presentationHS13/data/gui/layouts/UndockingDialog.layout (copied) * code/branches/presentationHS13/data/gui/scripts/UndockingDialog.lua (copied) * code/branches/presentationHS13/data/levels/EntryTest.oxw (copied) * code/branches/presentationHS13/data/levels/FPSTest.oxw (modified) * code/branches/presentationHS13/data/levels/docking.oxw (modified) * code/branches/presentationHS13/data/levels/dockingToASpaceStation.oxw (copied) * code/branches/presentationHS13/src/modules/docking/Dock.cc (modified) * code/branches/presentationHS13/src/modules/docking/Dock.h (modified) * code/branches/presentationHS13/src/modules/docking/MoveToDockingTarget.cc (modified) * code/branches/presentationHS13/src/modules/objects/ForceField.cc (modified) * code/branches/presentationHS13/src/modules/objects/ForceField.h (modified) * code/branches/presentationHS13/src/orxonox/infos/PlayerInfo.cc (modified) Merged spacestationentry branch Mon, 16 Dec 2013 13:06:09 GMT smerkli [9905] * code/branches/presentationHS13/data/levels/Invaders.oxw (modified) Florian forgot to change something, now screenshot should work Mon, 16 Dec 2013 13:00:00 GMT smerkli [9904] * code/branches/presentationHS13 (modified) * code/branches/presentationHS13/data/gui/scripts/MiscConfigMenu.lua (modified) * code/branches/presentationHS13/data/levels/radar3D_test.oxw (copied) * code/branches/presentationHS13/data/overlays/HUD.oxo (modified) * code/branches/presentationHS13/data/overlays/HUDTemplates3.oxo (modified) * code/branches/presentationHS13/src/libraries/util/Math.cc (modified) * code/branches/presentationHS13/src/libraries/util/Math.h (modified) * code/branches/presentationHS13/src/modules/overlays/hud/HUDNavigation.cc (modified) * code/branches/presentationHS13/src/modules/overlays/hud/HUDRadar.cc (modified) * code/branches/presentationHS13/src/modules/overlays/hud/HUDRadar.h (modified) Merged branch radarDreiD into presentationbranch Mon, 16 Dec 2013 12:58:35 GMT zifloria [9903] * code/branches/invaders/data/levels/Invaders.oxw (modified) level preview Mon, 16 Dec 2013 12:49:49 GMT noep [9902] * code/branches/presentationHS13/data/levels/templates/lodInformation.oxt (modified) Disabled LoD for HeavyCruiser Mon, 16 Dec 2013 12:33:09 GMT smerkli [9900] * code/branches/presentationHS13 (modified) * code/branches/presentationHS13/data/levels/Invaders.oxw (copied) * code/branches/presentationHS13/data/levels/_temp.oxw (copied) * code/branches/presentationHS13/data/levels/includes/invaderWeapon.oxi (copied) * code/branches/presentationHS13/data/levels/includes/invaderWeaponEnemy.oxi (copied) * code/branches/presentationHS13/data/levels/templates/.shipmodels (copied) * code/branches/presentationHS13/data/levels/templates/enemyInvader.oxt (copied) * code/branches/presentationHS13/data/levels/templates/enemyInvaderShooter.oxt (copied) * code/branches/presentationHS13/data/levels/templates/spaceshipInvader.oxt (copied) * code/branches/presentationHS13/data/overlays/InvaderHUD.oxo (copied) * code/branches/presentationHS13/src/modules/CMakeLists.txt (modified) * code/branches/presentationHS13/src/modules/invader (copied) * code/branches/presentationHS13/src/modules/invader/CMakeLists.txt (copied) * code/branches/presentationHS13/src/modules/invader/Invader.cc (copied) * code/branches/presentationHS13/src/modules/invader/Invader.h (copied) * code/branches/presentationHS13/src/modules/invader/InvaderCenterPoint.cc (copied) * code/branches/presentationHS13/src/modules/invader/InvaderCenterPoint.h (copied) * code/branches/presentationHS13/src/modules/invader/InvaderEnemy.cc (copied) * code/branches/presentationHS13/src/modules/invader/InvaderEnemy.h (copied) * code/branches/presentationHS13/src/modules/invader/InvaderEnemyShooter.cc (copied) * code/branches/presentationHS13/src/modules/invader/InvaderEnemyShooter.h (copied) * code/branches/presentationHS13/src/modules/invader/InvaderHUDinfo.cc (copied) * code/branches/presentationHS13/src/modules/invader/InvaderHUDinfo.h (copied) * code/branches/presentationHS13/src/modules/invader/InvaderPrereqs.h (copied) * code/branches/presentationHS13/src/modules/invader/InvaderShip.cc (copied) * code/branches/presentationHS13/src/modules/invader/InvaderShip.h (copied) * code/branches/presentationHS13/src/modules/invader/InvaderWeapon.cc (copied) * code/branches/presentationHS13/src/modules/invader/InvaderWeapon.h (copied) * code/branches/presentationHS13/src/modules/invader/InvaderWeaponEnemy.cc (copied) * code/branches/presentationHS13/src/modules/invader/InvaderWeaponEnemy.h (copied) * code/branches/presentationHS13/src/modules/weapons/weaponmodes/HsW01.h (modified) * code/branches/presentationHS13/src/orxonox/gametypes/Gametype.cc (modified) * code/branches/presentationHS13/src/orxonox/graphics/ParticleEmitter.cc (modified) * code/branches/presentationHS13/src/orxonox/graphics/ParticleEmitter.h (modified) * code/branches/presentationHS13/src/orxonox/worldentities/BigExplosion.cc (modified) * code/branches/presentationHS13/src/orxonox/worldentities/BigExplosion.h (modified) * code/branches/presentationHS13/src/orxonox/worldentities/pawns/Pawn.cc (modified) Merged the invaders branch of Florian