- Timestamp:
- Feb 21, 2019, 3:46:15 PM (6 years ago)
- Location:
- code/branches/mergeFS18
- Files:
-
- 6 edited
- 8 copied
-
. (modified) (1 prop)
-
data/levels/Wagnis.oxw (copied) (copied from code/branches/wagnis_HS18/data/levels/Wagnis.oxw)
-
data/levels/templates/wagnisCursor.oxt (copied) (copied from code/branches/wagnis_HS18/data/levels/templates/wagnisCursor.oxt)
-
data/overlays/WagnisHUD.oxo (copied) (copied from code/branches/wagnis_HS18/data/overlays/WagnisHUD.oxo)
-
src/libraries/tools/Timer.cc (modified) (1 diff)
-
src/libraries/tools/Timer.h (modified) (1 diff)
-
src/modules/CMakeLists.txt (modified) (1 diff)
-
src/modules/wagnis (copied) (copied from code/branches/wagnis_HS18/src/modules/wagnis)
-
src/modules/weapons/projectiles/CMakeLists.txt (modified) (1 diff)
-
src/modules/weapons/projectiles/WagnisProjectile.cc (copied) (copied from code/branches/wagnis_HS18/src/modules/weapons/projectiles/WagnisProjectile.cc)
-
src/modules/weapons/projectiles/WagnisProjectile.h (copied) (copied from code/branches/wagnis_HS18/src/modules/weapons/projectiles/WagnisProjectile.h)
-
src/modules/weapons/weaponmodes/CMakeLists.txt (modified) (1 diff)
-
src/modules/weapons/weaponmodes/WagnisGun.cc (copied) (copied from code/branches/wagnis_HS18/src/modules/weapons/weaponmodes/WagnisGun.cc)
-
src/modules/weapons/weaponmodes/WagnisGun.h (copied) (copied from code/branches/wagnis_HS18/src/modules/weapons/weaponmodes/WagnisGun.h)
Legend:
- Unmodified
- Added
- Removed
-
code/branches/mergeFS18
-
code/branches/mergeFS18/src/libraries/tools/Timer.cc
r12028 r12191 37 37 38 38 #include <boost/bimap.hpp> 39 #include <functional> 39 40 40 41 #include "util/Clock.h" -
code/branches/mergeFS18/src/libraries/tools/Timer.h
r12029 r12191 78 78 79 79 #include "tools/ToolsPrereqs.h" 80 #include <functional> 80 81 81 82 #include "core/object/Listable.h" -
code/branches/mergeFS18/src/modules/CMakeLists.txt
r12045 r12191 51 51 ADD_SUBDIRECTORY(pacman) 52 52 ADD_SUBDIRECTORY(orxyroad) 53 ADD_SUBDIRECTORY(wagnis) -
code/branches/mergeFS18/src/modules/weapons/projectiles/CMakeLists.txt
r11108 r12191 14 14 GravityBombField.cc 15 15 MineProjectile.cc 16 WagnisProjectile.cc 16 17 ) -
code/branches/mergeFS18/src/modules/weapons/weaponmodes/CMakeLists.txt
r11108 r12191 13 13 GravityBombFire.cc 14 14 MineGun.cc 15 WagnisGun.cc 15 16 )
Note: See TracChangeset
for help on using the changeset viewer.
