Changeset 9516

Timestamp:

Dec 15, 2012, 2:40:36 PM (12 years ago)

Author:

smerkli

Message:

Merged branch largeShip1. Cannot test at home,
but since it's only levels, should work.

Location:

code/branches/presentationHS12

Files:

• . (modified) (1 prop)
• data/levels/collateralDamageDemo.oxw (copied) (copied from code/branches/largeShip1/data/levels/collateralDamageDemo.oxw)
• data/levels/includes/weaponSettingsCollateral.oxi (copied) (copied from code/branches/largeShip1/data/levels/includes/weaponSettingsCollateral.oxi)
• data/levels/templates/spaceshipCollateralDamage.oxt (copied) (copied from code/branches/largeShip1/data/levels/templates/spaceshipCollateralDamage.oxt)