Changeset 10176 for code/branches

Timestamp:

Dec 11, 2014, 4:09:29 PM (10 years ago)

Author:

maxima

Message:

dodgeraceHS14 merged.

Location:

code/branches/presentationHS14

Files:

• . (modified) (1 prop)
• data/gui/scripts/CampaignMenu.lua (modified) (1 diff)
• data/gui/scripts/campaign.txt (modified) (1 diff)
• data/levels/DodgeRace.oxw (copied) (copied from code/branches/surfaceraceHS14/data/levels/DodgeRace.oxw)
• data/levels/templates/DodgeRacePattern.oxt (copied) (copied from code/branches/surfaceraceHS14/data/levels/templates/DodgeRacePattern.oxt)
• data/levels/templates/spaceshipDodgeRace.oxt (copied) (copied from code/branches/surfaceraceHS14/data/levels/templates/spaceshipDodgeRace.oxt)
• data/levels/templates/spaceshipInvader.oxt (modified) (1 diff)
• data/overlays/DodgeRaceHUD.oxo (copied) (copied from code/branches/surfaceraceHS14/data/overlays/DodgeRaceHUD.oxo)
• src/modules/CMakeLists.txt (modified) (1 diff)
• src/modules/dodgerace2 (copied) (copied from code/branches/surfaceraceHS14/src/modules/dodgerace2)
• src/modules/dodgerace2/CMakeLists.txt (copied) (copied from code/branches/surfaceraceHS14/src/modules/dodgerace2/CMakeLists.txt)
• src/modules/dodgerace2/DodgeRace.cc (copied) (copied from code/branches/surfaceraceHS14/src/modules/dodgerace2/DodgeRace.cc)
• src/modules/dodgerace2/DodgeRace.h (copied) (copied from code/branches/surfaceraceHS14/src/modules/dodgerace2/DodgeRace.h)
• src/modules/dodgerace2/DodgeRaceCenterPoint.cc (copied) (copied from code/branches/surfaceraceHS14/src/modules/dodgerace2/DodgeRaceCenterPoint.cc)
• src/modules/dodgerace2/DodgeRaceCenterPoint.h (copied) (copied from code/branches/surfaceraceHS14/src/modules/dodgerace2/DodgeRaceCenterPoint.h)
• src/modules/dodgerace2/DodgeRaceCube.cc (copied) (copied from code/branches/surfaceraceHS14/src/modules/dodgerace2/DodgeRaceCube.cc)
• src/modules/dodgerace2/DodgeRaceCube.h (copied) (copied from code/branches/surfaceraceHS14/src/modules/dodgerace2/DodgeRaceCube.h)
• src/modules/dodgerace2/DodgeRaceHUDinfo.cc (copied) (copied from code/branches/surfaceraceHS14/src/modules/dodgerace2/DodgeRaceHUDinfo.cc)
• src/modules/dodgerace2/DodgeRaceHUDinfo.h (copied) (copied from code/branches/surfaceraceHS14/src/modules/dodgerace2/DodgeRaceHUDinfo.h)
• src/modules/dodgerace2/DodgeRacePrereqs.h (copied) (copied from code/branches/surfaceraceHS14/src/modules/dodgerace2/DodgeRacePrereqs.h)
• src/modules/dodgerace2/DodgeRaceShip.cc (copied) (copied from code/branches/surfaceraceHS14/src/modules/dodgerace2/DodgeRaceShip.cc)
• src/modules/dodgerace2/DodgeRaceShip.h (copied) (copied from code/branches/surfaceraceHS14/src/modules/dodgerace2/DodgeRaceShip.h)
• src/modules/invader/Invader.cc (copied) (copied from code/branches/surfaceraceHS14/src/modules/invader/Invader.cc)
• src/modules/invader/Invader.h (copied) (copied from code/branches/surfaceraceHS14/src/modules/invader/Invader.h)
• src/modules/invader/InvaderCenterPoint.cc (copied) (copied from code/branches/surfaceraceHS14/src/modules/invader/InvaderCenterPoint.cc)
• src/modules/invader/InvaderCenterPoint.h (copied) (copied from code/branches/surfaceraceHS14/src/modules/invader/InvaderCenterPoint.h)
• src/modules/invader/InvaderEnemy.cc (copied) (copied from code/branches/surfaceraceHS14/src/modules/invader/InvaderEnemy.cc)
• src/modules/invader/InvaderEnemy.h (copied) (copied from code/branches/surfaceraceHS14/src/modules/invader/InvaderEnemy.h)
• src/modules/invader/InvaderEnemyShooter.cc (copied) (copied from code/branches/surfaceraceHS14/src/modules/invader/InvaderEnemyShooter.cc)
• src/modules/invader/InvaderEnemyShooter.h (copied) (copied from code/branches/surfaceraceHS14/src/modules/invader/InvaderEnemyShooter.h)
• src/modules/invader/InvaderHUDinfo.cc (copied) (copied from code/branches/surfaceraceHS14/src/modules/invader/InvaderHUDinfo.cc)
• src/modules/invader/InvaderHUDinfo.h (copied) (copied from code/branches/surfaceraceHS14/src/modules/invader/InvaderHUDinfo.h)
• src/modules/invader/InvaderPrereqs.h (copied) (copied from code/branches/surfaceraceHS14/src/modules/invader/InvaderPrereqs.h)
• src/modules/invader/InvaderShip.cc (copied) (copied from code/branches/surfaceraceHS14/src/modules/invader/InvaderShip.cc)
• src/modules/invader/InvaderShip.h (copied) (copied from code/branches/surfaceraceHS14/src/modules/invader/InvaderShip.h)
• src/modules/invader/InvaderWeapon.cc (copied) (copied from code/branches/surfaceraceHS14/src/modules/invader/InvaderWeapon.cc)
• src/modules/invader/InvaderWeapon.h (copied) (copied from code/branches/surfaceraceHS14/src/modules/invader/InvaderWeapon.h)
• src/modules/invader/InvaderWeaponEnemy.cc (copied) (copied from code/branches/surfaceraceHS14/src/modules/invader/InvaderWeaponEnemy.cc)
• src/modules/invader/InvaderWeaponEnemy.h (copied) (copied from code/branches/surfaceraceHS14/src/modules/invader/InvaderWeaponEnemy.h)
• svn-commit.tmp (copied) (copied from code/branches/surfaceraceHS14/svn-commit.tmp)

code/branches/presentationHS14/data/gui/scripts/CampaignMenu.lua

@@ -52 +52 @@
     
 function P.CheckLevel(filename)
-        local file = io.open("/home/pmao/pmao-extra-0/orxonox/storymodeHS14/data/gui/scripts/campaign.txt", "r+")
+        local file = io.open("/home/maxima/maxima-extra-0/orxonox/presentationHS14/data/gui/scripts/campaign.txt", "r+")
         local index = 0
         local returnvalue = false

code/branches/presentationHS14/data/gui/scripts/campaign.txt

@@ -2 +2 @@
 spacebar!!!                                                .
 missionOne.oxw 1                                           .
-fightInOurBack.oxw 1                                       .
-pirateAttack.oxw 1                                         .
+fightInOurBack.oxw 0                                       .
+pirateAttack.oxw 0                                         .
 iJohnVane_TriptoArea51.oxw 0                               .
 ............................................................

code/branches/presentationHS14/data/levels/templates/spaceshipInvader.oxt

@@ -68 +68 @@
   <InvaderShip>
     <camerapositions>
-<!--       <CameraPosition position="0,15, 60" drag=true mouselook=true />
-      <CameraPosition position="0,20, 90" drag=true mouselook=true />
-      <CameraPosition position="0,30,120" drag=true mouselook=true /> -->
+ <!--       <CameraPosition position="0,15, 60" drag=true mouselook=true />
+     <CameraPosition position="0,20, 90" drag=true mouselook=true /> 
+      <CameraPosition position="0,30,120" direction="0, 0, -1" drag=false mouselook=true /> -->
       <CameraPosition position="0,300,-100" direction="0, -1, 0" drag=false mouselook=true />
     </camerapositions>

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

@@ -40 +40 @@
 ADD_SUBDIRECTORY(towerdefense)
 ADD_SUBDIRECTORY(invader)
+ADD_SUBDIRECTORY(dodgerace2)