[Orxonox-commit 6925] r11546 - in code/branches/AsteroidMining_HS17: data/levels src/modules src/orxonox/worldentities/pawns

[remartin at orxonox.net]

Author: remartin
Date: 2017-11-06 17:04:28 +0100 (Mon, 06 Nov 2017)
New Revision: 11546

Modified:
   code/branches/AsteroidMining_HS17/data/levels/AsteroidFarming.oxw
   code/branches/AsteroidMining_HS17/src/modules/CMakeLists.txt
   code/branches/AsteroidMining_HS17/src/orxonox/worldentities/pawns/CMakeLists.txt
Log:
Dateien von /orxonox nach /src migriert. Generierung inkl. Mesh und Hitbox funktioniert nun, keine Kompilier-Fehler wegen dem Pickup. Absturz beim Aufruf der Death()-Methode!

Modified: code/branches/AsteroidMining_HS17/data/levels/AsteroidFarming.oxw
===================================================================
--- code/branches/AsteroidMining_HS17/data/levels/AsteroidFarming.oxw	2017-11-06 15:40:56 UTC (rev 11545)
+++ code/branches/AsteroidMining_HS17/data/levels/AsteroidFarming.oxw	2017-11-06 16:04:28 UTC (rev 11546)
@@ -89,7 +89,7 @@
 
     <!-----AsteroidMinable --->
 
-    <AsteroidMinable size=5 position="0,-500,0" />
+    <AsteroidMinable size=100 position="0,-500,0" />
 
     
 

Modified: code/branches/AsteroidMining_HS17/src/modules/CMakeLists.txt
===================================================================
--- code/branches/AsteroidMining_HS17/src/modules/CMakeLists.txt	2017-11-06 15:40:56 UTC (rev 11545)
+++ code/branches/AsteroidMining_HS17/src/modules/CMakeLists.txt	2017-11-06 16:04:28 UTC (rev 11546)
@@ -25,6 +25,7 @@
 
 ################ Sub Directories ################
 
+ADD_SUBDIRECTORY(asteroidmining)
 ADD_SUBDIRECTORY(dialogue)
 ADD_SUBDIRECTORY(designtools)
 ADD_SUBDIRECTORY(gametypes)

Modified: code/branches/AsteroidMining_HS17/src/orxonox/worldentities/pawns/CMakeLists.txt
===================================================================
--- code/branches/AsteroidMining_HS17/src/orxonox/worldentities/pawns/CMakeLists.txt	2017-11-06 15:40:56 UTC (rev 11545)
+++ code/branches/AsteroidMining_HS17/src/orxonox/worldentities/pawns/CMakeLists.txt	2017-11-06 16:04:28 UTC (rev 11546)
@@ -6,5 +6,4 @@
   ModularSpaceShip.cc
   TeamBaseMatchBase.cc
   Destroyer.cc
-  AsteroidMinable.cc
 )