# # ChangeLog for code/branches/presentation2012/src # # Generated by Trac 1.0.9 # Oct 31, 2024, 11:57:05 PM Sun, 27 May 2012 20:17:17 GMT landauf [9250] * code/branches/presentation2012/src/modules/towerdefense/Tower.h (modified) * code/branches/presentation2012/src/modules/towerdefense/TowerDefense.h (modified) * code/branches/presentation2012/src/modules/towerdefense/TowerDefenseController.h (modified) fixed build for msvc Thu, 24 May 2012 20:07:43 GMT landauf [9245] * code/branches/presentation2012 (modified) * code/branches/presentation2012/data/levels/includes/towerWeaponSettings.oxi (modified) * code/branches/presentation2012/data/levels/templates/tower.oxt (modified) * code/branches/presentation2012/data/levels/towerDefense.oxw (modified) * code/branches/presentation2012/src/modules/towerdefense/Tower.cc (modified) * code/branches/presentation2012/src/modules/towerdefense/Tower.h (modified) * code/branches/presentation2012/src/modules/towerdefense/TowerDefense.cc (modified) * code/branches/presentation2012/src/modules/towerdefense/TowerDefense.h (modified) * code/branches/presentation2012/src/modules/towerdefense/TowerDefensePlayerStats.h (modified) tower defense update (again, now hopefully successful) Thu, 24 May 2012 20:01:01 GMT landauf [9244] * code/branches/presentation2012 (modified) * code/branches/presentation2012/data/levels/emptyLevel.oxw (modified) * code/branches/presentation2012/src/modules/gametypes/CaptureTheFlag.cc (deleted) * code/branches/presentation2012/src/modules/gametypes/CaptureTheFlag.h (deleted) * code/branches/presentation2012/src/modules/pickup/PickupPrereqs.h (modified) * code/branches/presentation2012/src/modules/pickup/items/FlagPickup.cc (deleted) * code/branches/presentation2012/src/modules/pickup/items/FlagPickup.h (deleted) reverted the rest of r9241 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 Thu, 24 May 2012 18:49:19 GMT decapitb [9241] * code/branches/captureTheFlag/.project (copied) * code/branches/captureTheFlag/data/levels/includes/towerWeaponSettings.oxi (copied) * code/branches/captureTheFlag/data/levels/templates/tower.oxt (copied) * code/branches/captureTheFlag/data/levels/towerDefense.oxw (copied) * code/branches/captureTheFlag/data/overlays/towerdefenseHUD.oxo (copied) * code/branches/captureTheFlag/src/modules/towerdefense (copied) * code/branches/captureTheFlag/src/modules/towerdefense/CMakeLists.txt (copied) * code/branches/captureTheFlag/src/modules/towerdefense/Spielfeld Blender (copied) * code/branches/captureTheFlag/src/modules/towerdefense/Spielfeld Blender/OgreXMLConverter.log (copied) * code/branches/captureTheFlag/src/modules/towerdefense/Spielfeld Blender/Playfield_ME.mesh.xml (copied) * code/branches/captureTheFlag/src/modules/towerdefense/Spielfeld Blender/Spielfeld.blend (copied) * code/branches/captureTheFlag/src/modules/towerdefense/TDEnemy.h (copied) * code/branches/captureTheFlag/src/modules/towerdefense/Tower.cc (copied) * code/branches/captureTheFlag/src/modules/towerdefense/Tower.h (copied) * code/branches/captureTheFlag/src/modules/towerdefense/TowerDefense.cc (copied) * code/branches/captureTheFlag/src/modules/towerdefense/TowerDefense.h (copied) * code/branches/captureTheFlag/src/modules/towerdefense/TowerDefenseCenterpoint.cc (copied) * code/branches/captureTheFlag/src/modules/towerdefense/TowerDefenseCenterpoint.h (copied) * code/branches/captureTheFlag/src/modules/towerdefense/TowerDefenseController.cc (copied) * code/branches/captureTheFlag/src/modules/towerdefense/TowerDefenseController.h (copied) * code/branches/captureTheFlag/src/modules/towerdefense/TowerDefenseHUDController.cc (copied) * code/branches/captureTheFlag/src/modules/towerdefense/TowerDefenseHUDController.h (copied) * code/branches/captureTheFlag/src/modules/towerdefense/TowerDefensePlayerStats.cc (copied) * code/branches/captureTheFlag/src/modules/towerdefense/TowerDefensePlayerStats.h (copied) * code/branches/captureTheFlag/src/modules/towerdefense/TowerDefensePrereqs.h (copied) * code/branches/captureTheFlag/src/modules/towerdefense/tower (copied) * code/branches/captureTheFlag/src/modules/towerdefense/tower/Tower.blend (copied) * code/branches/captureTheFlag/src/modules/towerdefense/tower/Tower.material (copied) * code/branches/captureTheFlag/src/modules/towerdefense/tower/Tower.mesh (copied) * code/branches/captureTheFlag/src/modules/towerdefense/towerdefensereadme.txt (copied) * code/branches/presentation2012 (modified) * 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/gametypes/CaptureTheFlag.cc (copied) * code/branches/presentation2012/src/modules/gametypes/CaptureTheFlag.h (copied) * 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/pickup/PickupPrereqs.h (modified) * code/branches/presentation2012/src/modules/pickup/items/FlagPickup.cc (copied) * code/branches/presentation2012/src/modules/pickup/items/FlagPickup.h (copied) * 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) tower defense update Wed, 23 May 2012 11:07:29 GMT decapitb [9229] * code/branches/presentation2012 (modified) * code/branches/presentation2012/.project (copied) * code/branches/presentation2012/data/levels/emptyLevel.oxw (modified) * code/branches/presentation2012/data/levels/includes/towerWeaponSettings.oxi (copied) * code/branches/presentation2012/data/levels/portals.oxw (modified) * code/branches/presentation2012/data/levels/teamDeathMatch.oxw (modified) * code/branches/presentation2012/data/levels/templates/spaceshipPirate.oxt (modified) * code/branches/presentation2012/data/levels/templates/tower.oxt (copied) * code/branches/presentation2012/data/levels/theTimeMachine.oxw (modified) * code/branches/presentation2012/data/levels/towerDefense.oxw (copied) * code/branches/presentation2012/data/overlays/towerdefenseHUD.oxo (copied) * code/branches/presentation2012/src/modules/CMakeLists.txt (modified) * code/branches/presentation2012/src/modules/towerdefense (copied) * code/branches/presentation2012/src/modules/towerdefense/CMakeLists.txt (copied) * code/branches/presentation2012/src/modules/towerdefense/Spielfeld Blender (copied) * code/branches/presentation2012/src/modules/towerdefense/Spielfeld Blender/OgreXMLConverter.log (copied) * code/branches/presentation2012/src/modules/towerdefense/Spielfeld Blender/Playfield_ME.mesh.xml (copied) * code/branches/presentation2012/src/modules/towerdefense/Spielfeld Blender/Spielfeld.blend (copied) * code/branches/presentation2012/src/modules/towerdefense/TDEnemy.h (copied) * code/branches/presentation2012/src/modules/towerdefense/Tower.cc (copied) * code/branches/presentation2012/src/modules/towerdefense/Tower.h (copied) * code/branches/presentation2012/src/modules/towerdefense/TowerDefense.cc (copied) * code/branches/presentation2012/src/modules/towerdefense/TowerDefense.h (copied) * code/branches/presentation2012/src/modules/towerdefense/TowerDefenseCenterpoint.cc (copied) * code/branches/presentation2012/src/modules/towerdefense/TowerDefenseCenterpoint.h (copied) * code/branches/presentation2012/src/modules/towerdefense/TowerDefenseController.cc (copied) * code/branches/presentation2012/src/modules/towerdefense/TowerDefenseController.h (copied) * code/branches/presentation2012/src/modules/towerdefense/TowerDefenseHUDController.cc (copied) * code/branches/presentation2012/src/modules/towerdefense/TowerDefenseHUDController.h (copied) * code/branches/presentation2012/src/modules/towerdefense/TowerDefensePlayerStats.cc (copied) * code/branches/presentation2012/src/modules/towerdefense/TowerDefensePlayerStats.h (copied) * code/branches/presentation2012/src/modules/towerdefense/TowerDefensePrereqs.h (copied) * code/branches/presentation2012/src/modules/towerdefense/tower (copied) * code/branches/presentation2012/src/modules/towerdefense/tower/Tower.blend (copied) * code/branches/presentation2012/src/modules/towerdefense/tower/Tower.material (copied) * code/branches/presentation2012/src/modules/towerdefense/tower/Tower.mesh (copied) * code/branches/presentation2012/src/modules/towerdefense/towerdefensereadme.txt (copied) * code/branches/presentation2012/src/orxonox/controllers/FormationController.cc (modified) * code/branches/presentation2012/src/orxonox/controllers/WaypointController.cc (modified) * code/branches/presentation2012/src/orxonox/worldentities/WorldEntity.cc (modified) merged towerdefense Fri, 18 May 2012 13:39:47 GMT smerkli [9208] * code/branches/presentation2012 (modified) * code/branches/presentation2012/data/gui/layouts/ShipSelectionMenu.layout (copied) * code/branches/presentation2012/data/gui/scripts/ShipSelectionMenu.lua (copied) * code/branches/presentation2012/data/gui/scripts/SingleplayerMenu.lua (modified) * code/branches/presentation2012/data/levels/tutorial.oxw (modified) * code/branches/presentation2012/src/libraries/core/Loader.cc (modified) * code/branches/presentation2012/src/orxonox/LevelInfo.cc (modified) * code/branches/presentation2012/src/orxonox/LevelInfo.h (modified) * code/branches/presentation2012/src/orxonox/LevelManager.cc (modified) * code/branches/presentation2012/src/orxonox/ShipManager.cc (copied) * code/branches/presentation2012/src/orxonox/ShipManager.h (copied) merged branch shipSelection Fri, 18 May 2012 12:58:33 GMT smerkli [9195] * code/branches/presentation2012 (modified) * code/branches/presentation2012/data/levels/includes/pickups.oxi (modified) * code/branches/presentation2012/data/levels/pickups.oxw (modified) * code/branches/presentation2012/data/levels/templates/pickupRepresentationTemplates.oxt (modified) * code/branches/presentation2012/src/modules/pickup/PickupPrereqs.h (modified) * code/branches/presentation2012/src/modules/pickup/items/CMakeLists.txt (modified) * code/branches/presentation2012/src/modules/pickup/items/DamageBoostPickup.cc (copied) * code/branches/presentation2012/src/modules/pickup/items/DamageBoostPickup.h (copied) * code/branches/presentation2012/src/modules/pickup/items/SpeedPickup.h (modified) * code/branches/presentation2012/src/orxonox/worldentities/pawns/Pawn.cc (modified) * code/branches/presentation2012/src/orxonox/worldentities/pawns/Pawn.h (modified) merged branch pickup2012 Fri, 18 May 2012 12:21:25 GMT smerkli [9189] * code/branches/presentation2012 (copied) Created presentation branch for FS2012. Wed, 21 Mar 2012 20:31:38 GMT dafrick [9050] * code/trunk/data/gui/scripts/SingleplayerMenu.lua (modified) * code/trunk/src/libraries/core/GUIManager.cc (modified) More elegant resolution of discrepancies between cegui 0.6 and 0.7.