[Orxonox-commit 7769] r12361 - in code/branches/OrxoBlox_FS19: data/levels src/modules/OrxoBlox

[ahuwyler at orxonox.net]

Author: ahuwyler
Date: 2019-05-09 15:50:09 +0200 (Thu, 09 May 2019)
New Revision: 12361

Modified:
   code/branches/OrxoBlox_FS19/data/levels/orxoblox.oxw
   code/branches/OrxoBlox_FS19/src/modules/OrxoBlox/CMakeLists.txt
   code/branches/OrxoBlox_FS19/src/modules/OrxoBlox/OrxoBloxBall.cc
Log:
Nomal fuer de Jerome

Modified: code/branches/OrxoBlox_FS19/data/levels/orxoblox.oxw
===================================================================
--- code/branches/OrxoBlox_FS19/data/levels/orxoblox.oxw	2019-05-09 13:32:40 UTC (rev 12360)
+++ code/branches/OrxoBlox_FS19/data/levels/orxoblox.oxw	2019-05-09 13:50:09 UTC (rev 12361)
@@ -21,7 +21,7 @@
 <Template name=OrxoBloxbatcameras defaults=0>
   <OrxoBloxBat>
     <camerapositions>
-      <CameraPosition position="0,150,0" pitch=-90 absolute=true />
+      <CameraPosition position="0,150,0"  absolute=true />
       <CameraPosition position="0,50,160" drag=true mouselook=true />
       <CameraPosition position="0,40,125" drag=true mouselook=true />
       <CameraPosition position="0,30, 90" drag=true mouselook=true />
@@ -102,7 +102,7 @@
     <!--<Model mesh="axes.mesh" scale=10 position="0,0,0" /> -->
 
 
-    <OrxoBloxCenterpoint name=OrxoBloxcenter dimension="90,100" balltemplate=OrxoBloxball battemplate=OrxoBloxbat ballspeed=200 ballaccfactor=1.0 batspeed=130 batlength=0.25 StoneTemplate=OrxoBloxstone WallTemplate=OrxoBloxwall position="-55,-75,0">
+    <OrxoBloxCenterpoint name=OrxoBloxcenter dimension="90,100" balltemplate=OrxoBloxball battemplate=OrxoBloxbat ballspeed=200 ballaccfactor=1.0 batspeed=130 batlength=0.25 StoneTemplate=OrxoBloxstone WallTemplate=OrxoBloxwall >
         
       <attached>
             <!-- Balken die das Spielfeld begrenzen. -->

Modified: code/branches/OrxoBlox_FS19/src/modules/OrxoBlox/CMakeLists.txt
===================================================================
--- code/branches/OrxoBlox_FS19/src/modules/OrxoBlox/CMakeLists.txt	2019-05-09 13:32:40 UTC (rev 12360)
+++ code/branches/OrxoBlox_FS19/src/modules/OrxoBlox/CMakeLists.txt	2019-05-09 13:50:09 UTC (rev 12361)
@@ -1,5 +1,5 @@
 SET_SOURCE_FILES(OrxoBlox_SRC_FILES
-BUILD_UNIT OrxoBloxBuildUnit.cc
+
   OrxoBlox.cc
   OrxoBloxWall.cc
   OrxoBloxBall.cc
@@ -6,9 +6,9 @@
   OrxoBloxBot.cc
   OrxoBloxCenterpoint.cc
   OrxoBloxStones.cc
-  OrxoBloxCanon.cc
-  OrxoBloxShip.cc
-END_BUILD_UNIT
+  
+
+
 )
 
 ORXONOX_ADD_LIBRARY(OrxoBlox

Modified: code/branches/OrxoBlox_FS19/src/modules/OrxoBlox/OrxoBloxBall.cc
===================================================================
--- code/branches/OrxoBlox_FS19/src/modules/OrxoBlox/OrxoBloxBall.cc	2019-05-09 13:32:40 UTC (rev 12360)
+++ code/branches/OrxoBlox_FS19/src/modules/OrxoBlox/OrxoBloxBall.cc	2019-05-09 13:50:09 UTC (rev 12361)
@@ -161,9 +161,9 @@
                 velocity.y = 0;
                 velocity.z = 0; 
 
-                ChatManager::message("Waiting for your input");
+                //ChatManager::message("Waiting for your input");
                 //Input new speed here:
-                ChatManager::message("Setting new speed");
+                //ChatManager::message("Setting new speed");
 
                 //Set new speed here!!
                 velocity.x = rnd(-100,100);