Changeset 12045 for code/branches

Timestamp:

Oct 17, 2018, 11:38:23 AM (6 years ago)

Author:

merholzl

Message:

merged pacman

Location:

code/branches/mergeFS18

Files:

• . (modified) (1 prop)
• data/levels/3DPacman.oxw (copied) (copied from code/branches/3DPacman_FS18/data/levels/3DPacman.oxw)
• data/levels/templates/PacmanGelb.oxt (copied) (copied from code/branches/3DPacman_FS18/data/levels/templates/PacmanGelb.oxt)
• data/overlays/PacmanHUD.oxo (copied) (copied from code/branches/3DPacman_FS18/data/overlays/PacmanHUD.oxo)
• src/modules/CMakeLists.txt (modified) (1 diff)
• src/modules/dodgerace/DodgeRaceShip.cc (modified) (1 diff)
• src/modules/pacman (copied) (copied from code/branches/3DPacman_FS18/src/modules/pacman)

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

@@ -49 +49 @@
 ADD_SUBDIRECTORY(asteroids2D)
 ADD_SUBDIRECTORY(flappyorx)
+ADD_SUBDIRECTORY(pacman)
 ADD_SUBDIRECTORY(orxyroad)

code/branches/mergeFS18/src/modules/dodgerace/DodgeRaceShip.cc

@@ -106 +106 @@
 
         setPosition(pos);
-        setOrientation(Vector3::UNIT_Y, Degree(270));
+        //setOrientation(Vector3::UNIT_Y, Degree(270));
 
         // Level up!