Changeset 9271 for code/branches/presentation2012merge

Timestamp:

Jun 3, 2012, 5:17:18 PM (12 years ago)

Author:

landauf

Message:

svn:eol-style native (no changes in code)

Location:

code/branches/presentation2012merge

Files:

• cmake/tools/BuildUnits.cmake (modified) (1 prop)
• data/gui/layouts/ShipSelectionMenu.layout (modified) (1 prop)
• data/gui/layouts/SingleplayerConfigMenu.layout (modified) (1 prop)
• data/gui/scripts/ShipSelectionMenu.lua (modified) (1 prop)
• data/gui/scripts/SingleplayerConfigMenu.lua (modified) (1 prop)
• data/levels/Spacerace2.oxw (modified) (1 prop)
• data/levels/SurfaceRacePresentation.oxw (modified) (1 prop)
• data/levels/asteroidField.oxw (modified) (1 prop)
• data/levels/includes/asteroidField.lua (modified) (1 prop)
• data/levels/includes/towerWeaponSettings.oxi (modified) (1 prop)
• data/levels/includes/weaponSettingsSpacecruiser.oxi (modified) (1 prop)
• data/levels/missionOne.oxw (modified) (1 prop)
• data/levels/presentationHS11.oxw (modified) (1 prop)
• data/levels/surfaceRace.oxw (modified) (1 prop)
• data/levels/templates/spaceshipRace.oxt (modified) (1 prop)
• data/levels/templates/spaceshipSpacecruiser.oxt (modified) (1 prop)
• data/levels/templates/tower.oxt (modified) (1 prop)
• data/levels/towerDefense.oxw (modified) (1 prop)
• data/overlays/towerdefenseHUD.oxo (modified) (1 prop)
• doc/api/groups/Portals.dox (modified) (1 prop)
• doc/api/groups/Weapons.dox (modified) (1 prop)
• src/BuildUnitsConfigGCC.cmake (modified) (1 prop)
• src/BuildUnitsConfigMSVC.cmake (modified) (1 prop)
• src/external/enet/VERSION (modified) (1 prop)
• src/external/tolua/README_ORXONOX (modified) (1 prop)
• src/libraries/util/output/ConsoleWriter.cc (modified) (1 prop)
• src/modules/gametypes/OldRaceCheckPoint.cc (modified) (1 prop)
• src/modules/gametypes/OldRaceCheckPoint.h (modified) (1 prop)
• src/modules/gametypes/OldSpaceRace.cc (modified) (1 prop)
• src/modules/gametypes/OldSpaceRace.h (modified) (1 prop)
• src/modules/gametypes/SpaceRaceManager.cc (modified) (1 prop)
• src/modules/gametypes/SpaceRaceManager.h (modified) (1 prop)
• src/modules/overlays/hud/HUDBoostBar.cc (modified) (1 prop)
• src/modules/overlays/hud/HUDBoostBar.h (modified) (1 prop)
• src/modules/overlays/hud/HUDEnemyHealthBar.cc (modified) (1 prop)
• src/modules/overlays/hud/HUDEnemyHealthBar.h (modified) (1 prop)
• src/modules/pickup/items/DamageBoostPickup.cc (modified) (1 prop)
• src/modules/pickup/items/DamageBoostPickup.h (modified) (1 prop)
• src/modules/towerdefense/CMakeLists.txt (modified) (1 prop)
• src/modules/towerdefense/TDEnemy.h (modified) (1 prop)
• src/modules/towerdefense/Tower.cc (modified) (1 prop)
• src/modules/towerdefense/Tower.h (modified) (1 prop)
• src/modules/towerdefense/TowerDefense.cc (modified) (1 prop)
• src/modules/towerdefense/TowerDefense.h (modified) (1 prop)
• src/modules/towerdefense/TowerDefenseCenterpoint.cc (modified) (1 prop)
• src/modules/towerdefense/TowerDefenseCenterpoint.h (modified) (1 prop)
• src/modules/towerdefense/TowerDefenseController.cc (modified) (1 prop)
• src/modules/towerdefense/TowerDefenseController.h (modified) (1 prop)
• src/modules/towerdefense/TowerDefenseHUDController.cc (modified) (1 prop)
• src/modules/towerdefense/TowerDefenseHUDController.h (modified) (1 prop)
• src/modules/towerdefense/TowerDefensePlayerStats.cc (modified) (1 prop)
• src/modules/towerdefense/TowerDefensePlayerStats.h (modified) (1 prop)
• src/modules/towerdefense/TowerDefensePrereqs.h (modified) (1 prop)
• src/modules/towerdefense/towerdefensereadme.txt (modified) (1 prop)
• src/orxonox/ShipManager.cc (modified) (1 prop)
• src/orxonox/ShipManager.h (modified) (1 prop)
• src/orxonox/controllers/FormationController.cc (modified) (1 prop)
• src/orxonox/controllers/FormationController.h (modified) (1 prop)
• src/orxonox/gametypes/Mission.cc (modified) (1 prop)
• src/orxonox/gametypes/Mission.h (modified) (1 prop)
• src/orxonox/gametypes/TeamGametype.cc (modified) (1 prop)
• src/orxonox/gametypes/TeamGametype.h (modified) (1 prop)