# # ChangeLog for code/branches # # Generated by Trac 1.0.9 # Nov 13, 2024, 2:30:28 AM 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 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: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 Wed, 02 Nov 2011 14:43:42 GMT fmauro [8919] * 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) Corrected error in comments Wed, 02 Nov 2011 14:36:21 GMT eceline [8918] * code/branches/spaceraceTwo/src/orxonox/gametypes/Gametype.cc (modified) flackert nicht mehr, einige Zeilen auskommentiert Wed, 02 Nov 2011 14:35:23 GMT fmauro [8917] * code/branches/environment3/data/levels/asteroidField.oxw (modified) * code/branches/environment3/data/levels/includes/asteroidField.lua (modified) Added newtonian gravity to asteriods and comments Wed, 02 Nov 2011 14:16:25 GMT baermatt [8916] * 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) Associated each screenshot to the correct level Wed, 02 Nov 2011 13:51:40 GMT eceline [8915] * 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/SpaceRaceManager.cc (modified) * code/branches/spaceraceTwo/src/modules/gametypes/SpaceRaceManager.h (modified) Vektoren Wed, 02 Nov 2011 13:29:50 GMT baermatt [8914] * code/branches/menue/data/gui/scripts/SingleplayerMenu.lua (modified) Bugfix for "noscreenshot.png" Wed, 02 Nov 2011 12:31:12 GMT baermatt [8912] * code/branches/menue/data/gui/layouts/CreditsMenu.layout (modified) * code/branches/menue/data/gui/layouts/SingleplayerMenu.layout (modified) * code/branches/menue/data/gui/scripts/CreditsMenu.lua (modified) * code/branches/menue/data/gui/scripts/SingleplayerMenu.lua (modified) * code/branches/menue/src/orxonox/LevelInfo.cc (modified) * code/branches/menue/src/orxonox/LevelInfo.h (modified) Added screenshots and description-box in singleplayer menu Wed, 02 Nov 2011 12:23:26 GMT eceline [8911] * code/branches/spaceraceTwo/src/modules/gametypes/CMakeLists.txt (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 (added) * code/branches/spaceraceTwo/src/modules/gametypes/SpaceRaceManager.h (added) countdown Tue, 01 Nov 2011 18:25:24 GMT jo [8910] * code/branches/gamecontent/data/levels/missionOne.oxw (modified) Fri, 28 Oct 2011 16:09:10 GMT jo [8909] * code/branches/gamecontent/data/levels/missionOne.oxw (modified) * code/branches/gamecontent/src/orxonox/controllers/ArtificialController.cc (modified) On the way to add quests. Combined distance trigger does not act as ... Wed, 26 Oct 2011 18:34:40 GMT willis [8908] * code/branches/formation/src/orxonox/controllers/ArtificialController.cc (modified) * code/branches/formation/src/orxonox/controllers/ArtificialController.h (modified) formationflight: different form of formation + correct orientation added Wed, 26 Oct 2011 14:22:52 GMT jo [8907] * code/branches/gamecontent/src/orxonox/interfaces/PartyMember.h (added) Started to create an interface to make objects belong to a group. Wed, 26 Oct 2011 14:10:30 GMT mspaling [8906] * code/branches/hud/src/modules/overlays/hud/HUDNavigation.cc (modified) * code/branches/hud/src/orxonox/infos/PlayerInfo.cc (modified) * code/branches/hud/src/orxonox/interfaces/RadarViewable.h (modified) names added in hud Tue, 25 Oct 2011 20:56:31 GMT jo [8904] * code/branches/gamecontent/data/levels/includes/weaponSettingsSpacecruiser.oxi (modified) * code/branches/gamecontent/data/levels/missionOne.oxw (modified) * code/branches/gamecontent/data/levels/templates/spaceshipSpacecruiser.oxt (modified) * code/branches/gamecontent/src/modules/pong/Pong.cc (modified) * code/branches/gamecontent/src/orxonox/controllers/WaypointPatrolController.cc (modified) * code/branches/gamecontent/src/orxonox/controllers/WaypointPatrolController.h (modified) * code/branches/gamecontent/src/orxonox/gametypes/CMakeLists.txt (modified) * code/branches/gamecontent/src/orxonox/gametypes/Gametype.h (modified) * code/branches/gamecontent/src/orxonox/gametypes/Mission.cc (added) * code/branches/gamecontent/src/orxonox/gametypes/Mission.h (added) * code/branches/gamecontent/src/orxonox/gametypes/TeamDeathmatch.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/pawns/Pawn.cc (modified) On the way to a multiplayer gametype basceclass. Fri, 21 Oct 2011 13:28:08 GMT jo [8901] * code/branches/gamecontent/src/orxonox/gametypes/TeamGametype.cc (added) * code/branches/gamecontent/src/orxonox/gametypes/TeamGametype.h (added) Prototype of a baseclass for team gametypes. Work in progress. Wed, 19 Oct 2011 21:02:56 GMT jo [8900] * code/branches/gamecontent/src/modules/pong/Pong.cc (modified) * code/branches/gamecontent/src/modules/pong/Pong.h (modified) * code/branches/gamecontent/src/modules/pong/PongScore.cc (modified) * code/branches/gamecontent/src/modules/pong/PongScore.h (modified) Finished Polishing Pong. (gametype ends properly now, points ... Wed, 19 Oct 2011 14:23:22 GMT jo [8899] * code/branches/gamecontent/src/orxonox/gametypes/CMakeLists.txt (modified) Trying to add teamgametype as baseclass. Wed, 19 Oct 2011 14:21:48 GMT eceline [8898] * code/branches/spaceraceTwo/src/modules/gametypes/SpaceRace.cc (modified) * code/branches/spaceraceTwo/src/modules/gametypes/SpaceRace.h (modified) * code/branches/spaceraceTwo/src/orxonox/gametypes/Gametype.cc (modified) * code/branches/spaceraceTwo/src/orxonox/gametypes/Gametype.h (modified) * code/branches/spaceraceTwo/src/orxonox/infos/GametypeInfo.cc (modified) Space Race mit countdown Wed, 19 Oct 2011 14:18:16 GMT mspaling [8897] * code/branches/hud/src/modules/overlays/hud/HUDNavigation.cc (modified) Names for RadarViewablese added for later use in HUD Wed, 19 Oct 2011 14:16:25 GMT mspaling [8896] * code/branches/hud/src/modules/overlays/hud/HUDNavigation.cc (modified) * code/branches/hud/src/orxonox/infos/PlayerInfo.cc (modified) * code/branches/hud/src/orxonox/interfaces/RadarViewable.cc (modified) * code/branches/hud/src/orxonox/interfaces/RadarViewable.h (modified) Names for RadarViewablese added for later use in HUD Thu, 13 Oct 2011 18:59:27 GMT jo [8895] * code/branches/gamecontent/src/modules/pong/Pong.cc (modified) * code/branches/gamecontent/src/modules/pong/Pong.h (modified) * code/branches/gamecontent/src/modules/pong/PongAI.h (modified) Added end to pong gametype. Unfortunately the hud isn't consistent at ... Wed, 12 Oct 2011 19:48:04 GMT baermatt [8894] * code/branches/menue/data/gui/layouts/SingleplayerMenu.layout (modified) * code/branches/menue/data/gui/scripts/SingleplayerMenu.lua (modified) Added tabs in Singleplayer level selection menu. Wed, 12 Oct 2011 18:57:07 GMT jo [8893] * code/branches/gamecontent (copied) Wed, 12 Oct 2011 14:04:35 GMT baermatt [8890] * code/branches/menue/data/gui/layouts/SingleplayerMenu.layout (modified) * code/branches/menue/data/gui/scripts/SingleplayerMenu.lua (modified) First steps with lua, CEGUI and the Singleplayer menu. Wed, 12 Oct 2011 14:01:30 GMT fmauro [8889] * code/branches/environment3/data/levels/asteroidField.oxw (added) * code/branches/environment3/data/levels/includes/asteroidField.lua (added) First implementation of asteroid field generator Wed, 12 Oct 2011 11:57:16 GMT jo [8887] * code/branches/environment3 (copied) Wed, 12 Oct 2011 11:49:32 GMT jo [8886] * code/branches/enviroment (copied) Wed, 12 Oct 2011 11:48:46 GMT jo [8885] * code/branches/formation (copied) Wed, 12 Oct 2011 11:47:36 GMT jo [8884] * code/branches/menue (copied) Wed, 12 Oct 2011 11:47:15 GMT jo [8883] * code/branches/hud (copied) Wed, 12 Oct 2011 11:36:41 GMT smerkli [8882] * code/branches/tutorial/CMakeLists.txt (modified) just testing Wed, 12 Oct 2011 11:33:18 GMT jo [8881] * code/branches/spaceraceTwo (copied) Mon, 10 Oct 2011 19:03:50 GMT jo [8880] * code/branches/ai2/data/levels/missionOne.oxw (modified) Some level improvements. e.g. flying tutorial Sun, 02 Oct 2011 08:05:11 GMT jo [8878] * code/branches/ai2/data/levels/missionOne.oxw (modified) * code/branches/ai2/src/orxonox/interfaces/RadarViewable.h (modified) Trying to add quests. Wed, 28 Sep 2011 12:45:58 GMT jo [8877] * code/branches/tutorial/cmake/LibraryConfigTardis.cmake (modified) Tardis fix for 64 bit. Throws another error. Sun, 04 Sep 2011 20:27:17 GMT jo [8875] * code/branches/ai2/data/levels/missionOne.oxw (modified) * code/branches/ai2/src/modules/overlays/hud/HUDNavigation.cc (modified) * code/branches/ai2/src/modules/overlays/hud/HUDRadar.cc (modified) * code/branches/ai2/src/orxonox/LevelManager.cc (modified) * code/branches/ai2/src/orxonox/interfaces/RadarViewable.h (modified) * code/branches/ai2/src/orxonox/worldentities/pawns/Pawn.cc (modified) * code/branches/ai2/src/orxonox/worldentities/pawns/Pawn.h (modified) Radar fix: pawns were not displayed when their visibility/activity ... Sun, 04 Sep 2011 13:15:41 GMT jo [8874] * code/branches/ai2/data/levels/missionOne.oxw (modified) * code/branches/ai2/src/modules/overlays/hud/HUDNavigation.cc (modified) * code/branches/ai2/src/modules/overlays/hud/HUDNavigation.h (modified) * code/branches/ai2/src/modules/overlays/hud/HUDRadar.cc (modified) * code/branches/ai2/src/modules/overlays/hud/HUDRadar.h (modified) Radar & Navigation tweaks: Radar is now hiding 'radar invisible' ... Thu, 01 Sep 2011 10:11:47 GMT jo [8873] * code/branches/ai2/data/levels/missionOne.oxw (modified) Some level polishing. E.g. better message display. Thu, 01 Sep 2011 09:45:55 GMT jo [8872] * code/branches/ai2/data/levels/missionOne.oxw (modified) Some level polishing. E.g. better message display. Mon, 29 Aug 2011 14:30:28 GMT jo [8871] * code/branches/ai2/data/levels/missionOne.oxw (modified) Tutorial in first 'playable' version. There are some serious bugs ... Thu, 25 Aug 2011 15:13:18 GMT jo [8869] * code/branches/ai2/data/levels/includes/weaponSettingsTransporter.oxi (modified) * code/branches/ai2/data/levels/missionOne.oxw (modified) * code/branches/ai2/src/orxonox/worldentities/ControllableEntity.h (modified) Further work on tutorial. More about it in the forums. Mon, 22 Aug 2011 13:05:58 GMT dafrick [8856] * code/branches/gameimmersion (deleted) Removing obsolete branch. Sun, 21 Aug 2011 21:56:59 GMT landauf [8854] * code/branches/output/data/levels/presentationDM.oxw (modified) * code/branches/output/src/libraries/core/Language.cc (modified) * code/branches/output/src/libraries/core/input/InputManager.cc (modified) change some output's level to verbose: 1. in Language.cc because it ... Sun, 21 Aug 2011 21:18:20 GMT landauf [8853] * code/branches/output/src/libraries/util/CMakeLists.txt (modified) * code/branches/output/src/libraries/util/Output.h (modified) * code/branches/output/src/libraries/util/output/BaseWriter.cc (modified) * code/branches/output/src/libraries/util/output/BaseWriter.h (modified) * code/branches/output/src/libraries/util/output/CMakeLists.txt (added) * code/branches/output/src/libraries/util/output/OutputDefinitions.h (modified) * code/branches/output/src/libraries/util/output/SubcontextOutputListener.cc (modified) * code/branches/output/src/libraries/util/output/SubcontextOutputListener.h (modified) documented the remaining code of the output system created a build ... Sun, 21 Aug 2011 21:10:54 GMT jo [8852] * code/branches/ai2/src/orxonox/worldentities/ControllableEntity.cc (modified) * code/branches/ai2/src/orxonox/worldentities/ControllableEntity.h (modified) * code/branches/ai2/src/orxonox/worldentities/pawns/Pawn.h (modified) Buxfix. Sun, 21 Aug 2011 16:52:33 GMT jo [8851] * code/branches/ai2/data/levels/includes/weaponSettingsSpacecruiser.oxi (added) * code/branches/ai2/data/levels/missionOne.oxw (modified) * code/branches/ai2/data/levels/presentationFS11.oxw (modified) * code/branches/ai2/data/levels/templates/spaceshipSpacecruiser.oxt (added) * code/branches/ai2/src/orxonox/controllers/ArtificialController.cc (modified) Added docking part & powerful spaceship to the level. Some ... Sun, 21 Aug 2011 16:27:30 GMT landauf [8850] * code/branches/output/src/libraries/util/CMakeLists.txt (modified) * code/branches/output/src/libraries/util/output/BaseWriter.cc (modified) * code/branches/output/src/libraries/util/output/BaseWriter.h (modified) * code/branches/output/src/libraries/util/output/OutputListener.cc (modified) * code/branches/output/src/libraries/util/output/OutputListener.h (modified) * code/branches/output/src/libraries/util/output/SubcontextOutputListener.cc (added) * code/branches/output/src/libraries/util/output/SubcontextOutputListener.h (added) moved filtering of sub-contexts from BaseWriter to a new interface ... Sun, 21 Aug 2011 14:50:36 GMT landauf [8849] * code/branches/output/src/libraries/core/CoreIncludes.h (modified) * code/branches/output/src/libraries/core/command/CommandExecutor.cc (modified) * code/branches/output/src/libraries/util/output/OutputStream.cc (modified) * code/branches/output/src/libraries/util/output/OutputStream.h (modified) function argument was ignored in CommandExecutor::execute() added ... Sun, 21 Aug 2011 14:04:54 GMT landauf [8848] * code/branches/output/src/libraries/util/Output.h (modified) * code/branches/output/src/libraries/util/output/ConsoleWriter.cc (modified) * code/branches/output/src/libraries/util/output/ConsoleWriter.h (modified) * code/branches/output/src/libraries/util/output/LogWriter.cc (modified) * code/branches/output/src/libraries/util/output/LogWriter.h (modified) * code/branches/output/src/libraries/util/output/MemoryWriter.cc (modified) * code/branches/output/src/libraries/util/output/MemoryWriter.h (modified) * code/branches/output/src/libraries/util/output/OutputDefinitions.h (modified) * code/branches/output/src/libraries/util/output/OutputListener.cc (modified) * code/branches/output/src/libraries/util/output/OutputListener.h (modified) * code/branches/output/src/libraries/util/output/OutputManager.cc (modified) * code/branches/output/src/libraries/util/output/OutputManager.h (modified) * code/branches/output/src/libraries/util/output/OutputStream.cc (modified) * code/branches/output/src/libraries/util/output/OutputStream.h (modified) added documentation and some comments Thu, 18 Aug 2011 20:48:28 GMT jo [8847] * code/branches/ai2/data/levels/fightInOurBack.oxw (modified) * code/branches/ai2/data/levels/missionOne.oxw (modified) * code/branches/ai2/data/levels/presentationFS11.oxw (modified) * code/branches/ai2/src/orxonox/controllers/DroneController.cc (modified) Some level extensions. Sun, 14 Aug 2011 22:03:50 GMT rgrieder [8846] * code/branches/output/CMakeLists.txt (modified) The CMake version check should be placed AFTER the PROJECT command to ... Sun, 14 Aug 2011 20:58:07 GMT jo [8845] * code/branches/ai2/src/orxonox/controllers/ArtificialController.cc (modified) * code/branches/ai2/src/orxonox/controllers/ArtificialController.h (modified) * code/branches/ai2/src/orxonox/controllers/DroneController.cc (modified) * code/branches/ai2/src/orxonox/controllers/DroneController.h (modified) QUICK&DIRTY: drone uses portals. Sun, 14 Aug 2011 20:47:05 GMT rgrieder [8844] * code/branches/output/src/libraries/core/LuaState.h (modified) * code/branches/output/src/libraries/network/NetworkChatListener.h (modified) * code/branches/output/src/libraries/network/PeerList.cc (modified) * code/branches/output/src/orxonox/chat/ChatListener.h (modified) Added missing includes (only show up when PCH and build units are ... Sun, 14 Aug 2011 16:45:57 GMT dafrick [8843] * code/branches/ai2/data/gui/scripts/QuestGUI.lua (modified) * code/branches/ai2/src/modules/questsystem/QuestManager.cc (modified) * code/branches/ai2/src/modules/questsystem/QuestManager.h (modified) Fixing bug. Sun, 14 Aug 2011 11:45:06 GMT dafrick [8842] * code/branches/ai2/data/gui/scripts/QuestGUI.lua (modified) * code/branches/ai2/src/modules/questsystem/QuestItem.h (modified) * code/branches/ai2/src/modules/questsystem/QuestManager.cc (modified) * code/branches/ai2/src/modules/questsystem/QuestManager.h (modified) Renam to find bug. Sun, 14 Aug 2011 08:10:26 GMT dafrick [8841] * code/branches/ai2/src/modules/questsystem/QuestManager.cc (modified) Adding some asserts. Sat, 13 Aug 2011 21:58:07 GMT landauf [8840] * code/branches/output/data/gui/scripts/GameplayMenu.lua (modified) * code/branches/output/data/gui/scripts/MultiplayerMenu.lua (modified) * code/branches/output/data/gui/scripts/NotificationLayer.lua (modified) * code/branches/output/data/gui/scripts/QuestGUI.lua (modified) * code/branches/output/data/lua/LuaStateInit.lua (modified) * code/branches/output/src/libraries/core/CMakeLists.txt (modified) * code/branches/output/src/libraries/core/LuaState.cc (modified) * code/branches/output/src/libraries/core/LuaState.h (modified) * code/branches/output/src/libraries/core/command/Shell.cc (modified) * code/branches/output/src/libraries/util/output/OutputDefinitions.h (modified) Exported orxout() and the output levels to lua, replaces logMessage() ... Sat, 13 Aug 2011 21:27:42 GMT jo [8839] * code/branches/ai2/src/modules/questsystem/QuestManager.cc (modified) sorry, I forgot to remove a wrong buxfix entirely. Sat, 13 Aug 2011 21:21:03 GMT jo [8838] * code/branches/ai2/data/gui/scripts/QuestGUI.lua (modified) * code/branches/ai2/data/levels/missionOne.oxw (modified) * code/branches/ai2/data/levels/planets.oxw (modified) * code/branches/ai2/src/modules/questsystem/QuestManager.cc (modified) Minor level changes. Questmenu pauses game now. Sat, 13 Aug 2011 19:41:38 GMT landauf [8837] * code/branches/output/data/tcl/init.tcl (modified) * code/branches/output/src/libraries/core/command/ConsoleCommandCompilation.cc (modified) * code/branches/output/src/libraries/core/command/ConsoleCommandCompilation.h (modified) * code/branches/output/src/libraries/core/command/Shell.cc (modified) added console command "orxout" (and also "orxout_context") re-added ... Sat, 13 Aug 2011 17:30:04 GMT landauf [8836] * code/branches/output/src/libraries/core/command/CommandEvaluation.cc (modified) * code/branches/output/src/libraries/core/command/CommandExecutor.cc (modified) * code/branches/output/src/libraries/core/command/CommandExecutor.h (modified) * code/branches/output/src/libraries/core/command/Shell.cc (modified) * code/branches/output/src/libraries/core/command/TclBind.cc (modified) * code/branches/output/src/libraries/core/command/TclThreadManager.cc (modified) improved error output of CommandExecutor and Tcl Thu, 11 Aug 2011 22:48:23 GMT landauf [8835] * code/branches/output/src/libraries/core/ClassFactory.h (modified) * code/branches/output/src/libraries/core/command/Executor.cc (modified) * code/branches/output/src/libraries/util/output/OutputDefinitions.h (modified) * code/branches/output/src/modules/objects/Script.cc (modified) * code/branches/output/src/modules/overlays/GUIOverlay.cc (modified) * code/branches/output/src/orxonox/overlays/OrxonoxOverlay.cc (modified) cleaned up contexts, added some sub-contexts and made some output verbose Thu, 11 Aug 2011 22:26:40 GMT landauf [8834] * code/branches/output/src/libraries/core/command/Shell.cc (modified) * code/branches/output/src/libraries/util/output/BaseWriter.cc (modified) * code/branches/output/src/libraries/util/output/BaseWriter.h (modified) * code/branches/output/src/libraries/util/output/OutputListener.cc (modified) * code/branches/output/src/libraries/util/output/OutputListener.h (modified) added flag to disable automatic registration of output listeners. ... Thu, 11 Aug 2011 21:20:39 GMT landauf [8833] * code/branches/output/src/libraries/core/Core.cc (modified) * code/branches/output/src/libraries/core/command/Shell.cc (modified) * code/branches/output/src/libraries/util/Output.h (modified) * code/branches/output/src/libraries/util/output/BaseWriter.cc (modified) * code/branches/output/src/libraries/util/output/BaseWriter.h (modified) * code/branches/output/src/libraries/util/output/LogWriter.cc (modified) * code/branches/output/src/libraries/util/output/MemoryWriter.cc (modified) * code/branches/output/src/libraries/util/output/MemoryWriter.h (modified) * code/branches/output/src/libraries/util/output/OutputDefinitions.h (modified) * code/branches/output/src/libraries/util/output/OutputListener.cc (modified) * code/branches/output/src/libraries/util/output/OutputListener.h (modified) * code/branches/output/src/libraries/util/output/OutputManager.cc (modified) * code/branches/output/src/libraries/util/output/OutputManager.h (modified) * code/branches/output/src/libraries/util/output/OutputStream.cc (modified) * code/branches/output/src/libraries/util/output/OutputStream.h (modified) A context is now defined by a struct instead of only a mask. ... Mon, 08 Aug 2011 22:37:21 GMT landauf [8832] * code/branches/output/data/gui/scripts/MultiplayerMenu.lua (modified) * code/branches/output/src/libraries/network/MasterServerComm.cc (modified) * code/branches/output/src/libraries/network/MasterServerComm.h (modified) * code/branches/output/src/libraries/network/NetworkPrereqs.h (modified) * code/branches/output/src/libraries/network/Server.cc (modified) * code/branches/output/src/libraries/network/Server.h (modified) * code/branches/output/src/libraries/network/WANDiscovery.cc (modified) * code/branches/output/src/libraries/network/WANDiscovery.h (modified) Quick and dirty fix to un-singletonize WANDiscovery. It is now ...