# # ChangeLog for / # # Generated by Trac 1.0.9 # May 17, 2024, 11:13:21 PM Thu, 23 Feb 2012 19:52:57 GMT jo [9019] * code/branches/tutorial2/data/levels/tutorial.oxw (modified) * code/branches/tutorial2/src/orxonox/controllers/AutonomousDroneController.cc (added) * code/branches/tutorial2/src/orxonox/controllers/AutonomousDroneController.h (added) * code/branches/tutorial2/src/orxonox/worldentities/AutonomousDrone.cc (added) * code/branches/tutorial2/src/orxonox/worldentities/AutonomousDrone.h (added) Copied trunk & added files for the coding tutorial in order to update ... Thu, 23 Feb 2012 19:12:10 GMT jo [9018] * code/branches/tutorial2 (copied) Mon, 20 Feb 2012 21:17:56 GMT landauf [9017] * code/branches/testing/CMakeLists.txt (modified) * code/branches/testing/test (added) * code/branches/testing/test/CMakeLists.txt (added) * code/branches/testing/test/SampleTest.cc (added) sample tests with ctest Wed, 15 Feb 2012 22:51:58 GMT jo [9016] * code/trunk (modified) * code/trunk/data/defaultConfig/keybindings.ini (modified) * code/trunk/data/gui/layouts/CreditsMenu.layout (modified) * code/trunk/data/gui/layouts/MiscConfigMenu.layout (modified) * code/trunk/data/gui/layouts/SingleplayerConfigMenu.layout (copied) * code/trunk/data/gui/layouts/SingleplayerMenu.layout (modified) * code/trunk/data/gui/scripts/CreditsMenu.lua (modified) * code/trunk/data/gui/scripts/InGameMenu.lua (modified) * code/trunk/data/gui/scripts/MiscConfigMenu.lua (modified) * code/trunk/data/gui/scripts/SingleplayerConfigMenu.lua (copied) * code/trunk/data/gui/scripts/SingleplayerMenu.lua (modified) * code/trunk/data/levels/FPSTest.oxw (modified) * code/trunk/data/levels/Spacerace2.oxw (copied) * code/trunk/data/levels/asteroidField.oxw (copied) * code/trunk/data/levels/asteroids.oxw (modified) * code/trunk/data/levels/docking.oxw (modified) * code/trunk/data/levels/dynamicMatch.oxw (modified) * code/trunk/data/levels/earth.oxw (modified) * code/trunk/data/levels/emptyLevel.oxw (modified) * code/trunk/data/levels/events.oxw (modified) * code/trunk/data/levels/fightInOurBack.oxw (modified) * code/trunk/data/levels/includes/asteroidField.lua (copied) * code/trunk/data/levels/includes/weaponSettingsSpacecruiser.oxi (modified) * code/trunk/data/levels/lastManStanding.oxw (modified) * code/trunk/data/levels/lastTeamStanding.oxw (modified) * code/trunk/data/levels/lastTeamStandingII.oxw (modified) * code/trunk/data/levels/missionOne.oxw (modified) * code/trunk/data/levels/myTestLevel.oxw (modified) * code/trunk/data/levels/notifications.oxw (modified) * code/trunk/data/levels/pickups.oxw (modified) * code/trunk/data/levels/pirateAttack.oxw (modified) * code/trunk/data/levels/planets.oxw (modified) * code/trunk/data/levels/pong.oxw (modified) * code/trunk/data/levels/portals.oxw (modified) * code/trunk/data/levels/presentation.oxw (modified) * code/trunk/data/levels/presentation09.oxw (modified) * code/trunk/data/levels/presentation09b.oxw (modified) * code/trunk/data/levels/presentationDM.oxw (modified) * code/trunk/data/levels/presentationFS10.oxw (modified) * code/trunk/data/levels/presentationFS102.oxw (modified) * code/trunk/data/levels/presentationFS10Ed.oxw (modified) * code/trunk/data/levels/presentationFS11.oxw (modified) * code/trunk/data/levels/presentationHS09.oxw (modified) * code/trunk/data/levels/presentationHS09b.oxw (modified) * code/trunk/data/levels/presentationHS11.oxw (copied) * code/trunk/data/levels/princessAeryn.oxw (modified) * code/trunk/data/levels/quests.oxw (modified) * code/trunk/data/levels/screenshot.oxw (modified) * code/trunk/data/levels/shieldTest.oxw (modified) * code/trunk/data/levels/sound.oxw (modified) * code/trunk/data/levels/spaceRace.oxw (modified) * code/trunk/data/levels/teamBaseMatch.oxw (modified) * code/trunk/data/levels/teamDeathMatch.oxw (modified) * code/trunk/data/levels/templates/spaceshipSpacecruiser.oxt (modified) * code/trunk/data/levels/testStars.oxw (modified) * code/trunk/data/levels/testSwallow.oxw (modified) * code/trunk/data/levels/tetris.oxw (modified) * code/trunk/data/levels/theTimeMachine.oxw (modified) * code/trunk/data/levels/tutorial.oxw (modified) * code/trunk/data/levels/underAttack.oxw (modified) * code/trunk/data/levels/waypoints.oxw (modified) * code/trunk/data/overlays/HUDTemplates3.oxo (modified) * code/trunk/data/overlays/underAttackHUD.oxo (modified) * code/trunk/src/libraries/core/GUIManager.cc (modified) * code/trunk/src/libraries/util/SignalHandler.cc (modified) * code/trunk/src/modules/gametypes/CMakeLists.txt (modified) * code/trunk/src/modules/gametypes/GametypesPrereqs.h (modified) * code/trunk/src/modules/gametypes/OldRaceCheckPoint.cc (copied) * code/trunk/src/modules/gametypes/OldRaceCheckPoint.h (copied) * code/trunk/src/modules/gametypes/OldSpaceRace.cc (copied) * code/trunk/src/modules/gametypes/OldSpaceRace.h (copied) * code/trunk/src/modules/gametypes/RaceCheckPoint.cc (modified) * code/trunk/src/modules/gametypes/RaceCheckPoint.h (modified) * code/trunk/src/modules/gametypes/SpaceRace.cc (modified) * code/trunk/src/modules/gametypes/SpaceRace.h (modified) * code/trunk/src/modules/gametypes/SpaceRaceManager.cc (copied) * code/trunk/src/modules/gametypes/SpaceRaceManager.h (copied) * code/trunk/src/modules/objects/triggers/DistanceMultiTrigger.h (modified) * code/trunk/src/modules/objects/triggers/MultiTrigger.h (modified) * code/trunk/src/modules/overlays/hud/CMakeLists.txt (modified) * code/trunk/src/modules/overlays/hud/HUDEnemyHealthBar.cc (copied) * code/trunk/src/modules/overlays/hud/HUDEnemyHealthBar.h (copied) * code/trunk/src/modules/overlays/hud/HUDHealthBar.h (modified) * code/trunk/src/modules/overlays/hud/HUDNavigation.cc (modified) * code/trunk/src/modules/overlays/hud/HUDNavigation.h (modified) * code/trunk/src/modules/pong/Pong.cc (modified) * code/trunk/src/modules/pong/Pong.h (modified) * code/trunk/src/modules/pong/PongAI.h (modified) * code/trunk/src/modules/pong/PongScore.cc (modified) * code/trunk/src/modules/pong/PongScore.h (modified) * code/trunk/src/modules/weapons/projectiles/Rocket.cc (modified) * code/trunk/src/modules/weapons/projectiles/Rocket.h (modified) * code/trunk/src/modules/weapons/weaponmodes/LightningGun.cc (modified) * code/trunk/src/orxonox/Level.cc (modified) * code/trunk/src/orxonox/Level.h (modified) * code/trunk/src/orxonox/LevelInfo.cc (modified) * code/trunk/src/orxonox/LevelInfo.h (modified) * code/trunk/src/orxonox/controllers/AIController.cc (modified) * code/trunk/src/orxonox/controllers/AIController.h (modified) * code/trunk/src/orxonox/controllers/ArtificialController.cc (modified) * code/trunk/src/orxonox/controllers/ArtificialController.h (modified) * code/trunk/src/orxonox/controllers/CMakeLists.txt (modified) * code/trunk/src/orxonox/controllers/FormationController.cc (copied) * code/trunk/src/orxonox/controllers/FormationController.h (copied) * code/trunk/src/orxonox/controllers/HumanController.cc (modified) * code/trunk/src/orxonox/controllers/HumanController.h (modified) * code/trunk/src/orxonox/controllers/NewHumanController.cc (modified) * code/trunk/src/orxonox/controllers/NewHumanController.h (modified) * code/trunk/src/orxonox/controllers/WaypointPatrolController.cc (modified) * code/trunk/src/orxonox/controllers/WaypointPatrolController.h (modified) * code/trunk/src/orxonox/gametypes/CMakeLists.txt (modified) * code/trunk/src/orxonox/gametypes/Gametype.cc (modified) * code/trunk/src/orxonox/gametypes/Gametype.h (modified) * code/trunk/src/orxonox/gametypes/Mission.cc (copied) * code/trunk/src/orxonox/gametypes/Mission.h (copied) * code/trunk/src/orxonox/gametypes/TeamDeathmatch.h (modified) * code/trunk/src/orxonox/gametypes/TeamGametype.cc (copied) * code/trunk/src/orxonox/gametypes/TeamGametype.h (copied) * code/trunk/src/orxonox/gametypes/UnderAttack.cc (modified) * code/trunk/src/orxonox/infos/GametypeInfo.cc (modified) * code/trunk/src/orxonox/infos/GametypeInfo.h (modified) * code/trunk/src/orxonox/infos/PlayerInfo.cc (modified) * code/trunk/src/orxonox/interfaces/RadarViewable.cc (modified) * code/trunk/src/orxonox/interfaces/RadarViewable.h (modified) * code/trunk/src/orxonox/worldentities/ControllableEntity.cc (modified) * code/trunk/src/orxonox/worldentities/ControllableEntity.h (modified) * code/trunk/src/orxonox/worldentities/pawns/FpsPlayer.cc (modified) * code/trunk/src/orxonox/worldentities/pawns/FpsPlayer.h (modified) * code/trunk/src/orxonox/worldentities/pawns/Pawn.cc (modified) * code/trunk/src/orxonox/worldentities/pawns/Pawn.h (modified) Merging presentation2011 branch to trunk. Please check for possible bugs. Sun, 12 Feb 2012 17:24:32 GMT landauf [9015] * code/branches/testing (copied) creating branch to experiment with testing frameworks Wed, 21 Dec 2011 08:42:58 GMT smerkli [9014] * code/branches/presentation2011/data/levels/asteroidField.oxw (modified) Scaled up the collision shape for the planet in asteroidFieldTest to ... Wed, 21 Dec 2011 07:13:29 GMT jo [9013] * code/branches/presentation2011/data/levels/presentationHS11.oxw (modified) Added more enemies. Tue, 20 Dec 2011 22:10:32 GMT jo [9012] * code/branches/presentation2011/data/levels/presentationHS11.oxw (modified) Level update - now with improved concept. Tue, 20 Dec 2011 21:53:13 GMT smerkli [9011] * code/branches/presentation2011/data/levels/asteroidField.oxw (modified) Built saturn-like thing in asteriodfieldtest Tue, 20 Dec 2011 21:41:35 GMT jo [9010] * code/branches/presentation2011/data/levels/presentationHS11.oxw (modified) First draft. How it works: activate the bots by flying through the ... Tue, 20 Dec 2011 21:03:15 GMT jo [9009] * code/branches/presentation2011/data/levels/presentationHS11.oxw (modified) * code/branches/presentation2011/src/modules/weapons/projectiles/Rocket.cc (modified) * code/branches/presentation2011/src/modules/weapons/projectiles/Rocket.h (modified) Quick fix for the rocket. Taking care of this issue later. Tue, 20 Dec 2011 20:39:41 GMT jo [9008] * code/branches/presentation2011/data/levels/asteroidField.oxw (modified) * code/branches/presentation2011/data/levels/presentationHS11.oxw (modified) Working on the levels. Tue, 20 Dec 2011 20:29:09 GMT smerkli [9007] * code/branches/presentation2011/data/levels/asteroidField.oxw (modified) Added a planet with orbitting space trash to level. Mon, 19 Dec 2011 23:03:21 GMT jo [9006] * code/branches/presentation2011/data/levels/asteroidField.oxw (modified) * code/branches/presentation2011/data/levels/presentationHS11.oxw (added) * code/branches/presentation2011/src/orxonox/controllers/ArtificialController.cc (modified) * code/branches/presentation2011/src/orxonox/controllers/ArtificialController.h (modified) * code/branches/presentation2011/src/orxonox/controllers/FormationController.cc (modified) Repairing setbotlevel command. Start of a presentation level. Mon, 19 Dec 2011 13:43:04 GMT willis [9005] * code/branches/presentation2011/src/orxonox/controllers/AIController.cc (modified) * code/branches/presentation2011/src/orxonox/controllers/FormationController.cc (modified) * code/branches/presentation2011/src/orxonox/controllers/HumanController.cc (modified) * code/branches/presentation2011/src/orxonox/controllers/HumanController.h (modified) * code/branches/presentation2011/src/orxonox/controllers/NewHumanController.cc (modified) fixed merging some merging bugs and some other bugs... Sun, 18 Dec 2011 19:19:08 GMT landauf [9004] * data/trunk/images/levelpreviews/missionone.png (deleted) removed duplicate file to avoid svn error on windows (missionOne.png ... Sun, 18 Dec 2011 17:19:02 GMT jo [9003] * code/branches/presentation2011/data/levels/Spacerace2.oxw (modified) Spacerace level update. Sun, 18 Dec 2011 17:17:17 GMT jo [9002] * data/trunk/images/levelpreviews/spacerace2.png (added) Levelpreview added. Sun, 18 Dec 2011 16:45:04 GMT jo [9001] * code/branches/presentation2011/data/levels/missionOne.oxw (modified) Papercut in the tutorial level. Sun, 18 Dec 2011 14:24:21 GMT jo [9000] * code/branches/presentation2011/src/modules/gametypes/OldRaceCheckPoint.cc (added) * code/branches/presentation2011/src/modules/gametypes/OldRaceCheckPoint.h (added) * code/branches/presentation2011/src/modules/gametypes/OldSpaceRace.cc (added) * code/branches/presentation2011/src/modules/gametypes/OldSpaceRace.h (added) Forgot to add new files. Sun, 18 Dec 2011 14:22:43 GMT jo [8999] * code/branches/presentation2011/data/levels/spaceRace.oxw (modified) * code/branches/presentation2011/src/modules/gametypes/CMakeLists.txt (modified) * code/branches/presentation2011/src/modules/gametypes/GametypesPrereqs.h (modified) * code/branches/presentation2011/src/orxonox/controllers/FormationController.h (modified) Old version of the SpaceRace added. Sun, 18 Dec 2011 13:35:02 GMT jo [8998] * code/branches/presentation2011 (modified) * code/branches/presentation2011/data/levels/Spacerace2.oxw (copied) * code/branches/presentation2011/src/modules/gametypes/CMakeLists.txt (modified) * code/branches/presentation2011/src/modules/gametypes/RaceCheckPoint.cc (modified) * code/branches/presentation2011/src/modules/gametypes/RaceCheckPoint.h (modified) * code/branches/presentation2011/src/modules/gametypes/SpaceRace.cc (modified) * code/branches/presentation2011/src/modules/gametypes/SpaceRace.h (modified) * code/branches/presentation2011/src/modules/gametypes/SpaceRaceManager.cc (copied) * code/branches/presentation2011/src/modules/gametypes/SpaceRaceManager.h (copied) * code/branches/presentation2011/src/modules/objects/triggers/DistanceMultiTrigger.h (modified) * code/branches/presentation2011/src/modules/objects/triggers/MultiTrigger.h (modified) * code/branches/presentation2011/src/orxonox/gametypes/Gametype.cc (modified) * code/branches/presentation2011/src/orxonox/gametypes/Gametype.h (modified) * code/branches/presentation2011/src/orxonox/infos/GametypeInfo.cc (modified) * code/branches/presentation2011/src/orxonox/infos/PlayerInfo.cc (modified) Merged SpaceraceTwo. Old racelevel does not work anymore. Sun, 18 Dec 2011 12:58:58 GMT jo [8997] * code/branches/presentation2011/src/orxonox/gametypes/Mission.cc (modified) * code/branches/presentation2011/src/orxonox/gametypes/TeamGametype.cc (modified) Small edits. Documentation. Sun, 18 Dec 2011 00:18:51 GMT jo [8996] * code/branches/presentation2011/data/levels/lastTeamStandingII.oxw (modified) * code/branches/presentation2011/data/levels/missionOne.oxw (modified) * code/branches/presentation2011/src/libraries/core/GUIManager.cc (modified) * code/branches/presentation2011/src/orxonox/controllers/FormationController.cc (modified) * code/branches/presentation2011/src/orxonox/gametypes/TeamGametype.cc (modified) Repaired xml-interface in order to set a bot's team directly in the ... Sat, 17 Dec 2011 22:49:36 GMT jo [8995] * code/branches/presentation2011/src/modules/overlays/hud/HUDEnemyHealthBar.cc (modified) * code/branches/presentation2011/src/orxonox/controllers/FormationController.cc (modified) * code/branches/presentation2011/src/orxonox/gametypes/TeamGametype.cc (modified) check to prevent crashes. Sat, 17 Dec 2011 00:03:45 GMT jo [8994] * code/branches/presentation2011/data/levels/missionOne.oxw (modified) * code/branches/presentation2011/data/levels/underAttack.oxw (modified) * code/branches/presentation2011/data/overlays/underAttackHUD.oxo (modified) * code/branches/presentation2011/src/orxonox/gametypes/UnderAttack.cc (modified) Removing tansporter's healthbar. Fri, 16 Dec 2011 23:35:33 GMT jo [8993] * code/branches/presentation2011/src/modules/overlays/hud/HUDNavigation.cc (modified) * code/branches/presentation2011/src/modules/overlays/hud/HUDNavigation.h (modified) Repairing the radar. Fri, 16 Dec 2011 19:36:41 GMT jo [8992] * code/branches/presentation2011 (modified) * code/branches/presentation2011/data/defaultConfig/keybindings.ini (modified) * code/branches/presentation2011/src/orxonox/controllers/AIController.cc (modified) * code/branches/presentation2011/src/orxonox/controllers/AIController.h (modified) * code/branches/presentation2011/src/orxonox/controllers/ArtificialController.cc (modified) * code/branches/presentation2011/src/orxonox/controllers/ArtificialController.h (modified) * code/branches/presentation2011/src/orxonox/controllers/CMakeLists.txt (modified) * code/branches/presentation2011/src/orxonox/controllers/FormationController.cc (copied) * code/branches/presentation2011/src/orxonox/controllers/FormationController.h (copied) * code/branches/presentation2011/src/orxonox/controllers/HumanController.cc (modified) * code/branches/presentation2011/src/orxonox/controllers/HumanController.h (modified) * code/branches/presentation2011/src/orxonox/controllers/NewHumanController.cc (modified) Merged Formation branch. There are still some bugs (just have a look ... Fri, 16 Dec 2011 15:56:15 GMT jo [8991] * code/branches/formation/src/orxonox/controllers/AIController.cc (modified) * code/branches/formation/src/orxonox/controllers/ArtificialController.cc (modified) * code/branches/formation/src/orxonox/controllers/ArtificialController.h (modified) * code/branches/formation/src/orxonox/controllers/FormationController.cc (modified) * code/branches/formation/src/orxonox/controllers/FormationController.h (modified) * code/branches/formation/src/orxonox/controllers/HumanController.cc (modified) Works. (Seperate/independent states are used to manage the behaviour). Fri, 16 Dec 2011 15:25:28 GMT jo [8990] * code/branches/formation/src/orxonox/controllers/AIController.cc (modified) * code/branches/formation/src/orxonox/controllers/AIController.h (modified) * code/branches/formation/src/orxonox/controllers/ArtificialController.cc (modified) * code/branches/formation/src/orxonox/controllers/FormationController.cc (modified) * code/branches/formation/src/orxonox/controllers/FormationController.h (modified) * code/branches/formation/src/orxonox/controllers/HumanController.cc (modified) * code/branches/formation/src/orxonox/controllers/NewHumanController.cc (modified) Rough adding of both concepts. Further work on the states is needed. ... Wed, 14 Dec 2011 18:13:09 GMT jo [8989] * code/branches/formation/src/orxonox/controllers/ArtificialController.cc (modified) * code/branches/formation/src/orxonox/controllers/ArtificialController.h (modified) * code/branches/formation/src/orxonox/controllers/FormationController.cc (modified) Preparation before merging. Wed, 14 Dec 2011 15:45:22 GMT smerkli [8988] * code/branches/presentation2011 (modified) * code/branches/presentation2011/data/gui/scripts/MiscConfigMenu.lua (modified) * code/branches/presentation2011/data/levels/underAttack.oxw (modified) * code/branches/presentation2011/data/overlays/HUDTemplates3.oxo (modified) * code/branches/presentation2011/src/modules/overlays/hud/CMakeLists.txt (modified) * code/branches/presentation2011/src/modules/overlays/hud/HUDHealthBar.h (modified) * code/branches/presentation2011/src/modules/overlays/hud/HUDNavigation.cc (modified) * code/branches/presentation2011/src/modules/overlays/hud/HUDNavigation.h (modified) * code/branches/presentation2011/src/orxonox/controllers/NewHumanController.h (modified) * code/branches/presentation2011/src/orxonox/infos/PlayerInfo.cc (modified) * code/branches/presentation2011/src/orxonox/interfaces/RadarViewable.cc (modified) * code/branches/presentation2011/src/orxonox/interfaces/RadarViewable.h (modified) * code/branches/presentation2011/src/orxonox/worldentities/pawns/Pawn.cc (modified) merged hud branch Wed, 14 Dec 2011 15:33:22 GMT mspaling [8987] * code/branches/presentation2011/src/modules/overlays/hud/HUDEnemyHealthBar.cc (added) * code/branches/presentation2011/src/modules/overlays/hud/HUDEnemyHealthBar.h (added) added missing files Wed, 14 Dec 2011 15:22:57 GMT mspaling [8986] * code/branches/hud/src/orxonox/controllers/NewHumanController.h (modified) EnemyHealthBar is done! :) Wed, 14 Dec 2011 15:02:06 GMT smerkli [8985] * code/branches/formation/src/orxonox/controllers/Masterable.cc (deleted) * code/branches/formation/src/orxonox/controllers/Masterable.h (deleted) Removed Masterable.* files Wed, 14 Dec 2011 14:57:39 GMT jo [8984] * data/trunk/images/levelpreviews/asteroidFieldTest.png (added) * data/trunk/images/levelpreviews/missionOne.png (added) Screenshots added. Wed, 14 Dec 2011 14:53:15 GMT eceline [8983] * code/branches/spaceraceTwo/data/levels/Spacerace2.oxw (modified) * code/branches/spaceraceTwo/src/modules/gametypes/RaceCheckPoint.h (modified) * code/branches/spaceraceTwo/src/modules/gametypes/SpaceRaceManager.cc (modified) * code/branches/spaceraceTwo/src/modules/gametypes/SpaceRaceManager.h (modified) * code/branches/spaceraceTwo/src/orxonox/controllers/WaypointPatrolController.cc (modified) a few changes Wed, 14 Dec 2011 14:20:50 GMT jo [8982] * code/branches/presentation2011/data/levels/pirateAttack.oxw (modified) pirateattck.oxw fixed Wed, 14 Dec 2011 14:17:58 GMT jo [8981] * code/branches/presentation2011/data/levels/asteroidField.oxw (modified) * code/branches/presentation2011/data/levels/fightInOurBack.oxw (modified) * code/branches/presentation2011/data/levels/lastTeamStandingII.oxw (modified) * code/branches/presentation2011/data/levels/missionOne.oxw (modified) Fixed level preview screenshots & levelinfo tags Wed, 14 Dec 2011 13:38:37 GMT jo [8980] * code/branches/presentation2011 (modified) * code/branches/presentation2011/data/levels/dynamicMatch.oxw (modified) * code/branches/presentation2011/data/levels/fightInOurBack.oxw (modified) * code/branches/presentation2011/data/levels/includes/weaponSettingsSpacecruiser.oxi (modified) * code/branches/presentation2011/data/levels/lastManStanding.oxw (modified) * code/branches/presentation2011/data/levels/lastTeamStanding.oxw (modified) * code/branches/presentation2011/data/levels/lastTeamStandingII.oxw (modified) * code/branches/presentation2011/data/levels/missionOne.oxw (modified) * code/branches/presentation2011/data/levels/pirateAttack.oxw (modified) * code/branches/presentation2011/data/levels/templates/spaceshipSpacecruiser.oxt (modified) * code/branches/presentation2011/src/libraries/core/GUIManager.cc (modified) * code/branches/presentation2011/src/modules/pong/Pong.cc (modified) * code/branches/presentation2011/src/modules/pong/Pong.h (modified) * code/branches/presentation2011/src/modules/pong/PongAI.h (modified) * code/branches/presentation2011/src/modules/pong/PongScore.cc (modified) * code/branches/presentation2011/src/modules/pong/PongScore.h (modified) * code/branches/presentation2011/src/modules/weapons/projectiles/Rocket.cc (modified) * code/branches/presentation2011/src/modules/weapons/weaponmodes/LightningGun.cc (modified) * code/branches/presentation2011/src/orxonox/controllers/AIController.cc (modified) * code/branches/presentation2011/src/orxonox/controllers/AIController.h (modified) * code/branches/presentation2011/src/orxonox/controllers/ArtificialController.cc (modified) * code/branches/presentation2011/src/orxonox/controllers/ArtificialController.h (modified) * code/branches/presentation2011/src/orxonox/controllers/HumanController.cc (modified) * code/branches/presentation2011/src/orxonox/controllers/WaypointPatrolController.cc (modified) * code/branches/presentation2011/src/orxonox/controllers/WaypointPatrolController.h (modified) * code/branches/presentation2011/src/orxonox/gametypes/CMakeLists.txt (modified) * code/branches/presentation2011/src/orxonox/gametypes/Gametype.cc (modified) * code/branches/presentation2011/src/orxonox/gametypes/Gametype.h (modified) * code/branches/presentation2011/src/orxonox/gametypes/Mission.cc (copied) * code/branches/presentation2011/src/orxonox/gametypes/Mission.h (copied) * code/branches/presentation2011/src/orxonox/gametypes/TeamDeathmatch.h (modified) * code/branches/presentation2011/src/orxonox/gametypes/TeamGametype.cc (copied) * code/branches/presentation2011/src/orxonox/gametypes/TeamGametype.h (copied) * code/branches/presentation2011/src/orxonox/infos/GametypeInfo.h (modified) * code/branches/presentation2011/src/orxonox/worldentities/ControllableEntity.cc (modified) * code/branches/presentation2011/src/orxonox/worldentities/ControllableEntity.h (modified) * code/branches/presentation2011/src/orxonox/worldentities/pawns/Pawn.cc (modified) * code/branches/presentation2011/src/orxonox/worldentities/pawns/Pawn.h (modified) teamgametype merged into trunk Wed, 14 Dec 2011 13:16:45 GMT eceline [8979] * code/branches/spaceraceTwo/data/levels/Spacerace2.oxw (modified) * code/branches/spaceraceTwo/src/modules/gametypes/RaceCheckPoint.cc (modified) * code/branches/spaceraceTwo/src/modules/gametypes/RaceCheckPoint.h (modified) * code/branches/spaceraceTwo/src/modules/gametypes/SpaceRace.cc (modified) * code/branches/spaceraceTwo/src/modules/gametypes/SpaceRace.h (modified) * code/branches/spaceraceTwo/src/modules/gametypes/SpaceRaceManager.cc (modified) not much changed Wed, 14 Dec 2011 13:15:45 GMT willis [8978] * code/branches/formation/src/orxonox/controllers/AIController.cc (modified) * code/branches/formation/src/orxonox/controllers/ArtificialController.cc (modified) * code/branches/formation/src/orxonox/controllers/ArtificialController.h (modified) * code/branches/formation/src/orxonox/controllers/CMakeLists.txt (modified) * code/branches/formation/src/orxonox/controllers/FormationController.cc (added) * code/branches/formation/src/orxonox/controllers/FormationController.h (added) * code/branches/formation/src/orxonox/controllers/HumanController.cc (modified) * code/branches/formation/src/orxonox/controllers/HumanController.h (modified) renamed Masterable to FormationController, some minor changes Wed, 14 Dec 2011 13:12:11 GMT smerkli [8977] * code/branches/presentation2011 (modified) * code/branches/presentation2011/data/gui/layouts/CreditsMenu.layout (modified) * code/branches/presentation2011/data/gui/layouts/MiscConfigMenu.layout (modified) * code/branches/presentation2011/data/gui/layouts/SingleplayerConfigMenu.layout (copied) * code/branches/presentation2011/data/gui/layouts/SingleplayerMenu.layout (modified) * code/branches/presentation2011/data/gui/scripts/CreditsMenu.lua (modified) * code/branches/presentation2011/data/gui/scripts/InGameMenu.lua (modified) * code/branches/presentation2011/data/gui/scripts/MiscConfigMenu.lua (modified) * code/branches/presentation2011/data/gui/scripts/SingleplayerConfigMenu.lua (copied) * code/branches/presentation2011/data/gui/scripts/SingleplayerMenu.lua (modified) * code/branches/presentation2011/data/levels/FPSTest.oxw (modified) * code/branches/presentation2011/data/levels/asteroids.oxw (modified) * code/branches/presentation2011/data/levels/docking.oxw (modified) * code/branches/presentation2011/data/levels/dynamicMatch.oxw (modified) * code/branches/presentation2011/data/levels/earth.oxw (modified) * code/branches/presentation2011/data/levels/emptyLevel.oxw (modified) * code/branches/presentation2011/data/levels/events.oxw (modified) * code/branches/presentation2011/data/levels/lastManStanding.oxw (modified) * code/branches/presentation2011/data/levels/lastTeamStanding.oxw (modified) * code/branches/presentation2011/data/levels/myTestLevel.oxw (modified) * code/branches/presentation2011/data/levels/notifications.oxw (modified) * code/branches/presentation2011/data/levels/pickups.oxw (modified) * code/branches/presentation2011/data/levels/pirateAttack.oxw (modified) * code/branches/presentation2011/data/levels/planets.oxw (modified) * code/branches/presentation2011/data/levels/pong.oxw (modified) * code/branches/presentation2011/data/levels/portals.oxw (modified) * code/branches/presentation2011/data/levels/presentation.oxw (modified) * code/branches/presentation2011/data/levels/presentation09.oxw (modified) * code/branches/presentation2011/data/levels/presentation09b.oxw (modified) * code/branches/presentation2011/data/levels/presentationDM.oxw (modified) * code/branches/presentation2011/data/levels/presentationFS10.oxw (modified) * code/branches/presentation2011/data/levels/presentationFS102.oxw (modified) * code/branches/presentation2011/data/levels/presentationFS10Ed.oxw (modified) * code/branches/presentation2011/data/levels/presentationFS11.oxw (modified) * code/branches/presentation2011/data/levels/presentationHS09.oxw (modified) * code/branches/presentation2011/data/levels/presentationHS09b.oxw (modified) * code/branches/presentation2011/data/levels/princessAeryn.oxw (modified) * code/branches/presentation2011/data/levels/quests.oxw (modified) * code/branches/presentation2011/data/levels/screenshot.oxw (modified) * code/branches/presentation2011/data/levels/shieldTest.oxw (modified) * code/branches/presentation2011/data/levels/sound.oxw (modified) * code/branches/presentation2011/data/levels/spaceRace.oxw (modified) * code/branches/presentation2011/data/levels/teamBaseMatch.oxw (modified) * code/branches/presentation2011/data/levels/teamDeathMatch.oxw (modified) * code/branches/presentation2011/data/levels/testStars.oxw (modified) * code/branches/presentation2011/data/levels/testSwallow.oxw (modified) * code/branches/presentation2011/data/levels/tetris.oxw (modified) * code/branches/presentation2011/data/levels/theTimeMachine.oxw (modified) * code/branches/presentation2011/data/levels/tutorial.oxw (modified) * code/branches/presentation2011/data/levels/underAttack.oxw (modified) * code/branches/presentation2011/data/levels/waypoints.oxw (modified) * code/branches/presentation2011/src/orxonox/Level.cc (modified) * code/branches/presentation2011/src/orxonox/Level.h (modified) * code/branches/presentation2011/src/orxonox/LevelInfo.cc (modified) * code/branches/presentation2011/src/orxonox/LevelInfo.h (modified) * code/branches/presentation2011/src/orxonox/worldentities/pawns/FpsPlayer.cc (modified) * code/branches/presentation2011/src/orxonox/worldentities/pawns/FpsPlayer.h (modified) Merged menue Wed, 14 Dec 2011 12:50:57 GMT smerkli [8976] * code/branches/presentation2011 (modified) * code/branches/presentation2011/data/levels/asteroidField.oxw (copied) * code/branches/presentation2011/data/levels/includes/asteroidField.lua (copied) * code/branches/presentation2011/src/libraries/util/SignalHandler.cc (modified) Merged environment3 branch. Wed, 14 Dec 2011 12:39:43 GMT baermatt [8975] * code/branches/menue/src/orxonox/worldentities/pawns/FpsPlayer.cc (modified) * code/branches/menue/src/orxonox/worldentities/pawns/FpsPlayer.h (modified) Made jumping work again in FPS mode. Wed, 14 Dec 2011 12:23:56 GMT smerkli [8974] * code/branches/presentation2011 (copied) created. Wed, 14 Dec 2011 12:19:34 GMT fmauro [8973] * data/trunk/images/textures/smoke.png (modified) improved smoke texture Wed, 14 Dec 2011 12:18:07 GMT fmauro [8972] * code/branches/environment3/data/levels/asteroidField.oxw (modified) * code/branches/environment3/data/levels/includes/asteroidField.lua (modified) Adjusted fog size Tue, 13 Dec 2011 22:20:20 GMT jo [8971] * code/branches/spaceraceTwo/data/levels/Spacerace2.oxw (modified) * code/branches/spaceraceTwo/src/modules/gametypes/SpaceRace.cc (modified) Improved engine switching. Removed annoyance in the level. Tue, 13 Dec 2011 21:50:14 GMT jo [8970] * code/branches/spaceraceTwo/src/modules/gametypes/RaceCheckPoint.cc (modified) * code/branches/spaceraceTwo/src/modules/gametypes/RaceCheckPoint.h (modified) * code/branches/spaceraceTwo/src/modules/gametypes/SpaceRace.cc (modified) * code/branches/spaceraceTwo/src/modules/gametypes/SpaceRace.h (modified) * code/branches/spaceraceTwo/src/modules/gametypes/SpaceRaceManager.cc (modified) * code/branches/spaceraceTwo/src/modules/gametypes/SpaceRaceManager.h (modified) Cleanup code. Functionallity remains unchanged. Mon, 12 Dec 2011 20:07:24 GMT mspaling [8969] * code/branches/hud/src/modules/overlays/hud/HUDNavigation.h (modified) enemyhealthbar almost working.. just that damn mouse position.. Thu, 08 Dec 2011 17:07:32 GMT eceline [8968] * code/branches/spaceraceTwo/data/levels/Spacerace2.oxw (modified) * code/branches/spaceraceTwo/src/modules/gametypes/RaceCheckPoint.cc (modified) * code/branches/spaceraceTwo/src/modules/gametypes/RaceCheckPoint.h (modified) * code/branches/spaceraceTwo/src/modules/gametypes/SpaceRace.cc (modified) * code/branches/spaceraceTwo/src/modules/gametypes/SpaceRace.h (modified) * code/branches/spaceraceTwo/src/modules/gametypes/SpaceRaceManager.cc (modified) * code/branches/spaceraceTwo/src/modules/gametypes/SpaceRaceManager.h (modified) * code/branches/spaceraceTwo/src/orxonox/controllers/WaypointPatrolController.cc (modified) * code/branches/spaceraceTwo/src/orxonox/infos/PlayerInfo.cc (modified) added waypoint patrol controller to level, RaceCheckPoint::fire works now Thu, 08 Dec 2011 16:01:18 GMT willis [8967] * code/branches/formation/src/orxonox/controllers/Masterable.cc (modified) added DEFEND behaviour, fixed some orientation issue Wed, 07 Dec 2011 17:33:40 GMT mspaling [8966] * code/branches/hud/data/overlays/HUDTemplates3.oxo (modified) * code/branches/hud/src/modules/overlays/hud/HUDHealthBar.h (modified) worked on the enemyhealthbar again Wed, 07 Dec 2011 15:00:37 GMT willis [8965] * code/branches/formation/src/orxonox/controllers/AIController.cc (modified) * code/branches/formation/src/orxonox/controllers/HumanController.cc (modified) * code/branches/formation/src/orxonox/controllers/HumanController.h (modified) * code/branches/formation/src/orxonox/controllers/Masterable.cc (modified) * code/branches/formation/src/orxonox/controllers/Masterable.h (modified) * code/branches/formation/src/orxonox/controllers/NewHumanController.cc (modified) added some Mode features, fixed a speed issue Wed, 07 Dec 2011 14:22:46 GMT baermatt [8964] * code/branches/menue/data/gui/layouts/MiscConfigMenu.layout (modified) * code/branches/menue/data/gui/scripts/MiscConfigMenu.lua (modified) * code/branches/menue/data/gui/scripts/SingleplayerConfigMenu.lua (modified) * code/branches/menue/data/gui/scripts/SingleplayerMenu.lua (modified) Cleaned up the miscellaneous menu and added possibility to cancel. Wed, 07 Dec 2011 14:08:18 GMT fmauro [8963] * code/branches/environment3/data/levels/asteroidField.oxw (modified) removed bad levelinfo tag in asteroidField.oxw Wed, 07 Dec 2011 14:03:08 GMT fmauro [8962] * data/trunk/images/textures/smoke.png (added) * data/trunk/materials/smoke.material (added) added smoke billboard material and texture Wed, 07 Dec 2011 14:02:02 GMT fmauro [8961] * code/branches/environment3/data/levels/asteroidField.oxw (modified) * code/branches/environment3/data/levels/includes/asteroidField.lua (modified) added generateFog function Wed, 07 Dec 2011 13:51:57 GMT eceline [8960] * code/branches/spaceraceTwo/src/modules/gametypes/RaceCheckPoint.cc (modified) RaceCheckPoint::fire doesn't work Wed, 07 Dec 2011 13:38:31 GMT eceline [8959] * code/branches/spaceraceTwo/data/levels/Spacerace2.oxw (modified) * code/branches/spaceraceTwo/src/modules/gametypes/RaceCheckPoint.cc (modified) * code/branches/spaceraceTwo/src/modules/gametypes/RaceCheckPoint.h (modified) * code/branches/spaceraceTwo/src/modules/gametypes/SpaceRace.cc (modified) * code/branches/spaceraceTwo/src/modules/gametypes/SpaceRace.h (modified) * code/branches/spaceraceTwo/src/modules/gametypes/SpaceRaceManager.cc (modified) * code/branches/spaceraceTwo/src/modules/gametypes/SpaceRaceManager.h (modified) RaceCheckPoint::fire doesn't work Wed, 07 Dec 2011 13:21:24 GMT baermatt [8958] * code/branches/menue/data/levels/FPSTest.oxw (modified) * code/branches/menue/data/levels/asteroids.oxw (modified) * code/branches/menue/data/levels/docking.oxw (modified) * code/branches/menue/data/levels/dynamicMatch.oxw (modified) * code/branches/menue/data/levels/earth.oxw (modified) * code/branches/menue/data/levels/emptyLevel.oxw (modified) * code/branches/menue/data/levels/events.oxw (modified) * code/branches/menue/data/levels/fightInOurBack.oxw (modified) * code/branches/menue/data/levels/lastManStanding.oxw (modified) * code/branches/menue/data/levels/lastTeamStanding.oxw (modified) * code/branches/menue/data/levels/lastTeamStandingII.oxw (modified) * code/branches/menue/data/levels/myTestLevel.oxw (modified) * code/branches/menue/data/levels/notifications.oxw (modified) * code/branches/menue/data/levels/pickups.oxw (modified) * code/branches/menue/data/levels/pirateAttack.oxw (modified) * code/branches/menue/data/levels/planets.oxw (modified) * code/branches/menue/data/levels/pong.oxw (modified) * code/branches/menue/data/levels/portals.oxw (modified) * code/branches/menue/data/levels/presentation.oxw (modified) * code/branches/menue/data/levels/presentation09.oxw (modified) * code/branches/menue/data/levels/presentation09b.oxw (modified) * code/branches/menue/data/levels/presentationDM.oxw (modified) * code/branches/menue/data/levels/presentationFS10.oxw (modified) * code/branches/menue/data/levels/presentationFS102.oxw (modified) * code/branches/menue/data/levels/presentationFS10Ed.oxw (modified) * code/branches/menue/data/levels/presentationFS11.oxw (modified) * code/branches/menue/data/levels/presentationHS09.oxw (modified) * code/branches/menue/data/levels/presentationHS09b.oxw (modified) * code/branches/menue/data/levels/princessAeryn.oxw (modified) * code/branches/menue/data/levels/quests.oxw (modified) * code/branches/menue/data/levels/screenshot.oxw (modified) * code/branches/menue/data/levels/shieldTest.oxw (modified) * code/branches/menue/data/levels/sound.oxw (modified) * code/branches/menue/data/levels/spaceRace.oxw (modified) * code/branches/menue/data/levels/teamBaseMatch.oxw (modified) * code/branches/menue/data/levels/teamDeathMatch.oxw (modified) * code/branches/menue/data/levels/testStars.oxw (modified) * code/branches/menue/data/levels/testSwallow.oxw (modified) * code/branches/menue/data/levels/tetris.oxw (modified) * code/branches/menue/data/levels/theTimeMachine.oxw (modified) * code/branches/menue/data/levels/tutorial.oxw (modified) * code/branches/menue/data/levels/underAttack.oxw (modified) * code/branches/menue/data/levels/waypoints.oxw (modified) * code/branches/menue/src/orxonox/Level.cc (modified) * code/branches/menue/src/orxonox/Level.h (modified) Removing unused Level attributes. Wed, 07 Dec 2011 12:50:40 GMT willis [8957] * code/branches/formation/src/orxonox/controllers/Masterable.cc (modified) * code/branches/formation/src/orxonox/controllers/Masterable.h (modified) fixed a bug in searchnewMaster Wed, 30 Nov 2011 16:12:00 GMT jo [8956] * code/branches/gamecontent/data/levels/lastTeamStanding.oxw (modified) * code/branches/gamecontent/src/orxonox/gametypes/Gametype.cc (modified) * code/branches/gamecontent/src/orxonox/gametypes/Gametype.h (modified) * code/branches/gamecontent/src/orxonox/gametypes/TeamGametype.cc (modified) * code/branches/gamecontent/src/orxonox/gametypes/TeamGametype.h (modified) implementing first player control parameter. Wed, 30 Nov 2011 15:57:35 GMT mspaling [8955] * code/branches/hud/data/overlays/HUDTemplates3.oxo (modified) * code/branches/hud/src/modules/overlays/hud/CMakeLists.txt (modified) * code/branches/hud/src/modules/overlays/hud/HUDNavigation.h (modified) worked on EnemyHealthBar Wed, 30 Nov 2011 15:17:00 GMT eceline [8954] * code/branches/spaceraceTwo/src/modules/gametypes/RaceCheckPoint.cc (modified) * code/branches/spaceraceTwo/src/modules/gametypes/RaceCheckPoint.h (modified) * code/branches/spaceraceTwo/src/modules/gametypes/SpaceRace.cc (modified) * code/branches/spaceraceTwo/src/modules/objects/triggers/DistanceMultiTrigger.h (modified) * code/branches/spaceraceTwo/src/modules/objects/triggers/MultiTrigger.h (modified) DistanceMultiTrigger Wed, 30 Nov 2011 15:09:25 GMT willis [8953] * code/branches/formation/data/defaultConfig/keybindings.ini (modified) * code/branches/formation/src/orxonox/controllers/AIController.cc (modified) * code/branches/formation/src/orxonox/controllers/ArtificialController.cc (modified) * code/branches/formation/src/orxonox/controllers/ArtificialController.h (modified) * code/branches/formation/src/orxonox/controllers/HumanController.cc (modified) * code/branches/formation/src/orxonox/controllers/HumanController.h (modified) * code/branches/formation/src/orxonox/controllers/Masterable.cc (modified) * code/branches/formation/src/orxonox/controllers/Masterable.h (modified) added different Modes, debugging Sat, 26 Nov 2011 17:22:13 GMT dafrick [8952] * code/trunk/src/libraries/network/MasterServer.cc (modified) * code/trunk/src/libraries/network/packet/Gamestate.cc (modified) * code/trunk/src/modules/pong/PongAI.cc (modified) * code/trunk/src/modules/questsystem/QuestManager.cc (modified) * code/trunk/src/orxonox/gametypes/TeamBaseMatch.cc (modified) Removing some unused variables and taking care of some other warnings ... Sat, 26 Nov 2011 09:06:08 GMT jo [8951] * code/branches/gamecontent/data/levels/missionOne.oxw (modified) * code/branches/gamecontent/src/orxonox/controllers/ArtificialController.h (modified) * code/branches/gamecontent/src/orxonox/gametypes/TeamGametype.cc (modified) * code/branches/gamecontent/src/orxonox/interfaces/CMakeLists.txt (modified) * code/branches/gamecontent/src/orxonox/interfaces/PartyMember.cc (deleted) * code/branches/gamecontent/src/orxonox/interfaces/PartyMember.h (deleted) * code/branches/gamecontent/src/orxonox/worldentities/ControllableEntity.cc (modified) * code/branches/gamecontent/src/orxonox/worldentities/ControllableEntity.h (modified) * code/branches/gamecontent/src/orxonox/worldentities/pawns/Pawn.cc (modified) * code/branches/gamecontent/src/orxonox/worldentities/pawns/Pawn.h (modified) Removing interface - no actual need for it, since only two classes ... Fri, 25 Nov 2011 14:09:17 GMT jo [8950] * code/branches/gamecontent/src/orxonox/interfaces/PartyMember.h (modified) Wed, 23 Nov 2011 15:16:15 GMT eceline [8949] * code/branches/spaceraceTwo/data/levels/Spacerace2.oxw (modified) * code/branches/spaceraceTwo/src/modules/gametypes/RaceCheckPoint.cc (modified) * code/branches/spaceraceTwo/src/modules/gametypes/SpaceRace.cc (modified) * code/branches/spaceraceTwo/src/modules/gametypes/SpaceRaceManager.cc (modified) * code/branches/spaceraceTwo/src/orxonox/gametypes/Gametype.cc (modified) * code/branches/spaceraceTwo/src/orxonox/infos/GametypeInfo.cc (modified) level Spacerace2 works now Wed, 23 Nov 2011 15:06:18 GMT willis [8948] * code/branches/formation/src/orxonox/controllers/HumanController.cc (modified) * code/branches/formation/src/orxonox/controllers/HumanController.h (modified) * code/branches/formation/src/orxonox/controllers/Masterable.cc (modified) debugging Wed, 23 Nov 2011 14:55:17 GMT fmauro [8947] * code/branches/environment3/data/levels/includes/asteroidField.lua (modified) Improved readability of lua code Wed, 23 Nov 2011 14:13:31 GMT fmauro [8946] * code/branches/environment3/data/levels/asteroidField.oxw (modified) * code/branches/environment3/data/levels/includes/asteroidField.lua (modified) * code/branches/environment3/src/libraries/util/SignalHandler.cc (modified) asteroidBelt function added Wed, 23 Nov 2011 13:52:32 GMT baermatt [8945] * code/branches/menue/data/gui/layouts/SingleplayerMenu.layout (modified) * code/branches/menue/data/gui/scripts/InGameMenu.lua (modified) * code/branches/menue/data/gui/scripts/SingleplayerConfigMenu.lua (modified) * code/branches/menue/data/gui/scripts/SingleplayerMenu.lua (modified) Some bugfixes for the singleplayer config menu. Wed, 23 Nov 2011 13:14:29 GMT eceline [8944] * code/branches/spaceraceTwo/data/levels/Spacerace2.oxw (added) * code/branches/spaceraceTwo/src/modules/gametypes/SpaceRace.cc (modified) * code/branches/spaceraceTwo/src/modules/gametypes/SpaceRaceManager.cc (modified) * code/branches/spaceraceTwo/src/orxonox/gametypes/Gametype.cc (modified) * code/branches/spaceraceTwo/src/orxonox/infos/GametypeInfo.cc (modified) level file added Wed, 23 Nov 2011 13:13:52 GMT willis [8943] * code/branches/formation/data/defaultConfig/keybindings.ini (modified) * code/branches/formation/src/orxonox/controllers/HumanController.cc (modified) * code/branches/formation/src/orxonox/controllers/Masterable.cc (modified) Added Keybinding for toggleFormationFlight Fri, 18 Nov 2011 17:52:21 GMT jo [8942] * code/branches/gamecontent/data/levels/fightInOurBack.oxw (modified) * code/branches/gamecontent/data/levels/missionOne.oxw (modified) * code/branches/gamecontent/data/levels/pirateAttack.oxw (modified) * code/branches/gamecontent/src/orxonox/controllers/ArtificialController.cc (modified) * code/branches/gamecontent/src/orxonox/controllers/HumanController.cc (modified) * code/branches/gamecontent/src/orxonox/gametypes/Mission.cc (modified) * code/branches/gamecontent/src/orxonox/gametypes/TeamGametype.cc (modified) * code/branches/gamecontent/src/orxonox/gametypes/TeamGametype.h (modified) * code/branches/gamecontent/src/orxonox/interfaces/CMakeLists.txt (modified) * code/branches/gamecontent/src/orxonox/interfaces/PartyMember.cc (added) * code/branches/gamecontent/src/orxonox/interfaces/PartyMember.h (modified) * code/branches/gamecontent/src/orxonox/worldentities/pawns/Pawn.cc (modified) * code/branches/gamecontent/src/orxonox/worldentities/pawns/Pawn.h (modified) Pawn&SpaceShip Colouring via XML works. Quick&Dirty implementation ... Wed, 16 Nov 2011 16:02:12 GMT jo [8941] * code/branches/gamecontent/src/modules/weapons/weaponmodes/LightningGun.cc (modified) * code/branches/gamecontent/src/orxonox/gametypes/Mission.cc (modified) * code/branches/gamecontent/src/orxonox/gametypes/Mission.h (modified) * code/branches/gamecontent/src/orxonox/gametypes/TeamGametype.cc (modified) * code/branches/gamecontent/src/orxonox/gametypes/TeamGametype.h (modified) Object colouring added - according to current team implementation. ... Wed, 16 Nov 2011 15:20:26 GMT eceline [8940] * code/branches/spaceraceTwo/src/modules/gametypes/RaceCheckPoint.cc (modified) * code/branches/spaceraceTwo/src/modules/gametypes/RaceCheckPoint.h (modified) * code/branches/spaceraceTwo/src/modules/gametypes/SpaceRace.cc (modified) * code/branches/spaceraceTwo/src/modules/gametypes/SpaceRace.h (modified) * code/branches/spaceraceTwo/src/modules/gametypes/SpaceRaceManager.cc (modified) * code/branches/spaceraceTwo/src/modules/gametypes/SpaceRaceManager.h (modified) level Spacerace2 Wed, 16 Nov 2011 15:08:23 GMT willis [8939] * code/branches/formation/src/orxonox/controllers/ArtificialController.cc (modified) * code/branches/formation/src/orxonox/controllers/ArtificialController.h (modified) * code/branches/formation/src/orxonox/controllers/CMakeLists.txt (modified) * code/branches/formation/src/orxonox/controllers/HumanController.cc (modified) * code/branches/formation/src/orxonox/controllers/HumanController.h (modified) * code/branches/formation/src/orxonox/controllers/Masterable.cc (added) * code/branches/formation/src/orxonox/controllers/Masterable.h (added) moved formationflight to Masterable.* from Artificialcontroller, ... Wed, 16 Nov 2011 14:46:36 GMT baermatt [8938] * code/branches/menue/data/gui/layouts/SingleplayerConfigMenu.layout (modified) * code/branches/menue/data/gui/scripts/SingleplayerConfigMenu.lua (modified) * code/branches/menue/data/gui/scripts/SingleplayerMenu.lua (modified) Added some basic but yet static level configuration support. Wed, 16 Nov 2011 13:55:40 GMT smerkli [8937] * code/trunk (modified) * code/trunk/src/libraries/network/MasterServer.cc (modified) * code/trunk/src/libraries/network/MasterServer.h (modified) * code/trunk/src/libraries/network/ServerList.cc (modified) * code/trunk/src/libraries/network/ServerList.h (modified) merged masterserverfix corretly now. Wed, 16 Nov 2011 13:53:23 GMT smerkli [8936] * code/trunk (modified) merged masterserverfix Wed, 16 Nov 2011 13:32:57 GMT smerkli [8935] * code/branches/masterserverfix/src/libraries/network/MasterServer.cc (modified) * code/branches/masterserverfix/src/libraries/network/MasterServer.h (modified) * code/branches/masterserverfix/src/libraries/network/ServerList.cc (modified) * code/branches/masterserverfix/src/libraries/network/ServerList.h (modified) merged changes from masterserver2 branch into newer trunk here. Wed, 16 Nov 2011 13:07:17 GMT eceline [8934] * code/branches/spaceraceTwo/src/modules/gametypes/RaceCheckPoint.cc (modified) * code/branches/spaceraceTwo/src/modules/gametypes/RaceCheckPoint.h (modified) * code/branches/spaceraceTwo/src/modules/gametypes/SpaceRace.cc (modified) * code/branches/spaceraceTwo/src/modules/gametypes/SpaceRace.h (modified) * code/branches/spaceraceTwo/src/modules/gametypes/SpaceRaceManager.cc (modified) spaceracemanager Wed, 16 Nov 2011 13:02:06 GMT smerkli [8933] * code/branches/masterserverfix (copied) Sun, 13 Nov 2011 22:21:17 GMT jo [8932] * code/branches/gamecontent/data/levels/missionOne.oxw (modified) Finetuning the triggers such that the HydrogenFarmer is practically ... Thu, 10 Nov 2011 21:52:50 GMT jo [8931] * code/branches/menue/data/gui/scripts/SingleplayerMenu.lua (modified) * code/branches/menue/data/levels/asteroids.oxw (modified) * code/branches/menue/data/levels/dynamicMatch.oxw (modified) * code/branches/menue/data/levels/lastManStanding.oxw (modified) * code/branches/menue/data/levels/lastTeamStanding.oxw (modified) * code/branches/menue/data/levels/lastTeamStandingII.oxw (modified) * code/branches/menue/data/levels/pong.oxw (modified) * code/branches/menue/data/levels/spaceRace.oxw (modified) * code/branches/menue/data/levels/teamBaseMatch.oxw (modified) * code/branches/menue/data/levels/teamDeathMatch.oxw (modified) * code/branches/menue/data/levels/tetris.oxw (modified) * code/branches/menue/data/levels/theTimeMachine.oxw (modified) * code/branches/menue/data/levels/underAttack.oxw (modified) * code/branches/menue/src/orxonox/LevelInfo.cc (modified) Adding new tags: 'gametype' and 'minigame'. Wed, 09 Nov 2011 15:16:24 GMT jo [8930] * code/branches/gamecontent/src/orxonox/gametypes/Gametype.cc (modified) * code/branches/gamecontent/src/orxonox/gametypes/Gametype.h (modified) * code/branches/gamecontent/src/orxonox/gametypes/TeamGametype.cc (modified) * code/branches/gamecontent/src/orxonox/gametypes/TeamGametype.h (modified) * code/branches/gamecontent/src/orxonox/infos/GametypeInfo.h (modified) Adding some variables. Wed, 09 Nov 2011 15:12:35 GMT mspaling [8929] * code/branches/hud/data/gui/scripts/MiscConfigMenu.lua (modified) * code/branches/hud/data/levels/underAttack.oxw (modified) * code/branches/hud/src/modules/overlays/hud/HUDNavigation.cc (modified) * code/branches/hud/src/orxonox/worldentities/pawns/Pawn.cc (modified) added xmlport for rvnames and misc menu options Wed, 09 Nov 2011 15:11:12 GMT eceline [8928] * code/branches/spaceraceTwo/src/modules/gametypes/RaceCheckPoint.cc (modified) * code/branches/spaceraceTwo/src/modules/gametypes/RaceCheckPoint.h (modified) * code/branches/spaceraceTwo/src/modules/gametypes/SpaceRace.cc (modified) * code/branches/spaceraceTwo/src/modules/gametypes/SpaceRace.h (modified) * code/branches/spaceraceTwo/src/modules/gametypes/SpaceRaceManager.cc (modified) * code/branches/spaceraceTwo/src/modules/gametypes/SpaceRaceManager.h (modified) some changes for multiplayer-version Wed, 09 Nov 2011 13:42:04 GMT baermatt [8927] * code/branches/menue/data/gui/layouts/SingleplayerConfigMenu.layout (added) * code/branches/menue/data/gui/layouts/SingleplayerMenu.layout (modified) * code/branches/menue/data/gui/scripts/SingleplayerConfigMenu.lua (added) * code/branches/menue/data/gui/scripts/SingleplayerMenu.lua (modified) * code/branches/menue/data/levels/asteroids.oxw (modified) * code/branches/menue/data/levels/docking.oxw (modified) * code/branches/menue/data/levels/dynamicMatch.oxw (modified) * code/branches/menue/data/levels/fightInOurBack.oxw (modified) * code/branches/menue/data/levels/lastManStanding.oxw (modified) * code/branches/menue/data/levels/lastTeamStanding.oxw (modified) * code/branches/menue/data/levels/lastTeamStandingII.oxw (modified) * code/branches/menue/data/levels/pong.oxw (modified) * code/branches/menue/data/levels/portals.oxw (modified) * code/branches/menue/data/levels/presentationFS11.oxw (modified) * code/branches/menue/data/levels/princessAeryn.oxw (modified) * code/branches/menue/data/levels/screenshot.oxw (modified) * code/branches/menue/data/levels/sound.oxw (modified) * code/branches/menue/data/levels/teamBaseMatch.oxw (modified) * code/branches/menue/data/levels/teamDeathMatch.oxw (modified) * code/branches/menue/data/levels/tetris.oxw (modified) * code/branches/menue/data/levels/theTimeMachine.oxw (modified) * code/branches/menue/data/levels/underAttack.oxw (modified) * code/branches/menue/src/orxonox/LevelInfo.cc (modified) Changed some level tags. Tue, 08 Nov 2011 21:56:43 GMT jo [8926] * code/branches/ai (deleted) Tue, 08 Nov 2011 21:51:04 GMT jo [8925] * code/branches/ai2 (deleted) Tue, 08 Nov 2011 19:24:06 GMT jo [8924] * code/branches/gamecontent/data/levels/includes/weaponSettingsSpacecruiser.oxi (modified) * code/branches/gamecontent/data/levels/templates/spaceshipSpacecruiser.oxt (modified) * code/branches/gamecontent/src/libraries/core/GUIManager.cc (modified) Fixed the SpaceCruiser - no offset between the model's location and ... Fri, 04 Nov 2011 09:44:56 GMT jo [8923] * code/branches/gamecontent/data/levels/missionOne.oxw (modified) * code/branches/gamecontent/src/modules/weapons/projectiles/Rocket.cc (modified) * code/branches/gamecontent/src/orxonox/controllers/AIController.cc (modified) * code/branches/gamecontent/src/orxonox/controllers/AIController.h (modified) * code/branches/gamecontent/src/orxonox/controllers/ArtificialController.cc (modified) * code/branches/gamecontent/src/orxonox/gametypes/Mission.cc (modified) * code/branches/gamecontent/src/orxonox/gametypes/Mission.h (modified) * code/branches/gamecontent/src/orxonox/gametypes/TeamGametype.cc (modified) * code/branches/gamecontent/src/orxonox/gametypes/TeamGametype.h (modified) * code/branches/gamecontent/src/orxonox/worldentities/ControllableEntity.cc (modified) * code/branches/gamecontent/src/orxonox/worldentities/ControllableEntity.h (modified) Tutorial level enhancements (quest work, better texts are still ... Wed, 02 Nov 2011 15:33:24 GMT jo [8922] * code/branches/gamecontent/data/levels/dynamicMatch.oxw (modified) * code/branches/gamecontent/data/levels/lastManStanding.oxw (modified) * code/branches/gamecontent/data/levels/lastTeamStandingII.oxw (modified) * code/branches/gamecontent/data/levels/missionOne.oxw (modified) * code/branches/gamecontent/data/levels/templates/spaceshipSpacecruiser.oxt (modified) fix quest structure (almost finished). Wed, 02 Nov 2011 15:14:02 GMT eceline [8921] * code/branches/spaceraceTwo/src/modules/gametypes/RaceCheckPoint.cc (modified) vectors to store the next checkpoints Wed, 02 Nov 2011 15:11:58 GMT mspaling [8920] * code/branches/hud/src/modules/overlays/hud/HUDNavigation.cc (modified) * code/branches/hud/src/modules/overlays/hud/HUDNavigation.h (modified) Arrow in HUD now changes its size according to distance