# # ChangeLog for code/branches/presentation2012merge # # Generated by Trac 1.0.9 # May 17, 2024, 12:34:26 PM Sun, 08 Jul 2012 15:26:04 GMT landauf [9312] * code/branches/presentation2012merge/src/modules/pickup/items/DronePickup.cc (modified) * code/branches/presentation2012merge/src/modules/pickup/items/DronePickup.h (modified) * code/branches/presentation2012merge/src/modules/pickup/items/HealthPickup.cc (modified) * code/branches/presentation2012merge/src/modules/pickup/items/HealthPickup.h (modified) * code/branches/presentation2012merge/src/modules/pickup/items/MetaPickup.cc (modified) * code/branches/presentation2012merge/src/modules/pickup/items/MetaPickup.h (modified) renamed some functions where enums are converted to/from strings for ... Thu, 28 Jun 2012 12:39:05 GMT jo [9306] * code/branches/presentation2012merge/data/levels/tetris.oxw (modified) * code/branches/presentation2012merge/src/modules/gametypes/SpaceRace.cc (modified) Tetris: Level update Mon, 18 Jun 2012 19:54:49 GMT landauf [9305] * code/branches/presentation2012merge/src/modules/pickup/Pickup.cc (modified) * code/branches/presentation2012merge/src/modules/pickup/items/DamageBoostPickup.cc (modified) * code/branches/presentation2012merge/src/modules/pickup/items/DronePickup.cc (modified) * code/branches/presentation2012merge/src/modules/pickup/items/HealthPickup.cc (modified) * code/branches/presentation2012merge/src/modules/pickup/items/InvisiblePickup.cc (modified) * code/branches/presentation2012merge/src/modules/pickup/items/MetaPickup.cc (modified) * code/branches/presentation2012merge/src/modules/pickup/items/ShieldPickup.cc (modified) * code/branches/presentation2012merge/src/modules/pickup/items/ShrinkPickup.cc (modified) * code/branches/presentation2012merge/src/modules/pickup/items/SpeedPickup.cc (modified) * code/branches/presentation2012merge/src/orxonox/pickup/PickupIdentifier.cc (modified) * code/branches/presentation2012merge/src/orxonox/pickup/PickupIdentifier.h (modified) simplified code a little by using MultiType instead of explicit ... Sun, 17 Jun 2012 21:04:25 GMT jo [9304] * code/branches/presentation2012merge/data/levels/tetris.oxw (modified) * code/branches/presentation2012merge/data/overlays/tetrisHUD.oxo (added) Added tetris HUD template and some eye candy for the level. Sun, 17 Jun 2012 16:38:14 GMT landauf [9303] * code/branches/presentation2012merge/data/levels/templates/pickupRepresentationTemplates.oxt (modified) * code/branches/presentation2012merge/src/libraries/core/Template.cc (modified) added warning if a template is used on a different type than it was ... Sun, 17 Jun 2012 16:24:06 GMT landauf [9302] * code/branches/presentation2012merge/src/modules/pickup/PickupRepresentation.cc (modified) * code/branches/presentation2012merge/src/modules/pickup/PickupRepresentation.h (modified) * code/branches/presentation2012merge/src/modules/pickup/PickupSpawner.cc (modified) small cleanup. calling addTemplate() only once instead of twice 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 ... Sat, 16 Jun 2012 08:13:18 GMT jo [9300] * code/branches/presentation2012merge/data/levels/lastTeamStanding.oxw (modified) * code/branches/presentation2012merge/data/overlays/lastTeamStandingHUD.oxo (modified) Fixed LastTeamStanding HUD and level. Sat, 16 Jun 2012 07:57:22 GMT jo [9299] * code/branches/presentation2012merge/data/overlays/lastManStandingHUD.oxo (modified) LastManStanding HUD cleanup. Sat, 16 Jun 2012 07:49:40 GMT jo [9298] * code/branches/presentation2012merge/data/levels/tetris.oxw (modified) Quick fix; the missing file is on another machine. Thu, 14 Jun 2012 21:10:06 GMT landauf [9297] * code/branches/presentation2012merge/data/gui/scripts/PickupInventory.lua (modified) * code/branches/presentation2012merge/src/modules/pickup/PickupCollectionIdentifier.cc (modified) - fixed crash on closing pickup inventory. happened if pickup ... Tue, 12 Jun 2012 21:47:59 GMT landauf [9296] * code/branches/presentation2012merge/src/modules/pickup/CollectiblePickup.cc (modified) * code/branches/presentation2012merge/src/modules/pickup/PickupCollection.cc (modified) remove dropped pickups from their collection Tue, 12 Jun 2012 21:42:43 GMT landauf [9295] * code/branches/presentation2012merge/src/modules/pickup/PickupCollection.cc (modified) * code/branches/presentation2012merge/src/modules/pickup/PickupCollection.h (modified) removed fancy counters because they will get out of sync way too ... Tue, 12 Jun 2012 21:05:15 GMT landauf [9294] * code/branches/presentation2012merge/src/modules/pickup/PickupCollection.cc (modified) * code/branches/presentation2012merge/src/orxonox/pickup/PickupIdentifier.cc (modified) * code/branches/presentation2012merge/src/orxonox/pickup/PickupIdentifier.h (modified) removed 2 lines from ~PickupCollection() again because they don't ... Mon, 11 Jun 2012 20:57:40 GMT dafrick [9293] * code/branches/presentation2012merge/src/modules/pickup/PickupCollection.cc (modified) * code/branches/presentation2012merge/src/orxonox/interfaces/Pickupable.cc (modified) * code/branches/presentation2012merge/src/orxonox/interfaces/Pickupable.h (modified) Should fix internal warnig (and compile error introduced in last commit) Mon, 11 Jun 2012 20:40:01 GMT dafrick [9292] * code/branches/presentation2012merge/src/modules/pickup/PickupCollection.cc (modified) Looked through recten changes in pickup module, should be fine! Sun, 10 Jun 2012 21:02:29 GMT landauf [9291] * code/branches/presentation2012merge/data/levels/pickups.oxw (modified) moved box which was on top of the spawn point Sun, 10 Jun 2012 21:01:40 GMT landauf [9290] * code/branches/presentation2012merge/src/modules/pickup/CollectiblePickup.cc (modified) * code/branches/presentation2012merge/src/modules/pickup/CollectiblePickup.h (modified) * code/branches/presentation2012merge/src/modules/pickup/PickupCollection.cc (modified) * code/branches/presentation2012merge/src/modules/pickup/PickupCollection.h (modified) * code/branches/presentation2012merge/src/modules/pickup/PickupCollectionIdentifier.cc (modified) * code/branches/presentation2012merge/src/modules/pickup/PickupCollectionIdentifier.h (modified) Fixed crash with MSVC if a PickupCollection was used A depleted ... Sun, 10 Jun 2012 16:08:44 GMT landauf [9287] * code/branches/presentation2012merge/src/orxonox/CameraManager.cc (modified) CameraManager inherits from OrxonoxClass, should call RegisterRootObject Sun, 10 Jun 2012 15:13:00 GMT jo [9286] * code/branches/presentation2012merge (modified) * code/branches/presentation2012merge/data/levels/presentationHS11.oxw (modified) * code/branches/presentation2012merge/data/levels/tetris.oxw (modified) * code/branches/presentation2012merge/src/modules/tetris/CMakeLists.txt (modified) * code/branches/presentation2012merge/src/modules/tetris/Tetris.cc (modified) * code/branches/presentation2012merge/src/modules/tetris/Tetris.h (modified) * code/branches/presentation2012merge/src/modules/tetris/TetrisBrick.cc (copied) * code/branches/presentation2012merge/src/modules/tetris/TetrisBrick.h (copied) * code/branches/presentation2012merge/src/modules/tetris/TetrisCenterpoint.cc (modified) * code/branches/presentation2012merge/src/modules/tetris/TetrisCenterpoint.h (modified) * code/branches/presentation2012merge/src/modules/tetris/TetrisPrereqs.h (modified) * code/branches/presentation2012merge/src/modules/tetris/TetrisScore.cc (copied) * code/branches/presentation2012merge/src/modules/tetris/TetrisScore.h (copied) * code/branches/presentation2012merge/src/modules/tetris/TetrisStone.cc (modified) * code/branches/presentation2012merge/src/modules/tetris/TetrisStone.h (modified) * code/branches/presentation2012merge/src/orxonox/OrxonoxPrereqs.h (modified) * code/branches/presentation2012merge/src/orxonox/gametypes/Dynamicmatch.cc (modified) * code/branches/presentation2012merge/src/orxonox/gametypes/TeamDeathmatch.cc (modified) * code/branches/presentation2012merge/src/orxonox/gametypes/TeamDeathmatch.h (modified) * code/branches/presentation2012merge/src/orxonox/gametypes/TeamGametype.cc (modified) Merged pCuts branch. Sat, 09 Jun 2012 14:42:19 GMT landauf [9282] * code/branches/presentation2012merge/data/gui/scripts/ShipSelectionMenu.lua (modified) quick fix: use tcl instead of shell commands to find ship templates ... Sat, 09 Jun 2012 13:51:51 GMT landauf [9281] * code/branches/presentation2012merge/data/gui/scripts/ShipSelectionMenu.lua (modified) * code/branches/presentation2012merge/data/gui/scripts/SingleplayerMenu.lua (modified) * code/branches/presentation2012merge/src/orxonox/LevelInfo.cc (modified) * code/branches/presentation2012merge/src/orxonox/LevelInfo.h (modified) * code/branches/presentation2012merge/src/orxonox/ShipManager.cc (deleted) * code/branches/presentation2012merge/src/orxonox/ShipManager.h (deleted) small cleanup in ship selection: - renamed some functions - moved ... Tue, 05 Jun 2012 20:29:17 GMT landauf [9280] * code/branches/presentation2012merge/src/modules/overlays/hud/HUDNavigation.cc (modified) * code/branches/presentation2012merge/src/modules/overlays/hud/HUDNavigation.h (modified) reformatted HUDNavigation... wtf happened here? do people know we ... Mon, 04 Jun 2012 20:50:28 GMT landauf [9279] * code/branches/presentation2012merge/src/libraries/core/Super.h (modified) * code/branches/presentation2012merge/src/libraries/core/XMLPort.h (modified) * code/branches/presentation2012merge/src/modules/overlays/hud/HUDNavigation.cc (modified) * code/branches/presentation2012merge/src/modules/overlays/hud/HUDRadar.cc (modified) * code/branches/presentation2012merge/src/modules/pickup/Pickup.cc (modified) * code/branches/presentation2012merge/src/modules/pickup/PickupCollection.cc (modified) * code/branches/presentation2012merge/src/modules/pickup/PickupSpawner.cc (modified) * code/branches/presentation2012merge/src/modules/pickup/items/DamageBoostPickup.cc (modified) * code/branches/presentation2012merge/src/modules/pickup/items/DronePickup.cc (modified) * code/branches/presentation2012merge/src/modules/pickup/items/HealthPickup.cc (modified) * code/branches/presentation2012merge/src/modules/pickup/items/InvisiblePickup.cc (modified) * code/branches/presentation2012merge/src/modules/pickup/items/MetaPickup.cc (modified) * code/branches/presentation2012merge/src/modules/pickup/items/ShieldPickup.cc (modified) * code/branches/presentation2012merge/src/modules/pickup/items/ShrinkPickup.cc (modified) * code/branches/presentation2012merge/src/modules/pickup/items/SpeedPickup.cc (modified) * code/branches/presentation2012merge/src/modules/weapons/RocketController.cc (modified) * code/branches/presentation2012merge/src/orxonox/controllers/NewHumanController.cc (modified) * code/branches/presentation2012merge/src/orxonox/gamestates/GSRoot.cc (modified) * code/branches/presentation2012merge/src/orxonox/gametypes/Dynamicmatch.cc (modified) * code/branches/presentation2012merge/src/orxonox/gametypes/LastManStanding.cc (modified) * code/branches/presentation2012merge/src/orxonox/gametypes/LastTeamStanding.cc (modified) * code/branches/presentation2012merge/src/orxonox/interfaces/Pickupable.cc (modified) * code/branches/presentation2012merge/src/orxonox/worldentities/ControllableEntity.cc (modified) use orxonox_cast instead of dynamic_cast wherever possible Mon, 04 Jun 2012 20:14:08 GMT landauf [9278] * code/branches/presentation2012merge/src/orxonox/worldentities/pawns/Pawn.cc (modified) forgot that originator can be NULL Mon, 04 Jun 2012 19:40:54 GMT landauf [9277] * code/branches/presentation2012merge/src/orxonox/worldentities/pawns/Pawn.cc (modified) * code/branches/presentation2012merge/src/orxonox/worldentities/pawns/Pawn.h (modified) small cleanup of damage multiplier: added 'const' to getter and ... 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 19:53:24 GMT landauf [9275] * code/branches/presentation2012merge/data/levels/theTimeMachine.oxw (modified) fixed spaceship engines in theTimeMachine.oxw Sun, 03 Jun 2012 19:51:59 GMT landauf [9274] * code/branches/presentation2012merge/data/levels/templates/spaceshipPirate.oxt (modified) * code/branches/presentation2012merge/data/levels/theTimeMachine.oxw (modified) reverted more random stuff in level files Sun, 03 Jun 2012 19:25:48 GMT landauf [9273] * code/branches/presentation2012merge/data/levels/teamDeathMatch.oxw (modified) * code/branches/presentation2012merge/src/orxonox/Scene.cc (modified) reverted wrong skybox in teamDeathMatch.oxw added try-catch to avoid ... 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:56:07 GMT landauf [9270] * code/branches/presentation2012merge/src/modules/towerdefense/TowerDefense.cc (modified) fixed warning 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 Sun, 03 Jun 2012 13:38:49 GMT landauf [9266] * code/branches/presentation2012merge (copied) created branch from trunk to merge the cleanup of presentation2011 ... Sun, 03 Jun 2012 08:14:18 GMT landauf [9265] * code/trunk/src/orxonox/controllers/FormationController.cc (modified) fixed indentation