Changeset 12185 for code/branches

Timestamp:

Dec 11, 2018, 7:38:06 PM (6 years ago)

Author:

merholzl

Message:

OrxoKart merge

Location:

code/branches/Merge_HS18

Files:

• . (modified) (1 prop)
• data/levels/OrxoKart1.oxw (copied) (copied from code/branches/OrxoKart_HS18/data/levels/OrxoKart1.oxw)
• data/levels/OrxoKart2.oxw (copied) (copied from code/branches/OrxoKart_HS18/data/levels/OrxoKart2.oxw)
• data/levels/includes/weaponSettingsHover.oxi (modified) (2 diffs)
• data/levels/kart_alpha0.1.oxw (copied) (copied from code/branches/OrxoKart_HS18/data/levels/kart_alpha0.1.oxw)
• data/levels/templates/OrxoKartKart.oxt (copied) (copied from code/branches/OrxoKart_HS18/data/levels/templates/OrxoKartKart.oxt)
• data/overlays/OrxoKartHUD.oxo (copied) (copied from code/branches/OrxoKart_HS18/data/overlays/OrxoKartHUD.oxo)
• data/tcl/orxokart_highscores.txt (copied) (copied from code/branches/OrxoKart_HS18/data/tcl/orxokart_highscores.txt)
• src/modules/CMakeLists.txt (modified) (1 diff)
• src/modules/orxokart (copied) (copied from code/branches/OrxoKart_HS18/src/modules/orxokart)
• src/orxonox/controllers/CMakeLists.txt (modified) (1 diff)
• svn_is_cancer (copied) (copied from code/branches/OrxoKart_HS18/svn_is_cancer)

code/branches/Merge_HS18/data/levels/includes/weaponSettingsHover.oxi

@@ -7 +7 @@
   <WeaponSet firemode=1 />
 </weaponsets>
-<weaponpacks>
+<!--<weaponpacks>
   <WeaponPack>
     <links>
@@ -25 +25 @@
     </links>
   </WeaponPack>
-</weaponpacks>  
+</weaponpacks> --> 
 <munition>
   <IceMunition initialmagazines=1 maxmagazines=1 munitionpermagazine=10/>

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

@@ -51 +51 @@
 ADD_SUBDIRECTORY(pacman)
 ADD_SUBDIRECTORY(orxyroad)
+ADD_SUBDIRECTORY(orxokart)
 ADD_SUBDIRECTORY(wagnis)
 ADD_SUBDIRECTORY(TixyTaxyTorxy)

code/branches/Merge_HS18/src/orxonox/controllers/CMakeLists.txt

@@ -24 +24 @@
   AutonomousDroneController.cc; 
   StoryModeController.cc;
-        
 )