Changeset 9269 for code/branches/presentation2012merge/src/modules

Timestamp:

Jun 3, 2012, 4:33:13 PM (12 years ago)

Author:

landauf

Message:

merged presentation2012 to presentation2012merge

Location:

code/branches/presentation2012merge

Files:

• . (modified) (2 props)
• src/modules/CMakeLists.txt (modified) (1 diff)
• src/modules/pickup/PickupPrereqs.h (modified) (1 diff)
• src/modules/pickup/items/CMakeLists.txt (modified) (1 diff)
• src/modules/pickup/items/DamageBoostPickup.cc (copied) (copied from code/branches/presentation2012/src/modules/pickup/items/DamageBoostPickup.cc)
• src/modules/pickup/items/DamageBoostPickup.h (copied) (copied from code/branches/presentation2012/src/modules/pickup/items/DamageBoostPickup.h)
• src/modules/pickup/items/SpeedPickup.h (modified) (1 diff)
• src/modules/towerdefense (copied) (copied from code/branches/presentation2012/src/modules/towerdefense)

code/branches/presentation2012merge

@@ +1 @@
+.project
 build
 codeblocks
+dependencies
 vs
-dependencies

@@ +1 @@
+.project
 build
 codeblocks
+dependencies
 vs
-dependencies

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

@@ -38 +38 @@
 ADD_SUBDIRECTORY(weapons)
 ADD_SUBDIRECTORY(docking)
+ADD_SUBDIRECTORY(towerdefense)

code/branches/presentation2012merge/src/modules/pickup/PickupPrereqs.h

@@ -86 +86 @@
     class ShieldPickup;
     class ShrinkPickup;
-
+    class DamageBoostPickup;
 }
 

code/branches/presentation2012merge/src/modules/pickup/items/CMakeLists.txt

@@ -7 +7 @@
   ShieldPickup.cc
   ShrinkPickup.cc
+  DamageBoostPickup.cc
 )

code/branches/presentation2012merge/src/modules/pickup/items/SpeedPickup.h

@@ -112 +112 @@
         private:
             void initialize(void); //!< Initializes the member variables.
-            SpaceShip* carrierToSpaceShipHelper(void); //!< Helper to transform the PickupCarrier to a SpaceSHip, and throw an error message if the conversion fails.
+            SpaceShip* carrierToSpaceShipHelper(void); //!< Helper to transform the PickupCarrier to a SpaceShip, and throw an error message if the conversion fails.
 
             Timer durationTimer_; //!< Timer.

@@ +1 @@
+.project
 build
 codeblocks
+dependencies
 vs
-dependencies