Changeset 11725
- Timestamp:
- Feb 11, 2018, 12:26:40 AM (6 years ago)
- Location:
- code/branches/Presentation_HS17_merge
- Files:
-
- 2 edited
- 6 copied
-
. (modified) (1 prop)
-
data/levels/Asteroids2D.oxw (copied) (copied from code/branches/Asteroid_HS17/data/levels/Asteroids2D.oxw)
-
data/levels/includes/asteroids2DWeapon.oxi (copied) (copied from code/branches/Asteroid_HS17/data/levels/includes/asteroids2DWeapon.oxi)
-
data/levels/templates/asteroidsAsteroids2D.oxt (copied) (copied from code/branches/Asteroid_HS17/data/levels/templates/asteroidsAsteroids2D.oxt)
-
data/levels/templates/spaceshipAsteroids2D.oxt (copied) (copied from code/branches/Asteroid_HS17/data/levels/templates/spaceshipAsteroids2D.oxt)
-
data/overlays/Asteroids2DHUD.oxo (copied) (copied from code/branches/Asteroid_HS17/data/overlays/Asteroids2DHUD.oxo)
-
src/modules/CMakeLists.txt (modified) (1 diff)
-
src/modules/asteroids2D (copied) (copied from code/branches/Asteroid_HS17/src/modules/asteroids2D)
Legend:
- Unmodified
- Added
- Removed
-
code/branches/Presentation_HS17_merge
- Property svn:mergeinfo changed
/code/branches/Asteroid_HS17 (added) merged: 11456,11490,11506,11516,11528,11541,11555,11593-11594,11608,11613-11614,11616-11617,11619,11637,11643,11645,11660,11666,11668-11669,11671
- Property svn:mergeinfo changed
-
code/branches/Presentation_HS17_merge/src/modules/CMakeLists.txt
r11451 r11725 46 46 ADD_SUBDIRECTORY(hover) 47 47 ADD_SUBDIRECTORY(superorxobros) 48 ADD_SUBDIRECTORY(asteroids2D)
Note: See TracChangeset
for help on using the changeset viewer.
