Changeset 12179 for code/branches/Merge_HS18
- Timestamp:
- Dec 11, 2018, 2:21:47 PM (6 years ago)
- Location:
- code/branches/Merge_HS18
- Files:
-
- 3 edited
- 3 copied
-
. (modified) (1 prop)
-
data/levels/TixyTaxyTorxy.oxw (copied) (copied from code/branches/TixyTaxyTorxy_HS18/data/levels/TixyTaxyTorxy.oxw)
-
data/overlays/TixyTaxyTorxyHUD.oxo (copied) (copied from code/branches/TixyTaxyTorxy_HS18/data/overlays/TixyTaxyTorxyHUD.oxo)
-
src/modules/CMakeLists.txt (modified) (1 diff)
-
src/modules/TixyTaxyTorxy (copied) (copied from code/branches/TixyTaxyTorxy_HS18/src/modules/TixyTaxyTorxy)
-
src/modules/towerdefense/TowerDefenseCenterpoint.h (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
-
code/branches/Merge_HS18
- Property svn:mergeinfo changed
/code/branches/TixyTaxyTorxy_HS18 (added) merged: 12039,12063-12064,12086-12087,12149
- Property svn:mergeinfo changed
-
code/branches/Merge_HS18/src/modules/CMakeLists.txt
r12045 r12179 51 51 ADD_SUBDIRECTORY(pacman) 52 52 ADD_SUBDIRECTORY(orxyroad) 53 ADD_SUBDIRECTORY(TixyTaxyTorxy) -
code/branches/Merge_HS18/src/modules/towerdefense/TowerDefenseCenterpoint.h
r11099 r12179 45 45 @ingroup TowerDefense 46 46 */ 47 48 47 49 class _TowerDefenseExport TowerDefenseCenterpoint : public MobileEntity 48 50 {
Note: See TracChangeset
for help on using the changeset viewer.
