# # ChangeLog for code/branches/presentation2012merge/data/levels/surfaceRace.oxw # # Generated by Trac 1.0.9 # Jun 7, 2024, 2:23:21 PM Sat, 16 Jun 2012 13:23:01 GMT jo [9301] * code/branches/presentation2012merge/data/levels/surfaceRace.oxw (modified) * code/branches/presentation2012merge/src/modules/gametypes/OldSpaceRace.h (modified) * code/branches/presentation2012merge/src/modules/gametypes/SpaceRace.cc (modified) Quick fix: Suppress default bots in racing gametypes, since so far we ... Sun, 03 Jun 2012 20:38:57 GMT landauf [9276] * code/branches/presentation2012merge/data/levels/surfaceRace.oxw (modified) fixed surfaceRace.oxw level Sun, 03 Jun 2012 16:05:24 GMT landauf [9272] * code/branches/presentation2012merge/data/gui/layouts/GUILayout.xsd (modified) * code/branches/presentation2012merge/data/gui/layouts/InGamePickupHUD.layout (modified) * code/branches/presentation2012merge/data/gui/layouts/ShipSelectionMenu.layout (modified) * code/branches/presentation2012merge/data/gui/scripts/ShipSelectionMenu.lua (modified) * code/branches/presentation2012merge/data/gui/scripts/SingleplayerMenu.lua (modified) * code/branches/presentation2012merge/data/levels/Spacerace2.oxw (modified) * code/branches/presentation2012merge/data/levels/SurfaceRacePresentation.oxw (modified) * code/branches/presentation2012merge/data/levels/asteroidField.oxw (modified) * code/branches/presentation2012merge/data/levels/dynamicMatch.oxw (modified) * code/branches/presentation2012merge/data/levels/includes/CuboidSpaceStation.lua (modified) * code/branches/presentation2012merge/data/levels/includes/asteroidField.lua (modified) * code/branches/presentation2012merge/data/levels/includes/weaponSettingsFPS.oxi (modified) * code/branches/presentation2012merge/data/levels/lastManStanding.oxw (modified) * code/branches/presentation2012merge/data/levels/lastTeamStanding.oxw (modified) * code/branches/presentation2012merge/data/levels/old/CuboidSpaceStation.oxw (modified) * code/branches/presentation2012merge/data/levels/presentationFS10Ed.oxw (modified) * code/branches/presentation2012merge/data/levels/presentationHS11.oxw (modified) * code/branches/presentation2012merge/data/levels/surfaceRace.oxw (modified) * code/branches/presentation2012merge/data/levels/templates/FPS.oxt (modified) * code/branches/presentation2012merge/data/levels/templates/tower.oxt (modified) * code/branches/presentation2012merge/data/levels/testStars.oxw (modified) * code/branches/presentation2012merge/data/levels/towerDefense.oxw (modified) * code/branches/presentation2012merge/data/overlays/towerdefenseHUD.oxo (modified) * code/branches/presentation2012merge/src/modules/gametypes/SpaceRaceManager.cc (modified) * code/branches/presentation2012merge/src/modules/pickup/items/DamageBoostPickup.cc (modified) * code/branches/presentation2012merge/src/modules/pickup/items/DamageBoostPickup.h (modified) * code/branches/presentation2012merge/src/modules/towerdefense/CMakeLists.txt (modified) * code/branches/presentation2012merge/src/modules/towerdefense/TDEnemy.h (modified) * code/branches/presentation2012merge/src/modules/towerdefense/Tower.cc (modified) * code/branches/presentation2012merge/src/modules/towerdefense/Tower.h (modified) * code/branches/presentation2012merge/src/modules/towerdefense/TowerDefense.cc (modified) * code/branches/presentation2012merge/src/modules/towerdefense/TowerDefense.h (modified) * code/branches/presentation2012merge/src/modules/towerdefense/TowerDefenseCenterpoint.cc (modified) * code/branches/presentation2012merge/src/modules/towerdefense/TowerDefenseCenterpoint.h (modified) * code/branches/presentation2012merge/src/modules/towerdefense/TowerDefenseHUDController.cc (modified) * code/branches/presentation2012merge/src/modules/towerdefense/TowerDefenseHUDController.h (modified) * code/branches/presentation2012merge/src/modules/towerdefense/TowerDefensePlayerStats.cc (modified) * code/branches/presentation2012merge/src/modules/towerdefense/TowerDefensePlayerStats.h (modified) * code/branches/presentation2012merge/src/modules/towerdefense/TowerDefensePrereqs.h (modified) * code/branches/presentation2012merge/src/orxonox/LevelInfo.h (modified) * code/branches/presentation2012merge/src/orxonox/ShipManager.cc (modified) * code/branches/presentation2012merge/src/orxonox/controllers/FormationController.cc (modified) * code/branches/presentation2012merge/src/orxonox/gametypes/Mission.cc (modified) * code/branches/presentation2012merge/src/orxonox/infos/PlayerInfo.cc (modified) * code/branches/presentation2012merge/src/orxonox/interfaces/RadarViewable.h (modified) * code/branches/presentation2012merge/src/orxonox/worldentities/ControllableEntity.cc (modified) * code/branches/presentation2012merge/src/orxonox/worldentities/ControllableEntity.h (modified) * code/branches/presentation2012merge/src/orxonox/worldentities/pawns/Pawn.cc (modified) * code/branches/presentation2012merge/src/orxonox/worldentities/pawns/SpaceShip.cc (modified) replaced tabs with spaces (no code changed) Sun, 03 Jun 2012 15:17:18 GMT landauf [9271] * code/branches/presentation2012merge/cmake/tools/BuildUnits.cmake (modified) * code/branches/presentation2012merge/data/gui/layouts/ShipSelectionMenu.layout (modified) * code/branches/presentation2012merge/data/gui/layouts/SingleplayerConfigMenu.layout (modified) * code/branches/presentation2012merge/data/gui/scripts/ShipSelectionMenu.lua (modified) * code/branches/presentation2012merge/data/gui/scripts/SingleplayerConfigMenu.lua (modified) * code/branches/presentation2012merge/data/levels/Spacerace2.oxw (modified) * code/branches/presentation2012merge/data/levels/SurfaceRacePresentation.oxw (modified) * code/branches/presentation2012merge/data/levels/asteroidField.oxw (modified) * code/branches/presentation2012merge/data/levels/includes/asteroidField.lua (modified) * code/branches/presentation2012merge/data/levels/includes/towerWeaponSettings.oxi (modified) * code/branches/presentation2012merge/data/levels/includes/weaponSettingsSpacecruiser.oxi (modified) * code/branches/presentation2012merge/data/levels/missionOne.oxw (modified) * code/branches/presentation2012merge/data/levels/presentationHS11.oxw (modified) * code/branches/presentation2012merge/data/levels/surfaceRace.oxw (modified) * code/branches/presentation2012merge/data/levels/templates/spaceshipRace.oxt (modified) * code/branches/presentation2012merge/data/levels/templates/spaceshipSpacecruiser.oxt (modified) * code/branches/presentation2012merge/data/levels/templates/tower.oxt (modified) * code/branches/presentation2012merge/data/levels/towerDefense.oxw (modified) * code/branches/presentation2012merge/data/overlays/towerdefenseHUD.oxo (modified) * code/branches/presentation2012merge/doc/api/groups/Portals.dox (modified) * code/branches/presentation2012merge/doc/api/groups/Weapons.dox (modified) * code/branches/presentation2012merge/src/BuildUnitsConfigGCC.cmake (modified) * code/branches/presentation2012merge/src/BuildUnitsConfigMSVC.cmake (modified) * code/branches/presentation2012merge/src/external/enet/VERSION (modified) * code/branches/presentation2012merge/src/external/tolua/README_ORXONOX (modified) * code/branches/presentation2012merge/src/libraries/util/output/ConsoleWriter.cc (modified) * code/branches/presentation2012merge/src/modules/gametypes/OldRaceCheckPoint.cc (modified) * code/branches/presentation2012merge/src/modules/gametypes/OldRaceCheckPoint.h (modified) * code/branches/presentation2012merge/src/modules/gametypes/OldSpaceRace.cc (modified) * code/branches/presentation2012merge/src/modules/gametypes/OldSpaceRace.h (modified) * code/branches/presentation2012merge/src/modules/gametypes/SpaceRaceManager.cc (modified) * code/branches/presentation2012merge/src/modules/gametypes/SpaceRaceManager.h (modified) * code/branches/presentation2012merge/src/modules/overlays/hud/HUDBoostBar.cc (modified) * code/branches/presentation2012merge/src/modules/overlays/hud/HUDBoostBar.h (modified) * code/branches/presentation2012merge/src/modules/overlays/hud/HUDEnemyHealthBar.cc (modified) * code/branches/presentation2012merge/src/modules/overlays/hud/HUDEnemyHealthBar.h (modified) * code/branches/presentation2012merge/src/modules/pickup/items/DamageBoostPickup.cc (modified) * code/branches/presentation2012merge/src/modules/pickup/items/DamageBoostPickup.h (modified) * code/branches/presentation2012merge/src/modules/towerdefense/CMakeLists.txt (modified) * code/branches/presentation2012merge/src/modules/towerdefense/TDEnemy.h (modified) * code/branches/presentation2012merge/src/modules/towerdefense/Tower.cc (modified) * code/branches/presentation2012merge/src/modules/towerdefense/Tower.h (modified) * code/branches/presentation2012merge/src/modules/towerdefense/TowerDefense.cc (modified) * code/branches/presentation2012merge/src/modules/towerdefense/TowerDefense.h (modified) * code/branches/presentation2012merge/src/modules/towerdefense/TowerDefenseCenterpoint.cc (modified) * code/branches/presentation2012merge/src/modules/towerdefense/TowerDefenseCenterpoint.h (modified) * code/branches/presentation2012merge/src/modules/towerdefense/TowerDefenseController.cc (modified) * code/branches/presentation2012merge/src/modules/towerdefense/TowerDefenseController.h (modified) * code/branches/presentation2012merge/src/modules/towerdefense/TowerDefenseHUDController.cc (modified) * code/branches/presentation2012merge/src/modules/towerdefense/TowerDefenseHUDController.h (modified) * code/branches/presentation2012merge/src/modules/towerdefense/TowerDefensePlayerStats.cc (modified) * code/branches/presentation2012merge/src/modules/towerdefense/TowerDefensePlayerStats.h (modified) * code/branches/presentation2012merge/src/modules/towerdefense/TowerDefensePrereqs.h (modified) * code/branches/presentation2012merge/src/modules/towerdefense/towerdefensereadme.txt (modified) * code/branches/presentation2012merge/src/orxonox/ShipManager.cc (modified) * code/branches/presentation2012merge/src/orxonox/ShipManager.h (modified) * code/branches/presentation2012merge/src/orxonox/controllers/FormationController.cc (modified) * code/branches/presentation2012merge/src/orxonox/controllers/FormationController.h (modified) * code/branches/presentation2012merge/src/orxonox/gametypes/Mission.cc (modified) * code/branches/presentation2012merge/src/orxonox/gametypes/Mission.h (modified) * code/branches/presentation2012merge/src/orxonox/gametypes/TeamGametype.cc (modified) * code/branches/presentation2012merge/src/orxonox/gametypes/TeamGametype.h (modified) svn:eol-style native (no changes in code) Sun, 03 Jun 2012 14:33:13 GMT landauf [9269] * code/branches/presentation2012merge (modified) * code/branches/presentation2012merge/data/gui/layouts/ShipSelectionMenu.layout (copied) * code/branches/presentation2012merge/data/gui/scripts/AudioMenu.lua (modified) * code/branches/presentation2012merge/data/gui/scripts/ShipSelectionMenu.lua (copied) * code/branches/presentation2012merge/data/gui/scripts/SingleplayerMenu.lua (modified) * code/branches/presentation2012merge/data/levels/SurfaceRacePresentation.oxw (copied) * code/branches/presentation2012merge/data/levels/includes/pickups.oxi (modified) * code/branches/presentation2012merge/data/levels/includes/towerWeaponSettings.oxi (copied) * code/branches/presentation2012merge/data/levels/pickups.oxw (modified) * code/branches/presentation2012merge/data/levels/portals.oxw (modified) * code/branches/presentation2012merge/data/levels/surfaceRace.oxw (copied) * code/branches/presentation2012merge/data/levels/teamDeathMatch.oxw (modified) * code/branches/presentation2012merge/data/levels/templates/pickupRepresentationTemplates.oxt (modified) * code/branches/presentation2012merge/data/levels/templates/spaceshipPirate.oxt (modified) * code/branches/presentation2012merge/data/levels/templates/spaceshipRace.oxt (copied) * code/branches/presentation2012merge/data/levels/templates/tower.oxt (copied) * code/branches/presentation2012merge/data/levels/theTimeMachine.oxw (modified) * code/branches/presentation2012merge/data/levels/towerDefense.oxw (copied) * code/branches/presentation2012merge/data/levels/tutorial.oxw (modified) * code/branches/presentation2012merge/data/overlays/towerdefenseHUD.oxo (copied) * code/branches/presentation2012merge/src/modules/CMakeLists.txt (modified) * code/branches/presentation2012merge/src/modules/pickup/PickupPrereqs.h (modified) * code/branches/presentation2012merge/src/modules/pickup/items/CMakeLists.txt (modified) * code/branches/presentation2012merge/src/modules/pickup/items/DamageBoostPickup.cc (copied) * code/branches/presentation2012merge/src/modules/pickup/items/DamageBoostPickup.h (copied) * code/branches/presentation2012merge/src/modules/pickup/items/SpeedPickup.h (modified) * code/branches/presentation2012merge/src/modules/towerdefense (copied) * code/branches/presentation2012merge/src/orxonox/LevelInfo.cc (modified) * code/branches/presentation2012merge/src/orxonox/LevelInfo.h (modified) * code/branches/presentation2012merge/src/orxonox/ShipManager.cc (copied) * code/branches/presentation2012merge/src/orxonox/ShipManager.h (copied) * code/branches/presentation2012merge/src/orxonox/controllers/FormationController.cc (modified) * code/branches/presentation2012merge/src/orxonox/worldentities/pawns/Pawn.cc (modified) * code/branches/presentation2012merge/src/orxonox/worldentities/pawns/Pawn.h (modified) merged presentation2012 to presentation2012merge Thu, 24 May 2012 19:33:31 GMT landauf [9243] * code/branches/presentation2012/CMakeLists.txt (modified) * code/branches/presentation2012/INSTALL (modified) * code/branches/presentation2012/LICENSE (modified) * code/branches/presentation2012/README (modified) * code/branches/presentation2012/bin (modified) * code/branches/presentation2012/cmake (modified) * code/branches/presentation2012/contrib (modified) * code/branches/presentation2012/data (modified) * code/branches/presentation2012/data/levels (modified) * code/branches/presentation2012/data/levels/FPSTest.oxw (modified) * code/branches/presentation2012/data/levels/Spacerace2.oxw (modified) * code/branches/presentation2012/data/levels/asteroidField.oxw (modified) * code/branches/presentation2012/data/levels/asteroids.oxw (modified) * code/branches/presentation2012/data/levels/docking.oxw (modified) * code/branches/presentation2012/data/levels/dynamicMatch.oxw (modified) * code/branches/presentation2012/data/levels/earth.oxw (modified) * code/branches/presentation2012/data/levels/emptyLevel.oxw (modified) * code/branches/presentation2012/data/levels/events.oxw (modified) * code/branches/presentation2012/data/levels/fightInOurBack.oxw (modified) * code/branches/presentation2012/data/levels/includes (modified) * code/branches/presentation2012/data/levels/includes/CuboidSpaceStation.lua (modified) * code/branches/presentation2012/data/levels/includes/asteroidField.lua (modified) * code/branches/presentation2012/data/levels/includes/notifications.oxi (modified) * code/branches/presentation2012/data/levels/includes/pickups.oxi (modified) * code/branches/presentation2012/data/levels/includes/weaponSettingsAssff.oxi (modified) * code/branches/presentation2012/data/levels/includes/weaponSettingsAssff2.oxi (modified) * code/branches/presentation2012/data/levels/includes/weaponSettingsFPS.oxi (modified) * code/branches/presentation2012/data/levels/includes/weaponSettingsGhost.oxi (modified) * code/branches/presentation2012/data/levels/includes/weaponSettingsH2.oxi (modified) * code/branches/presentation2012/data/levels/includes/weaponSettingsHXY.oxi (modified) * code/branches/presentation2012/data/levels/includes/weaponSettingsImmTest.oxi (modified) * code/branches/presentation2012/data/levels/includes/weaponSettingsPirate.oxi (modified) * code/branches/presentation2012/data/levels/includes/weaponSettingsSpacecruiser.oxi (modified) * code/branches/presentation2012/data/levels/includes/weaponSettingsSwallow.oxi (modified) * code/branches/presentation2012/data/levels/includes/weaponSettingsTransporter.oxi (modified) * code/branches/presentation2012/data/levels/lastManStanding.oxw (modified) * code/branches/presentation2012/data/levels/lastTeamStanding.oxw (modified) * code/branches/presentation2012/data/levels/lastTeamStandingII.oxw (modified) * code/branches/presentation2012/data/levels/missionOne.oxw (modified) * code/branches/presentation2012/data/levels/myTestLevel.oxw (modified) * code/branches/presentation2012/data/levels/notifications.oxw (modified) * code/branches/presentation2012/data/levels/old (modified) * code/branches/presentation2012/data/levels/pickups.oxw (modified) * code/branches/presentation2012/data/levels/pirateAttack.oxw (modified) * code/branches/presentation2012/data/levels/planets.oxw (modified) * code/branches/presentation2012/data/levels/pong.oxw (modified) * code/branches/presentation2012/data/levels/portals.oxw (modified) * code/branches/presentation2012/data/levels/presentation.oxw (modified) * code/branches/presentation2012/data/levels/presentation09.oxw (modified) * code/branches/presentation2012/data/levels/presentation09b.oxw (modified) * code/branches/presentation2012/data/levels/presentationDM.oxw (modified) * code/branches/presentation2012/data/levels/presentationFS10.oxw (modified) * code/branches/presentation2012/data/levels/presentationFS102.oxw (modified) * code/branches/presentation2012/data/levels/presentationFS10Ed.oxw (modified) * code/branches/presentation2012/data/levels/presentationFS11.oxw (modified) * code/branches/presentation2012/data/levels/presentationHS09.oxw (modified) * code/branches/presentation2012/data/levels/presentationHS09b.oxw (modified) * code/branches/presentation2012/data/levels/presentationHS11.oxw (modified) * code/branches/presentation2012/data/levels/princessAeryn.oxw (modified) * code/branches/presentation2012/data/levels/quests.oxw (modified) * code/branches/presentation2012/data/levels/screenshot.oxw (modified) * code/branches/presentation2012/data/levels/shieldTest.oxw (modified) * code/branches/presentation2012/data/levels/sound.oxw (modified) * code/branches/presentation2012/data/levels/spaceRace.oxw (modified) * code/branches/presentation2012/data/levels/surfaceRace.oxw (modified) * code/branches/presentation2012/data/levels/teamBaseMatch.oxw (modified) * code/branches/presentation2012/data/levels/teamDeathMatch.oxw (modified) * code/branches/presentation2012/data/levels/templates (modified) * code/branches/presentation2012/data/levels/templates/FPS.oxt (modified) * code/branches/presentation2012/data/levels/templates/lodInformation.oxt (modified) * code/branches/presentation2012/data/levels/templates/pickupRepresentationTemplates.oxt (modified) * code/branches/presentation2012/data/levels/templates/spaceshipAssff.oxt (modified) * code/branches/presentation2012/data/levels/templates/spaceshipAssff2.oxt (modified) * code/branches/presentation2012/data/levels/templates/spaceshipGhost.oxt (modified) * code/branches/presentation2012/data/levels/templates/spaceshipH2.oxt (modified) * code/branches/presentation2012/data/levels/templates/spaceshipHXY.oxt (modified) * code/branches/presentation2012/data/levels/templates/spaceshipHXYSL.oxt (modified) * code/branches/presentation2012/data/levels/templates/spaceshipPirate.oxt (modified) * code/branches/presentation2012/data/levels/templates/spaceshipRace.oxt (modified) * code/branches/presentation2012/data/levels/templates/spaceshipSpacecruiser.oxt (modified) * code/branches/presentation2012/data/levels/templates/spaceshipSwallow.oxt (modified) * code/branches/presentation2012/data/levels/templates/spaceshipTransporter.oxt (modified) * code/branches/presentation2012/data/levels/templates/spaceshipTransporterSL.oxt (modified) * code/branches/presentation2012/data/levels/testStars.oxw (modified) * code/branches/presentation2012/data/levels/testSwallow.oxw (modified) * code/branches/presentation2012/data/levels/tetris.oxw (modified) * code/branches/presentation2012/data/levels/theTimeMachine.oxw (modified) * code/branches/presentation2012/data/levels/tutorial.oxw (modified) * code/branches/presentation2012/data/levels/underAttack.oxw (modified) * code/branches/presentation2012/data/levels/waypoints.oxw (modified) * code/branches/presentation2012/data/overlays (modified) * code/branches/presentation2012/data/overlays/HUD.oxo (modified) * code/branches/presentation2012/data/overlays/HUDTemplates3.oxo (modified) * code/branches/presentation2012/data/overlays/HUDTemplatesFPS.oxo (modified) * code/branches/presentation2012/data/overlays/debug.oxo (modified) * code/branches/presentation2012/data/overlays/dynamicMatchHUD.oxo (modified) * code/branches/presentation2012/data/overlays/lastManStandingHUD.oxo (modified) * code/branches/presentation2012/data/overlays/lastTeamStandingHUD.oxo (modified) * code/branches/presentation2012/data/overlays/pongHUD.oxo (modified) * code/branches/presentation2012/data/overlays/stats.oxo (modified) * code/branches/presentation2012/data/overlays/teamBaseMatchHUD.oxo (modified) * code/branches/presentation2012/data/overlays/underAttackHUD.oxo (modified) * code/branches/presentation2012/doc (modified) * code/branches/presentation2012/src (modified) * code/branches/presentation2012/src/modules (modified) * code/branches/presentation2012/src/modules/CMakeLists.txt (modified) * code/branches/presentation2012/src/modules/designtools (modified) * code/branches/presentation2012/src/modules/docking (modified) * code/branches/presentation2012/src/modules/gametypes (modified) * code/branches/presentation2012/src/modules/notifications (modified) * code/branches/presentation2012/src/modules/objects (modified) * code/branches/presentation2012/src/modules/overlays (modified) * code/branches/presentation2012/src/modules/pickup (modified) * code/branches/presentation2012/src/modules/pong (modified) * code/branches/presentation2012/src/modules/portals (modified) * code/branches/presentation2012/src/modules/questsystem (modified) * code/branches/presentation2012/src/modules/tetris (modified) * code/branches/presentation2012/src/modules/weapons (modified) removed accidental svn:mergeinfo from r9241