Changeset 10960

Timestamp:

Dec 9, 2015, 12:47:30 PM (9 years ago)

Author:

maxima

Message:

Merged presentation and hover branches. Hover minigame works fine.

Location:

code/branches/presentationHS15

Files:

• . (modified) (1 prop)
• data/levels/Hover.oxw (copied) (copied from code/branches/hoverHS15/data/levels/Hover.oxw)
• data/levels/includes/weaponSettingsHover.oxi (copied) (copied from code/branches/hoverHS15/data/levels/includes/weaponSettingsHover.oxi)
• data/levels/templates/spaceshipHover.oxt (copied) (copied from code/branches/hoverHS15/data/levels/templates/spaceshipHover.oxt)
• data/overlays/HoverHUD.oxo (copied) (copied from code/branches/hoverHS15/data/overlays/HoverHUD.oxo)
• src/modules/CMakeLists.txt (modified) (1 diff)
• src/modules/hover (copied) (copied from code/branches/hoverHS15/src/modules/hover)
• src/modules/hover/CMakeLists.txt (copied) (copied from code/branches/hoverHS15/src/modules/hover/CMakeLists.txt)
• src/modules/hover/FlagHUD.cc (copied) (copied from code/branches/hoverHS15/src/modules/hover/FlagHUD.cc)
• src/modules/hover/FlagHUD.h (copied) (copied from code/branches/hoverHS15/src/modules/hover/FlagHUD.h)
• src/modules/hover/Hover.cc (copied) (copied from code/branches/hoverHS15/src/modules/hover/Hover.cc)
• src/modules/hover/Hover.h (copied) (copied from code/branches/hoverHS15/src/modules/hover/Hover.h)
• src/modules/hover/HoverFlag.cc (copied) (copied from code/branches/hoverHS15/src/modules/hover/HoverFlag.cc)
• src/modules/hover/HoverFlag.h (copied) (copied from code/branches/hoverHS15/src/modules/hover/HoverFlag.h)
• src/modules/hover/HoverOrigin.cc (copied) (copied from code/branches/hoverHS15/src/modules/hover/HoverOrigin.cc)
• src/modules/hover/HoverOrigin.h (copied) (copied from code/branches/hoverHS15/src/modules/hover/HoverOrigin.h)
• src/modules/hover/HoverPrereqs.h (copied) (copied from code/branches/hoverHS15/src/modules/hover/HoverPrereqs.h)
• src/modules/hover/HoverShip.cc (copied) (copied from code/branches/hoverHS15/src/modules/hover/HoverShip.cc)
• src/modules/hover/HoverShip.h (copied) (copied from code/branches/hoverHS15/src/modules/hover/HoverShip.h)
• src/modules/hover/HoverWall.cc (copied) (copied from code/branches/hoverHS15/src/modules/hover/HoverWall.cc)
• src/modules/hover/HoverWall.h (copied) (copied from code/branches/hoverHS15/src/modules/hover/HoverWall.h)
• src/modules/hover/TimeHUD.cc (copied) (copied from code/branches/hoverHS15/src/modules/hover/TimeHUD.cc)
• src/modules/hover/TimeHUD.h (copied) (copied from code/branches/hoverHS15/src/modules/hover/TimeHUD.h)

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

@@ -43 +43 @@
 ADD_SUBDIRECTORY(mini4dgame)
 ADD_SUBDIRECTORY(dodgerace)
+ADD_SUBDIRECTORY(hover)