Changeset 5695 for code/trunk/data/overlays

Timestamp:

Aug 30, 2009, 2:22:00 AM (15 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/overlays (copied) (copied from code/branches/resource2/data/overlays)
• data/overlays/OrxonoxLoading.overlay (copied) (copied from code/branches/resource2/data/overlays/OrxonoxLoading.overlay)
• data/overlays/debug.oxo (copied) (copied from code/branches/resource2/data/overlays/debug.oxo)
• data/overlays/hud.oxo (copied) (copied from code/branches/resource2/data/overlays/hud.oxo)
• data/overlays/hudtemplates3.oxo (copied) (copied from code/branches/resource2/data/overlays/hudtemplates3.oxo)
• data/overlays/ponghud.oxo (copied) (copied from code/branches/resource2/data/overlays/ponghud.oxo)
• data/overlays/stats.oxo (copied) (copied from code/branches/resource2/data/overlays/stats.oxo)
• data/overlays/teambasematchhud.oxo (copied) (copied from code/branches/resource2/data/overlays/teambasematchhud.oxo)
• data/overlays/underattackhud.oxo (copied) (copied from code/branches/resource2/data/overlays/underattackhud.oxo)