# # ChangeLog for code/branches/turretFS14 # # Generated by Trac 1.0.9 # Dec 25, 2024, 7:38:20 PM Wed, 03 Dec 2014 12:03:15 GMT maxima [10145] * 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/TeamTargetProxy.cc (added) * code/branches/turretFS14/src/modules/objects/controllers/TeamTargetProxy.h (added) * code/branches/turretFS14/src/modules/objects/controllers/TurretController.cc (added) * code/branches/turretFS14/src/modules/objects/controllers/TurretController.h (added) Thu, 22 May 2014 11:41:32 GMT muemart [10070] * code/branches/turretFS14/data/levels/includes/weaponSettingsTurret.oxi (modified) Add damage to the turret 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, 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 ... 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 ... 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, 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, 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 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, 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 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, 13 Mar 2014 12:33:09 GMT smerkli [9998] * code/branches/turretFS14 (copied) Created branch for turret extension Sat, 01 Feb 2014 17:01:47 GMT jo [9992] * code/trunk/data/levels/iJohnVane_TriptoArea51.oxw (modified) * code/trunk/data/levels/iiJohnVane_Area51UnderFire.oxw (modified) * code/trunk/data/levels/iiiJohnVane_EscapeTheBastards.oxw (modified) The end of Area51UnderFire is ok. Unfortunately the explosion could ...