Changeset 2106 for code/trunk/src/orxonox/objects
- Timestamp:
- Nov 2, 2008, 1:01:06 AM (16 years ago)
- Location:
- code/trunk/src/orxonox/objects
- Files:
-
- 8 edited
- 2 moved
-
weaponSystem/Munition.h (modified) (1 diff)
-
weaponSystem/Weapon.h (modified) (1 diff)
-
weaponSystem/WeaponSet.h (modified) (1 diff)
-
weaponSystem/WeaponSlot.h (modified) (1 diff)
-
weaponSystem/WeaponSystem.cc (moved) (moved from code/trunk/src/orxonox/objects/WeaponSystem.cc) (2 props)
-
weaponSystem/WeaponSystem.h (moved) (moved from code/trunk/src/orxonox/objects/WeaponSystem.h) (1 prop)
-
weaponSystem/munitions/LaserGunMunition.h (modified) (1 diff)
-
weaponSystem/weapons/LaserGun.h (modified) (1 diff)
-
weaponSystem/weapons/Missile.h (modified) (1 diff)
-
worldentities/pawns/Pawn.cc (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
-
code/trunk/src/orxonox/objects/weaponSystem/Munition.h
r2097 r2106 52 52 } 53 53 54 #endif /* _ WeaponSystem_H__ */54 #endif /* _Munition_H__ */ -
code/trunk/src/orxonox/objects/weaponSystem/Weapon.h
r2098 r2106 57 57 } 58 58 59 #endif /* _Weapon System_H__ */59 #endif /* _Weapon_H__ */ -
code/trunk/src/orxonox/objects/weaponSystem/WeaponSet.h
r2104 r2106 63 63 } 64 64 65 #endif /* _WeaponS ystem_H__ */65 #endif /* _WeaponSet_H__ */ -
code/trunk/src/orxonox/objects/weaponSystem/WeaponSlot.h
r2104 r2106 67 67 } 68 68 69 #endif /* _WeaponS ystem_H__ */69 #endif /* _WeaponSlot_H__ */ -
code/trunk/src/orxonox/objects/weaponSystem/WeaponSystem.cc
- Property svn:eol-style set to native
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
/code/branches/weapon/src/orxonox/objects/WeaponSystem.cc merged eligible /code/branches/ceguilua/src/orxonox/objects/WeaponSystem.cc 1802-1808 /code/branches/core3/src/orxonox/objects/WeaponSystem.cc 1572-1739 /code/branches/gcc43/src/orxonox/objects/WeaponSystem.cc 1580 /code/branches/gui/src/orxonox/objects/WeaponSystem.cc 1635-1723 /code/branches/input/src/orxonox/objects/WeaponSystem.cc 1629-1636 /code/branches/objecthierarchy/src/orxonox/objects/WeaponSystem.cc 1911-2085,2100 /code/branches/pickups/src/orxonox/objects/WeaponSystem.cc 1926-2086 /code/branches/questsystem/src/orxonox/objects/WeaponSystem.cc 1894-2088 /code/branches/script_trigger/src/orxonox/objects/WeaponSystem.cc 1295-1953,1955
-
code/trunk/src/orxonox/objects/weaponSystem/WeaponSystem.h
- Property svn:eol-style set to native
-
code/trunk/src/orxonox/objects/weaponSystem/munitions/LaserGunMunition.h
r2097 r2106 56 56 } 57 57 58 #endif /* _ WeaponSystem_H__ */58 #endif /* _LaserGunMunition_H__ */ -
code/trunk/src/orxonox/objects/weaponSystem/weapons/LaserGun.h
r2098 r2106 58 58 } 59 59 60 #endif /* _ WeaponSystem_H__ */60 #endif /* _LaserGun_H__ */ -
code/trunk/src/orxonox/objects/weaponSystem/weapons/Missile.h
r2098 r2106 52 52 } 53 53 54 #endif /* _ WeaponSystem_H__ */54 #endif /* _Missile_H__ */ -
code/trunk/src/orxonox/objects/worldentities/pawns/Pawn.cc
r2098 r2106 35 35 #include "objects/infos/PlayerInfo.h" 36 36 #include "objects/gametypes/Gametype.h" 37 #include "objects/ WeaponSystem.h"37 #include "objects/weaponSystem/WeaponSystem.h" 38 38 39 39 namespace orxonox
Note: See TracChangeset
for help on using the changeset viewer.
