Changeset 11546

Timestamp:

Nov 6, 2017, 5:04:28 PM (6 years ago)

Author:

remartin

Message:

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!

Location:

code/branches/AsteroidMining_HS17

Files:

• data/levels/AsteroidFarming.oxw (modified) (1 diff)
• src/modules/CMakeLists.txt (modified) (1 diff)
• src/orxonox/worldentities/pawns/CMakeLists.txt (modified) (1 diff)

code/branches/AsteroidMining_HS17/data/levels/AsteroidFarming.oxw

@@ -90 +90 @@
     <!-----AsteroidMinable --->
 
-    <AsteroidMinable size=5 position="0,-500,0" />
+    <AsteroidMinable size=100 position="0,-500,0" />
 
     

code/branches/AsteroidMining_HS17/src/modules/CMakeLists.txt

@@ -26 +26 @@
 ################ Sub Directories ################
 
+ADD_SUBDIRECTORY(asteroidmining)
 ADD_SUBDIRECTORY(dialogue)
 ADD_SUBDIRECTORY(designtools)

code/branches/AsteroidMining_HS17/src/orxonox/worldentities/pawns/CMakeLists.txt

@@ -7 +7 @@
   TeamBaseMatchBase.cc
   Destroyer.cc
-  AsteroidMinable.cc
 )