#
# ChangeLog for code/branches/presentation2011
#
# Generated by Trac 1.0.9
# May 18, 2024, 6:58:57 PM

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: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:23:56 GMT smerkli [8974]
	* code/branches/presentation2011 (copied)

	created.


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 ...