# # ChangeLog for code/branches # # Generated by Trac 1.0.9 # Nov 25, 2024, 2:10:06 PM 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:51:50 GMT landauf [9268] * code/branches/presentation2012 (modified) * code/branches/presentation2012/.project (deleted) corrected svn:mergeinfo removed .project and added it to ignore-list Sun, 03 Jun 2012 13:44:44 GMT landauf [9267] * code/branches/dialogsystem2012 (deleted) * code/branches/spacegate (deleted) removed branches that weren't used 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, 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 Sun, 27 May 2012 17:59:29 GMT landauf [9249] * code/branches/environment3 (deleted) * code/branches/formation (deleted) * code/branches/gamecontent (deleted) * code/branches/hud (deleted) * code/branches/masterserver2 (deleted) * code/branches/masterserverfix (deleted) * code/branches/menue (deleted) * code/branches/spaceraceTwo (deleted) removed old branches from fall 2011 Thu, 24 May 2012 22:55:33 GMT decapitb [9248] * code/branches/presentation2012/data/levels/SurfaceRacePresentation.oxw (modified) added space junk and portals (with new mesh\!) Thu, 24 May 2012 22:10:01 GMT decapitb [9247] * code/branches/presentation2012/data/levels/SurfaceRacePresentation.oxw (added) * code/branches/presentation2012/data/levels/templates/spaceshipRace.oxt (modified) surfacerace presentation level added. changed template name of ... Thu, 24 May 2012 21:43:25 GMT decapitb [9246] * code/branches/presentation2012/data/gui/scripts/ShipSelectionMenu.lua (modified) 'ls [path] -l' caused crash, changed to 'ls -l [path]' 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 19:24:58 GMT landauf [9242] * code/branches/captureTheFlag/.project (deleted) * code/branches/captureTheFlag/data/levels/includes/towerWeaponSettings.oxi (deleted) * code/branches/captureTheFlag/data/levels/templates/tower.oxt (deleted) * code/branches/captureTheFlag/data/levels/towerDefense.oxw (deleted) * code/branches/captureTheFlag/data/overlays/towerdefenseHUD.oxo (deleted) * code/branches/captureTheFlag/src/modules/towerdefense (deleted) reverted accidental changes 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 Thu, 24 May 2012 13:06:56 GMT mpalic [9237] * code/branches/spacebomb/src/modules/weapons/projectiles/SimpleRocket.cc (modified) * code/branches/spacebomb/src/modules/weapons/weaponmodes/SimpleRocketFire.cc (modified) Modified SimpleRocket to be able to use it for the SpaceBomb Thu, 24 May 2012 08:00:06 GMT mentzerf [9236] * code/branches/newlevel2012/data/levels/includes/towerWeaponSettings.oxi (modified) * code/branches/newlevel2012/data/levels/templates/tower.oxt (modified) * code/branches/newlevel2012/data/levels/towerDefense.oxw (modified) * code/branches/newlevel2012/src/modules/towerdefense/Tower.cc (modified) * code/branches/newlevel2012/src/modules/towerdefense/Tower.h (modified) * code/branches/newlevel2012/src/modules/towerdefense/TowerDefense.cc (modified) * code/branches/newlevel2012/src/modules/towerdefense/TowerDefense.h (modified) * code/branches/newlevel2012/src/modules/towerdefense/TowerDefensePlayerStats.h (modified) * Changed waypoint scale so that they are not visible anymore * ... Wed, 23 May 2012 15:59:03 GMT decapitb [9234] * code/branches/captureTheFlag/src/modules/gametypes/CaptureTheFlag.cc (added) * code/branches/captureTheFlag/src/modules/gametypes/CaptureTheFlag.h (added) resolving conflict... i hope Wed, 23 May 2012 15:58:17 GMT decapitb [9233] * code/branches/captureTheFlag/src/modules/gametypes/captureTheFlag.cc (deleted) * code/branches/captureTheFlag/src/modules/gametypes/captureTheFlag.h (deleted) Wed, 23 May 2012 15:56:57 GMT decapitb [9232] * code/branches/captureTheFlag (modified) * code/branches/captureTheFlag/src/modules/overlays/hud/HUDNavigation.cc (modified) * code/branches/captureTheFlag/src/modules/overlays/hud/HUDNavigation.h (modified) * code/branches/captureTheFlag/src/modules/pickup/items/FlagPickup.cc (copied) * code/branches/captureTheFlag/src/modules/pickup/items/FlagPickup.h (copied) * code/branches/captureTheFlag/src/orxonox/overlays/OrxonoxOverlay.cc (modified) * code/branches/captureTheFlag/src/orxonox/overlays/OrxonoxOverlay.h (modified) * code/branches/captureTheFlag/src/orxonox/worldentities/pawns/Pawn.h (modified) safety checkin Wed, 23 May 2012 15:56:32 GMT decapitb [9231] * code/branches/captureTheFlag/src/modules/pickup/items/FlagPickup.h (deleted) conflict... Wed, 23 May 2012 15:55:49 GMT decapitb [9230] * code/branches/captureTheFlag/src/modules/pickup/items/FlagPickup.cc (deleted) conflict... 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 Sat, 19 May 2012 22:52:15 GMT landauf [9226] * code/branches/testing/src/libraries/util/MultiType.h (modified) * code/branches/testing/src/libraries/util/MultiTypeValue.h (modified) * code/branches/testing/test/util/MultiTypeTest.cc (modified) changed hasDefaultValue() to lastConversionSuccessful() (inverted ... Sat, 19 May 2012 21:24:18 GMT landauf [9225] * code/branches/testing/src/libraries/core/command/Shell.cc (modified) * code/branches/testing/src/libraries/util/MultiType.cc (modified) * code/branches/testing/src/libraries/util/MultiType.h (modified) * code/branches/testing/src/libraries/util/MultiTypeValue.h (modified) * code/branches/testing/src/orxonox/graphics/ParticleEmitter.cc (modified) * code/branches/testing/test/util/MultiTypeTest.cc (modified) a lot of refactoring in the internals of MultiType renamed set() ... Sat, 19 May 2012 13:03:02 GMT landauf [9224] * code/branches/testing/src/libraries/core/CommandLineParser.cc (modified) * code/branches/testing/src/libraries/core/CommandLineParser.h (modified) * code/branches/testing/src/libraries/core/ConfigValueContainer.cc (modified) * code/branches/testing/src/libraries/core/Core.cc (modified) * code/branches/testing/src/libraries/core/PathConfig.cc (modified) * code/branches/testing/src/libraries/core/command/CommandEvaluation.cc (modified) * code/branches/testing/src/libraries/core/command/CommandExecutor.cc (modified) * code/branches/testing/src/libraries/core/command/TclBind.cc (modified) * code/branches/testing/src/libraries/network/Client.cc (modified) * code/branches/testing/src/libraries/tools/Shader.cc (modified) * code/branches/testing/src/libraries/util/MultiType.h (modified) * code/branches/testing/src/orxonox/LevelManager.cc (modified) * code/branches/testing/src/orxonox/Main.cc (modified) * code/branches/testing/test/util/MultiTypeTest.cc (modified) renamed set and get functions in MultiType: - setValue() -> set() ... Sat, 19 May 2012 09:35:32 GMT landauf [9223] * code/branches/testing/src/libraries/util/MultiType.h (modified) * code/branches/testing/test/util/MultiTypeTest.cc (modified) renamed setType() to reset() Sat, 19 May 2012 09:27:07 GMT landauf [9222] * code/branches/testing/src/libraries/core/CommandLineParser.cc (modified) * code/branches/testing/src/libraries/core/CommandLineParser.h (modified) * code/branches/testing/src/libraries/core/ConfigValueContainer.cc (modified) * code/branches/testing/src/libraries/core/command/CommandEvaluation.cc (modified) * code/branches/testing/src/libraries/core/command/CommandExecutor.cc (modified) * code/branches/testing/src/libraries/core/command/Executor.cc (modified) * code/branches/testing/src/libraries/core/command/Executor.h (modified) * code/branches/testing/src/libraries/core/command/Functor.h (modified) * code/branches/testing/src/libraries/tools/Shader.cc (modified) * code/branches/testing/src/libraries/tools/Shader.h (modified) * code/branches/testing/src/libraries/util/MultiType.cc (modified) * code/branches/testing/src/libraries/util/MultiType.h (modified) * code/branches/testing/src/libraries/util/MultiTypeValue.h (modified) renamed MT_Value as MultiType::Type and removed it from the public ... Fri, 18 May 2012 21:17:31 GMT landauf [9221] * code/branches/testing/src/libraries/util/MultiType.h (modified) * code/branches/testing/test/util/CMakeLists.txt (modified) * code/branches/testing/test/util/MultiTypeTest.cc (added) added tests for MultiType added isType() which is equivalent ... Fri, 18 May 2012 15:46:57 GMT ninow [9220] * code/branches/captureTheFlag/data/levels/captureTheFlag.oxw (modified) * code/branches/captureTheFlag/src/modules/gametypes/CMakeLists.txt (modified) * code/branches/captureTheFlag/src/modules/pickup/items/CMakeLists.txt (modified) * code/branches/captureTheFlag/src/modules/pickup/items/FlagPickup.h (modified) fixed some errors Fri, 18 May 2012 15:08:35 GMT scmoritz [9219] * code/branches/waypoints/src/modules/overlays/hud/HUDNavigation.cc (modified) * code/branches/waypoints/src/modules/overlays/hud/HUDNavigation.h (modified) 3D arrow added. Spinns around like crazy. the partyarrow needs a fix :) Fri, 18 May 2012 14:44:47 GMT ninow [9218] * code/branches/captureTheFlag/data/levels/captureTheFlag.oxw (added) * code/branches/captureTheFlag/src/modules/gametypes/captureTheFlag.cc (added) * code/branches/captureTheFlag/src/modules/gametypes/captureTheFlag.h (added) * code/branches/captureTheFlag/src/modules/pickup/items/FlagPickup.cc (added) * code/branches/captureTheFlag/src/modules/pickup/items/FlagPickup.h (added) * code/branches/captureTheFlag/src/orxonox/gametypes/captureTheFlag.cpp (added) * code/branches/captureTheFlag/src/orxonox/gametypes/captureTheFlag.h (added) Forgot to add Files Fri, 18 May 2012 14:39:32 GMT ninow [9217] * code/branches/captureTheFlag/data/levels/includes/pickups.oxi (modified) * code/branches/captureTheFlag/src/modules/gametypes/CMakeLists.txt (modified) First Checkin of my Gametype Fri, 18 May 2012 14:32:28 GMT smerkli [9216] * code/branches/presentation2012 (modified) * code/branches/presentation2012/data/gui/scripts/AudioMenu.lua (modified) merged branch spacegate Fri, 18 May 2012 14:14:05 GMT lukasmue [9214] * code/branches/sound2012/data/gui/scripts/AudioMenu.lua (modified) enabled Metal music theme Fri, 18 May 2012 14:07:37 GMT weigeltm [9213] * code/branches/newlevel2012/data/levels/includes/towerWeaponSettings.oxi (modified) * code/branches/newlevel2012/data/levels/templates/spaceshipPirate.oxt (modified) * code/branches/newlevel2012/data/levels/templates/tower.oxt (modified) * code/branches/newlevel2012/data/levels/towerDefense.oxw (modified) * code/branches/newlevel2012/src/modules/towerdefense/CMakeLists.txt (modified) * code/branches/newlevel2012/src/modules/towerdefense/Tower.cc (modified) * code/branches/newlevel2012/src/modules/towerdefense/TowerDefenseController.cc (added) * code/branches/newlevel2012/src/modules/towerdefense/TowerDefenseController.h (added) tried to fix towers. failed. Fri, 18 May 2012 14:00:21 GMT mentzerf [9211] * code/branches/newlevel2012/src/modules/towerdefense/TowerDefense.cc (modified) * code/branches/newlevel2012/src/modules/towerdefense/TowerDefense.h (modified) * code/branches/newlevel2012/src/modules/towerdefense/TowerDefensePlayerStats.h (modified) + Now only adding tower if there is enough credit 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 13:34:50 GMT mentzerf [9207] * code/branches/newlevel2012/src/modules/towerdefense/CMakeLists.txt (modified) * code/branches/newlevel2012/src/modules/towerdefense/TowerDefense.cc (modified) * code/branches/newlevel2012/src/modules/towerdefense/TowerDefense.h (modified) * code/branches/newlevel2012/src/modules/towerdefense/TowerDefenseHUDController.cc (modified) * code/branches/newlevel2012/src/modules/towerdefense/TowerDefenseHUDController.h (modified) * code/branches/newlevel2012/src/modules/towerdefense/TowerDefensePlayerStats.cc (added) * code/branches/newlevel2012/src/modules/towerdefense/TowerDefensePlayerStats.h (added) * code/branches/newlevel2012/src/modules/towerdefense/TowerDefensePrereqs.h (modified) + Added new class 'TowerDefensePlayerStats' to manage stats - ... Fri, 18 May 2012 13:28:26 GMT smerkli [9205] * code/branches/sound2012 (copied) Added sound branch to test some sound-related things before merging. Fri, 18 May 2012 13:21:21 GMT mentzerf [9204] * code/branches/newlevel2012/src/modules/towerdefense/CMakeLists.txt (modified) * code/branches/newlevel2012/src/modules/towerdefense/TowerDefense.h (modified) * code/branches/newlevel2012/src/modules/towerdefense/TowerDefenseHUDController.cc (added) * code/branches/newlevel2012/src/modules/towerdefense/TowerDefenseHUDController.h (added) * code/branches/newlevel2012/src/modules/towerdefense/TowerDefensePlayerStats.cc (deleted) * code/branches/newlevel2012/src/modules/towerdefense/TowerDefensePlayerStats.h (deleted) * Renamed TowerDefensePlayerStats to TowerDefenseHUDController Fri, 18 May 2012 13:14:19 GMT smerkli [9203] * code/branches/presentation2012 (modified) * code/branches/presentation2012/data/levels/surfaceRace.oxw (copied) * code/branches/presentation2012/data/levels/templates/spaceshipRace.oxt (copied) merged branch surfaceRace Fri, 18 May 2012 13:13:04 GMT smerkli [9202] * code/branches/presentation2012/data/levels/templates/pickupRepresentationTemplates.oxt (modified) small color update to damageboostpickup Fri, 18 May 2012 13:09:07 GMT huttemat [9201] * code/branches/shipSelection/data/gui/layouts/ShipSelectionMenu.layout (modified) * code/branches/shipSelection/data/gui/scripts/ShipSelectionMenu.lua (modified) * code/branches/shipSelection/data/gui/scripts/SingleplayerMenu.lua (modified) * code/branches/shipSelection/data/levels/tutorial.oxw (modified) * code/branches/shipSelection/src/orxonox/ShipManager.cc (modified) many bugfixes, code cleanup, documentation Fri, 18 May 2012 13:06:46 GMT lkevin [9200] * code/branches/pickup2012/data/levels/templates/pickupRepresentationTemplates.oxt (modified) Changed colour of the damageboost pickups. Fri, 18 May 2012 13:02:07 GMT mentzerf [9199] * code/branches/newlevel2012/src/modules/towerdefense/tower/Tower.blend (added) Tower.blend now in SVN Fri, 18 May 2012 13:00:02 GMT mentzerf [9196] * code/branches/newlevel2012/src/modules/towerdefense/tower/OgreXMLConverter.log (deleted) * code/branches/newlevel2012/src/modules/towerdefense/tower/RustySteel.jpg (deleted) * code/branches/newlevel2012/src/modules/towerdefense/tower/Tower.mesh.xml (deleted) - Removed unused files 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:57:05 GMT mentzerf [9194] * code/branches/newlevel2012/src/modules/towerdefense/Tower (deleted) * code/branches/newlevel2012/src/modules/towerdefense/tower (added) * code/branches/newlevel2012/src/modules/towerdefense/tower/OgreXMLConverter.log (added) * code/branches/newlevel2012/src/modules/towerdefense/tower/RustySteel.jpg (added) * code/branches/newlevel2012/src/modules/towerdefense/tower/Tower.material (added) * code/branches/newlevel2012/src/modules/towerdefense/tower/Tower.mesh (added) * code/branches/newlevel2012/src/modules/towerdefense/tower/Tower.mesh.xml (added) * code/branches/newlevel2012/src/modules/towerdefense/tower2 (deleted) Yet another new model... Fri, 18 May 2012 12:46:22 GMT mentzerf [9193] * code/branches/newlevel2012/src/modules/towerdefense/tower2 (added) * code/branches/newlevel2012/src/modules/towerdefense/tower2/OgreXMLConverter.log (added) * code/branches/newlevel2012/src/modules/towerdefense/tower2/Scene.material (added) * code/branches/newlevel2012/src/modules/towerdefense/tower2/Tower.mesh (added) * code/branches/newlevel2012/src/modules/towerdefense/tower2/Tower.mesh.xml (added) Created another tower model Fri, 18 May 2012 12:32:32 GMT mentzerf [9190] * code/branches/newlevel2012/src/modules/towerdefense/Tower (added) * code/branches/newlevel2012/src/modules/towerdefense/Tower/Scene.material (added) * code/branches/newlevel2012/src/modules/towerdefense/Tower/TestBrick.png (added) * code/branches/newlevel2012/src/modules/towerdefense/Tower/Tower.mesh (added) * code/branches/newlevel2012/src/modules/towerdefense/Tower/Tower.mesh.xml (added) Added Tower mesh Fri, 18 May 2012 12:21:25 GMT smerkli [9189] * code/branches/presentation2012 (copied) Created presentation branch for FS2012. Fri, 18 May 2012 11:54:37 GMT mentzerf [9188] * code/branches/newlevel2012/src/orxonox/controllers/FormationController.cc (modified) * Now using new waypoints Fri, 18 May 2012 11:43:08 GMT laumerf [9187] * code/branches/surfaceRace/data/levels/surfaceRace.oxw (modified) replaced pickups Fri, 18 May 2012 11:24:06 GMT huttemat [9185] * code/branches/shipSelection/data/levels/tutorial.oxw (modified) test Fri, 18 May 2012 10:47:54 GMT lkevin [9184] * code/branches/pickup2012/data/levels/includes/pickups.oxi (modified) * code/branches/pickup2012/data/levels/pickups.oxw (modified) * code/branches/pickup2012/data/levels/templates/pickupRepresentationTemplates.oxt (modified) * code/branches/pickup2012/src/modules/pickup/items/DamageBoostPickup.cc (modified) * code/branches/pickup2012/src/modules/pickup/items/DamageBoostPickup.h (modified) * code/branches/pickup2012/src/orxonox/worldentities/pawns/Pawn.cc (modified) * code/branches/pickup2012/src/orxonox/worldentities/pawns/Pawn.h (modified) Finished DamageBoost Pickup and the XML inclusions are working now. Mon, 14 May 2012 07:27:32 GMT jo [9181] * code/branches/newlevel2012/.project (modified) That was not supposed. Mon, 14 May 2012 07:21:32 GMT jo [9180] * code/branches/newlevel2012/.project (modified) * code/branches/newlevel2012/data/overlays/towerdefenseHUD.oxo (modified) * code/branches/newlevel2012/src/modules/towerdefense/TowerDefense.cc (modified) TowerDefenseHUD is displayed correctly now. Fri, 11 May 2012 14:20:50 GMT scmoritz [9177] * code/branches/waypoints/src/modules/overlays/hud/HUDNavigation.cc (modified) * code/branches/waypoints/src/modules/overlays/hud/HUDNavigation.h (modified) 3D arrow trial Fri, 11 May 2012 14:03:28 GMT weigeltm [9175] * code/branches/newlevel2012/data/levels/includes/towerWeaponSettings.oxi (modified) * code/branches/newlevel2012/data/levels/templates/tower.oxt (modified) * code/branches/newlevel2012/data/levels/towerDefense.oxw (modified) * code/branches/newlevel2012/src/modules/towerdefense/Tower.cc (modified) * code/branches/newlevel2012/src/modules/towerdefense/Tower.h (modified) * code/branches/newlevel2012/src/modules/towerdefense/TowerDefense.cc (modified) * code/branches/newlevel2012/src/modules/towerdefense/TowerDefenseCenterpoint.cc (modified) * code/branches/newlevel2012/src/modules/towerdefense/TowerDefenseCenterpoint.h (modified) * code/branches/newlevel2012/src/orxonox/worldentities/WorldEntity.cc (modified) removed attach-command, got rid of error messages, attached weapons ... Fri, 11 May 2012 14:03:17 GMT toliecht [9174] * code/branches/surfaceRace/data/levels/surfaceRace.oxw (modified) bla Fri, 11 May 2012 13:35:56 GMT mentzerf [9173] * code/branches/newlevel2012/data/levels/towerDefense.oxw (modified) * code/branches/newlevel2012/data/overlays/towerdefenseHUD.oxo (modified) * code/branches/newlevel2012/src/modules/towerdefense/CMakeLists.txt (modified) * Fixed compile error + Added another OverlayText, but still not ... Fri, 11 May 2012 12:53:41 GMT mentzerf [9172] * code/branches/newlevel2012/data/levels/towerDefense.oxw (modified) * code/branches/newlevel2012/data/overlays/towerdefenseHUD.oxo (added) * code/branches/newlevel2012/src/modules/towerdefense/CMakeLists.txt (modified) * code/branches/newlevel2012/src/modules/towerdefense/TowerDefense.cc (modified) * code/branches/newlevel2012/src/modules/towerdefense/TowerDefense.h (modified) * code/branches/newlevel2012/src/modules/towerdefense/TowerDefensePlayerStats.cc (added) * code/branches/newlevel2012/src/modules/towerdefense/TowerDefensePlayerStats.h (added) * code/branches/newlevel2012/src/modules/towerdefense/TowerDefensePrereqs.h (modified) * Tried to add HUD. Failed miserably. Does not compile any more =( Fri, 11 May 2012 12:51:22 GMT laumerf [9171] * code/branches/surfaceRace/data/levels/surfaceRace.oxw (modified) added new pickups Fri, 11 May 2012 11:31:42 GMT toliecht [9169] * code/branches/surfaceRace/data/levels/surfaceRace.oxw (modified) zylinderlaumer Fri, 11 May 2012 11:28:44 GMT mentzerf [9168] * code/branches/newlevel2012/data/levels/towerDefense.oxw (modified) * Changed Collision shape of playfield Fri, 11 May 2012 11:17:00 GMT weigeltm [9167] * code/branches/newlevel2012/data/levels/towerDefense.oxw (modified) * code/branches/newlevel2012/src/modules/towerdefense/TowerDefense.cc (modified) small refactor (ridiculously small (really)) Fri, 04 May 2012 14:27:06 GMT laumerf [9162] * code/branches/surfaceRace/data/levels/surfaceRace.oxw (modified) added asteroids and pick ups Fri, 04 May 2012 14:19:17 GMT weigeltm [9161] * code/branches/newlevel2012/data/levels/includes/towerWeaponSettings.oxi (added) * code/branches/newlevel2012/data/levels/templates/tower.oxt (added) * code/branches/newlevel2012/data/levels/towerDefense.oxw (modified) * code/branches/newlevel2012/src/modules/towerdefense/Tower.cc (modified) * code/branches/newlevel2012/src/orxonox/controllers/WaypointController.cc (modified) updated tower template and more stuff Fri, 04 May 2012 14:12:47 GMT mentzerf [9160] * code/branches/newlevel2012/src/modules/towerdefense/TowerDefense.cc (modified) * code/branches/newlevel2012/src/modules/towerdefense/TowerDefense.h (modified) * Fixed height of towers + not adding towers when they were added already Fri, 04 May 2012 14:09:25 GMT scmoritz [9159] * code/branches/waypoints/src/modules/overlays/hud/HUDNavigation.cc (modified) * code/branches/waypoints/src/orxonox/overlays/OrxonoxOverlay.cc (modified) * code/branches/waypoints/src/orxonox/overlays/OrxonoxOverlay.h (modified) 3DScene added. creation of the arrow doesnt work. Fri, 04 May 2012 14:05:53 GMT huttemat [9157] * code/branches/shipSelection/data/gui/scripts/ShipSelectionMenu.lua (modified) * code/branches/shipSelection/data/levels/tutorial.oxw (modified) * code/branches/shipSelection/src/orxonox/LevelInfo.cc (modified) * code/branches/shipSelection/src/orxonox/ShipManager.cc (added) * code/branches/shipSelection/src/orxonox/ShipManager.h (added) ShipSelecting working, still hackish and featureless though Fri, 04 May 2012 13:56:56 GMT lkevin [9155] * code/branches/pickup2012/data/levels/includes/pickups.oxi (modified) * code/branches/pickup2012/data/levels/pickups.oxw (modified) * code/branches/pickup2012/data/levels/templates/pickupRepresentationTemplates.oxt (modified) * code/branches/pickup2012/src/modules/pickup/items/DamageBoostPickup.cc (modified) * code/branches/pickup2012/src/modules/pickup/items/DamageBoostPickup.h (modified) * code/branches/pickup2012/src/modules/pickup/items/SpeedPickup.h (modified) * code/branches/pickup2012/src/orxonox/worldentities/pawns/Pawn.cc (modified) Changed pickup icon and xml for possible varieties of the pickup in ... Fri, 04 May 2012 12:51:44 GMT mentzerf [9154] * code/branches/newlevel2012/data/levels/towerDefense.oxw (modified) * code/branches/newlevel2012/src/modules/towerdefense/TowerDefense.cc (modified) * code/branches/newlevel2012/src/modules/towerdefense/TowerDefenseCenterpoint.cc (modified) * code/branches/newlevel2012/src/modules/towerdefense/TowerDefenseCenterpoint.h (modified) * code/branches/newlevel2012/src/orxonox/controllers/WaypointController.cc (modified) * Fixed size of oxw stuff. + Added tileScale to ... Fri, 04 May 2012 12:01:18 GMT laumerf [9150] * code/branches/surfaceRace/data/levels/surfaceRace.oxw (modified) bla Fri, 04 May 2012 11:55:19 GMT mentzerf [9149] * code/branches/newlevel2012/data/levels/towerDefense.oxw (modified) * code/branches/newlevel2012/src/modules/towerdefense/Turm Blender (deleted) - Removed Tower Model Fri, 04 May 2012 11:53:59 GMT mentzerf [9148] * code/branches/newlevel2012/src/modules/towerdefense/TowerDefense.cc (modified) * Changed addWaypointsAndFirstEnemy Fri, 04 May 2012 11:24:38 GMT weigeltm [9146] * code/branches/newlevel2012/src/modules/towerdefense/Turm Blender/Scene.material (added) * code/branches/newlevel2012/src/modules/towerdefense/Turm Blender/Tower_ME.mesh (added) exported tower Fri, 04 May 2012 11:21:13 GMT weigeltm [9145] * code/branches/newlevel2012/.project (modified) * code/branches/newlevel2012/data/levels/teamDeathMatch.oxw (modified) * code/branches/newlevel2012/data/levels/theTimeMachine.oxw (modified) * code/branches/newlevel2012/src/modules/towerdefense/Turm Blender/Tower_ME.mesh.xml (modified) exported tower Fri, 04 May 2012 11:12:42 GMT mentzerf [9144] * code/branches/newlevel2012/data/levels/towerDefense.oxw (modified) * code/branches/newlevel2012/src/modules/towerdefense/Turm Blender (added) * code/branches/newlevel2012/src/modules/towerdefense/Turm Blender/Tower_MAT.material (added) * code/branches/newlevel2012/src/modules/towerdefense/Turm Blender/Tower_ME.mesh.xml (added) * code/branches/newlevel2012/src/modules/towerdefense/Turm Blender/Turm.blend (added) * code/branches/newlevel2012/src/modules/towerdefense/Turm Blender/Turm.scene (added) * code/branches/newlevel2012/src/modules/towerdefense/Turm Blender/brick01.jpg (added) * code/branches/newlevel2012/src/orxonox/controllers/WaypointController.cc (modified) + Added Tower model, not in game yet Wed, 02 May 2012 11:22:20 GMT jo [9143] * code/branches/newlevel2012/.project (modified) * code/branches/newlevel2012/data/levels/towerDefense.oxw (modified) * code/branches/newlevel2012/src/modules/towerdefense/Tower.cc (modified) * code/branches/newlevel2012/src/modules/towerdefense/TowerDefense.cc (modified) * code/branches/newlevel2012/src/modules/towerdefense/TowerDefense.h (modified) * code/branches/newlevel2012/src/modules/towerdefense/TowerDefenseCenterpoint.cc (modified) * code/branches/newlevel2012/src/modules/towerdefense/towerdefensereadme.txt (modified) Some hints added on how to proceed. Sun, 29 Apr 2012 15:22:56 GMT mentzerf [9142] * code/branches/newlevel2012/data/levels/towerDefense.oxw (modified) * code/branches/newlevel2012/src/modules/towerdefense/TowerDefense.cc (modified) * code/branches/newlevel2012/src/modules/towerdefense/TowerDefense.h (modified) * code/branches/newlevel2012/src/orxonox/controllers/WaypointController.cc (modified) + Tried to create waypoints programmatically, succeeded, BUT: the ... Sun, 29 Apr 2012 13:42:22 GMT mentzerf [9141] * code/branches/newlevel2012/data/levels/towerDefense.oxw (modified) * code/branches/newlevel2012/src/modules/towerdefense/Tower.cc (modified) * code/branches/newlevel2012/src/modules/towerdefense/Tower.h (modified) * code/branches/newlevel2012/src/modules/towerdefense/TowerDefense.h (modified) * code/branches/newlevel2012/src/modules/towerdefense/TowerDefenseCenterpoint.cc (modified) * code/branches/newlevel2012/src/modules/towerdefense/TowerDefenseCenterpoint.h (modified) * code/branches/newlevel2012/src/modules/towerdefense/towerdefensereadme.txt (added) Added readme file and reformatted some more Sun, 29 Apr 2012 12:05:17 GMT mentzerf [9140] * code/branches/newlevel2012/src/modules/towerdefense/TowerDefense.h (modified) * Fixed a bug that prevented compiling Sun, 29 Apr 2012 10:52:05 GMT mentzerf [9139] * code/branches/newlevel2012/data/levels/towerDefense.oxw (modified) * code/branches/newlevel2012/src/modules/towerdefense/TowerDefense.cc (modified) * code/branches/newlevel2012/src/modules/towerdefense/TowerDefense.h (modified) * Fixed some formatting, some comments and some logs. Done for today. Sun, 29 Apr 2012 10:40:11 GMT mentzerf [9138] * code/branches/newlevel2012/data/levels/towerDefense.oxw (modified) * code/branches/newlevel2012/src/modules/towerdefense/TowerDefense.cc (modified) Fixed the oxw file (some more): * the playfield now lies in the x,y ... Sun, 29 Apr 2012 09:17:38 GMT mentzerf [9137] * code/branches/newlevel2012/data/levels/towerDefense.oxw (modified) * code/branches/newlevel2012/src/modules/towerdefense/Tower.h (modified) * code/branches/newlevel2012/src/modules/towerdefense/TowerDefense.cc (modified) + 'addTower' now adds a "tower" (actually a green cube) at 0,0 Sun, 29 Apr 2012 09:08:26 GMT mentzerf [9136] * code/branches/newlevel2012/src/modules/towerdefense/TowerDefense.cc (modified) * code/branches/newlevel2012/src/modules/towerdefense/TowerDefense.h (modified) * code/branches/newlevel2012/src/modules/towerdefense/TowerDefenseCenterpoint.cc (modified) + Added console command "addTower" to later spawn in towers. Now only ... Sun, 29 Apr 2012 09:06:40 GMT mentzerf [9135] * code/branches/newlevel2012/src/modules/towerdefense/CMakeLists.txt (modified) * code/branches/newlevel2012/src/modules/towerdefense/Tower.cc (added) * code/branches/newlevel2012/src/modules/towerdefense/Tower.h (added) * code/branches/newlevel2012/src/modules/towerdefense/TowerDefensePrereqs.h (modified) + Added class Tower, later will be used to spawn in towers Sun, 29 Apr 2012 09:06:06 GMT mentzerf [9134] * code/branches/newlevel2012/data/levels/towerDefense.oxw (modified) + Added Template for tower * Replaced StaticEntity for playfield ... Sun, 29 Apr 2012 08:06:09 GMT mentzerf [9133] * code/branches/newlevel2012/data/levels/towerDefense.oxw (modified) * code/branches/newlevel2012/src/modules/towerdefense/TowerDefense.cc (modified) Fixed oxw file: * Camera is now focus on 0,0,0 and locked on a ... Sun, 29 Apr 2012 08:04:00 GMT mentzerf [9132] * code/branches/newlevel2012/src/modules/towerdefense/Spielfeld Blender/Playfield.material (deleted) * code/branches/newlevel2012/src/modules/towerdefense/Spielfeld Blender/Playfield_ME.mesh (deleted) * code/branches/newlevel2012/src/modules/towerdefense/Spielfeld Blender/Spielfeld.blend1 (deleted) * code/branches/newlevel2012/src/modules/towerdefense/Spielfeld Blender/playfield_top.png (deleted) * code/branches/newlevel2012/src/modules/towerdefense/Spielfeld Blender/plazfield_top.png (deleted) - Deleted Playfield files, they are in the trunk now Fri, 27 Apr 2012 14:11:30 GMT laumerf [9130] * code/branches/surfaceRace/data/levels/surfaceRace.oxw (modified) added new checkpoints Fri, 27 Apr 2012 13:59:19 GMT mentzerf [9129] * code/branches/newlevel2012/data/levels/towerDefense.oxw (modified) * code/branches/newlevel2012/src/modules/towerdefense/TowerDefense.cc (modified) added spaceship that follows four waypoints on the playfield Fri, 27 Apr 2012 13:58:26 GMT huttemat [9128] * code/branches/shipSelection/data/levels/tutorial.oxw (modified) some stuff not yet saved Fri, 27 Apr 2012 13:56:15 GMT huttemat [9127] * code/branches/shipSelection/data/gui/scripts/ShipSelectionMenu.lua (modified) * code/branches/shipSelection/data/gui/scripts/SingleplayerMenu.lua (modified) * code/branches/shipSelection/data/levels/tutorial.oxw (modified) * code/branches/shipSelection/src/libraries/core/Loader.cc (modified) * code/branches/shipSelection/src/orxonox/LevelInfo.h (modified) * code/branches/shipSelection/src/orxonox/LevelManager.cc (modified) shipselection core works now Fri, 27 Apr 2012 13:18:31 GMT mentzerf [9124] * code/branches/newlevel2012/data/levels/towerDefense.oxw (modified) * code/branches/newlevel2012/src/modules/towerdefense/TowerDefense.cc (modified) restored working playfield Fri, 27 Apr 2012 12:56:33 GMT mentzerf [9123] * code/branches/newlevel2012/src/modules/towerdefense/TowerDefense.cc (modified) * Fixed SVN error Fri, 27 Apr 2012 12:49:43 GMT mentzerf [9122] * code/branches/newlevel2012/data/levels/towerDefense.oxw (modified) * code/branches/newlevel2012/src/modules/towerdefense/TowerDefense.cc (modified) * code/branches/newlevel2012/src/modules/towerdefense/TowerDefense.h (modified) Updated oxw and added method call to spawnEnemy Fri, 27 Apr 2012 12:41:35 GMT laumerf [9121] * code/branches/surfaceRace/data/levels/surfaceRace.oxw (modified) Added new Checkpoints