Changeset 9241 for code/branches/captureTheFlag
- Timestamp:
- May 24, 2012, 8:49:19 PM (13 years ago)
- Location:
- code/branches/captureTheFlag
- Files:
-
- 30 copied
-
.project (copied) (copied from code/branches/newlevel2012/.project) (1 prop)
-
data/levels/includes/towerWeaponSettings.oxi (copied) (copied from code/branches/newlevel2012/data/levels/includes/towerWeaponSettings.oxi) (1 prop)
-
data/levels/templates/tower.oxt (copied) (copied from code/branches/newlevel2012/data/levels/templates/tower.oxt) (1 prop)
-
data/levels/towerDefense.oxw (copied) (copied from code/branches/newlevel2012/data/levels/towerDefense.oxw) (1 prop)
-
data/overlays/towerdefenseHUD.oxo (copied) (copied from code/branches/newlevel2012/data/overlays/towerdefenseHUD.oxo) (1 prop)
-
src/modules/towerdefense (copied) (copied from code/branches/newlevel2012/src/modules/towerdefense) (1 prop)
-
src/modules/towerdefense/CMakeLists.txt (copied) (copied from code/branches/newlevel2012/src/modules/towerdefense/CMakeLists.txt)
-
src/modules/towerdefense/Spielfeld Blender (copied) (copied from code/branches/newlevel2012/src/modules/towerdefense/Spielfeld Blender)
-
src/modules/towerdefense/Spielfeld Blender/OgreXMLConverter.log (copied) (copied from code/branches/newlevel2012/src/modules/towerdefense/Spielfeld Blender/OgreXMLConverter.log)
-
src/modules/towerdefense/Spielfeld Blender/Playfield_ME.mesh.xml (copied) (copied from code/branches/newlevel2012/src/modules/towerdefense/Spielfeld Blender/Playfield_ME.mesh.xml)
-
src/modules/towerdefense/Spielfeld Blender/Spielfeld.blend (copied) (copied from code/branches/newlevel2012/src/modules/towerdefense/Spielfeld Blender/Spielfeld.blend)
-
src/modules/towerdefense/TDEnemy.h (copied) (copied from code/branches/newlevel2012/src/modules/towerdefense/TDEnemy.h)
-
src/modules/towerdefense/Tower.cc (copied) (copied from code/branches/newlevel2012/src/modules/towerdefense/Tower.cc)
-
src/modules/towerdefense/Tower.h (copied) (copied from code/branches/newlevel2012/src/modules/towerdefense/Tower.h)
-
src/modules/towerdefense/TowerDefense.cc (copied) (copied from code/branches/newlevel2012/src/modules/towerdefense/TowerDefense.cc)
-
src/modules/towerdefense/TowerDefense.h (copied) (copied from code/branches/newlevel2012/src/modules/towerdefense/TowerDefense.h)
-
src/modules/towerdefense/TowerDefenseCenterpoint.cc (copied) (copied from code/branches/newlevel2012/src/modules/towerdefense/TowerDefenseCenterpoint.cc)
-
src/modules/towerdefense/TowerDefenseCenterpoint.h (copied) (copied from code/branches/newlevel2012/src/modules/towerdefense/TowerDefenseCenterpoint.h)
-
src/modules/towerdefense/TowerDefenseController.cc (copied) (copied from code/branches/newlevel2012/src/modules/towerdefense/TowerDefenseController.cc)
-
src/modules/towerdefense/TowerDefenseController.h (copied) (copied from code/branches/newlevel2012/src/modules/towerdefense/TowerDefenseController.h)
-
src/modules/towerdefense/TowerDefenseHUDController.cc (copied) (copied from code/branches/newlevel2012/src/modules/towerdefense/TowerDefenseHUDController.cc)
-
src/modules/towerdefense/TowerDefenseHUDController.h (copied) (copied from code/branches/newlevel2012/src/modules/towerdefense/TowerDefenseHUDController.h)
-
src/modules/towerdefense/TowerDefensePlayerStats.cc (copied) (copied from code/branches/newlevel2012/src/modules/towerdefense/TowerDefensePlayerStats.cc)
-
src/modules/towerdefense/TowerDefensePlayerStats.h (copied) (copied from code/branches/newlevel2012/src/modules/towerdefense/TowerDefensePlayerStats.h)
-
src/modules/towerdefense/TowerDefensePrereqs.h (copied) (copied from code/branches/newlevel2012/src/modules/towerdefense/TowerDefensePrereqs.h)
-
src/modules/towerdefense/tower (copied) (copied from code/branches/newlevel2012/src/modules/towerdefense/tower)
-
src/modules/towerdefense/tower/Tower.blend (copied) (copied from code/branches/newlevel2012/src/modules/towerdefense/tower/Tower.blend)
-
src/modules/towerdefense/tower/Tower.material (copied) (copied from code/branches/newlevel2012/src/modules/towerdefense/tower/Tower.material)
-
src/modules/towerdefense/tower/Tower.mesh (copied) (copied from code/branches/newlevel2012/src/modules/towerdefense/tower/Tower.mesh)
-
src/modules/towerdefense/towerdefensereadme.txt (copied) (copied from code/branches/newlevel2012/src/modules/towerdefense/towerdefensereadme.txt)
-
code/branches/captureTheFlag/.project
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
/code/branches/newlevel2012/.project merged eligible /code/branches/sound2012/.project 9215-9240 /code/trunk/.project 9017-9204
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
-
code/branches/captureTheFlag/data/levels/includes/towerWeaponSettings.oxi
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
/code/branches/newlevel2012/data/levels/includes/towerWeaponSettings.oxi merged eligible /code/branches/sound2012/data/levels/includes/towerWeaponSettings.oxi 9215-9240 /code/trunk/data/levels/includes/towerWeaponSettings.oxi 9017-9204
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
-
code/branches/captureTheFlag/data/levels/templates/tower.oxt
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
/code/branches/newlevel2012/data/levels/templates/tower.oxt merged eligible /code/branches/sound2012/data/levels/templates/tower.oxt 9215-9240 /code/trunk/data/levels/templates/tower.oxt 9017-9204
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
-
code/branches/captureTheFlag/data/levels/towerDefense.oxw
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
/code/branches/newlevel2012/data/levels/towerDefense.oxw merged eligible /code/branches/sound2012/data/levels/towerDefense.oxw 9215-9240 /code/trunk/data/levels/towerDefense.oxw 9017-9204
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
-
code/branches/captureTheFlag/data/overlays/towerdefenseHUD.oxo
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
/code/branches/newlevel2012/data/overlays/towerdefenseHUD.oxo merged eligible /code/branches/sound2012/data/overlays/towerdefenseHUD.oxo 9215-9240 /code/trunk/data/overlays/towerdefenseHUD.oxo 9017-9204
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
-
code/branches/captureTheFlag/src/modules/towerdefense
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
/code/branches/newlevel2012/src/modules/towerdefense merged eligible /code/branches/sound2012/src/modules/towerdefense 9215-9240 /code/trunk/src/modules/towerdefense 9017-9204
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
Note: See TracChangeset
for help on using the changeset viewer.
