#
# ChangeLog for /
#
# Generated by Trac 1.0.9
# Nov 18, 2024, 4:17:42 PM

Wed, 03 Jun 2009 17:45:10 GMT rgrieder [3115]
	* code/branches/pch/cmake/FlagUtilities.cmake (modified)
	* code/branches/pch/cmake/SeparateFlags.cmake (added)
	* code/branches/pch/cmake/SetCacheAdvanced.cmake (added)

	Split the flag parser and the advanced cache writer from ...


Wed, 03 Jun 2009 17:20:36 GMT rgrieder [3114]
	* code/branches/pch (copied)

	Creating branch for experimental precompiled header file support.


Wed, 03 Jun 2009 16:36:48 GMT scheusso [3113]
	* code/branches/netp4 (copied)

	create new netp4 (network & performance) branch


Wed, 03 Jun 2009 16:36:00 GMT scheusso [3112]
	* code/branches/netp (deleted)
	* code/branches/netp2 (deleted)
	* code/branches/netp3 (deleted)

	delete old netp branches


Tue, 02 Jun 2009 18:31:14 GMT rgrieder [3111]
	* code/trunk/cmake/BuildConfigGCC.cmake (modified)

	REMOVE_COMPILER_FLAGS makes no sense here. This fixes some gcc ...


Tue, 02 Jun 2009 17:38:48 GMT rgrieder [3110]
	* code/trunk/src/orxonox/CMakeLists.txt (modified)
	* code/trunk/src/orxonox/CameraManager.cc (modified)
	* code/trunk/src/orxonox/GraphicsManager.cc (modified)
	* code/trunk/src/orxonox/LevelManager.cc (modified)
	* code/trunk/src/orxonox/Main.cc (modified)
	* code/trunk/src/orxonox/PawnManager.cc (modified)
	* code/trunk/src/orxonox/PlayerManager.cc (modified)
	* code/trunk/src/orxonox/gamestates/GSClient.cc (modified)
	* code/trunk/src/orxonox/gamestates/GSDedicated.cc (modified)
	* code/trunk/src/orxonox/gamestates/GSGraphics.cc (modified)
	* code/trunk/src/orxonox/gamestates/GSIOConsole.cc (modified)
	* code/trunk/src/orxonox/gamestates/GSLevel.cc (modified)
	* code/trunk/src/orxonox/gamestates/GSMainMenu.cc (modified)
	* code/trunk/src/orxonox/gamestates/GSRoot.cc (modified)
	* code/trunk/src/orxonox/gamestates/GSServer.cc (modified)
	* code/trunk/src/orxonox/gamestates/GSStandalone.cc (modified)
	* code/trunk/src/orxonox/gui/GUIManager.cc (modified)
	* code/trunk/src/orxonox/objects/EventDispatcher.cc (modified)
	* code/trunk/src/orxonox/objects/EventListener.cc (modified)
	* code/trunk/src/orxonox/objects/EventTarget.cc (modified)
	* code/trunk/src/orxonox/objects/GlobalShader.cc (modified)
	* code/trunk/src/orxonox/objects/Level.cc (modified)
	* code/trunk/src/orxonox/objects/Radar.cc (modified)
	* code/trunk/src/orxonox/objects/RadarListener.cc (modified)
	* code/trunk/src/orxonox/objects/RadarViewable.cc (modified)
	* code/trunk/src/orxonox/objects/Scene.cc (modified)
	* code/trunk/src/orxonox/objects/Script.cc (modified)
	* code/trunk/src/orxonox/objects/Teamcolourable.cc (modified)
	* code/trunk/src/orxonox/objects/Test.cc (modified)
	* code/trunk/src/orxonox/objects/Tickable.cc (modified)
	* code/trunk/src/orxonox/objects/collisionshapes/BoxCollisionShape.cc (modified)
	* code/trunk/src/orxonox/objects/collisionshapes/CollisionShape.cc (modified)
	* code/trunk/src/orxonox/objects/collisionshapes/CompoundCollisionShape.cc (modified)
	* code/trunk/src/orxonox/objects/collisionshapes/ConeCollisionShape.cc (modified)
	* code/trunk/src/orxonox/objects/collisionshapes/PlaneCollisionShape.cc (modified)
	* code/trunk/src/orxonox/objects/collisionshapes/SphereCollisionShape.cc (modified)
	* code/trunk/src/orxonox/objects/collisionshapes/WorldEntityCollisionShape.cc (modified)
	* code/trunk/src/orxonox/objects/controllers/AIController.cc (modified)
	* code/trunk/src/orxonox/objects/controllers/ArtificialController.cc (modified)
	* code/trunk/src/orxonox/objects/controllers/Controller.cc (modified)
	* code/trunk/src/orxonox/objects/controllers/HumanController.cc (modified)
	* code/trunk/src/orxonox/objects/controllers/PongAI.cc (modified)
	* code/trunk/src/orxonox/objects/controllers/ScriptController.cc (modified)
	* code/trunk/src/orxonox/objects/controllers/WaypointController.cc (modified)
	* code/trunk/src/orxonox/objects/controllers/WaypointPatrolController.cc (modified)
	* code/trunk/src/orxonox/objects/gametypes/Asteroids.cc (modified)
	* code/trunk/src/orxonox/objects/gametypes/Deathmatch.cc (modified)
	* code/trunk/src/orxonox/objects/gametypes/Gametype.cc (modified)
	* code/trunk/src/orxonox/objects/gametypes/Pong.cc (modified)
	* code/trunk/src/orxonox/objects/gametypes/TeamDeathmatch.cc (modified)
	* code/trunk/src/orxonox/objects/gametypes/UnderAttack.cc (modified)
	* code/trunk/src/orxonox/objects/infos/Bot.cc (modified)
	* code/trunk/src/orxonox/objects/infos/GametypeInfo.cc (modified)
	* code/trunk/src/orxonox/objects/infos/HumanPlayer.cc (modified)
	* code/trunk/src/orxonox/objects/infos/Info.cc (modified)
	* code/trunk/src/orxonox/objects/infos/PlayerInfo.cc (modified)
	* code/trunk/src/orxonox/objects/infos/PongBot.cc (modified)
	* code/trunk/src/orxonox/objects/items/Engine.cc (modified)
	* code/trunk/src/orxonox/objects/items/Item.cc (modified)
	* code/trunk/src/orxonox/objects/items/MultiStateEngine.cc (modified)
	* code/trunk/src/orxonox/objects/quest/AddQuest.cc (modified)
	* code/trunk/src/orxonox/objects/quest/AddQuestHint.cc (modified)
	* code/trunk/src/orxonox/objects/quest/AddReward.cc (modified)
	* code/trunk/src/orxonox/objects/quest/ChangeQuestStatus.cc (modified)
	* code/trunk/src/orxonox/objects/quest/CompleteQuest.cc (modified)
	* code/trunk/src/orxonox/objects/quest/FailQuest.cc (modified)
	* code/trunk/src/orxonox/objects/quest/GlobalQuest.cc (modified)
	* code/trunk/src/orxonox/objects/quest/LocalQuest.cc (modified)
	* code/trunk/src/orxonox/objects/quest/Quest.cc (modified)
	* code/trunk/src/orxonox/objects/quest/QuestDescription.cc (modified)
	* code/trunk/src/orxonox/objects/quest/QuestEffect.cc (modified)
	* code/trunk/src/orxonox/objects/quest/QuestEffectBeacon.cc (modified)
	* code/trunk/src/orxonox/objects/quest/QuestHint.cc (modified)
	* code/trunk/src/orxonox/objects/quest/QuestItem.cc (modified)
	* code/trunk/src/orxonox/objects/quest/QuestListener.cc (modified)
	* code/trunk/src/orxonox/objects/quest/QuestManager.cc (modified)
	* code/trunk/src/orxonox/objects/quest/QuestNotification.cc (modified)
	* code/trunk/src/orxonox/objects/quest/Rewardable.cc (modified)
	* code/trunk/src/orxonox/objects/weaponsystem/DefaultWeaponmodeLink.cc (modified)
	* code/trunk/src/orxonox/objects/weaponsystem/Munition.cc (modified)
	* code/trunk/src/orxonox/objects/weaponsystem/MuzzleFlash.cc (modified)
	* code/trunk/src/orxonox/objects/weaponsystem/Weapon.cc (modified)
	* code/trunk/src/orxonox/objects/weaponsystem/WeaponMode.cc (modified)
	* code/trunk/src/orxonox/objects/weaponsystem/WeaponPack.cc (modified)
	* code/trunk/src/orxonox/objects/weaponsystem/WeaponSet.cc (modified)
	* code/trunk/src/orxonox/objects/weaponsystem/WeaponSlot.cc (modified)
	* code/trunk/src/orxonox/objects/weaponsystem/WeaponSystem.cc (modified)
	* code/trunk/src/orxonox/objects/weaponsystem/munitions/FusionMunition.cc (modified)
	* code/trunk/src/orxonox/objects/weaponsystem/munitions/LaserMunition.cc (modified)
	* code/trunk/src/orxonox/objects/weaponsystem/munitions/ReplenishingMunition.cc (modified)
	* code/trunk/src/orxonox/objects/weaponsystem/projectiles/BillboardProjectile.cc (modified)
	* code/trunk/src/orxonox/objects/weaponsystem/projectiles/LightningGunProjectile.cc (modified)
	* code/trunk/src/orxonox/objects/weaponsystem/projectiles/ParticleProjectile.cc (modified)
	* code/trunk/src/orxonox/objects/weaponsystem/projectiles/Projectile.cc (modified)
	* code/trunk/src/orxonox/objects/weaponsystem/weaponmodes/EnergyDrink.cc (modified)
	* code/trunk/src/orxonox/objects/weaponsystem/weaponmodes/FusionFire.cc (modified)
	* code/trunk/src/orxonox/objects/weaponsystem/weaponmodes/HsW01.cc (modified)
	* code/trunk/src/orxonox/objects/weaponsystem/weaponmodes/LaserFire.cc (modified)
	* code/trunk/src/orxonox/objects/weaponsystem/weaponmodes/LightningGun.cc (modified)
	* code/trunk/src/orxonox/objects/worldentities/Attacher.cc (modified)
	* code/trunk/src/orxonox/objects/worldentities/Backlight.cc (modified)
	* code/trunk/src/orxonox/objects/worldentities/BigExplosion.cc (modified)
	* code/trunk/src/orxonox/objects/worldentities/Billboard.cc (modified)
	* code/trunk/src/orxonox/objects/worldentities/BlinkingBillboard.cc (modified)
	* code/trunk/src/orxonox/objects/worldentities/Camera.cc (modified)
	* code/trunk/src/orxonox/objects/worldentities/CameraPosition.cc (modified)
	* code/trunk/src/orxonox/objects/worldentities/ControllableEntity.cc (modified)
	* code/trunk/src/orxonox/objects/worldentities/ExplosionChunk.cc (modified)
	* code/trunk/src/orxonox/objects/worldentities/FadingBillboard.cc (modified)
	* code/trunk/src/orxonox/objects/worldentities/Light.cc (modified)
	* code/trunk/src/orxonox/objects/worldentities/MobileEntity.cc (modified)
	* code/trunk/src/orxonox/objects/worldentities/Model.cc (modified)
	* code/trunk/src/orxonox/objects/worldentities/MovableEntity.cc (modified)
	* code/trunk/src/orxonox/objects/worldentities/ParticleEmitter.cc (modified)
	* code/trunk/src/orxonox/objects/worldentities/ParticleSpawner.cc (modified)
	* code/trunk/src/orxonox/objects/worldentities/Planet.cc (modified)
	* code/trunk/src/orxonox/objects/worldentities/PongBall.cc (modified)
	* code/trunk/src/orxonox/objects/worldentities/PongBat.cc (modified)
	* code/trunk/src/orxonox/objects/worldentities/PongCenterpoint.cc (modified)
	* code/trunk/src/orxonox/objects/worldentities/SpawnPoint.cc (modified)
	* code/trunk/src/orxonox/objects/worldentities/StaticEntity.cc (modified)
	* code/trunk/src/orxonox/objects/worldentities/TeamSpawnPoint.cc (modified)
	* code/trunk/src/orxonox/objects/worldentities/WorldEntity.cc (modified)
	* code/trunk/src/orxonox/objects/worldentities/pawns/Destroyer.cc (modified)
	* code/trunk/src/orxonox/objects/worldentities/pawns/Pawn.cc (modified)
	* code/trunk/src/orxonox/objects/worldentities/pawns/SpaceShip.cc (modified)
	* code/trunk/src/orxonox/objects/worldentities/pawns/Spectator.cc (modified)
	* code/trunk/src/orxonox/objects/worldentities/triggers/CheckPoint.cc (modified)
	* code/trunk/src/orxonox/objects/worldentities/triggers/DistanceTrigger.cc (modified)
	* code/trunk/src/orxonox/objects/worldentities/triggers/EventTrigger.cc (modified)
	* code/trunk/src/orxonox/objects/worldentities/triggers/PlayerTrigger.cc (modified)
	* code/trunk/src/orxonox/objects/worldentities/triggers/Trigger.cc (modified)
	* code/trunk/src/orxonox/overlays/FadeoutText.cc (modified)
	* code/trunk/src/orxonox/overlays/GUIOverlay.cc (modified)
	* code/trunk/src/orxonox/overlays/OrxonoxOverlay.cc (modified)
	* code/trunk/src/orxonox/overlays/OverlayGroup.cc (modified)
	* code/trunk/src/orxonox/overlays/OverlayText.cc (modified)
	* code/trunk/src/orxonox/overlays/console/InGameConsole.cc (modified)
	* code/trunk/src/orxonox/overlays/debug/DebugFPSText.cc (modified)
	* code/trunk/src/orxonox/overlays/debug/DebugRTRText.cc (modified)
	* code/trunk/src/orxonox/overlays/hud/AnnounceMessage.cc (modified)
	* code/trunk/src/orxonox/overlays/hud/ChatOverlay.cc (modified)
	* code/trunk/src/orxonox/overlays/hud/DeathMessage.cc (modified)
	* code/trunk/src/orxonox/overlays/hud/GametypeStatus.cc (modified)
	* code/trunk/src/orxonox/overlays/hud/HUDBar.cc (modified)
	* code/trunk/src/orxonox/overlays/hud/HUDHealthBar.cc (modified)
	* code/trunk/src/orxonox/overlays/hud/HUDNavigation.cc (modified)
	* code/trunk/src/orxonox/overlays/hud/HUDRadar.cc (modified)
	* code/trunk/src/orxonox/overlays/hud/HUDSpeedBar.cc (modified)
	* code/trunk/src/orxonox/overlays/hud/HUDTimer.cc (modified)
	* code/trunk/src/orxonox/overlays/hud/KillMessage.cc (modified)
	* code/trunk/src/orxonox/overlays/hud/PongScore.cc (modified)
	* code/trunk/src/orxonox/overlays/hud/TeamBaseMatchScore.cc (modified)
	* code/trunk/src/orxonox/overlays/hud/UnderAttackHealthBar.cc (modified)
	* code/trunk/src/orxonox/overlays/map/Map.cc (modified)
	* code/trunk/src/orxonox/overlays/notifications/Notification.cc (modified)
	* code/trunk/src/orxonox/overlays/notifications/NotificationManager.cc (modified)
	* code/trunk/src/orxonox/overlays/notifications/NotificationOverlay.cc (modified)
	* code/trunk/src/orxonox/overlays/notifications/NotificationQueue.cc (modified)
	* code/trunk/src/orxonox/overlays/stats/CreateLines.cc (modified)
	* code/trunk/src/orxonox/overlays/stats/Scoreboard.cc (modified)
	* code/trunk/src/orxonox/overlays/stats/Stats.cc (modified)
	* code/trunk/src/orxonox/overlays/stats/StatsTest.cc (modified)
	* code/trunk/src/orxonox/pch (deleted)
	* code/trunk/src/orxonox/tools/BillboardSet.cc (modified)
	* code/trunk/src/orxonox/tools/Mesh.cc (modified)
	* code/trunk/src/orxonox/tools/ParticleInterface.cc (modified)
	* code/trunk/src/orxonox/tools/Shader.cc (modified)
	* code/trunk/src/orxonox/tools/TextureGenerator.cc (modified)
	* code/trunk/src/orxonox/tools/TimeFactorListener.cc (modified)
	* code/trunk/src/orxonox/tools/Timer.cc (modified)
	* code/trunk/src/orxonox/tools/WindowEventListener.cc (modified)

	Removed old msvc specific support for precompiled header files.


Fri, 29 May 2009 18:05:17 GMT adrfried [3109]
	* code/branches/ggz/src/orxonox/GGZClient.cc (modified)
	* code/branches/ggz/src/orxonox/gamestates/GSClient.cc (modified)

	segfault fixed


Thu, 28 May 2009 22:46:24 GMT erwin [3108]
	* code/trunk/src/orxonox/objects/worldentities/PongBall.cc (modified)
	* code/trunk/src/orxonox/objects/worldentities/PongBall.h (modified)
	* code/trunk/src/orxonox/sound/SoundBase.cc (modified)
	* code/trunk/src/orxonox/sound/SoundManager.cc (modified)

	first attempt to implement sounds for pong, only score sound is ...


Thu, 28 May 2009 21:47:22 GMT adrfried [3107]
	* code/branches/ggz/bin/ggz/module.dsc (modified)
	* code/branches/ggz/src/orxonox/GGZClient.cc (modified)
	* code/branches/ggz/src/orxonox/GGZClient.h (modified)
	* code/branches/ggz/src/orxonox/OrxonoxPrereqs.h (modified)
	* code/branches/ggz/src/orxonox/gamestates/GSClient.cc (modified)
	* code/branches/ggz/src/orxonox/gamestates/GSClient.h (modified)

	some more work on ggzclient


Thu, 28 May 2009 15:18:42 GMT adrfried [3106]
	* code/branches/ggz/src/CMakeLists.txt (modified)
	* code/branches/ggz/src/SpecialConfig.h.in (modified)
	* code/branches/ggz/src/orxonox/gamestates/GSClient.cc (modified)
	* code/branches/ggz/src/orxonox/gamestates/GSClient.h (modified)

	ggz build configuration bug fixed


Thu, 28 May 2009 05:15:03 GMT landauf [3105]
	* code/trunk/src/orxonox/objects/weaponsystem/projectiles/Projectile.cc (modified)

	fixed self-collision with projectiles


Thu, 28 May 2009 03:37:34 GMT landauf [3104]
	* code/trunk/src/orxonox/objects/gametypes/TeamBaseMatch.cc (modified)
	* code/trunk/src/orxonox/objects/gametypes/TeamBaseMatch.h (modified)
	* code/trunk/src/orxonox/objects/gametypes/UnderAttack.cc (modified)
	* code/trunk/src/orxonox/overlays/hud/CMakeLists.txt (modified)
	* code/trunk/src/orxonox/overlays/hud/TeamBaseMatchScore.cc (added)
	* code/trunk/src/orxonox/overlays/hud/TeamBaseMatchScore.h (added)
	* code/trunk/src/orxonox/overlays/hud/UnderAttackHealthBar.cc (added)
	* code/trunk/src/orxonox/overlays/hud/UnderAttackHealthBar.h (added)

	Added two new HUD-elements for TeamBaseMatch and UnderAttack


Thu, 28 May 2009 02:56:37 GMT scheusso [3103]
	* code/trunk/src/core/Core.cc (modified)
	* code/trunk/src/orxonox/GraphicsManager.cc (modified)
	* code/trunk/src/orxonox/objects/gametypes/TeamBaseMatch.cc (modified)

	some fixes and changes (also signalhandler)


Thu, 28 May 2009 01:05:54 GMT scheusso [3102]
	* code/trunk/src/network/GamestateClient.cc (modified)
	* code/trunk/src/network/GamestateManager.cc (modified)
	* code/trunk/src/network/Server.cc (modified)
	* code/trunk/src/network/synchronisable/SynchronisableVariable.h (modified)

	fixed some problems when changing the gamestate (from menu to server ...


Thu, 28 May 2009 00:41:15 GMT landauf [3101]
	* code/trunk (modified)
	* code/trunk/src/orxonox/objects/RadarViewable.cc (modified)
	* code/trunk/src/orxonox/objects/RadarViewable.h (modified)
	* code/trunk/src/orxonox/objects/worldentities/CMakeLists.txt (modified)
	* code/trunk/src/orxonox/overlays/map/Map.cc (modified)
	* code/trunk/src/orxonox/overlays/map/Map.h (modified)

	merged revision 3090 from map branch back to trunk


Thu, 28 May 2009 00:14:54 GMT scheusso [3100]
	* code/trunk/src/orxonox/GraphicsManager.cc (modified)

	reapplied retos patch


Wed, 27 May 2009 23:58:22 GMT landauf [3099]
	* code/trunk/src/orxonox/OrxonoxPrereqs.h (modified)
	* code/trunk/src/orxonox/objects/CMakeLists.txt (modified)
	* code/trunk/src/orxonox/objects/GametypeMessageListener.cc (added)
	* code/trunk/src/orxonox/objects/GametypeMessageListener.h (added)
	* code/trunk/src/orxonox/objects/gametypes/Asteroids.cc (modified)
	* code/trunk/src/orxonox/objects/gametypes/Gametype.cc (modified)
	* code/trunk/src/orxonox/objects/gametypes/Pong.cc (modified)
	* code/trunk/src/orxonox/objects/gametypes/TeamBaseMatch.cc (modified)
	* code/trunk/src/orxonox/objects/gametypes/UnderAttack.cc (modified)
	* code/trunk/src/orxonox/objects/infos/GametypeInfo.cc (modified)
	* code/trunk/src/orxonox/objects/infos/GametypeInfo.h (modified)
	* code/trunk/src/orxonox/objects/worldentities/triggers/CheckPoint.cc (modified)
	* code/trunk/src/orxonox/overlays/CMakeLists.txt (modified)
	* code/trunk/src/orxonox/overlays/FadeoutText.cc (added)
	* code/trunk/src/orxonox/overlays/FadeoutText.h (added)
	* code/trunk/src/orxonox/overlays/OverlayText.h (modified)
	* code/trunk/src/orxonox/overlays/hud/AnnounceMessage.cc (added)
	* code/trunk/src/orxonox/overlays/hud/AnnounceMessage.h (added)
	* code/trunk/src/orxonox/overlays/hud/CMakeLists.txt (modified)
	* code/trunk/src/orxonox/overlays/hud/DeathMessage.cc (added)
	* code/trunk/src/orxonox/overlays/hud/DeathMessage.h (added)
	* code/trunk/src/orxonox/overlays/hud/KillMessage.cc (added)
	* code/trunk/src/orxonox/overlays/hud/KillMessage.h (added)

	Added Gameplay messages (Announces, Killmessages and Deathmessages)


Wed, 27 May 2009 23:02:42 GMT rgrieder [3098]
	* code/trunk/src/orxonox/GraphicsManager.cc (modified)

	Either my box or Oli's gets screwed, but since it only didn't work on ...


Wed, 27 May 2009 21:13:16 GMT scheusso [3097]
	* code/trunk/src/network/packet/Packet.cc (modified)

	small possible memory leak closed


Wed, 27 May 2009 20:40:08 GMT rgrieder [3096]
	* code/trunk/src/orxonox/GraphicsManager.cc (modified)

	Found some leftovers of my attempt to partially shut down OGRE (which ...


Wed, 27 May 2009 20:03:32 GMT landauf [3095]
	* code/trunk/src/network/Host.cc (modified)

	fixed standalone chat


Wed, 27 May 2009 19:42:13 GMT rgrieder [3094]
	* code/trunk/src/orxonox/gamestates/GSMainMenu.cc (modified)
	* code/trunk/src/orxonox/gamestates/GSMainMenu.h (modified)

	Adding functionality to the server, client and dedicated buttons ...


Wed, 27 May 2009 19:39:38 GMT scheusso [3093]
	* code/trunk/src/network/ConnectionManager.cc (modified)
	* code/trunk/src/network/ConnectionManager.h (modified)

	it is now possible to send packets/network function calls to all ...


Wed, 27 May 2009 19:37:12 GMT rgrieder [3092]
	* code/trunk/src/orxonox/sound/SoundManager.cc (modified)

	SoundManager.cc: alutGetMIMETypes might return NULL instead of const ...


Wed, 27 May 2009 19:35:51 GMT rgrieder [3091]
	* code/trunk/src/orxonox/GraphicsManager.cc (modified)

	Hitting the X-Button of the window actually stops orxonox now.


Wed, 27 May 2009 15:23:51 GMT Naaduun [3090]
	* code/branches/map/src/orxonox/objects/RadarViewable.cc (modified)
	* code/branches/map/src/orxonox/objects/RadarViewable.h (modified)
	* code/branches/map/src/orxonox/overlays/map/Map.cc (modified)
	* code/branches/map/src/orxonox/overlays/map/Map.h (modified)

	Fixed einige Bugs bei Zerstörung der Map


Wed, 27 May 2009 14:11:31 GMT landauf [3089]
	* code/trunk (modified)
	* code/trunk/archlinux (copied)
	* code/trunk/archlinux/PKGBUILD (copied)
	* code/trunk/src/orxonox/OrxonoxPrereqs.h (modified)
	* code/trunk/src/orxonox/objects/RadarViewable.cc (modified)
	* code/trunk/src/orxonox/objects/RadarViewable.h (modified)
	* code/trunk/src/orxonox/objects/controllers/HumanController.cc (modified)
	* code/trunk/src/orxonox/objects/controllers/HumanController.h (modified)
	* code/trunk/src/orxonox/objects/worldentities/CameraPosition.cc (modified)
	* code/trunk/src/orxonox/objects/worldentities/CameraPosition.h (modified)
	* code/trunk/src/orxonox/objects/worldentities/ControllableEntity.cc (modified)
	* code/trunk/src/orxonox/objects/worldentities/ControllableEntity.h (modified)
	* code/trunk/src/orxonox/objects/worldentities/pawns/Pawn.cc (modified)
	* code/trunk/src/orxonox/objects/worldentities/pawns/Pawn.h (modified)
	* code/trunk/src/orxonox/overlays/CMakeLists.txt (modified)
	* code/trunk/src/orxonox/overlays/map (copied)
	* code/trunk/src/orxonox/overlays/map/CMakeLists.txt (copied)
	* code/trunk/src/orxonox/overlays/map/Map.cc (copied)
	* code/trunk/src/orxonox/overlays/map/Map.h (copied)
	* code/trunk/src/orxonox/tools/CMakeLists.txt (modified)
	* code/trunk/src/orxonox/tools/DynamicLines.cpp (copied)
	* code/trunk/src/orxonox/tools/DynamicLines.h (copied)
	* code/trunk/src/orxonox/tools/DynamicRenderable.cpp (copied)
	* code/trunk/src/orxonox/tools/DynamicRenderable.h (copied)
	* code/trunk/src/util/CMakeLists.txt (modified)
	* code/trunk/src/util/SubString.cc (modified)

	merged map branch back to trunk


Wed, 27 May 2009 14:09:13 GMT scheusso [3088]
	* code/trunk/src/network/synchronisable/Synchronisable.cc (modified)
	* code/trunk/src/orxonox/objects/weaponsystem/projectiles/LightningGunProjectile.cc (modified)
	* code/trunk/src/orxonox/objects/weaponsystem/projectiles/LightningGunProjectile.h (modified)
	* code/trunk/src/orxonox/objects/weaponsystem/projectiles/Projectile.cc (modified)
	* code/trunk/src/orxonox/overlays/hud/HUDTimer.cc (modified)

	fix in Projectile (there was no createFactory) and some additional ...


Wed, 27 May 2009 12:45:54 GMT landauf [3087]
	* code/trunk (modified)
	* code/trunk/src/orxonox/OrxonoxPrereqs.h (modified)
	* code/trunk/src/orxonox/objects/worldentities/BigExplosion.cc (copied)
	* code/trunk/src/orxonox/objects/worldentities/BigExplosion.h (copied)
	* code/trunk/src/orxonox/objects/worldentities/CMakeLists.txt (modified)
	* code/trunk/src/orxonox/objects/worldentities/pawns/Pawn.cc (modified)
	* code/trunk/src/orxonox/objects/worldentities/pawns/Pawn.h (modified)

	merged particles branch back to trunk


Tue, 26 May 2009 23:44:48 GMT landauf [3086]
	* code/trunk/src/orxonox/objects/controllers/ArtificialController.cc (modified)
	* code/trunk/src/orxonox/objects/gametypes/TeamBaseMatch.cc (modified)
	* code/trunk/src/orxonox/objects/worldentities/pawns/Pawn.h (modified)
	* code/trunk/src/orxonox/objects/worldentities/pawns/TeamBaseMatchBase.cc (modified)
	* code/trunk/src/orxonox/overlays/hud/HUDRadar.cc (modified)

	added bot-support for TeamBaseMatch (and some small fixes)


Tue, 26 May 2009 19:27:15 GMT danielh [3085]
	* code/trunk/src/orxonox/objects/pickup/PickupInventory.cc (modified)

	No more hiding of items when the frame is clicked :-)


Tue, 26 May 2009 19:20:57 GMT landauf [3084]
	* code/trunk (modified)
	* code/trunk/src/CMakeLists.txt (modified)
	* code/trunk/src/core/Game.cc (modified)
	* code/trunk/src/core/Game.h (modified)
	* code/trunk/src/core/GameState.cc (modified)
	* code/trunk/src/core/GameState.h (modified)
	* code/trunk/src/core/input/InputManager.cc (modified)
	* code/trunk/src/core/input/InputManager.h (modified)
	* code/trunk/src/network/CMakeLists.txt (modified)
	* code/trunk/src/network/Client.cc (modified)
	* code/trunk/src/network/Client.h (modified)
	* code/trunk/src/network/ClientConnection.cc (modified)
	* code/trunk/src/network/ClientConnection.h (modified)
	* code/trunk/src/network/ConnectionManager.cc (modified)
	* code/trunk/src/network/ConnectionManager.h (modified)
	* code/trunk/src/network/FunctionCallManager.cc (copied)
	* code/trunk/src/network/FunctionCallManager.h (copied)
	* code/trunk/src/network/GamestateManager.cc (modified)
	* code/trunk/src/network/GamestateManager.h (modified)
	* code/trunk/src/network/Host.h (modified)
	* code/trunk/src/network/NetworkFunction.cc (copied)
	* code/trunk/src/network/NetworkFunction.h (copied)
	* code/trunk/src/network/NetworkPrereqs.h (modified)
	* code/trunk/src/network/Server.cc (modified)
	* code/trunk/src/network/Server.h (modified)
	* code/trunk/src/network/TrafficControl.cc (modified)
	* code/trunk/src/network/TrafficControl.h (modified)
	* code/trunk/src/network/packet/CMakeLists.txt (modified)
	* code/trunk/src/network/packet/ClassID.cc (modified)
	* code/trunk/src/network/packet/FunctionCalls.cc (copied)
	* code/trunk/src/network/packet/FunctionCalls.h (copied)
	* code/trunk/src/network/packet/FunctionIDs.cc (copied)
	* code/trunk/src/network/packet/FunctionIDs.h (copied)
	* code/trunk/src/network/packet/Gamestate.cc (modified)
	* code/trunk/src/network/packet/Gamestate.h (modified)
	* code/trunk/src/network/packet/Packet.cc (modified)
	* code/trunk/src/network/packet/Packet.h (modified)
	* code/trunk/src/network/synchronisable/NetworkCallbackManager.cc (modified)
	* code/trunk/src/network/synchronisable/Synchronisable.cc (modified)
	* code/trunk/src/network/synchronisable/Synchronisable.h (modified)
	* code/trunk/src/network/synchronisable/SynchronisableSpecialisations.cc (modified)
	* code/trunk/src/network/synchronisable/SynchronisableVariable.cc (copied)
	* code/trunk/src/network/synchronisable/SynchronisableVariable.h (modified)
	* code/trunk/src/orxonox/OrxonoxPrereqs.h (modified)
	* code/trunk/src/orxonox/gamestates/GSGraphics.cc (modified)
	* code/trunk/src/orxonox/gamestates/GSGraphics.h (modified)
	* code/trunk/src/orxonox/gamestates/GSRoot.cc (modified)
	* code/trunk/src/orxonox/gamestates/GSRoot.h (modified)
	* code/trunk/src/orxonox/objects/CMakeLists.txt (modified)
	* code/trunk/src/orxonox/objects/Test.cc (modified)
	* code/trunk/src/orxonox/objects/Test.h (modified)
	* code/trunk/src/orxonox/objects/controllers/AIController.cc (modified)
	* code/trunk/src/orxonox/objects/worldentities/ControllableEntity.cc (modified)
	* code/trunk/src/orxonox/objects/worldentities/MobileEntity.h (modified)
	* code/trunk/src/orxonox/objects/worldentities/PongBall.cc (modified)
	* code/trunk/src/orxonox/objects/worldentities/PongBall.h (modified)
	* code/trunk/src/orxonox/objects/worldentities/PongBat.cc (modified)
	* code/trunk/src/orxonox/objects/worldentities/pawns/Pawn.cc (modified)
	* code/trunk/src/orxonox/objects/worldentities/pawns/Pawn.h (modified)
	* code/trunk/src/util/MultiType.h (modified)
	* code/trunk/src/util/MultiTypeValue.h (modified)
	* code/trunk/src/util/Serialise.h (copied)

	merged netp3 branch back to trunk


Tue, 26 May 2009 18:11:37 GMT scheusso [3083]
	* code/branches/netp3/src/network/Client.cc (modified)
	* code/branches/netp3/src/network/TrafficControl.cc (modified)
	* code/branches/netp3/src/network/TrafficControl.h (modified)
	* code/branches/netp3/src/network/packet/Gamestate.cc (modified)
	* code/branches/netp3/src/network/packet/Gamestate.h (modified)

	some changes/fixes in gamestates and trafficcontrol


Tue, 26 May 2009 17:29:40 GMT Naaduun [3082]
	* code/branches/map/src/orxonox/overlays/map/Map.cc (modified)

	Map fixed: Leitlinien zur Anzeige der Höhe


Tue, 26 May 2009 08:33:37 GMT bknecht [3081]
	* code/trunk/src/orxonox/objects/pickup/items/HealthUsable.h (modified)

	fixing an include. why do only I have this problem?


Tue, 26 May 2009 00:54:06 GMT landauf [3080]
	* code/trunk/src/orxonox/objects/worldentities/WorldEntity.cc (modified)

	Yet another bugfix.


Tue, 26 May 2009 00:28:24 GMT landauf [3079]
	* code/trunk/src/orxonox/OrxonoxPrereqs.h (modified)
	* code/trunk/src/orxonox/objects/pickup/DroppedItem.cc (modified)
	* code/trunk/src/orxonox/objects/pickup/DroppedItem.h (modified)
	* code/trunk/src/orxonox/objects/pickup/ModifierPickup.cc (modified)
	* code/trunk/src/orxonox/objects/pickup/PickupCollection.cc (modified)
	* code/trunk/src/orxonox/objects/pickup/PickupCollection.h (modified)
	* code/trunk/src/orxonox/objects/pickup/PickupInventory.cc (modified)
	* code/trunk/src/orxonox/objects/pickup/PickupInventory.h (modified)
	* code/trunk/src/orxonox/objects/pickup/PickupSpawner.cc (modified)
	* code/trunk/src/orxonox/objects/pickup/PickupSpawner.h (modified)
	* code/trunk/src/orxonox/objects/pickup/items/HealthImmediate.cc (modified)
	* code/trunk/src/orxonox/objects/pickup/items/HealthImmediate.h (modified)
	* code/trunk/src/orxonox/objects/pickup/items/HealthUsable.cc (modified)
	* code/trunk/src/orxonox/objects/pickup/items/HealthUsable.h (modified)
	* code/trunk/src/orxonox/objects/pickup/items/Jump.cc (modified)
	* code/trunk/src/orxonox/objects/pickup/items/Jump.h (modified)

	Added forward declarations to OrxonoxPrereqs.h.


Mon, 25 May 2009 21:49:42 GMT landauf [3078]
	* code/trunk/src/orxonox/objects/controllers/WaypointController.cc (modified)
	* code/trunk/src/orxonox/objects/controllers/WaypointController.h (modified)
	* code/trunk/src/orxonox/objects/controllers/WaypointPatrolController.cc (modified)
	* code/trunk/src/orxonox/objects/controllers/WaypointPatrolController.h (modified)
	* code/trunk/src/orxonox/objects/pickup/items/CMakeLists.txt (modified)
	* code/trunk/src/orxonox/objects/pickup/items/HealthImmediate.cc (modified)
	* code/trunk/src/orxonox/objects/pickup/items/HealthImmediate.h (modified)
	* code/trunk/src/orxonox/objects/pickup/items/HealthUsable.cc (modified)
	* code/trunk/src/orxonox/objects/pickup/items/HealthUsable.h (modified)
	* code/trunk/src/orxonox/objects/pickup/items/Jump.cc (modified)
	* code/trunk/src/orxonox/objects/pickup/items/Jump.h (modified)
	* code/trunk/src/orxonox/objects/quest/QuestNotification.cc (modified)
	* code/trunk/src/orxonox/objects/quest/QuestNotification.h (modified)
	* code/trunk/src/orxonox/objects/worldentities/Attacher.cc (modified)
	* code/trunk/src/orxonox/objects/worldentities/Attacher.h (modified)
	* code/trunk/src/orxonox/overlays/GUIOverlay.cc (modified)
	* code/trunk/src/orxonox/overlays/GUIOverlay.h (modified)
	* code/trunk/src/orxonox/overlays/hud/PongScore.cc (modified)
	* code/trunk/src/orxonox/overlays/hud/PongScore.h (modified)
	* code/trunk/src/orxonox/overlays/notifications/NotificationOverlay.cc (modified)
	* code/trunk/src/orxonox/overlays/notifications/NotificationOverlay.h (modified)
	* code/trunk/src/orxonox/sound/CMakeLists.txt (modified)
	* code/trunk/src/orxonox/sound/SoundBase.cc (modified)
	* code/trunk/src/orxonox/sound/SoundBase.h (modified)
	* code/trunk/src/orxonox/sound/SoundMainMenu.cc (modified)
	* code/trunk/src/orxonox/sound/SoundMainMenu.h (modified)
	* code/trunk/src/orxonox/sound/SoundManager.cc (modified)
	* code/trunk/src/orxonox/sound/SoundManager.h (modified)

	added svn:eolstyle native, no codechanges


Mon, 25 May 2009 21:16:27 GMT landauf [3077]
	* code/trunk/src/orxonox/objects/worldentities/Attacher.cc (added)
	* code/trunk/src/orxonox/objects/worldentities/Attacher.h (added)
	* code/trunk/src/orxonox/objects/worldentities/CMakeLists.txt (modified)
	* code/trunk/src/orxonox/objects/worldentities/WorldEntity.cc (modified)
	* code/trunk/src/orxonox/objects/worldentities/WorldEntity.h (modified)

	Added Attacher - a class which attaches itself to an object with a ...


Mon, 25 May 2009 20:25:28 GMT danielh [3076]
	* code/trunk/src/orxonox/objects/pickup/PickupInventory.cc (modified)

	fixed window Clicked event


Mon, 25 May 2009 19:08:55 GMT erwin [3075]
	* code/trunk/src/orxonox/sound/SoundBase.cc (modified)

	fixed ogg loader. it works, bitches


Mon, 25 May 2009 18:40:39 GMT landauf [3074]
	* code/trunk/src/network/Host.cc (modified)
	* code/trunk/src/orxonox/objects/pickup/PickupCollection.cc (modified)
	* code/trunk/src/orxonox/objects/pickup/PickupInventory.cc (modified)
	* code/trunk/src/orxonox/objects/pickup/items/HealthImmediate.cc (modified)
	* code/trunk/src/orxonox/objects/pickup/items/HealthImmediate.h (modified)
	* code/trunk/src/orxonox/objects/pickup/items/Jump.cc (modified)
	* code/trunk/src/orxonox/objects/pickup/items/Jump.h (modified)
	* code/trunk/src/orxonox/objects/weaponsystem/Munition.cc (modified)
	* code/trunk/src/orxonox/objects/weaponsystem/WeaponSystem.cc (modified)

	removed some warnings and fixed an include error


Mon, 25 May 2009 18:30:15 GMT landauf [3073]
	* code/trunk (modified)
	* code/trunk/src/orxonox/CMakeLists.txt (modified)
	* code/trunk/src/orxonox/objects/controllers/HumanController.cc (modified)
	* code/trunk/src/orxonox/objects/controllers/HumanController.h (modified)
	* code/trunk/src/orxonox/objects/items/Engine.cc (modified)
	* code/trunk/src/orxonox/objects/pickup/BaseItem.cc (copied)
	* code/trunk/src/orxonox/objects/pickup/BaseItem.h (copied)
	* code/trunk/src/orxonox/objects/pickup/CMakeLists.txt (modified)
	* code/trunk/src/orxonox/objects/pickup/DroppedItem.cc (copied)
	* code/trunk/src/orxonox/objects/pickup/DroppedItem.h (copied)
	* code/trunk/src/orxonox/objects/pickup/EquipmentItem.cc (copied)
	* code/trunk/src/orxonox/objects/pickup/EquipmentItem.h (copied)
	* code/trunk/src/orxonox/objects/pickup/ModifierPickup.cc (copied)
	* code/trunk/src/orxonox/objects/pickup/ModifierPickup.h (copied)
	* code/trunk/src/orxonox/objects/pickup/ModifierType.h (copied)
	* code/trunk/src/orxonox/objects/pickup/PassiveItem.cc (copied)
	* code/trunk/src/orxonox/objects/pickup/PassiveItem.h (copied)
	* code/trunk/src/orxonox/objects/pickup/PickupCollection.cc (copied)
	* code/trunk/src/orxonox/objects/pickup/PickupCollection.h (copied)
	* code/trunk/src/orxonox/objects/pickup/PickupInventory.cc (copied)
	* code/trunk/src/orxonox/objects/pickup/PickupInventory.h (copied)
	* code/trunk/src/orxonox/objects/pickup/PickupSpawner.cc (copied)
	* code/trunk/src/orxonox/objects/pickup/PickupSpawner.h (copied)
	* code/trunk/src/orxonox/objects/pickup/ShipEquipment.cc (deleted)
	* code/trunk/src/orxonox/objects/pickup/ShipEquipment.h (deleted)
	* code/trunk/src/orxonox/objects/pickup/ShipEquipmentClasses.cc (deleted)
	* code/trunk/src/orxonox/objects/pickup/ShipEquipmentClasses.h (deleted)
	* code/trunk/src/orxonox/objects/pickup/ShipItem.cc (deleted)
	* code/trunk/src/orxonox/objects/pickup/ShipItem.h (deleted)
	* code/trunk/src/orxonox/objects/pickup/Turbo.cc (deleted)
	* code/trunk/src/orxonox/objects/pickup/Turbo.h (deleted)
	* code/trunk/src/orxonox/objects/pickup/Usable.h (deleted)
	* code/trunk/src/orxonox/objects/pickup/UsableItem.cc (copied)
	* code/trunk/src/orxonox/objects/pickup/UsableItem.h (copied)
	* code/trunk/src/orxonox/objects/pickup/items (copied)
	* code/trunk/src/orxonox/objects/pickup/items/CMakeLists.txt (copied)
	* code/trunk/src/orxonox/objects/pickup/items/HealthImmediate.cc (copied)
	* code/trunk/src/orxonox/objects/pickup/items/HealthImmediate.h (copied)
	* code/trunk/src/orxonox/objects/pickup/items/HealthUsable.cc (copied)
	* code/trunk/src/orxonox/objects/pickup/items/HealthUsable.h (copied)
	* code/trunk/src/orxonox/objects/pickup/items/Jump.cc (copied)
	* code/trunk/src/orxonox/objects/pickup/items/Jump.h (copied)
	* code/trunk/src/orxonox/objects/weaponsystem/projectiles/Projectile.cc (modified)
	* code/trunk/src/orxonox/objects/worldentities/ControllableEntity.h (modified)
	* code/trunk/src/orxonox/objects/worldentities/pawns/Pawn.cc (modified)
	* code/trunk/src/orxonox/objects/worldentities/pawns/Pawn.h (modified)

	merged pickups2 branch back to trunk. not yet tested.


Mon, 25 May 2009 18:04:03 GMT landauf [3072]
	* code/branches/pickups3 (deleted)

	back backup


Mon, 25 May 2009 18:01:33 GMT landauf [3071]
	* code/branches/pickups3 (modified)

	hmm


Mon, 25 May 2009 17:55:52 GMT landauf [3070]
	* code/branches/pickups3 (modified)
	* code/branches/pickups3/bin/client1.bat.in (modified)
	* code/branches/pickups3/bin/client2.bat.in (modified)
	* code/branches/pickups3/bin/dedicated.bat.in (modified)
	* code/branches/pickups3/bin/run.bat.in (modified)
	* code/branches/pickups3/bin/server.bat.in (modified)
	* code/branches/pickups3/bin/standalone.bat.in (modified)
	* code/branches/pickups3/cmake/FindDirectX.cmake (modified)
	* code/branches/pickups3/cmake/LibraryConfigTardis.cmake (modified)
	* code/branches/pickups3/src/core/LuaBind.cc (modified)
	* code/branches/pickups3/src/core/LuaBind.h (modified)
	* code/branches/pickups3/src/core/Template.cc (modified)
	* code/branches/pickups3/src/core/Template.h (modified)
	* code/branches/pickups3/src/core/XMLFile.h (modified)
	* code/branches/pickups3/src/core/XMLIncludes.h (modified)
	* code/branches/pickups3/src/cpptcl/cpptcl.cc (modified)
	* code/branches/pickups3/src/cpptcl/cpptcl.h (modified)
	* code/branches/pickups3/src/network/synchronisable/NetworkCallback.h (modified)
	* code/branches/pickups3/src/network/synchronisable/Synchronisable.cc (modified)
	* code/branches/pickups3/src/network/synchronisable/Synchronisable.h (modified)
	* code/branches/pickups3/src/orxonox/CameraManager.cc (modified)
	* code/branches/pickups3/src/orxonox/CameraManager.h (modified)
	* code/branches/pickups3/src/orxonox/objects/Level.cc (modified)
	* code/branches/pickups3/src/orxonox/objects/Level.h (modified)
	* code/branches/pickups3/src/orxonox/objects/collisionshapes (modified)
	* code/branches/pickups3/src/orxonox/objects/gametypes/TeamDeathmatch.cc (modified)
	* code/branches/pickups3/src/orxonox/objects/gametypes/TeamDeathmatch.h (modified)
	* code/branches/pickups3/src/orxonox/objects/quest/AddQuest.cc (modified)
	* code/branches/pickups3/src/orxonox/objects/quest/AddQuest.h (modified)
	* code/branches/pickups3/src/orxonox/objects/quest/AddQuestHint.cc (modified)
	* code/branches/pickups3/src/orxonox/objects/quest/AddQuestHint.h (modified)
	* code/branches/pickups3/src/orxonox/objects/quest/AddReward.cc (modified)
	* code/branches/pickups3/src/orxonox/objects/quest/AddReward.h (modified)
	* code/branches/pickups3/src/orxonox/objects/quest/ChangeQuestStatus.cc (modified)
	* code/branches/pickups3/src/orxonox/objects/quest/ChangeQuestStatus.h (modified)
	* code/branches/pickups3/src/orxonox/objects/quest/CompleteQuest.cc (modified)
	* code/branches/pickups3/src/orxonox/objects/quest/CompleteQuest.h (modified)
	* code/branches/pickups3/src/orxonox/objects/quest/FailQuest.cc (modified)
	* code/branches/pickups3/src/orxonox/objects/quest/FailQuest.h (modified)
	* code/branches/pickups3/src/orxonox/objects/quest/GlobalQuest.cc (modified)
	* code/branches/pickups3/src/orxonox/objects/quest/GlobalQuest.h (modified)
	* code/branches/pickups3/src/orxonox/objects/quest/LocalQuest.cc (modified)
	* code/branches/pickups3/src/orxonox/objects/quest/LocalQuest.h (modified)
	* code/branches/pickups3/src/orxonox/objects/quest/Quest.cc (modified)
	* code/branches/pickups3/src/orxonox/objects/quest/Quest.h (modified)
	* code/branches/pickups3/src/orxonox/objects/quest/QuestDescription.cc (modified)
	* code/branches/pickups3/src/orxonox/objects/quest/QuestDescription.h (modified)
	* code/branches/pickups3/src/orxonox/objects/quest/QuestEffect.cc (modified)
	* code/branches/pickups3/src/orxonox/objects/quest/QuestEffect.h (modified)
	* code/branches/pickups3/src/orxonox/objects/quest/QuestHint.cc (modified)
	* code/branches/pickups3/src/orxonox/objects/quest/QuestHint.h (modified)
	* code/branches/pickups3/src/orxonox/objects/quest/QuestItem.cc (modified)
	* code/branches/pickups3/src/orxonox/objects/quest/QuestItem.h (modified)
	* code/branches/pickups3/src/orxonox/objects/quest/QuestManager.cc (modified)
	* code/branches/pickups3/src/orxonox/objects/quest/QuestManager.h (modified)
	* code/branches/pickups3/src/orxonox/objects/quest/Rewardable.cc (modified)
	* code/branches/pickups3/src/orxonox/objects/quest/Rewardable.h (modified)
	* code/branches/pickups3/src/orxonox/objects/weaponSystem/WeaponSystem.cc (modified)
	* code/branches/pickups3/src/orxonox/objects/weaponSystem/WeaponSystem.h (modified)
	* code/branches/pickups3/src/orxonox/objects/worldentities/Backlight.cc (modified)
	* code/branches/pickups3/src/orxonox/objects/worldentities/Backlight.h (modified)
	* code/branches/pickups3/src/orxonox/objects/worldentities/Camera.cc (modified)
	* code/branches/pickups3/src/orxonox/objects/worldentities/Camera.h (modified)
	* code/branches/pickups3/src/orxonox/objects/worldentities/MobileEntity.cc (modified)
	* code/branches/pickups3/src/orxonox/objects/worldentities/MobileEntity.h (modified)
	* code/branches/pickups3/src/orxonox/objects/worldentities/ParticleSpawner.cc (modified)
	* code/branches/pickups3/src/orxonox/objects/worldentities/ParticleSpawner.h (modified)
	* code/branches/pickups3/src/orxonox/objects/worldentities/StaticEntity.cc (modified)
	* code/branches/pickups3/src/orxonox/objects/worldentities/StaticEntity.h (modified)
	* code/branches/pickups3/src/orxonox/objects/worldentities/triggers/DistanceTrigger.cc (modified)
	* code/branches/pickups3/src/orxonox/objects/worldentities/triggers/DistanceTrigger.h (modified)
	* code/branches/pickups3/src/orxonox/objects/worldentities/triggers/Trigger.cc (modified)
	* code/branches/pickups3/src/orxonox/objects/worldentities/triggers/Trigger.h (modified)
	* code/branches/pickups3/src/tolua/all-5.0.lua (modified)
	* code/branches/pickups3/src/tolua/all-5.1.lua (modified)
	* code/branches/pickups3/src/util (modified)
	* code/branches/pickups3/src/util/Exception.cc (modified)
	* code/branches/pickups3/src/util/Exception.h (modified)
	* code/branches/pickups3/src/util/SignalHandler.cc (modified)
	* code/branches/pickups3/src/util/SignalHandler.h (modified)

	test: removing mergeinfo also in pickups branch


Mon, 25 May 2009 17:51:58 GMT landauf [3069]
	* code/branches/pickups3 (copied)

	backup


Mon, 25 May 2009 17:47:11 GMT landauf [3068]
	* code/trunk/bin/client1.bat.in (modified)
	* code/trunk/bin/client2.bat.in (modified)
	* code/trunk/bin/dedicated.bat.in (modified)
	* code/trunk/bin/run.bat.in (modified)
	* code/trunk/bin/server.bat.in (modified)
	* code/trunk/bin/standalone.bat.in (modified)
	* code/trunk/cmake/FindDirectX.cmake (modified)
	* code/trunk/cmake/LibraryConfigTardis.cmake (modified)
	* code/trunk/src/core/LuaBind.cc (modified)
	* code/trunk/src/core/LuaBind.h (modified)
	* code/trunk/src/core/Template.cc (modified)
	* code/trunk/src/core/Template.h (modified)
	* code/trunk/src/core/XMLFile.h (modified)
	* code/trunk/src/core/XMLIncludes.h (modified)
	* code/trunk/src/cpptcl/cpptcl.cc (modified)
	* code/trunk/src/cpptcl/cpptcl.h (modified)
	* code/trunk/src/network/synchronisable/NetworkCallback.h (modified)
	* code/trunk/src/network/synchronisable/Synchronisable.cc (modified)
	* code/trunk/src/network/synchronisable/Synchronisable.h (modified)
	* code/trunk/src/orxonox/CameraManager.cc (modified)
	* code/trunk/src/orxonox/CameraManager.h (modified)
	* code/trunk/src/orxonox/objects/Level.cc (modified)
	* code/trunk/src/orxonox/objects/Level.h (modified)
	* code/trunk/src/orxonox/objects/collisionshapes (modified)
	* code/trunk/src/orxonox/objects/gametypes/TeamDeathmatch.cc (modified)
	* code/trunk/src/orxonox/objects/gametypes/TeamDeathmatch.h (modified)
	* code/trunk/src/orxonox/objects/pickup/Usable.h (modified)
	* code/trunk/src/orxonox/objects/quest/AddQuest.cc (modified)
	* code/trunk/src/orxonox/objects/quest/AddQuest.h (modified)
	* code/trunk/src/orxonox/objects/quest/AddQuestHint.cc (modified)
	* code/trunk/src/orxonox/objects/quest/AddQuestHint.h (modified)
	* code/trunk/src/orxonox/objects/quest/AddReward.cc (modified)
	* code/trunk/src/orxonox/objects/quest/AddReward.h (modified)
	* code/trunk/src/orxonox/objects/quest/ChangeQuestStatus.cc (modified)
	* code/trunk/src/orxonox/objects/quest/ChangeQuestStatus.h (modified)
	* code/trunk/src/orxonox/objects/quest/CompleteQuest.cc (modified)
	* code/trunk/src/orxonox/objects/quest/CompleteQuest.h (modified)
	* code/trunk/src/orxonox/objects/quest/FailQuest.cc (modified)
	* code/trunk/src/orxonox/objects/quest/FailQuest.h (modified)
	* code/trunk/src/orxonox/objects/quest/GlobalQuest.cc (modified)
	* code/trunk/src/orxonox/objects/quest/GlobalQuest.h (modified)
	* code/trunk/src/orxonox/objects/quest/LocalQuest.cc (modified)
	* code/trunk/src/orxonox/objects/quest/LocalQuest.h (modified)
	* code/trunk/src/orxonox/objects/quest/Quest.cc (modified)
	* code/trunk/src/orxonox/objects/quest/Quest.h (modified)
	* code/trunk/src/orxonox/objects/quest/QuestDescription.cc (modified)
	* code/trunk/src/orxonox/objects/quest/QuestDescription.h (modified)
	* code/trunk/src/orxonox/objects/quest/QuestEffect.cc (modified)
	* code/trunk/src/orxonox/objects/quest/QuestEffect.h (modified)
	* code/trunk/src/orxonox/objects/quest/QuestHint.cc (modified)
	* code/trunk/src/orxonox/objects/quest/QuestHint.h (modified)
	* code/trunk/src/orxonox/objects/quest/QuestItem.cc (modified)
	* code/trunk/src/orxonox/objects/quest/QuestItem.h (modified)
	* code/trunk/src/orxonox/objects/quest/QuestManager.cc (modified)
	* code/trunk/src/orxonox/objects/quest/QuestManager.h (modified)
	* code/trunk/src/orxonox/objects/quest/Rewardable.cc (modified)
	* code/trunk/src/orxonox/objects/quest/Rewardable.h (modified)
	* code/trunk/src/orxonox/objects/weaponsystem/weaponmodes (modified)
	* code/trunk/src/orxonox/objects/worldentities/Backlight.cc (modified)
	* code/trunk/src/orxonox/objects/worldentities/Backlight.h (modified)
	* code/trunk/src/orxonox/objects/worldentities/Camera.cc (modified)
	* code/trunk/src/orxonox/objects/worldentities/Camera.h (modified)
	* code/trunk/src/orxonox/objects/worldentities/MobileEntity.cc (modified)
	* code/trunk/src/orxonox/objects/worldentities/MobileEntity.h (modified)
	* code/trunk/src/orxonox/objects/worldentities/ParticleSpawner.cc (modified)
	* code/trunk/src/orxonox/objects/worldentities/ParticleSpawner.h (modified)
	* code/trunk/src/orxonox/objects/worldentities/StaticEntity.cc (modified)
	* code/trunk/src/orxonox/objects/worldentities/StaticEntity.h (modified)
	* code/trunk/src/orxonox/objects/worldentities/triggers/DistanceTrigger.cc (modified)
	* code/trunk/src/orxonox/objects/worldentities/triggers/DistanceTrigger.h (modified)
	* code/trunk/src/orxonox/objects/worldentities/triggers/Trigger.cc (modified)
	* code/trunk/src/orxonox/objects/worldentities/triggers/Trigger.h (modified)
	* code/trunk/src/tolua/all-5.0.lua (modified)
	* code/trunk/src/tolua/all-5.1.lua (modified)
	* code/trunk/src/util (modified)
	* code/trunk/src/util/Exception.cc (modified)
	* code/trunk/src/util/Exception.h (modified)
	* code/trunk/src/util/SignalHandler.cc (modified)
	* code/trunk/src/util/SignalHandler.h (modified)

	removing svn:mergeinfo again after sound2 merge


Mon, 25 May 2009 16:39:23 GMT Aurelian [3067]
	* code/trunk/src/orxonox/objects/worldentities/triggers/CheckPoint.cc (modified)

	COUT in CheckPoint removed


Mon, 25 May 2009 16:05:11 GMT scheusso [3066]
	* code/branches/netp3/src/network/Client.cc (modified)
	* code/branches/netp3/src/network/Host.h (modified)
	* code/branches/netp3/src/network/Server.cc (modified)

	trying to reduce network delays/lags


Mon, 25 May 2009 16:03:56 GMT decapitb [3065]
	* code/branches/particles/src/orxonox/objects/worldentities/BigExplosion.cc (modified)
	* code/branches/particles/src/orxonox/objects/worldentities/BigExplosion.h (modified)




Mon, 25 May 2009 15:54:42 GMT Aurelian [3064]
	* code/trunk/src/orxonox/objects/Radar.cc (modified)
	* code/trunk/src/orxonox/objects/RadarViewable.cc (modified)
	* code/trunk/src/orxonox/objects/RadarViewable.h (modified)
	* code/trunk/src/orxonox/objects/gametypes/Asteroids.h (modified)
	* code/trunk/src/orxonox/objects/worldentities/ForceField.cc (modified)
	* code/trunk/src/orxonox/objects/worldentities/ForceField.h (modified)
	* code/trunk/src/orxonox/objects/worldentities/MovableEntity.cc (modified)
	* code/trunk/src/orxonox/objects/worldentities/triggers/CheckPoint.cc (modified)
	* code/trunk/src/orxonox/objects/worldentities/triggers/CheckPoint.h (modified)

	Final commit of gametype asteroids for presentation. everything ...


Mon, 25 May 2009 15:38:00 GMT danielh [3063]
	* code/branches/pickups2/src/orxonox/objects/pickup/CMakeLists.txt (modified)
	* code/branches/pickups2/src/orxonox/objects/pickup/Jump.cc (deleted)
	* code/branches/pickups2/src/orxonox/objects/pickup/Jump.h (deleted)
	* code/branches/pickups2/src/orxonox/objects/pickup/PickupSpawner.cc (modified)
	* code/branches/pickups2/src/orxonox/objects/pickup/items (added)
	* code/branches/pickups2/src/orxonox/objects/pickup/items/CMakeLists.txt (added)
	* code/branches/pickups2/src/orxonox/objects/pickup/items/HealthImmediate.cc (added)
	* code/branches/pickups2/src/orxonox/objects/pickup/items/HealthImmediate.h (added)
	* code/branches/pickups2/src/orxonox/objects/pickup/items/HealthUsable.cc (added)
	* code/branches/pickups2/src/orxonox/objects/pickup/items/HealthUsable.h (added)
	* code/branches/pickups2/src/orxonox/objects/pickup/items/Jump.cc (added)
	* code/branches/pickups2/src/orxonox/objects/pickup/items/Jump.h (added)

	- Moved pickups to a seperate directory
	- Added two pickups: ...


Mon, 25 May 2009 15:13:41 GMT scheusso [3062]
	* code/branches/netp3/src/orxonox/objects/worldentities/PongBat.cc (modified)

	pongbat fix for client (no more hanging at the edge anymore)


Mon, 25 May 2009 14:09:03 GMT scheusso [3061]
	* code/branches/sound (deleted)
	* code/branches/sound2 (deleted)

	deleted old sound branches


Mon, 25 May 2009 13:07:31 GMT scheusso [3060]
	* code/trunk (modified)
	* code/trunk/bin/client1.bat.in (modified)
	* code/trunk/bin/client2.bat.in (modified)
	* code/trunk/bin/dedicated.bat.in (modified)
	* code/trunk/bin/run.bat.in (modified)
	* code/trunk/bin/server.bat.in (modified)
	* code/trunk/bin/standalone.bat.in (modified)
	* code/trunk/cmake/FindDirectX.cmake (modified)
	* code/trunk/cmake/LibraryConfigTardis.cmake (modified)
	* code/trunk/src/CMakeLists.txt (modified)
	* code/trunk/src/audio (deleted)
	* code/trunk/src/core/LuaBind.cc (modified)
	* code/trunk/src/core/LuaBind.h (modified)
	* code/trunk/src/core/Template.cc (modified)
	* code/trunk/src/core/Template.h (modified)
	* code/trunk/src/core/XMLFile.h (modified)
	* code/trunk/src/core/XMLIncludes.h (modified)
	* code/trunk/src/cpptcl/cpptcl.cc (modified)
	* code/trunk/src/cpptcl/cpptcl.h (modified)
	* code/trunk/src/network/synchronisable/NetworkCallback.h (modified)
	* code/trunk/src/network/synchronisable/Synchronisable.cc (modified)
	* code/trunk/src/network/synchronisable/Synchronisable.h (modified)
	* code/trunk/src/orxonox/CMakeLists.txt (modified)
	* code/trunk/src/orxonox/CameraManager.cc (modified)
	* code/trunk/src/orxonox/CameraManager.h (modified)
	* code/trunk/src/orxonox/OrxonoxPrereqs.h (modified)
	* code/trunk/src/orxonox/gamestates/GSMainMenu.cc (modified)
	* code/trunk/src/orxonox/gamestates/GSMainMenu.h (modified)
	* code/trunk/src/orxonox/objects/Level.cc (modified)
	* code/trunk/src/orxonox/objects/Level.h (modified)
	* code/trunk/src/orxonox/objects/collisionshapes (modified)
	* code/trunk/src/orxonox/objects/gametypes/TeamDeathmatch.cc (modified)
	* code/trunk/src/orxonox/objects/gametypes/TeamDeathmatch.h (modified)
	* code/trunk/src/orxonox/objects/items/Engine.cc (modified)
	* code/trunk/src/orxonox/objects/items/Engine.h (modified)
	* code/trunk/src/orxonox/objects/pickup/Usable.h (modified)
	* code/trunk/src/orxonox/objects/quest/AddQuest.cc (modified)
	* code/trunk/src/orxonox/objects/quest/AddQuest.h (modified)
	* code/trunk/src/orxonox/objects/quest/AddQuestHint.cc (modified)
	* code/trunk/src/orxonox/objects/quest/AddQuestHint.h (modified)
	* code/trunk/src/orxonox/objects/quest/AddReward.cc (modified)
	* code/trunk/src/orxonox/objects/quest/AddReward.h (modified)
	* code/trunk/src/orxonox/objects/quest/ChangeQuestStatus.cc (modified)
	* code/trunk/src/orxonox/objects/quest/ChangeQuestStatus.h (modified)
	* code/trunk/src/orxonox/objects/quest/CompleteQuest.cc (modified)
	* code/trunk/src/orxonox/objects/quest/CompleteQuest.h (modified)
	* code/trunk/src/orxonox/objects/quest/FailQuest.cc (modified)
	* code/trunk/src/orxonox/objects/quest/FailQuest.h (modified)
	* code/trunk/src/orxonox/objects/quest/GlobalQuest.cc (modified)
	* code/trunk/src/orxonox/objects/quest/GlobalQuest.h (modified)
	* code/trunk/src/orxonox/objects/quest/LocalQuest.cc (modified)
	* code/trunk/src/orxonox/objects/quest/LocalQuest.h (modified)
	* code/trunk/src/orxonox/objects/quest/Quest.cc (modified)
	* code/trunk/src/orxonox/objects/quest/Quest.h (modified)
	* code/trunk/src/orxonox/objects/quest/QuestDescription.cc (modified)
	* code/trunk/src/orxonox/objects/quest/QuestDescription.h (modified)
	* code/trunk/src/orxonox/objects/quest/QuestEffect.cc (modified)
	* code/trunk/src/orxonox/objects/quest/QuestEffect.h (modified)
	* code/trunk/src/orxonox/objects/quest/QuestHint.cc (modified)
	* code/trunk/src/orxonox/objects/quest/QuestHint.h (modified)
	* code/trunk/src/orxonox/objects/quest/QuestItem.cc (modified)
	* code/trunk/src/orxonox/objects/quest/QuestItem.h (modified)
	* code/trunk/src/orxonox/objects/quest/QuestManager.cc (modified)
	* code/trunk/src/orxonox/objects/quest/QuestManager.h (modified)
	* code/trunk/src/orxonox/objects/quest/Rewardable.cc (modified)
	* code/trunk/src/orxonox/objects/quest/Rewardable.h (modified)
	* code/trunk/src/orxonox/objects/worldentities/Backlight.cc (modified)
	* code/trunk/src/orxonox/objects/worldentities/Backlight.h (modified)
	* code/trunk/src/orxonox/objects/worldentities/Camera.cc (modified)
	* code/trunk/src/orxonox/objects/worldentities/Camera.h (modified)
	* code/trunk/src/orxonox/objects/worldentities/MobileEntity.cc (modified)
	* code/trunk/src/orxonox/objects/worldentities/MobileEntity.h (modified)
	* code/trunk/src/orxonox/objects/worldentities/ParticleSpawner.cc (modified)
	* code/trunk/src/orxonox/objects/worldentities/ParticleSpawner.h (modified)
	* code/trunk/src/orxonox/objects/worldentities/StaticEntity.cc (modified)
	* code/trunk/src/orxonox/objects/worldentities/StaticEntity.h (modified)
	* code/trunk/src/orxonox/objects/worldentities/triggers/DistanceTrigger.cc (modified)
	* code/trunk/src/orxonox/objects/worldentities/triggers/DistanceTrigger.h (modified)
	* code/trunk/src/orxonox/objects/worldentities/triggers/Trigger.cc (modified)
	* code/trunk/src/orxonox/objects/worldentities/triggers/Trigger.h (modified)
	* code/trunk/src/orxonox/sound (added)
	* code/trunk/src/orxonox/sound/CMakeLists.txt (added)
	* code/trunk/src/orxonox/sound/SoundBase.cc (added)
	* code/trunk/src/orxonox/sound/SoundBase.h (added)
	* code/trunk/src/orxonox/sound/SoundMainMenu.cc (added)
	* code/trunk/src/orxonox/sound/SoundMainMenu.h (added)
	* code/trunk/src/orxonox/sound/SoundManager.cc (added)
	* code/trunk/src/orxonox/sound/SoundManager.h (added)
	* code/trunk/src/tolua/all-5.0.lua (modified)
	* code/trunk/src/tolua/all-5.1.lua (modified)
	* code/trunk/src/util (modified)
	* code/trunk/src/util/Exception.cc (modified)
	* code/trunk/src/util/Exception.h (modified)
	* code/trunk/src/util/SignalHandler.cc (modified)
	* code/trunk/src/util/SignalHandler.h (modified)

	merged sound2 back to trunk


Mon, 25 May 2009 13:01:08 GMT mockm [3059]
	* code/trunk/src/network/Host.cc (modified)

	broadcast message in standalone works now


Mon, 25 May 2009 12:45:57 GMT scheusso [3058]
	* code/trunk/src/network/Host.cc (modified)

	adjustment to be able to see chat messages in standalone mode


Mon, 25 May 2009 12:30:56 GMT mockm [3057]
	* code/trunk/src/orxonox/objects/gametypes/UnderAttack.cc (modified)

	new rev of gametype UnderAttack: Gametime has been enlarged :-)


Mon, 25 May 2009 11:56:53 GMT Aurelian [3056]
	* code/trunk/src/orxonox/objects/gametypes/Asteroids.cc (modified)
	* code/trunk/src/orxonox/objects/gametypes/Asteroids.h (modified)

	Bug in gametype Asteroids fixed: game ends directly after death


Mon, 25 May 2009 11:53:13 GMT erwin [3055]
	* code/branches/sound2/src/orxonox/CameraManager.h (modified)
	* code/branches/sound2/src/orxonox/OrxonoxPrereqs.h (modified)
	* code/branches/sound2/src/orxonox/gamestates/GSMainMenu.cc (modified)
	* code/branches/sound2/src/orxonox/gamestates/GSMainMenu.h (modified)
	* code/branches/sound2/src/orxonox/sound/CMakeLists.txt (modified)
	* code/branches/sound2/src/orxonox/sound/SoundBase.cc (modified)
	* code/branches/sound2/src/orxonox/sound/SoundBase.h (modified)
	* code/branches/sound2/src/orxonox/sound/SoundMainMenu.cc (added)
	* code/branches/sound2/src/orxonox/sound/SoundMainMenu.h (added)
	* code/branches/sound2/src/orxonox/sound/SoundManager.cc (modified)
	* code/branches/sound2/src/orxonox/sound/SoundManager.h (modified)

	added mainmenu ambient sound


Mon, 25 May 2009 10:37:19 GMT decapitb [3054]
	* code/branches/particles/src/orxonox/OrxonoxPrereqs.h (modified)
	* code/branches/particles/src/orxonox/objects/worldentities/BigExplosion.cc (added)
	* code/branches/particles/src/orxonox/objects/worldentities/BigExplosion.h (added)
	* code/branches/particles/src/orxonox/objects/worldentities/CMakeLists.txt (modified)
	* code/branches/particles/src/orxonox/objects/worldentities/pawns/Pawn.cc (modified)
	* code/branches/particles/src/orxonox/objects/worldentities/pawns/Pawn.h (modified)

	everything


Mon, 25 May 2009 02:19:14 GMT landauf [3053]
	* code/trunk (modified)
	* code/trunk/src/orxonox/OrxonoxPrereqs.h (modified)
	* code/trunk/src/orxonox/objects/CMakeLists.txt (modified)
	* code/trunk/src/orxonox/objects/controllers/AIController.cc (modified)
	* code/trunk/src/orxonox/objects/controllers/HumanController.cc (modified)
	* code/trunk/src/orxonox/objects/controllers/HumanController.h (modified)
	* code/trunk/src/orxonox/objects/controllers/WaypointPatrolController.cc (modified)
	* code/trunk/src/orxonox/objects/weaponsystem (copied)
	* code/trunk/src/orxonox/objects/weaponsystem/CMakeLists.txt (copied)
	* code/trunk/src/orxonox/objects/weaponsystem/DefaultWeaponmodeLink.cc (copied)
	* code/trunk/src/orxonox/objects/weaponsystem/DefaultWeaponmodeLink.h (copied)
	* code/trunk/src/orxonox/objects/weaponsystem/Munition.cc (copied)
	* code/trunk/src/orxonox/objects/weaponsystem/Munition.h (copied)
	* code/trunk/src/orxonox/objects/weaponsystem/MuzzleFlash.cc (copied)
	* code/trunk/src/orxonox/objects/weaponsystem/MuzzleFlash.h (copied)
	* code/trunk/src/orxonox/objects/weaponsystem/Weapon.cc (copied)
	* code/trunk/src/orxonox/objects/weaponsystem/Weapon.h (copied)
	* code/trunk/src/orxonox/objects/weaponsystem/WeaponMode.cc (copied)
	* code/trunk/src/orxonox/objects/weaponsystem/WeaponMode.h (copied)
	* code/trunk/src/orxonox/objects/weaponsystem/WeaponPack.cc (copied)
	* code/trunk/src/orxonox/objects/weaponsystem/WeaponPack.h (copied)
	* code/trunk/src/orxonox/objects/weaponsystem/WeaponSet.cc (copied)
	* code/trunk/src/orxonox/objects/weaponsystem/WeaponSet.h (copied)
	* code/trunk/src/orxonox/objects/weaponsystem/WeaponSlot.cc (copied)
	* code/trunk/src/orxonox/objects/weaponsystem/WeaponSlot.h (copied)
	* code/trunk/src/orxonox/objects/weaponsystem/WeaponSystem.cc (copied)
	* code/trunk/src/orxonox/objects/weaponsystem/WeaponSystem.h (copied)
	* code/trunk/src/orxonox/objects/weaponsystem/munitions (copied)
	* code/trunk/src/orxonox/objects/weaponsystem/munitions/CMakeLists.txt (copied)
	* code/trunk/src/orxonox/objects/weaponsystem/munitions/FusionMunition.cc (copied)
	* code/trunk/src/orxonox/objects/weaponsystem/munitions/FusionMunition.h (copied)
	* code/trunk/src/orxonox/objects/weaponsystem/munitions/LaserMunition.cc (copied)
	* code/trunk/src/orxonox/objects/weaponsystem/munitions/LaserMunition.h (copied)
	* code/trunk/src/orxonox/objects/weaponsystem/munitions/ReplenishingMunition.cc (copied)
	* code/trunk/src/orxonox/objects/weaponsystem/munitions/ReplenishingMunition.h (copied)
	* code/trunk/src/orxonox/objects/weaponsystem/projectiles (copied)
	* code/trunk/src/orxonox/objects/weaponsystem/projectiles/BillboardProjectile.cc (copied)
	* code/trunk/src/orxonox/objects/weaponsystem/projectiles/BillboardProjectile.h (copied)
	* code/trunk/src/orxonox/objects/weaponsystem/projectiles/CMakeLists.txt (copied)
	* code/trunk/src/orxonox/objects/weaponsystem/projectiles/LightningGunProjectile.cc (copied)
	* code/trunk/src/orxonox/objects/weaponsystem/projectiles/LightningGunProjectile.h (copied)
	* code/trunk/src/orxonox/objects/weaponsystem/projectiles/ParticleProjectile.cc (copied)
	* code/trunk/src/orxonox/objects/weaponsystem/projectiles/ParticleProjectile.h (copied)
	* code/trunk/src/orxonox/objects/weaponsystem/projectiles/Projectile.cc (copied)
	* code/trunk/src/orxonox/objects/weaponsystem/projectiles/Projectile.h (copied)
	* code/trunk/src/orxonox/objects/weaponsystem/weaponmodes (copied)
	* code/trunk/src/orxonox/objects/weaponsystem/weaponmodes/CMakeLists.txt (copied)
	* code/trunk/src/orxonox/objects/weaponsystem/weaponmodes/EnergyDrink.cc (copied)
	* code/trunk/src/orxonox/objects/weaponsystem/weaponmodes/EnergyDrink.h (copied)
	* code/trunk/src/orxonox/objects/weaponsystem/weaponmodes/FusionFire.cc (copied)
	* code/trunk/src/orxonox/objects/weaponsystem/weaponmodes/FusionFire.h (copied)
	* code/trunk/src/orxonox/objects/weaponsystem/weaponmodes/HsW01.cc (copied)
	* code/trunk/src/orxonox/objects/weaponsystem/weaponmodes/HsW01.h (copied)
	* code/trunk/src/orxonox/objects/weaponsystem/weaponmodes/LaserFire.cc (copied)
	* code/trunk/src/orxonox/objects/weaponsystem/weaponmodes/LaserFire.h (copied)
	* code/trunk/src/orxonox/objects/weaponsystem/weaponmodes/LightningGun.cc (copied)
	* code/trunk/src/orxonox/objects/weaponsystem/weaponmodes/LightningGun.h (copied)
	* code/trunk/src/orxonox/objects/worldentities/Billboard.cc (modified)
	* code/trunk/src/orxonox/objects/worldentities/Billboard.h (modified)
	* code/trunk/src/orxonox/objects/worldentities/ControllableEntity.h (modified)
	* code/trunk/src/orxonox/objects/worldentities/pawns/Pawn.cc (modified)
	* code/trunk/src/orxonox/objects/worldentities/pawns/Pawn.h (modified)
	* code/trunk/src/orxonox/objects/worldentities/pawns/Spectator.cc (modified)
	* code/trunk/src/orxonox/objects/worldentities/pawns/Spectator.h (modified)

	merged weapons branch back to trunk


Mon, 25 May 2009 01:45:05 GMT landauf [3052]
	* code/trunk/src/orxonox/objects/weaponSystem (deleted)

	removed the old weaponSystem directory to get ready for merge. the ...


Mon, 25 May 2009 01:39:11 GMT landauf [3051]
	* code/trunk (modified)

	Well, I guess codeb_l_ocks fits better. I'm just wondering why it ...


Mon, 25 May 2009 01:34:38 GMT landauf [3050]
	* code/trunk (modified)

	added /build and /codeblocks to the ignore list


Mon, 25 May 2009 01:26:43 GMT landauf [3049]
	* code/trunk/src/orxonox/OrxonoxPrereqs.h (modified)
	* code/trunk/src/orxonox/objects/controllers/AIController.cc (modified)
	* code/trunk/src/orxonox/objects/controllers/ArtificialController.cc (modified)
	* code/trunk/src/orxonox/objects/controllers/ArtificialController.h (modified)
	* code/trunk/src/orxonox/objects/controllers/CMakeLists.txt (modified)
	* code/trunk/src/orxonox/objects/controllers/WaypointController.cc (added)
	* code/trunk/src/orxonox/objects/controllers/WaypointController.h (added)
	* code/trunk/src/orxonox/objects/controllers/WaypointPatrolController.cc (added)
	* code/trunk/src/orxonox/objects/controllers/WaypointPatrolController.h (added)
	* code/trunk/src/orxonox/objects/gametypes/TeamDeathmatch.cc (modified)
	* code/trunk/src/orxonox/objects/gametypes/TeamDeathmatch.h (modified)
	* code/trunk/src/orxonox/objects/worldentities/ControllableEntity.cc (modified)
	* code/trunk/src/orxonox/objects/worldentities/ControllableEntity.h (modified)
	* code/trunk/src/util/Math.cc (modified)

	- Added option to add a Controller to a ControllableEntity in the XML ...


Sun, 24 May 2009 23:12:52 GMT scheusso [3048]
	* code/branches/netp3/src/orxonox/objects/worldentities/PongBat.cc (modified)

	some adjustments in order to make network playing of pong smoother


Sun, 24 May 2009 22:47:15 GMT scheusso [3047]
	* code/branches/netp3/src/network/GamestateManager.cc (modified)
	* code/branches/netp3/src/network/packet/Gamestate.cc (modified)
	* code/branches/netp3/src/network/packet/Gamestate.h (modified)

	had to revert some things in Gamestate::diff


Sun, 24 May 2009 21:53:09 GMT bknecht [3046]
	* code/branches/pickups2/src/orxonox/objects/pickup/PickupSpawner.cc (modified)
	* code/branches/pickups2/src/orxonox/objects/pickup/PickupSpawner.h (modified)

	introducing the bouncing pickup


Sun, 24 May 2009 21:27:14 GMT scheusso [3045]
	* code/branches/netp3/src/network/Client.cc (modified)
	* code/branches/netp3/src/network/Client.h (modified)
	* code/branches/netp3/src/network/ClientConnection.cc (modified)
	* code/branches/netp3/src/network/ClientConnection.h (modified)
	* code/branches/netp3/src/network/GamestateManager.cc (modified)
	* code/branches/netp3/src/network/GamestateManager.h (modified)
	* code/branches/netp3/src/network/Server.cc (modified)
	* code/branches/netp3/src/network/Server.h (modified)
	* code/branches/netp3/src/network/packet/Gamestate.cc (modified)
	* code/branches/netp3/src/network/packet/Gamestate.h (modified)
	* code/branches/netp3/src/network/synchronisable/SynchronisableVariable.cc (modified)
	* code/branches/netp3/src/network/synchronisable/SynchronisableVariable.h (modified)

	some cleaning up


Sun, 24 May 2009 21:25:55 GMT scheusso [3044]
	* code/branches/netp3/src/orxonox/objects/worldentities/PongBall.cc (modified)

	clientside physics of pong now working


Sun, 24 May 2009 20:38:06 GMT scheusso [3043]
	* code/branches/netp3/src/network/TrafficControl.cc (modified)
	* code/branches/netp3/src/network/packet/Gamestate.cc (modified)
	* code/branches/netp3/src/orxonox/objects/worldentities/PongBall.cc (modified)
	* code/branches/netp3/src/orxonox/objects/worldentities/PongBall.h (modified)

	first approach of having client-side pong physics
	some optimisations ...


Sun, 24 May 2009 20:23:43 GMT bknecht [3042]
	* code/branches/pickups2/src/orxonox/objects/pickup/Jump.h (modified)
	* code/branches/pickups2/src/orxonox/objects/pickup/ModifierPickup.h (modified)
	* code/branches/pickups2/src/orxonox/objects/pickup/PickupSpawner.h (modified)

	fixed some includes to make code compilable on Unix systems


Sun, 24 May 2009 20:01:49 GMT danielh [3041]
	* code/branches/pickups2/src/orxonox/objects/pickup/PickupInventory.cc (modified)

	Now creating some CEGUI windows for items as soon as the inventory is ...


Sun, 24 May 2009 19:43:45 GMT landauf [3040]
	* code/branches/pickups2/src/orxonox/objects/pickup/Jump.cc (modified)
	* code/branches/pickups2/src/orxonox/objects/pickup/PickupCollection.cc (modified)
	* code/branches/pickups2/src/orxonox/objects/pickup/PickupInventory.cc (modified)
	* code/branches/pickups2/src/orxonox/objects/pickup/PickupInventory.h (modified)

	added 2 typedefs in PickupCollection.cc to replace _Pairii which ...


Sun, 24 May 2009 16:09:23 GMT landauf [3039]
	* code/trunk/src/orxonox/objects/worldentities/pawns/SpaceShip.cc (modified)
	* code/trunk/src/orxonox/objects/worldentities/pawns/Spectator.cc (modified)

	changed rotation convertion.

	+pitch is a counterclockwise rotation ...


Sun, 24 May 2009 15:42:50 GMT landauf [3038]
	* code/trunk/src/orxonox/objects/controllers/HumanController.cc (modified)
	* code/trunk/src/orxonox/objects/gametypes/Gametype.cc (modified)
	* code/trunk/src/orxonox/objects/infos/PlayerInfo.cc (modified)
	* code/trunk/src/orxonox/objects/infos/PlayerInfo.h (modified)
	* code/trunk/src/orxonox/objects/worldentities/ControllableEntity.cc (modified)
	* code/trunk/src/orxonox/objects/worldentities/ControllableEntity.h (modified)
	* code/trunk/src/orxonox/objects/worldentities/pawns/Pawn.cc (modified)
	* code/trunk/src/orxonox/objects/worldentities/pawns/Pawn.h (modified)
	* code/trunk/src/orxonox/objects/worldentities/pawns/Spectator.h (modified)

	Cleaned up setPlayer/removePlayer interface between PlayerInfo and ...


Sun, 24 May 2009 01:01:38 GMT bknecht [3037]
	* code/trunk/src/core/Game.cc (modified)
	* code/trunk/src/core/Game.h (modified)

	minor fix so not all hell breaks loose if we do not use this function ...


Sun, 24 May 2009 00:39:16 GMT bknecht [3036]
	* code/trunk/src/core/CMakeLists.txt (modified)
	* code/trunk/src/core/Game.cc (modified)
	* code/trunk/src/core/Game.h (modified)
	* code/trunk/src/orxonox/gamestates/GSLevel.cc (modified)

	we do now save what level you chose last time and will preselect it ...


Sat, 23 May 2009 22:36:48 GMT landauf [3035]
	* code/trunk/src/core/CommandExecutor.cc (modified)
	* code/trunk/src/core/CommandExecutor.h (modified)

	get returnvalue shortcuts in CommandExecutor (for tolua)


Sat, 23 May 2009 20:05:58 GMT landauf [3034]
	* code/trunk/src/orxonox/gui/GUIManager.cc (modified)
	* code/trunk/src/orxonox/objects/worldentities/pawns/Spectator.cc (modified)
	* code/trunk/src/orxonox/objects/worldentities/triggers/DistanceTrigger.cc (modified)
	* code/trunk/src/orxonox/overlays/OverlayGroup.cc (modified)
	* code/trunk/src/orxonox/overlays/notifications/Notification.h (modified)
	* code/trunk/src/orxonox/overlays/notifications/NotificationManager.h (modified)

	replaced tabs with spaces


Sat, 23 May 2009 19:57:52 GMT landauf [3033]
	* code/trunk (modified)
	* code/trunk/src/orxonox/OrxonoxPrereqs.h (modified)
	* code/trunk/src/orxonox/objects/gametypes/Asteroids.cc (copied)
	* code/trunk/src/orxonox/objects/gametypes/Asteroids.h (copied)
	* code/trunk/src/orxonox/objects/gametypes/CMakeLists.txt (modified)
	* code/trunk/src/orxonox/objects/gametypes/Gametype.cc (modified)
	* code/trunk/src/orxonox/objects/gametypes/Gametype.h (modified)
	* code/trunk/src/orxonox/objects/gametypes/TeamBaseMatch.cc (copied)
	* code/trunk/src/orxonox/objects/gametypes/TeamBaseMatch.h (copied)
	* code/trunk/src/orxonox/objects/gametypes/TeamDeathmatch.cc (modified)
	* code/trunk/src/orxonox/objects/gametypes/TeamDeathmatch.h (modified)
	* code/trunk/src/orxonox/objects/gametypes/UnderAttack.cc (copied)
	* code/trunk/src/orxonox/objects/gametypes/UnderAttack.h (copied)
	* code/trunk/src/orxonox/objects/quest/QuestEffectBeacon.cc (modified)
	* code/trunk/src/orxonox/objects/worldentities/CMakeLists.txt (modified)
	* code/trunk/src/orxonox/objects/worldentities/ForceField.cc (copied)
	* code/trunk/src/orxonox/objects/worldentities/ForceField.h (copied)
	* code/trunk/src/orxonox/objects/worldentities/MobileEntity.cc (modified)
	* code/trunk/src/orxonox/objects/worldentities/MobileEntity.h (modified)
	* code/trunk/src/orxonox/objects/worldentities/MovableEntity.cc (modified)
	* code/trunk/src/orxonox/objects/worldentities/MovableEntity.h (modified)
	* code/trunk/src/orxonox/objects/worldentities/SpawnPoint.cc (modified)
	* code/trunk/src/orxonox/objects/worldentities/pawns/CMakeLists.txt (modified)
	* code/trunk/src/orxonox/objects/worldentities/pawns/Destroyer.cc (copied)
	* code/trunk/src/orxonox/objects/worldentities/pawns/Destroyer.h (copied)
	* code/trunk/src/orxonox/objects/worldentities/pawns/Pawn.cc (modified)
	* code/trunk/src/orxonox/objects/worldentities/pawns/TeamBaseMatchBase.cc (copied)
	* code/trunk/src/orxonox/objects/worldentities/pawns/TeamBaseMatchBase.h (copied)
	* code/trunk/src/orxonox/objects/worldentities/triggers/CMakeLists.txt (modified)
	* code/trunk/src/orxonox/objects/worldentities/triggers/CheckPoint.cc (copied)
	* code/trunk/src/orxonox/objects/worldentities/triggers/CheckPoint.h (copied)
	* code/trunk/src/orxonox/objects/worldentities/triggers/DistanceTrigger.cc (modified)
	* code/trunk/src/orxonox/objects/worldentities/triggers/DistanceTrigger.h (modified)
	* code/trunk/src/orxonox/objects/worldentities/triggers/PlayerTrigger.h (modified)
	* code/trunk/src/orxonox/objects/worldentities/triggers/Trigger.cc (modified)
	* code/trunk/src/orxonox/objects/worldentities/triggers/Trigger.h (modified)
	* code/trunk/src/orxonox/overlays/hud/CMakeLists.txt (modified)
	* code/trunk/src/orxonox/overlays/hud/HUDTimer.cc (copied)
	* code/trunk/src/orxonox/overlays/hud/HUDTimer.h (copied)

	merged gametypes branch back to trunk


Sat, 23 May 2009 18:07:31 GMT landauf [3032]
	* code/branches/gametypes_test (deleted)

	test


Sat, 23 May 2009 18:03:44 GMT landauf [3031]
	* code/branches/gametypes_test (modified)

	test


Sat, 23 May 2009 17:57:07 GMT landauf [3030]
	* code/branches/gametypes_test (modified)
	* code/branches/gametypes_test/bin/client1.bat.in (modified)
	* code/branches/gametypes_test/bin/client2.bat.in (modified)
	* code/branches/gametypes_test/bin/dedicated.bat.in (modified)
	* code/branches/gametypes_test/bin/run.bat.in (modified)
	* code/branches/gametypes_test/bin/server.bat.in (modified)
	* code/branches/gametypes_test/bin/standalone.bat.in (modified)
	* code/branches/gametypes_test/cmake/FindDirectX.cmake (modified)
	* code/branches/gametypes_test/cmake/LibraryConfigTardis.cmake (modified)
	* code/branches/gametypes_test/src/core/LuaBind.cc (modified)
	* code/branches/gametypes_test/src/core/LuaBind.h (modified)
	* code/branches/gametypes_test/src/core/Template.cc (modified)
	* code/branches/gametypes_test/src/core/Template.h (modified)
	* code/branches/gametypes_test/src/core/XMLFile.h (modified)
	* code/branches/gametypes_test/src/core/XMLIncludes.h (modified)
	* code/branches/gametypes_test/src/cpptcl/cpptcl.cc (modified)
	* code/branches/gametypes_test/src/cpptcl/cpptcl.h (modified)
	* code/branches/gametypes_test/src/network/synchronisable/NetworkCallback.h (modified)
	* code/branches/gametypes_test/src/network/synchronisable/Synchronisable.cc (modified)
	* code/branches/gametypes_test/src/network/synchronisable/Synchronisable.h (modified)
	* code/branches/gametypes_test/src/orxonox/CameraManager.cc (modified)
	* code/branches/gametypes_test/src/orxonox/CameraManager.h (modified)
	* code/branches/gametypes_test/src/orxonox/objects/Level.cc (modified)
	* code/branches/gametypes_test/src/orxonox/objects/Level.h (modified)
	* code/branches/gametypes_test/src/orxonox/objects/collisionshapes (modified)
	* code/branches/gametypes_test/src/orxonox/objects/gametypes/TeamDeathmatch.cc (modified)
	* code/branches/gametypes_test/src/orxonox/objects/gametypes/TeamDeathmatch.h (modified)
	* code/branches/gametypes_test/src/orxonox/objects/pickup/Usable.h (modified)
	* code/branches/gametypes_test/src/orxonox/objects/quest/AddQuest.cc (modified)
	* code/branches/gametypes_test/src/orxonox/objects/quest/AddQuest.h (modified)
	* code/branches/gametypes_test/src/orxonox/objects/quest/AddQuestHint.cc (modified)
	* code/branches/gametypes_test/src/orxonox/objects/quest/AddQuestHint.h (modified)
	* code/branches/gametypes_test/src/orxonox/objects/quest/AddReward.cc (modified)
	* code/branches/gametypes_test/src/orxonox/objects/quest/AddReward.h (modified)
	* code/branches/gametypes_test/src/orxonox/objects/quest/ChangeQuestStatus.cc (modified)
	* code/branches/gametypes_test/src/orxonox/objects/quest/ChangeQuestStatus.h (modified)
	* code/branches/gametypes_test/src/orxonox/objects/quest/CompleteQuest.cc (modified)
	* code/branches/gametypes_test/src/orxonox/objects/quest/CompleteQuest.h (modified)
	* code/branches/gametypes_test/src/orxonox/objects/quest/FailQuest.cc (modified)
	* code/branches/gametypes_test/src/orxonox/objects/quest/FailQuest.h (modified)
	* code/branches/gametypes_test/src/orxonox/objects/quest/GlobalQuest.cc (modified)
	* code/branches/gametypes_test/src/orxonox/objects/quest/GlobalQuest.h (modified)
	* code/branches/gametypes_test/src/orxonox/objects/quest/LocalQuest.cc (modified)
	* code/branches/gametypes_test/src/orxonox/objects/quest/LocalQuest.h (modified)
	* code/branches/gametypes_test/src/orxonox/objects/quest/Quest.cc (modified)
	* code/branches/gametypes_test/src/orxonox/objects/quest/Quest.h (modified)
	* code/branches/gametypes_test/src/orxonox/objects/quest/QuestDescription.cc (modified)
	* code/branches/gametypes_test/src/orxonox/objects/quest/QuestDescription.h (modified)
	* code/branches/gametypes_test/src/orxonox/objects/quest/QuestEffect.cc (modified)
	* code/branches/gametypes_test/src/orxonox/objects/quest/QuestEffect.h (modified)
	* code/branches/gametypes_test/src/orxonox/objects/quest/QuestHint.cc (modified)
	* code/branches/gametypes_test/src/orxonox/objects/quest/QuestHint.h (modified)
	* code/branches/gametypes_test/src/orxonox/objects/quest/QuestItem.cc (modified)
	* code/branches/gametypes_test/src/orxonox/objects/quest/QuestItem.h (modified)
	* code/branches/gametypes_test/src/orxonox/objects/quest/QuestManager.cc (modified)
	* code/branches/gametypes_test/src/orxonox/objects/quest/QuestManager.h (modified)
	* code/branches/gametypes_test/src/orxonox/objects/quest/Rewardable.cc (modified)
	* code/branches/gametypes_test/src/orxonox/objects/quest/Rewardable.h (modified)
	* code/branches/gametypes_test/src/orxonox/objects/weaponSystem/WeaponSystem.cc (modified)
	* code/branches/gametypes_test/src/orxonox/objects/weaponSystem/WeaponSystem.h (modified)
	* code/branches/gametypes_test/src/orxonox/objects/worldentities/Backlight.cc (modified)
	* code/branches/gametypes_test/src/orxonox/objects/worldentities/Backlight.h (modified)
	* code/branches/gametypes_test/src/orxonox/objects/worldentities/Camera.cc (modified)
	* code/branches/gametypes_test/src/orxonox/objects/worldentities/Camera.h (modified)
	* code/branches/gametypes_test/src/orxonox/objects/worldentities/MobileEntity.cc (modified)
	* code/branches/gametypes_test/src/orxonox/objects/worldentities/MobileEntity.h (modified)
	* code/branches/gametypes_test/src/orxonox/objects/worldentities/ParticleSpawner.cc (modified)
	* code/branches/gametypes_test/src/orxonox/objects/worldentities/ParticleSpawner.h (modified)
	* code/branches/gametypes_test/src/orxonox/objects/worldentities/StaticEntity.cc (modified)
	* code/branches/gametypes_test/src/orxonox/objects/worldentities/StaticEntity.h (modified)
	* code/branches/gametypes_test/src/orxonox/objects/worldentities/triggers/DistanceTrigger.cc (modified)
	* code/branches/gametypes_test/src/orxonox/objects/worldentities/triggers/DistanceTrigger.h (modified)
	* code/branches/gametypes_test/src/orxonox/objects/worldentities/triggers/Trigger.cc (modified)
	* code/branches/gametypes_test/src/orxonox/objects/worldentities/triggers/Trigger.h (modified)
	* code/branches/gametypes_test/src/tolua/all-5.0.lua (modified)
	* code/branches/gametypes_test/src/tolua/all-5.1.lua (modified)
	* code/branches/gametypes_test/src/util (modified)
	* code/branches/gametypes_test/src/util/Exception.cc (modified)
	* code/branches/gametypes_test/src/util/Exception.h (modified)
	* code/branches/gametypes_test/src/util/SignalHandler.cc (modified)
	* code/branches/gametypes_test/src/util/SignalHandler.h (modified)

	test


Sat, 23 May 2009 17:54:20 GMT landauf [3029]
	* code/branches/gametypes_test (copied)

	test


Sat, 23 May 2009 17:50:02 GMT landauf [3028]
	* code/trunk/bin/client1.bat.in (modified)
	* code/trunk/bin/client2.bat.in (modified)
	* code/trunk/bin/dedicated.bat.in (modified)
	* code/trunk/bin/run.bat.in (modified)
	* code/trunk/bin/server.bat.in (modified)
	* code/trunk/bin/standalone.bat.in (modified)
	* code/trunk/cmake/FindDirectX.cmake (modified)
	* code/trunk/cmake/LibraryConfigTardis.cmake (modified)
	* code/trunk/src/core/LuaBind.cc (modified)
	* code/trunk/src/core/LuaBind.h (modified)
	* code/trunk/src/core/Template.cc (modified)
	* code/trunk/src/core/Template.h (modified)
	* code/trunk/src/core/XMLFile.h (modified)
	* code/trunk/src/core/XMLIncludes.h (modified)
	* code/trunk/src/cpptcl/cpptcl.cc (modified)
	* code/trunk/src/cpptcl/cpptcl.h (modified)
	* code/trunk/src/network/synchronisable/NetworkCallback.h (modified)
	* code/trunk/src/network/synchronisable/Synchronisable.cc (modified)
	* code/trunk/src/network/synchronisable/Synchronisable.h (modified)
	* code/trunk/src/orxonox/CameraManager.cc (modified)
	* code/trunk/src/orxonox/CameraManager.h (modified)
	* code/trunk/src/orxonox/objects/Level.cc (modified)
	* code/trunk/src/orxonox/objects/Level.h (modified)
	* code/trunk/src/orxonox/objects/collisionshapes (modified)
	* code/trunk/src/orxonox/objects/gametypes/TeamDeathmatch.cc (modified)
	* code/trunk/src/orxonox/objects/gametypes/TeamDeathmatch.h (modified)
	* code/trunk/src/orxonox/objects/pickup/Usable.h (modified)
	* code/trunk/src/orxonox/objects/quest/AddQuest.cc (modified)
	* code/trunk/src/orxonox/objects/quest/AddQuest.h (modified)
	* code/trunk/src/orxonox/objects/quest/AddQuestHint.cc (modified)
	* code/trunk/src/orxonox/objects/quest/AddQuestHint.h (modified)
	* code/trunk/src/orxonox/objects/quest/AddReward.cc (modified)
	* code/trunk/src/orxonox/objects/quest/AddReward.h (modified)
	* code/trunk/src/orxonox/objects/quest/ChangeQuestStatus.cc (modified)
	* code/trunk/src/orxonox/objects/quest/ChangeQuestStatus.h (modified)
	* code/trunk/src/orxonox/objects/quest/CompleteQuest.cc (modified)
	* code/trunk/src/orxonox/objects/quest/CompleteQuest.h (modified)
	* code/trunk/src/orxonox/objects/quest/FailQuest.cc (modified)
	* code/trunk/src/orxonox/objects/quest/FailQuest.h (modified)
	* code/trunk/src/orxonox/objects/quest/GlobalQuest.cc (modified)
	* code/trunk/src/orxonox/objects/quest/GlobalQuest.h (modified)
	* code/trunk/src/orxonox/objects/quest/LocalQuest.cc (modified)
	* code/trunk/src/orxonox/objects/quest/LocalQuest.h (modified)
	* code/trunk/src/orxonox/objects/quest/Quest.cc (modified)
	* code/trunk/src/orxonox/objects/quest/Quest.h (modified)
	* code/trunk/src/orxonox/objects/quest/QuestDescription.cc (modified)
	* code/trunk/src/orxonox/objects/quest/QuestDescription.h (modified)
	* code/trunk/src/orxonox/objects/quest/QuestEffect.cc (modified)
	* code/trunk/src/orxonox/objects/quest/QuestEffect.h (modified)
	* code/trunk/src/orxonox/objects/quest/QuestHint.cc (modified)
	* code/trunk/src/orxonox/objects/quest/QuestHint.h (modified)
	* code/trunk/src/orxonox/objects/quest/QuestItem.cc (modified)
	* code/trunk/src/orxonox/objects/quest/QuestItem.h (modified)
	* code/trunk/src/orxonox/objects/quest/QuestManager.cc (modified)
	* code/trunk/src/orxonox/objects/quest/QuestManager.h (modified)
	* code/trunk/src/orxonox/objects/quest/Rewardable.cc (modified)
	* code/trunk/src/orxonox/objects/quest/Rewardable.h (modified)
	* code/trunk/src/orxonox/objects/weaponSystem/WeaponSystem.cc (modified)
	* code/trunk/src/orxonox/objects/weaponSystem/WeaponSystem.h (modified)
	* code/trunk/src/orxonox/objects/worldentities/Backlight.cc (modified)
	* code/trunk/src/orxonox/objects/worldentities/Backlight.h (modified)
	* code/trunk/src/orxonox/objects/worldentities/Camera.cc (modified)
	* code/trunk/src/orxonox/objects/worldentities/Camera.h (modified)
	* code/trunk/src/orxonox/objects/worldentities/MobileEntity.cc (modified)
	* code/trunk/src/orxonox/objects/worldentities/MobileEntity.h (modified)
	* code/trunk/src/orxonox/objects/worldentities/ParticleSpawner.cc (modified)
	* code/trunk/src/orxonox/objects/worldentities/ParticleSpawner.h (modified)
	* code/trunk/src/orxonox/objects/worldentities/StaticEntity.cc (modified)
	* code/trunk/src/orxonox/objects/worldentities/StaticEntity.h (modified)
	* code/trunk/src/orxonox/objects/worldentities/triggers/DistanceTrigger.cc (modified)
	* code/trunk/src/orxonox/objects/worldentities/triggers/DistanceTrigger.h (modified)
	* code/trunk/src/orxonox/objects/worldentities/triggers/Trigger.cc (modified)
	* code/trunk/src/orxonox/objects/worldentities/triggers/Trigger.h (modified)
	* code/trunk/src/tolua/all-5.0.lua (modified)
	* code/trunk/src/tolua/all-5.1.lua (modified)
	* code/trunk/src/util (modified)
	* code/trunk/src/util/Exception.cc (modified)
	* code/trunk/src/util/Exception.h (modified)
	* code/trunk/src/util/SignalHandler.cc (modified)
	* code/trunk/src/util/SignalHandler.h (modified)

	removed svn:mergeinfo properties


Sat, 23 May 2009 17:47:09 GMT landauf [3027]
	* code/trunk/bin/bin_trunk (deleted)

	test


Sat, 23 May 2009 17:47:00 GMT landauf [3026]
	* code/trunk/bin/bin_branch (deleted)

	test


Sat, 23 May 2009 17:44:22 GMT landauf [3025]
	* code/trunk/bin/bin_branch/client1.bat.in (modified)
	* code/trunk/bin/bin_branch/client2.bat.in (modified)
	* code/trunk/bin/bin_branch/dedicated.bat.in (modified)
	* code/trunk/bin/bin_branch/run.bat.in (modified)
	* code/trunk/bin/bin_branch/server.bat.in (modified)
	* code/trunk/bin/bin_branch/standalone.bat.in (modified)

	test


Sat, 23 May 2009 17:40:47 GMT landauf [3024]
	* code/trunk/bin/bin_branch (copied)

	test


Sat, 23 May 2009 17:40:28 GMT landauf [3023]
	* code/trunk/bin/bin_branch (deleted)

	test


Sat, 23 May 2009 17:36:43 GMT landauf [3022]
	* code/trunk/bin/bin_branch (copied)

	test


Sat, 23 May 2009 17:36:30 GMT landauf [3021]
	* code/trunk/bin/bin_trunk (copied)

	test


Sat, 23 May 2009 17:04:10 GMT landauf [3020]
	* code/branches/gametypes/src/orxonox/OrxonoxPrereqs.h (modified)
	* code/branches/gametypes/src/orxonox/objects/gametypes/Asteroids.cc (modified)
	* code/branches/gametypes/src/orxonox/objects/gametypes/Asteroids.h (modified)
	* code/branches/gametypes/src/orxonox/objects/gametypes/TeamBaseMatch.cc (modified)
	* code/branches/gametypes/src/orxonox/objects/gametypes/TeamBaseMatch.h (modified)
	* code/branches/gametypes/src/orxonox/objects/gametypes/UnderAttack.cc (modified)
	* code/branches/gametypes/src/orxonox/objects/gametypes/UnderAttack.h (modified)
	* code/branches/gametypes/src/orxonox/objects/worldentities/ForceField.cc (modified)
	* code/branches/gametypes/src/orxonox/objects/worldentities/pawns/Destroyer.cc (modified)
	* code/branches/gametypes/src/orxonox/objects/worldentities/pawns/Destroyer.h (modified)
	* code/branches/gametypes/src/orxonox/objects/worldentities/pawns/TeamBaseMatchBase.cc (modified)
	* code/branches/gametypes/src/orxonox/objects/worldentities/pawns/TeamBaseMatchBase.h (modified)
	* code/branches/gametypes/src/orxonox/objects/worldentities/triggers/CheckPoint.cc (modified)
	* code/branches/gametypes/src/orxonox/objects/worldentities/triggers/CheckPoint.h (modified)
	* code/branches/gametypes/src/orxonox/overlays/hud/HUDTimer.cc (modified)
	* code/branches/gametypes/src/orxonox/overlays/hud/HUDTimer.h (modified)

	some small adjustments in all the new gametype classes


Sat, 23 May 2009 16:24:32 GMT landauf [3019]
	* code/branches/gametypes/src/orxonox/objects/gametypes/Asteroids.cc (modified)
	* code/branches/gametypes/src/orxonox/objects/gametypes/Asteroids.h (modified)
	* code/branches/gametypes/src/orxonox/objects/gametypes/TeamBaseMatch.cc (modified)
	* code/branches/gametypes/src/orxonox/objects/gametypes/TeamBaseMatch.h (modified)
	* code/branches/gametypes/src/orxonox/objects/gametypes/UnderAttack.cc (modified)
	* code/branches/gametypes/src/orxonox/objects/gametypes/UnderAttack.h (modified)
	* code/branches/gametypes/src/orxonox/objects/worldentities/ForceField.cc (modified)
	* code/branches/gametypes/src/orxonox/objects/worldentities/ForceField.h (modified)
	* code/branches/gametypes/src/orxonox/objects/worldentities/pawns/Destroyer.cc (modified)
	* code/branches/gametypes/src/orxonox/objects/worldentities/pawns/Destroyer.h (modified)
	* code/branches/gametypes/src/orxonox/objects/worldentities/pawns/TeamBaseMatchBase.cc (modified)
	* code/branches/gametypes/src/orxonox/objects/worldentities/pawns/TeamBaseMatchBase.h (modified)
	* code/branches/gametypes/src/orxonox/objects/worldentities/triggers/CheckPoint.cc (modified)
	* code/branches/gametypes/src/orxonox/objects/worldentities/triggers/CheckPoint.h (modified)
	* code/branches/gametypes/src/orxonox/overlays/hud/HUDTimer.cc (modified)
	* code/branches/gametypes/src/orxonox/overlays/hud/HUDTimer.h (modified)

	set eol-style:native, no codechanges


Sat, 23 May 2009 15:24:40 GMT landauf [3018]
	* code/branches/lod (deleted)
	* code/branches/lod2 (deleted)

	removed lod and lod2. lodfinal is still in use.


Sat, 23 May 2009 14:34:59 GMT landauf [3017]
	* code/branches/gui (deleted)
	* code/branches/questsystem4 (deleted)
	* code/branches/questsystem5 (deleted)
	* code/branches/weaponsystem (deleted)

	removed some branches


Sat, 23 May 2009 07:53:13 GMT danielh [3016]
	* code/branches/pickups2/src/orxonox/objects/pickup/PickupCollection.cc (modified)
	* code/branches/pickups2/src/orxonox/objects/pickup/PickupInventory.cc (modified)
	* code/branches/pickups2/src/orxonox/objects/pickup/PickupInventory.h (modified)

	- minor fix in PickupCollection
	- Made PickupInventory into a ...