- Timestamp:
- Mar 23, 2009, 1:04:52 AM (15 years ago)
- File:
-
- 1 moved
Legend:
- Unmodified
- Added
- Removed
-
code/branches/miniprojects/src/orxonox/objects/gametypes/TeamDeathmatch.h
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
/code/branches/buildsystem/src/orxonox/objects/gametypes/TeamGametype.h 1874-2276,2278-2400 /code/branches/buildsystem2/src/orxonox/objects/gametypes/TeamGametype.h 2506-2658 /code/branches/buildsystem3/src/orxonox/objects/gametypes/TeamGametype.h 2662-2708 /code/branches/ceguilua/src/orxonox/objects/gametypes/TeamGametype.h 1802-1808 /code/branches/core3/src/orxonox/objects/gametypes/TeamGametype.h 1572-1739 /code/branches/gcc43/src/orxonox/objects/gametypes/TeamGametype.h 1580 /code/branches/gui/src/orxonox/objects/gametypes/TeamGametype.h 1635-1723 /code/branches/input/src/orxonox/objects/gametypes/TeamGametype.h 1629-1636 /code/branches/lodfinal/src/orxonox/objects/gametypes/TeamGametype.h 2372-2411 /code/branches/network/src/orxonox/objects/gametypes/TeamGametype.h 2356 /code/branches/network64/src/orxonox/objects/gametypes/TeamGametype.h 2210-2355 /code/branches/objecthierarchy/src/orxonox/objects/gametypes/TeamGametype.h 1911-2085,2100,2110-2169 /code/branches/objecthierarchy2/src/orxonox/objects/gametypes/TeamGametype.h 2171-2479 /code/branches/overlay/src/orxonox/objects/gametypes/TeamGametype.h 2117-2385 /code/branches/physics/src/orxonox/objects/gametypes/TeamGametype.h 1912-2055,2107-2439 /code/branches/physics_merge/src/orxonox/objects/gametypes/TeamGametype.h 2436-2457 /code/branches/pickups/src/orxonox/objects/gametypes/TeamGametype.h 1926-2086,2127 /code/branches/pickups2/src/orxonox/objects/gametypes/TeamGametype.h 2107-2497 /code/branches/presentation/src/orxonox/objects/gametypes/TeamGametype.h 2369-2652,2654-2660 /code/branches/questsystem/src/orxonox/objects/gametypes/TeamGametype.h 1894-2088 /code/branches/questsystem2/src/orxonox/objects/gametypes/TeamGametype.h 2107-2259 /code/branches/script_trigger/src/orxonox/objects/gametypes/TeamGametype.h 1295-1953,1955 /code/branches/weapon/src/orxonox/objects/gametypes/TeamGametype.h 1925-2094 /code/branches/weapon2/src/orxonox/objects/gametypes/TeamGametype.h 2107-2488
r2820 r2821 27 27 */ 28 28 29 #ifndef _Team Gametype_H__30 #define _Team Gametype_H__29 #ifndef _TeamDeathmatch_H__ 30 #define _TeamDeathmatch_H__ 31 31 32 32 #include "OrxonoxPrereqs.h" … … 38 38 namespace orxonox 39 39 { 40 class _OrxonoxExport Team Gametype: public Deathmatch40 class _OrxonoxExport TeamDeathmatch : public Deathmatch 41 41 { 42 42 public: 43 Team Gametype(BaseObject* creator);44 virtual ~Team Gametype() {}43 TeamDeathmatch(BaseObject* creator); 44 virtual ~TeamDeathmatch() {} 45 45 46 46 void setConfigValues(); … … 65 65 } 66 66 67 #endif /* _Team Gametype_H__ */67 #endif /* _TeamDeathmatch_H__ */ -
Property
svn:mergeinfo
set to
(toggle deleted branches)
Note: See TracChangeset
for help on using the changeset viewer.