# # ChangeLog for code/branches/AsteroidMining_HS17 # # Generated by Trac 1.0.9 # Nov 22, 2024, 6:37:04 PM Tue, 12 Dec 2017 19:29:52 GMT remartin [11667] * code/branches/AsteroidMining_HS17/data/levels/AsteroidFarming.oxw (modified) * code/branches/AsteroidMining_HS17/src/modules/asteroidmining/AsteroidMinable.cc (modified) * code/branches/AsteroidMining_HS17/src/modules/asteroidmining/AsteroidMinable.h (modified) * code/branches/AsteroidMining_HS17/src/modules/asteroidmining/SpicedAsteroidBelt.cc (modified) * code/branches/AsteroidMining_HS17/src/modules/asteroidmining/SpicedAsteroidBelt.h (modified) * code/branches/AsteroidMining_HS17/src/modules/asteroidmining/SpicedAsteroidField.cc (modified) * code/branches/AsteroidMining_HS17/src/modules/asteroidmining/SpicedAsteroidField.h (modified) Added tilting for the spicedAsteroidBelt. Finished commenting, polish ... Mon, 11 Dec 2017 17:06:20 GMT remartin [11665] * code/branches/AsteroidMining_HS17/src/modules/asteroidmining/SpicedAsteroidBelt.cc (added) * code/branches/AsteroidMining_HS17/src/modules/asteroidmining/SpicedAsteroidBelt.h (added) Mon, 11 Dec 2017 17:05:17 GMT remartin [11664] * code/branches/AsteroidMining_HS17/data/levels/AsteroidFarming.oxw (modified) * code/branches/AsteroidMining_HS17/src/modules/asteroidmining/AsteroidMinable.cc (modified) * code/branches/AsteroidMining_HS17/src/modules/asteroidmining/AsteroidMinable.h (modified) * code/branches/AsteroidMining_HS17/src/modules/asteroidmining/CMakeLists.txt (modified) * code/branches/AsteroidMining_HS17/src/modules/asteroidmining/SpicedAsteroidField.cc (modified) * code/branches/AsteroidMining_HS17/src/modules/asteroidmining/SpicedAsteroidField.h (modified) SpicedAsteroidBelt erstellt, kosmetische Veränderungen. Offener Punkt ... Mon, 11 Dec 2017 12:02:41 GMT remartin [11646] * code/branches/AsteroidMining_HS17/data/levels/AsteroidFarming.oxw (modified) * code/branches/AsteroidMining_HS17/src/modules/asteroidmining/AsteroidMinable.h (modified) * code/branches/AsteroidMining_HS17/src/modules/asteroidmining/SpicedAsteroidField.cc (modified) Fisch Mon, 04 Dec 2017 17:36:34 GMT remartin [11641] * code/branches/AsteroidMining_HS17/src/modules/asteroidmining/AsteroidMinable.cc (modified) Changed detail in variable sized Array definition, should now build ... Mon, 04 Dec 2017 15:38:17 GMT remartin [11640] * code/branches/AsteroidMining_HS17/data/levels/AsteroidFarming.oxw (modified) * code/branches/AsteroidMining_HS17/src/modules/asteroidmining/AsteroidMinable.cc (modified) * code/branches/AsteroidMining_HS17/src/modules/asteroidmining/AsteroidMinable.h (modified) * code/branches/AsteroidMining_HS17/src/modules/asteroidmining/CMakeLists.txt (modified) * code/branches/AsteroidMining_HS17/src/modules/asteroidmining/SpicedAsteroidField.cc (modified) * code/branches/AsteroidMining_HS17/src/modules/asteroidmining/SpicedAsteroidField.h (modified) Das Aufteilen funktioniert nun gut. AsteroidField fertiggestellt und ... Sun, 03 Dec 2017 18:32:18 GMT remartin [11618] * code/branches/AsteroidMining_HS17/src/modules/asteroidmining/AsteroidMinable.cc (modified) * code/branches/AsteroidMining_HS17/src/modules/asteroidmining/AsteroidMinable.h (modified) Die überkomplizierte Verteilung in SpawnChildren funktioniert recht ... Fri, 01 Dec 2017 19:40:42 GMT remartin [11615] * code/branches/AsteroidMining_HS17/src/modules/asteroidmining/AsteroidMinable.cc (modified) * code/branches/AsteroidMining_HS17/src/modules/asteroidmining/SpicedAsteroidField.cc (modified) * code/branches/AsteroidMining_HS17/src/modules/asteroidmining/SpicedAsteroidField.h (modified) Gebastel in spawnChildren, hat immer noch Fehler drin. Mon, 27 Nov 2017 17:54:29 GMT remartin [11610] * code/branches/AsteroidMining_HS17/src/modules/asteroidmining/SpicedAsteroidField.cc (added) * code/branches/AsteroidMining_HS17/src/modules/asteroidmining/SpicedAsteroidField.h (added) Mon, 27 Nov 2017 17:53:05 GMT remartin [11609] * code/branches/AsteroidMining_HS17/src/modules/asteroidmining/AsteroidMinable.cc (modified) * code/branches/AsteroidMining_HS17/src/modules/pickup/PickupSpawner.cc (modified) * code/branches/AsteroidMining_HS17/src/orxonox/worldentities/pawns/Pawn.cc (modified) * code/branches/AsteroidMining_HS17/src/orxonox/worldentities/pawns/Pawn.h (modified) Solved pickup problem with tiny adaptation in Pawn.h and ... Tue, 21 Nov 2017 15:51:31 GMT remartin [11587] * code/branches/AsteroidMining_HS17/src/modules/asteroidmining/AsteroidMinable.cc (modified) Kleinere Probleme gelöst (HP, Position richtig setzen). Noch die ... Tue, 21 Nov 2017 12:07:17 GMT remartin [11586] * code/branches/AsteroidMining_HS17/src/modules/asteroidmining/AsteroidMinable.cc (modified) * code/branches/AsteroidMining_HS17/src/modules/asteroidmining/AsteroidMinable.h (modified) Major breakthrough: Variable Collision shape works, error in ... Mon, 20 Nov 2017 15:21:26 GMT remartin [11581] * code/branches/AsteroidMining_HS17/data/levels/AsteroidFarming.oxw (modified) * code/branches/AsteroidMining_HS17/src/modules/asteroidmining/AsteroidMinable.cc (modified) * code/branches/AsteroidMining_HS17/src/modules/asteroidmining/AsteroidMinable.h (modified) Doesn-t freeze any more. Asteroids and the pickup seem to collide ... Mon, 13 Nov 2017 15:34:53 GMT remartin [11561] * code/branches/AsteroidMining_HS17/data/levels/AsteroidFarming.oxw (modified) * code/branches/AsteroidMining_HS17/src/modules/asteroidmining/AsteroidMinable.cc (modified) * code/branches/AsteroidMining_HS17/src/modules/pickup/Pickup.h (modified) * code/branches/AsteroidMining_HS17/src/modules/pickup/PickupSpawner.h (modified) Pickup generating works now after changing privacy settings of set ... Thu, 09 Nov 2017 17:13:50 GMT remartin [11553] * code/branches/AsteroidMining_HS17/src/modules/asteroidmining/AsteroidMinable.cc (modified) That pickup stuff is a bloody mess. Protected methods and weird ... Tue, 07 Nov 2017 16:47:14 GMT remartin [11551] * code/branches/AsteroidMining_HS17/data/levels/AsteroidFarming.oxw (modified) * code/branches/AsteroidMining_HS17/src/modules/asteroidmining/AsteroidMinable.cc (modified) * code/branches/AsteroidMining_HS17/src/modules/asteroidmining/AsteroidMinable.h (modified) added method 'putStuff' for initialisation. Mesh has correct size ... Tue, 07 Nov 2017 12:04:27 GMT remartin [11550] * code/branches/AsteroidMining_HS17/src/modules/asteroidmining/AsteroidMinable.cc (modified) Unsymmetrische Kommentarklammern in Ordnung gebracht. Sollte jetzt ... Mon, 06 Nov 2017 16:11:38 GMT remartin [11548] * code/branches/AsteroidMining_HS17/src/orxonox/worldentities/pawns/AsteroidMinable.cc (deleted) * code/branches/AsteroidMining_HS17/src/orxonox/worldentities/pawns/AsteroidMinable.h (deleted) Mon, 06 Nov 2017 16:06:16 GMT remartin [11547] * code/branches/AsteroidMining_HS17/src/modules/asteroidmining (added) * code/branches/AsteroidMining_HS17/src/modules/asteroidmining/AsteroidMinable.cc (added) * code/branches/AsteroidMining_HS17/src/modules/asteroidmining/AsteroidMinable.h (added) * code/branches/AsteroidMining_HS17/src/modules/asteroidmining/CMakeLists.txt (added) Mon, 06 Nov 2017 16:04:28 GMT remartin [11546] * code/branches/AsteroidMining_HS17/data/levels/AsteroidFarming.oxw (modified) * code/branches/AsteroidMining_HS17/src/modules/CMakeLists.txt (modified) * code/branches/AsteroidMining_HS17/src/orxonox/worldentities/pawns/CMakeLists.txt (modified) Dateien von /orxonox nach /src migriert. Generierung inkl. Mesh und ... Mon, 30 Oct 2017 15:22:22 GMT remartin [11524] * code/branches/AsteroidMining_HS17/src/orxonox/worldentities/pawns/AsteroidMinable.cc (modified) Mon, 30 Oct 2017 15:12:04 GMT remartin [11520] * code/branches/AsteroidMining_HS17/data/levels/AsteroidFarming.oxw (modified) * code/branches/AsteroidMining_HS17/src/orxonox/worldentities/pawns/AsteroidMinable.cc (modified) * code/branches/AsteroidMining_HS17/src/orxonox/worldentities/pawns/AsteroidMinable.h (modified) Added spawning of pickup and smaller asteroids, doesn't work yet. Mon, 23 Oct 2017 14:13:00 GMT remartin [11508] * code/branches/AsteroidMining_HS17/data/levels/AsteroidFarming.oxw (modified) * code/branches/AsteroidMining_HS17/src/orxonox/worldentities/pawns/AsteroidMinable.cc (added) * code/branches/AsteroidMining_HS17/src/orxonox/worldentities/pawns/AsteroidMinable.h (added) * code/branches/AsteroidMining_HS17/src/orxonox/worldentities/pawns/CMakeLists.txt (modified) Started cobbling together the class 'AsteroidMining'. Adapted the ... Mon, 16 Oct 2017 14:05:59 GMT remartin [11492] * code/branches/AsteroidMining_HS17/data/levels/AsteroidFarming.oxw (added) initialised pps project Mon, 16 Oct 2017 12:40:59 GMT patricwi [11461] * code/branches/AsteroidMining_HS17 (copied) Creating new AsteroidMining branch Wed, 11 Oct 2017 14:11:29 GMT patricwi [11451] * code/trunk (modified) * code/trunk/data/gui/layouts/Dialogue.layout (copied) * code/trunk/data/gui/scripts/Dialogue.lua (copied) * code/trunk/data/gui/scripts/TestDialogButttons.lua (copied) * code/trunk/data/levels/DialogueShowcase.oxw (copied) * code/trunk/data/levels/events.oxw (modified) * code/trunk/data/overlays/HUDTemplates3.oxo (modified) * code/trunk/src/modules/CMakeLists.txt (modified) * code/trunk/src/modules/dialogue (copied) Dialogue merged without core modifications