Changeset 5695 for code/trunk/data/levels/includes

Timestamp:

Aug 30, 2009, 2:22:00 AM (16 years ago)

Author:

rgrieder

Message:

Merged resource2 branch back to trunk.

IMPORTANT NOTE:
Upon this merge you need to specifically call your data directory "data_extern" when checking it out (when you don't provide a name, it will be just called 'trunk').
The new CMake variable is EXTERNAL_DATA_DIRECTORY. DATA_DIRECTORY now points to the one the source part of the repository.
UPDATE YOUR DATA DIRECTORY AS WELL!!!

Location:

code/trunk

Files:

• . (modified) (1 prop)
• data (copied) (copied from code/branches/resource2/data)
• data/levels (copied) (copied from code/branches/resource2/data/levels)
• data/levels/includes (copied) (copied from code/branches/resource2/data/levels/includes)
• data/levels/includes/CuboidSpaceStation.lua (copied) (copied from code/branches/resource2/data/levels/includes/CuboidSpaceStation.lua)
• data/levels/includes/weaponsettings1.oxi (copied) (copied from code/branches/resource2/data/levels/includes/weaponsettings1.oxi)
• data/levels/includes/weaponsettings2.oxi (copied) (copied from code/branches/resource2/data/levels/includes/weaponsettings2.oxi)
• data/levels/includes/weaponsettings3.oxi (copied) (copied from code/branches/resource2/data/levels/includes/weaponsettings3.oxi)
• data/levels/includes/weaponsettings_H2.oxi (copied) (copied from code/branches/resource2/data/levels/includes/weaponsettings_H2.oxi)
• data/levels/includes/weaponsettings_pirate.oxi (copied) (copied from code/branches/resource2/data/levels/includes/weaponsettings_pirate.oxi)