Changeset 2921
- Timestamp:
- Apr 18, 2009, 7:06:36 PM (16 years ago)
- Location:
- code/branches/weapons/src/orxonox/objects/weaponSystem
- Files:
-
- 6 deleted
- 1 edited
- 5 copied
- 1 moved
-
CMakeLists.txt (modified) (1 diff)
-
weaponmodes (moved) (moved from code/branches/weapons/src/orxonox/objects/weaponSystem/weapons) (1 prop)
-
weaponmodes/CMakeLists.txt (copied) (copied from code/branches/weapons/src/orxonox/objects/weaponSystem/weapons/CMakeLists.txt)
-
weaponmodes/Fusion.cc (deleted)
-
weaponmodes/Fusion.h (deleted)
-
weaponmodes/FusionFire.cc (copied) (copied from code/branches/weapons/src/orxonox/objects/weaponSystem/weapons/FusionFire.cc)
-
weaponmodes/FusionFire.h (copied) (copied from code/branches/weapons/src/orxonox/objects/weaponSystem/weapons/FusionFire.h)
-
weaponmodes/LaserFire.cc (copied) (copied from code/branches/weapons/src/orxonox/objects/weaponSystem/weapons/LaserFire.cc)
-
weaponmodes/LaserFire.h (copied) (copied from code/branches/weapons/src/orxonox/objects/weaponSystem/weapons/LaserFire.h)
-
weaponmodes/LaserGun.cc (deleted)
-
weaponmodes/LaserGun.h (deleted)
-
weaponmodes/Missile.cc (deleted)
-
weaponmodes/Missile.h (deleted)
Legend:
- Unmodified
- Added
- Removed
-
code/branches/weapons/src/orxonox/objects/weaponSystem/CMakeLists.txt
r2918 r2921 12 12 ADD_SUBDIRECTORY(munitions) 13 13 ADD_SUBDIRECTORY(projectiles) 14 ADD_SUBDIRECTORY(weapon s)14 ADD_SUBDIRECTORY(weaponmodes) -
code/branches/weapons/src/orxonox/objects/weaponSystem/weaponmodes
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
/code/branches/gui/src/orxonox/objects/weaponSystem/weapons merged eligible /code/branches/lodfinal/src/orxonox/objects/weaponSystem/weapons merged eligible /code/branches/pickups/src/orxonox/objects/weaponSystem/weapons merged eligible /code/branches/pickups2/src/orxonox/objects/weaponSystem/weapons merged eligible /code/branches/weaponsystem/src/orxonox/objects/weaponSystem/weapons merged eligible /code/branches/buildsystem/src/orxonox/objects/weaponSystem/weapons 1874-2276,2278-2400 /code/branches/buildsystem2/src/orxonox/objects/weaponSystem/weapons 2506-2658 /code/branches/buildsystem3/src/orxonox/objects/weaponSystem/weapons 2662-2708 /code/branches/ceguilua/src/orxonox/objects/weaponSystem/weapons 1802-1808 /code/branches/core3/src/orxonox/objects/weaponSystem/weapons 1572-1739 /code/branches/gcc43/src/orxonox/objects/weaponSystem/weapons 1580 /code/branches/input/src/orxonox/objects/weaponSystem/weapons 1629-1636 /code/branches/miniprojects/src/orxonox/objects/weaponSystem/weapons 2754-2824 /code/branches/network/src/orxonox/objects/weaponSystem/weapons 2356 /code/branches/network64/src/orxonox/objects/weaponSystem/weapons 2210-2355 /code/branches/objecthierarchy/src/orxonox/objects/weaponSystem/weapons 1911-2085,2100,2110-2169 /code/branches/objecthierarchy2/src/orxonox/objects/weaponSystem/weapons 2171-2479 /code/branches/overlay/src/orxonox/objects/weaponSystem/weapons 2117-2385 /code/branches/physics/src/orxonox/objects/weaponSystem/weapons 1912-2055,2107-2439 /code/branches/physics_merge/src/orxonox/objects/weaponSystem/weapons 2436-2457 /code/branches/presentation/src/orxonox/objects/weaponSystem/weapons 2369-2652,2654-2660 /code/branches/questsystem/src/orxonox/objects/weaponSystem/weapons 1894-2088 /code/branches/questsystem2/src/orxonox/objects/weaponSystem/weapons 2107-2259 /code/branches/script_trigger/src/orxonox/objects/weaponSystem/weapons 1295-1953,1955 /code/branches/weapon/src/orxonox/objects/weaponSystem/weapons 1925-2094 /code/branches/weapon2/src/orxonox/objects/weaponSystem/weapons 2107-2488
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
Note: See TracChangeset
for help on using the changeset viewer.
