Changeset 5695 for code/trunk/data/levels

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/levels (copied) (copied from code/branches/resource2/data/levels)
• data/levels/empty_level.oxw (copied) (copied from code/branches/resource2/data/levels/empty_level.oxw)
• data/levels/gametype_asteroids.oxw (copied) (copied from code/branches/resource2/data/levels/gametype_asteroids.oxw)
• data/levels/gametype_underattack.oxw (copied) (copied from code/branches/resource2/data/levels/gametype_underattack.oxw)
• 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)
• data/levels/old (copied) (copied from code/branches/resource2/data/levels/old)
• data/levels/old/CuboidSpaceStation.oxw (copied) (copied from code/branches/resource2/data/levels/old/CuboidSpaceStation.oxw)
• data/levels/old/physicstest.oxw (copied) (copied from code/branches/resource2/data/levels/old/physicstest.oxw)
• data/levels/old/physicstest2.oxw (copied) (copied from code/branches/resource2/data/levels/old/physicstest2.oxw)
• data/levels/old/planettest.oxw (copied) (copied from code/branches/resource2/data/levels/old/planettest.oxw)
• data/levels/old/presentation_physics.oxw (copied) (copied from code/branches/resource2/data/levels/old/presentation_physics.oxw)
• data/levels/old/princessaeryn.oxw (copied) (copied from code/branches/resource2/data/levels/old/princessaeryn.oxw)
• data/levels/old/questsystem.oxw (copied) (copied from code/branches/resource2/data/levels/old/questsystem.oxw)
• data/levels/old/sample4.oxw (copied) (copied from code/branches/resource2/data/levels/old/sample4.oxw)
• data/levels/old/spaceshiptemplates_physics.oxw (copied) (copied from code/branches/resource2/data/levels/old/spaceshiptemplates_physics.oxw)
• data/levels/old/tutorial_hs08.oxw (copied) (copied from code/branches/resource2/data/levels/old/tutorial_hs08.oxw)
• data/levels/pickuptest.oxw (copied) (copied from code/branches/resource2/data/levels/pickuptest.oxw)
• data/levels/presentation.oxw (copied) (copied from code/branches/resource2/data/levels/presentation.oxw)
• data/levels/presentation09.oxw (copied) (copied from code/branches/resource2/data/levels/presentation09.oxw)
• data/levels/presentation09b.oxw (copied) (copied from code/branches/resource2/data/levels/presentation09b.oxw)
• data/levels/presentation_dm.oxw (copied) (copied from code/branches/resource2/data/levels/presentation_dm.oxw)
• data/levels/presentation_pong.oxw (copied) (copied from code/branches/resource2/data/levels/presentation_pong.oxw)
• data/levels/teambasematchlevel.oxw (copied) (copied from code/branches/resource2/data/levels/teambasematchlevel.oxw)
• data/levels/teamdeathmatch.oxw (copied) (copied from code/branches/resource2/data/levels/teamdeathmatch.oxw)
• data/levels/templates (copied) (copied from code/branches/resource2/data/levels/templates)
• data/levels/templates/spaceship_H2.oxt (copied) (copied from code/branches/resource2/data/levels/templates/spaceship_H2.oxt)
• data/levels/templates/spaceship_assff.oxt (copied) (copied from code/branches/resource2/data/levels/templates/spaceship_assff.oxt)
• data/levels/templates/spaceship_pirate.oxt (copied) (copied from code/branches/resource2/data/levels/templates/spaceship_pirate.oxt)
• data/levels/tutorial.oxw (copied) (copied from code/branches/resource2/data/levels/tutorial.oxw)
• data/levels/waypoints.oxw (copied) (copied from code/branches/resource2/data/levels/waypoints.oxw)