Changeset 10237 for code/branches

Timestamp:

Feb 1, 2015, 3:57:57 PM (10 years ago)

Author:

landauf

Message:

merged surfaceraceHS14 (but without all the strange stuff that happened to the invaders module in this branch)

Location:

code/branches/presentationHS14merge

Files:

• . (modified) (1 prop)
• 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/overlays/DodgeRaceHUD.oxo (copied) (copied from code/branches/surfaceraceHS14/data/overlays/DodgeRaceHUD.oxo)
• src/modules/CMakeLists.txt (modified) (1 diff)
• src/modules/dodgerace (copied) (copied from code/branches/surfaceraceHS14/src/modules/dodgerace)

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

@@ -42 +42 @@
 ADD_SUBDIRECTORY(jump)
 ADD_SUBDIRECTORY(mini4dgame)
+ADD_SUBDIRECTORY(dodgerace)