Changeset 10073 for code/branches/presentationFS14/src/orxonox/OrxonoxPrereqs.h

Timestamp:

May 22, 2014, 2:49:16 PM (11 years ago)

Author:

smerkli

Message:

Merged modularships branch

Location:

code/branches/presentationFS14

Files:

• . (modified) (1 prop)
• src/orxonox/OrxonoxPrereqs.h (modified) (2 diffs)

code/branches/presentationFS14/src/orxonox/OrxonoxPrereqs.h

@@ -142 +142 @@
 
     // items
+    class ShipPart;
+    class PartDestructionEvent;
     class Engine;
     class Item;
@@ -189 +191 @@
     class Pawn;
     class SpaceShip;
+    class ModularSpaceShip;
     class Spectator;
     class TeamBaseMatchBase;