Changeset 10176
- Timestamp:
- Dec 11, 2014, 4:09:29 PM (9 years ago)
- Location:
- code/branches/presentationHS14
- Files:
-
- 5 edited
- 35 copied
-
. (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)
Legend:
- Unmodified
- Added
- Removed
-
code/branches/presentationHS14
- Property svn:mergeinfo changed
/code/branches/surfaceraceHS14 (added) merged: 10080,10092-10093,10095,10099,10107,10114,10116-10118,10124,10127-10128,10135,10139,10152,10154,10166
- Property svn:mergeinfo changed
-
code/branches/presentationHS14/data/gui/scripts/CampaignMenu.lua
r10175 r10176 52 52 53 53 function P.CheckLevel(filename) 54 local file = io.open("/home/ pmao/pmao-extra-0/orxonox/storymodeHS14/data/gui/scripts/campaign.txt", "r+")54 local file = io.open("/home/maxima/maxima-extra-0/orxonox/presentationHS14/data/gui/scripts/campaign.txt", "r+") 55 55 local index = 0 56 56 local returnvalue = false -
code/branches/presentationHS14/data/gui/scripts/campaign.txt
r10175 r10176 2 2 spacebar!!! . 3 3 missionOne.oxw 1 . 4 fightInOurBack.oxw 1.5 pirateAttack.oxw 1.4 fightInOurBack.oxw 0 . 5 pirateAttack.oxw 0 . 6 6 iJohnVane_TriptoArea51.oxw 0 . 7 7 ............................................................ -
code/branches/presentationHS14/data/levels/templates/spaceshipInvader.oxt
r9943 r10176 68 68 <InvaderShip> 69 69 <camerapositions> 70 <!-- <CameraPosition position="0,15, 60" drag=true mouselook=true />71 <CameraPosition position="0,20, 90" drag=true mouselook=true />72 <CameraPosition position="0,30,120" d rag=true mouselook=true /> -->70 <!-- <CameraPosition position="0,15, 60" drag=true mouselook=true /> 71 <CameraPosition position="0,20, 90" drag=true mouselook=true /> 72 <CameraPosition position="0,30,120" direction="0, 0, -1" drag=false mouselook=true /> --> 73 73 <CameraPosition position="0,300,-100" direction="0, -1, 0" drag=false mouselook=true /> 74 74 </camerapositions> -
code/branches/presentationHS14/src/modules/CMakeLists.txt
r9939 r10176 40 40 ADD_SUBDIRECTORY(towerdefense) 41 41 ADD_SUBDIRECTORY(invader) 42 ADD_SUBDIRECTORY(dodgerace2)
Note: See TracChangeset
for help on using the changeset viewer.
