#
# ChangeLog for code/branches
#
# Generated by Trac 1.0.9
# Nov 25, 2024, 9:50:38 PM

Thu, 20 May 2010 12:45:03 GMT cdaniel [6934]
	* code/branches/presentation3/src/orxonox/ChatInputHandler.cc (modified)

	Fixed Include file destination (For Visual Studio under Windows)


Thu, 20 May 2010 12:40:53 GMT scheusso [6933]
	* code/branches/presentation3/src/orxonox/LevelManager.cc (modified)

	make sure this won't happen again


Thu, 20 May 2010 12:38:40 GMT scheusso [6932]
	* code/branches/presentation3/data/levels/templates/lodinformation.oxt (modified)

	this way the default values will not be set when applying this
	template


Thu, 20 May 2010 11:51:27 GMT erwin [6931]
	* code/branches/sound5/src/orxonox/sound/AmbientSound.cc (modified)
	* code/branches/sound5/src/orxonox/sound/SoundStreamer.cc (modified)
	* code/branches/sound5/src/orxonox/sound/SoundStreamer.h (modified)

	Merged changes from local sandbox to sound5


Thu, 20 May 2010 09:33:07 GMT scheusso [6928]
	* code/branches/presentation3 (modified)
	* code/branches/presentation3/data/defaultConfig/keybindings.ini (modified)
	* code/branches/presentation3/data/gui/layouts/ChatBox-inputonly.layout (copied)
	* code/branches/presentation3/data/gui/layouts/ChatBox.layout (copied)
	* code/branches/presentation3/data/gui/schemes/OrxonoxGUIScheme.scheme (modified)
	* code/branches/presentation3/data/gui/scripts/ChatBox-inputonly.lua (copied)
	* code/branches/presentation3/data/gui/scripts/ChatBox.lua (copied)
	* code/branches/presentation3/src/libraries/network/ChatListener.cc (modified)
	* code/branches/presentation3/src/libraries/network/ChatListener.h (modified)
	* code/branches/presentation3/src/libraries/network/Host.h (modified)
	* code/branches/presentation3/src/libraries/network/packet/Chat.cc (modified)
	* code/branches/presentation3/src/libraries/network/packet/Chat.h (modified)
	* code/branches/presentation3/src/orxonox/CMakeLists.txt (modified)
	* code/branches/presentation3/src/orxonox/ChatHistory.cc (copied)
	* code/branches/presentation3/src/orxonox/ChatHistory.h (copied)
	* code/branches/presentation3/src/orxonox/ChatInputHandler.cc (copied)
	* code/branches/presentation3/src/orxonox/ChatInputHandler.h (copied)
	* code/branches/presentation3/src/orxonox/graphics/CEGuiSample.cc (copied)
	* code/branches/presentation3/src/orxonox/graphics/CEGuiSample.h (copied)

	mergine chat2 into presentation merger branch


Thu, 20 May 2010 08:28:10 GMT scheusso [6927]
	* code/branches/presentation3/src/orxonox/LevelManager.cc (modified)

	fix in levelmanager: if a template was assigned to the Level the ...


Thu, 20 May 2010 08:23:22 GMT scheusso [6926]
	* code/branches/presentation3 (modified)
	* code/branches/presentation3/data/levels/empty_level.oxw (modified)
	* code/branches/presentation3/data/levels/gametype_asteroids.oxw (modified)
	* code/branches/presentation3/data/levels/gametype_underattack.oxw (modified)
	* code/branches/presentation3/data/levels/presentationLOD.oxw (copied)
	* code/branches/presentation3/data/levels/presentationLODdif.oxw (copied)
	* code/branches/presentation3/data/levels/teambasematchlevel.oxw (modified)
	* code/branches/presentation3/data/levels/teamdeathmatch.oxw (modified)
	* code/branches/presentation3/data/levels/templates/lodinformation.oxt (copied)
	* code/branches/presentation3/src/libraries/core/BaseObject.cc (modified)
	* code/branches/presentation3/src/libraries/core/BaseObject.h (modified)
	* code/branches/presentation3/src/orxonox/Level.cc (modified)
	* code/branches/presentation3/src/orxonox/Level.h (modified)
	* code/branches/presentation3/src/orxonox/LevelManager.cc (modified)
	* code/branches/presentation3/src/orxonox/graphics/CMakeLists.txt (modified)
	* code/branches/presentation3/src/orxonox/graphics/MeshLodInformation.cc (copied)
	* code/branches/presentation3/src/orxonox/graphics/MeshLodInformation.h (copied)
	* code/branches/presentation3/src/orxonox/graphics/Model.cc (modified)
	* code/branches/presentation3/src/orxonox/graphics/Model.h (modified)

	merging lod branch into presentation3 merger branch


Tue, 18 May 2010 15:34:48 GMT rgrieder [6924]
	* code/branches/hudelements/src/modules/overlays/hud/HUDNavigation.cc (modified)
	* code/branches/hudelements/src/modules/overlays/hud/HUDNavigation.h (modified)

	Clean up in HUDNavigation, no actual code changes.


Tue, 18 May 2010 12:22:51 GMT rgrieder [6923]
	* code/branches/hudelements/src/modules/overlays/hud/HUDNavigation.cc (modified)

	HUDNavigation: setFontName() when adding an object should resolve the ...


Tue, 18 May 2010 07:34:53 GMT rgrieder [6922]
	* code/branches/hudelements/src/modules/overlays/hud/HUDNavigation.cc (modified)

	Fixed bug in HUDNavigation destructor again.


Mon, 17 May 2010 15:01:54 GMT jo [6921]
	* code/branches/dynamicmatch/src/modules/overlays/hud/CMakeLists.txt (modified)
	* code/branches/dynamicmatch/src/orxonox/gametypes/Dynamicmatch.cc (modified)
	* code/branches/dynamicmatch/src/orxonox/gametypes/Dynamicmatch.h (modified)
	* code/branches/dynamicmatch/src/orxonox/infos/GametypeInfo.cc (modified)
	* code/branches/dynamicmatch/src/orxonox/infos/GametypeInfo.h (modified)
	* code/branches/dynamicmatch/src/orxonox/interfaces/GametypeMessageListener.h (modified)

	With additional tutorial messages in order to explain how the ...


Mon, 17 May 2010 14:57:26 GMT stmathia [6920]
	* code/branches/presentation3/data/levels/Level(Deathmatch).oxw (added)
	* code/branches/presentation3/data/levels/Level(UnderAttack).oxw (added)
	* code/branches/presentation3/data/levels/mylevel.oxw (added)
	* code/branches/presentation3/src/orxonox/gametypes/TeamDeathmatch.cc (modified)

	Changes in level files. Addition to TemaDeathmatch, should now be ...


Mon, 17 May 2010 14:45:50 GMT solex [6919]
	* code/branches/ai/src/orxonox/controllers/AIController.cc (modified)
	* code/branches/ai/src/orxonox/controllers/ArtificialController.cc (modified)
	* code/branches/ai/src/orxonox/controllers/ArtificialController.h (modified)
	* code/branches/ai/src/orxonox/worldentities/ControllableEntity.cc (modified)

	finally some decent formation flying!


Mon, 17 May 2010 14:36:18 GMT gasserlu [6918]
	* code/branches/ai/data/levels/pickup.oxw (modified)
	* code/branches/ai/data/levels/templates/pickup_representation_templates.oxt (modified)
	* code/branches/ai/src/orxonox/controllers/ArtificialController.cc (modified)
	* code/branches/ai/src/orxonox/controllers/CMakeLists.txt (modified)
	* code/branches/ai/src/orxonox/controllers/DroneController.cc (modified)
	* code/branches/ai/src/orxonox/controllers/DroneController.h (modified)
	* code/branches/ai/src/orxonox/worldentities/Drone.cc (modified)

	drone follows in realistic matter


Mon, 17 May 2010 13:51:43 GMT scurcio [6917]
	* code/branches/hudelements/data/gui/scripts/InGamePickupHUD.lua (modified)
	* code/branches/hudelements/src/modules/overlays/hud/HUDNavigation.cc (modified)
	* code/branches/hudelements/src/modules/overlays/hud/HUDNavigation.h (modified)

	final changes in struct for the objectMap


Mon, 17 May 2010 13:50:30 GMT smerkli [6916]
	* code/branches/chat2/src/orxonox/ChatInputHandler.cc (modified)

	added some comments, made reasonable-length lines ^-^ ready to merge.


Mon, 17 May 2010 13:50:13 GMT scheusso [6915]
	* code/branches/lod/src/orxonox/graphics/Model.h (modified)

	fixed gcc error


Mon, 17 May 2010 13:41:40 GMT sfluecki [6914]
	* code/branches/hudelements/src/modules/overlays/hud/HUDNavigation.cc (modified)
	* code/branches/hudelements/src/modules/overlays/hud/HUDNavigation.h (modified)

	changed pair in HUDNavigation activeObjectListMap to Struct


Mon, 17 May 2010 13:33:21 GMT scheusso [6913]
	* code/branches/hudelements/src/modules/overlays/hud/HUDRadar.cc (modified)

	bugfix in HUDRadar which caused a segfault on exit (overlay element ...


Mon, 17 May 2010 13:31:49 GMT scheusso [6912]
	* code/branches/presentation3 (copied)

	creating new presentation merger branch


Mon, 17 May 2010 13:28:36 GMT kolibri7 [6911]
	* code/branches/lod/src/orxonox/graphics/Model.cc (modified)

	*deleted a default values function call


Mon, 17 May 2010 13:22:10 GMT smerkli [6910]
	* code/branches/chat2/data/gui/layouts/ChatBox.layout (modified)
	* code/branches/chat2/src/orxonox/ChatHistory.cc (modified)
	* code/branches/chat2/src/orxonox/ChatInputHandler.cc (modified)
	* code/branches/chat2/src/orxonox/ChatInputHandler.h (modified)
	* code/branches/chat2/src/orxonox/graphics/ChatBox.cc (deleted)
	* code/branches/chat2/src/orxonox/graphics/ChatBox.h (deleted)

	Added final comments, getting ready for merge


Mon, 17 May 2010 13:21:51 GMT kolibri7 [6909]
	* code/branches/lod/data/levels/empty_level.oxw (modified)
	* code/branches/lod/data/levels/gametype_asteroids.oxw (modified)
	* code/branches/lod/data/levels/teambasematchlevel.oxw (modified)
	* code/branches/lod/data/levels/teamdeathmatch.oxw (modified)
	* code/branches/lod/data/levels/templates/lodinformation.oxt (modified)
	* code/branches/lod/src/orxonox/Level.cc (modified)
	* code/branches/lod/src/orxonox/graphics/Model.cc (modified)
	* code/branches/lod/src/orxonox/graphics/Model.h (modified)

	*fully functional lod implementation
	*added file ...


Mon, 17 May 2010 12:41:01 GMT freicy [6908]
	* code/branches/fps/data/levels/includes/weaponsettings_fps.oxi (modified)
	* code/branches/fps/data/levels/presentation_FS10.oxw (modified)
	* code/branches/fps/data/levels/templates/fps.oxt (modified)
	* code/branches/fps/src/orxonox/worldentities/pawns/FpsPlayer.cc (modified)

	by Cyrill Frei


Mon, 17 May 2010 12:36:42 GMT rgrieder [6907]
	* code/branches/hudelements/src/modules/overlays/hud/HUDNavigation.cc (modified)
	* code/branches/hudelements/src/orxonox/interfaces/RadarViewable.cc (modified)
	* code/branches/hudelements/src/orxonox/interfaces/RadarViewable.h (modified)

	Fixed two bugs in HUDNavigation.cc and RadarViewable.


Sat, 15 May 2010 16:12:13 GMT gnadler [6905]
	* code/branches/rocket/src/modules/weapons/RocketController.cc (modified)
	* code/branches/rocket/src/modules/weapons/RocketController.h (modified)
	* code/branches/rocket/src/modules/weapons/projectiles/SimpleRocket.cc (modified)
	* code/branches/rocket/src/modules/weapons/projectiles/SimpleRocket.h (modified)
	* code/branches/rocket/src/modules/weapons/weaponmodes/SimpleRocketFire.cc (modified)
	* code/branches/rocket/src/orxonox/controllers/DroneController.cc (modified)
	* code/branches/rocket/src/orxonox/controllers/DroneController.h (modified)
	* code/branches/rocket/src/orxonox/controllers/NewHumanController.cc (modified)
	* code/branches/rocket/src/orxonox/controllers/NewHumanController.h (modified)
	* code/branches/rocket/src/orxonox/worldentities/Drone.cc (modified)

	rockets get target but moveToPosition function does not work
	correctly.


Sat, 15 May 2010 13:24:06 GMT scheusso [6904]
	* code/branches/rocket/src/modules/weapons/RocketController.cc (modified)

	fixed missing include


Sat, 15 May 2010 12:57:51 GMT gnadler [6903]
	* code/branches/rocket/src/modules/weapons/RocketController.cc (modified)
	* code/branches/rocket/src/modules/weapons/RocketController.h (modified)
	* code/branches/rocket/src/orxonox/controllers/DroneController.cc (modified)
	* code/branches/rocket/src/orxonox/controllers/NewHumanController.cc (modified)
	* code/branches/rocket/src/orxonox/controllers/NewHumanController.h (modified)

	Cant assign Pawn* to WeakPtr<Pawn>.


Sat, 15 May 2010 09:36:04 GMT gnadler [6902]
	* code/branches/rocket/src/modules/weapons/RocketController.cc (modified)
	* code/branches/rocket/src/modules/weapons/projectiles/SimpleRocket.cc (modified)

	no rocket is controlled by controller. accidentally deleted tick ...


Fri, 14 May 2010 10:41:04 GMT gnadler [6900]
	* code/branches/rocket/src/modules/weapons/RocketController.cc (modified)
	* code/branches/rocket/src/modules/weapons/projectiles/SimpleRocket.cc (modified)
	* code/branches/rocket/src/modules/weapons/projectiles/SimpleRocket.h (modified)
	* code/branches/rocket/src/modules/weapons/weaponmodes/SimpleRocketFire.cc (modified)

	rockentcontroller doesn't control the rocket it spawns itself. ...


Thu, 13 May 2010 11:19:04 GMT scheusso [6899]
	* code/branches/hudelements/src/modules/overlays/hud/HUDNavigation.cc (modified)
	* code/branches/hudelements/src/modules/overlays/hud/HUDNavigation.h (modified)

	some cleaning up
	still segfault when terminating


Thu, 13 May 2010 10:02:14 GMT sfluecki [6898]
	* code/branches/hudelements/src/modules/overlays/hud/HUDNavigation.cc (modified)
	* code/branches/hudelements/src/modules/overlays/hud/HUDNavigation.h (modified)

	changes in 'src/modules/overlays/hud/HUDNavigation'. ...


Tue, 11 May 2010 12:56:32 GMT sfluecki [6897]
	* code/branches/hudelements/src/modules/overlays/hud/HUDNavigation.cc (modified)
	* code/branches/hudelements/src/modules/overlays/hud/HUDNavigation.h (modified)
	* code/branches/hudelements/src/modules/overlays/hud/HUDRadar.cc (modified)

	Updates in der reinitialisierung von HUDNavigation -> changes in ...


Mon, 10 May 2010 15:02:26 GMT benedict [6896]
	* code/branches/ppspickups3/src/orxonox/worldentities/pawns/Pawn.cc (modified)

	spamming the server


Mon, 10 May 2010 14:57:42 GMT benedict [6895]
	* code/branches/ppspickups3/src/orxonox/worldentities/pawns/Pawn.cc (modified)

	high on cpout


Mon, 10 May 2010 14:52:34 GMT ebeier [6894]
	* code/branches/ppspickups3/src/orxonox/worldentities/pawns/Pawn.cc (modified)

	cout again -.-


Mon, 10 May 2010 14:49:45 GMT ebeier [6893]
	* code/branches/ppspickups3/src/orxonox/worldentities/pawns/Pawn.cc (modified)

	more cout yeahhhhhh


Mon, 10 May 2010 14:41:26 GMT ebeier [6892]
	* code/branches/ppspickups3/src/orxonox/worldentities/pawns/Pawn.cc (modified)

	inserted cout for troubleshooting


Mon, 10 May 2010 14:40:44 GMT gasserlu [6891]
	* code/branches/ai/data/levels/pickup.oxw (modified)
	* code/branches/ai/src/modules/pickup/items/DronePickup.cc (modified)
	* code/branches/ai/src/orxonox/controllers/AIController.cc (modified)
	* code/branches/ai/src/orxonox/controllers/ArtificialController.cc (modified)
	* code/branches/ai/src/orxonox/controllers/DroneController.cc (modified)
	* code/branches/ai/src/orxonox/controllers/DroneController.h (modified)

	DroneController modified, sameTeam() mod.// hack


Mon, 10 May 2010 14:34:39 GMT smerkli [6890]
	* code/branches/chat2/src/orxonox/ChatInputHandler.cc (modified)




Mon, 10 May 2010 14:32:26 GMT solex [6888]
	* code/branches/ai/data/levels/teamdeathmatch.oxw (modified)
	* code/branches/ai/src/orxonox/controllers/AIController.cc (modified)
	* code/branches/ai/src/orxonox/controllers/ArtificialController.cc (modified)
	* code/branches/ai/src/orxonox/controllers/ArtificialController.h (modified)

	formation flight: new formations


Mon, 10 May 2010 14:30:01 GMT ebeier [6887]
	* code/branches/ppspickups3/src/modules/pickup/items/ShieldPickup.cc (modified)

	small correction


Mon, 10 May 2010 14:26:04 GMT sfluecki [6886]
	* code/branches/hudelements/src/modules/overlays/hud/HUDNavigation.cc (modified)

	HUDNavigation constructor corrected


Mon, 10 May 2010 14:24:18 GMT smerkli [6885]
	* code/branches/chat2/src/orxonox/ChatInputHandler.cc (modified)
	* code/branches/chat2/src/orxonox/ChatInputHandler.h (modified)

	Strage delete-button bug persists.


Mon, 10 May 2010 14:23:29 GMT benedict [6884]
	* code/branches/ppspickups3/data/levels/includes/pickups.oxi (modified)
	* code/branches/ppspickups3/data/levels/pickup.oxw (modified)
	* code/branches/ppspickups3/data/levels/templates/pickup_representation_templates.oxt (modified)
	* code/branches/ppspickups3/src/modules/pickup/items/ShieldPickup.cc (modified)
	* code/branches/ppspickups3/src/modules/pickup/items/ShieldPickup.h (modified)
	* code/branches/ppspickups3/src/orxonox/worldentities/pawns/Pawn.cc (modified)
	* code/branches/ppspickups3/src/orxonox/worldentities/pawns/Pawn.h (modified)

	did the shield pickup. upload for testing


Mon, 10 May 2010 14:17:20 GMT freicy [6883]
	* code/branches/fps/data/levels/presentation_FS10.oxw (added)
	* code/branches/fps/data/levels/templates/fps.oxt (modified)
	* code/branches/fps/data/overlays/hudtamplates_fps.oxo (modified)
	* code/branches/fps/src/orxonox/controllers/NewHumanController.cc (modified)

	by cyrill


Mon, 10 May 2010 14:14:28 GMT edwind [6882]
	* code/branches/fps/data/levels/fps_test.oxw (modified)
	* code/branches/fps/src/orxonox/worldentities/pawns/FpsPlayer.cc (modified)

	commit by ed


Mon, 10 May 2010 14:00:52 GMT kolibri7 [6881]
	* code/branches/lod/data/levels/gametype_underattack.oxw (modified)
	* code/branches/lod/data/levels/templates/lodinformation.oxt (modified)
	* code/branches/lod/src/orxonox/graphics/MeshLodInformation.cc (modified)
	* code/branches/lod/src/orxonox/graphics/MeshLodInformation.h (modified)

	*lodLevel is a float now
	*gametype_underattack.oxw includes the ...


Mon, 10 May 2010 13:58:08 GMT rgrieder [6880]
	* code/branches/hudelements/src/modules/overlays/hud/HUDNavigation.cc (modified)

	HUDNavigation: Fixed a few bugs, add to background and fixed size
	issues.


Mon, 10 May 2010 13:50:27 GMT smerkli [6879]
	* code/branches/chat2/src/orxonox/ChatInputHandler.cc (modified)
	* code/branches/chat2/src/orxonox/ChatInputHandler.h (modified)

	bugfixes, performance improvements.


Mon, 10 May 2010 13:38:16 GMT scheusso [6878]
	* code/branches/rocket/src/modules/weapons/projectiles/SimpleRocket.cc (modified)

	fixed sigabrt that happened when the rocket collided against anything


Mon, 10 May 2010 13:35:48 GMT kolibri7 [6877]
	* code/branches/lod/data/levels/gametype_underattack.oxw (modified)
	* code/branches/lod/src/orxonox/Level.cc (modified)
	* code/branches/lod/src/orxonox/graphics/MeshLodInformation.cc (modified)
	* code/branches/lod/src/orxonox/graphics/Model.cc (modified)

	*everything works now; setting the lodlevels and also the XML-Port. ...


Mon, 10 May 2010 13:18:14 GMT smerkli [6876]
	* code/branches/chat2/data/gui/layouts/ChatBox-inputonly.layout (modified)
	* code/branches/chat2/data/gui/layouts/ChatBox.layout (modified)
	* code/branches/chat2/data/gui/schemes/OrxonoxGUIScheme.scheme (modified)
	* code/branches/chat2/src/orxonox/ChatInputHandler.cc (modified)
	* code/branches/chat2/src/orxonox/ChatInputHandler.h (modified)

	Scrolling chat now works, discovered delete-button bug, fixing it
	now.


Mon, 10 May 2010 13:02:52 GMT sfluecki [6875]
	* code/branches/hudelements/src/modules/overlays/hud/HUDNavigation.cc (modified)

	ping & showGUI check done


Mon, 10 May 2010 12:55:46 GMT sfluecki [6874]
	* code/branches/hudelements/src/modules/overlays/hud/HUDNavigation.cc (modified)
	* code/branches/hudelements/src/modules/overlays/hud/HUDNavigation.h (modified)

	blub


Mon, 10 May 2010 12:21:36 GMT sfluecki [6873]
	* code/branches/hudelements/src/modules/overlays/hud/HUDNavigation.cc (modified)
	* code/branches/hudelements/src/modules/overlays/hud/HUDNavigation.h (modified)

	für reto


Mon, 10 May 2010 12:20:21 GMT edwind [6872]
	* code/branches/fps/data/levels/fps_test.oxw (modified)
	* code/branches/fps/data/levels/old/physicstest2.oxw (modified)
	* code/branches/fps/data/levels/templates/fps.oxt (modified)
	* code/branches/fps/src/orxonox/worldentities/pawns/FpsPlayer.cc (modified)
	* code/branches/fps/src/orxonox/worldentities/pawns/FpsPlayer.h (modified)

	commit by ed


Mon, 10 May 2010 11:47:44 GMT smerkli [6870]
	* code/branches/chat2/data/gui/layouts/ChatBox-inputonly.layout (copied)
	* code/branches/chat2/data/gui/layouts/ChatBox.layout (modified)
	* code/branches/chat2/data/gui/scripts/ChatBox-inputonly.lua (copied)
	* code/branches/chat2/src/orxonox/ChatInputHandler.cc (modified)
	* code/branches/chat2/src/orxonox/ChatInputHandler.h (modified)

	Chatbox light added, trigger with n in game.


Mon, 10 May 2010 11:28:19 GMT ebeier [6869]
	* code/branches/ppspickups3/src/modules/pickup/PickupPrereqs.h (modified)
	* code/branches/ppspickups3/src/modules/pickup/items/CMakeLists.txt (modified)
	* code/branches/ppspickups3/src/modules/pickup/items/ShieldPickup.cc (added)
	* code/branches/ppspickups3/src/modules/pickup/items/ShieldPickup.h (added)

	added files for ShieldPickup, nothing implemented yet.


Mon, 10 May 2010 11:23:04 GMT sfluecki [6868]
	* code/branches/hudelements/src/modules/overlays/hud/HUDNavigation.cc (modified)
	* code/branches/hudelements/src/modules/overlays/hud/HUDNavigation.h (modified)

	nochma test?


Mon, 10 May 2010 10:58:17 GMT freicy [6867]
	* code/branches/fps/data/levels/fps_test.oxw (added)
	* code/branches/fps/data/levels/includes/weaponsettings_fps.oxi (added)
	* code/branches/fps/data/levels/templates/fps.oxt (added)
	* code/branches/fps/data/overlays/hudtamplates_fps.oxo (added)
	* code/branches/fps/src/orxonox/worldentities/pawns/FpsPlayer.cc (added)
	* code/branches/fps/src/orxonox/worldentities/pawns/FpsPlayer.h (added)

	commit by cyrill


Mon, 10 May 2010 10:40:49 GMT freicy [6866]
	* code/branches/fps/data/levels/empty_level.oxw (modified)
	* code/branches/fps/src/orxonox/Scene.cc (modified)
	* code/branches/fps/src/orxonox/controllers/HumanController.cc (modified)
	* code/branches/fps/src/orxonox/controllers/NewHumanController.cc (modified)
	* code/branches/fps/src/orxonox/worldentities/CameraPosition.cc (modified)
	* code/branches/fps/src/orxonox/worldentities/ControllableEntity.h (modified)
	* code/branches/fps/src/orxonox/worldentities/pawns/CMakeLists.txt (modified)

	commit by cyrill


Mon, 10 May 2010 09:02:12 GMT sfluecki [6865]
	* code/branches/hudelements/src/modules/overlays/hud/HUDNavigation.cc (modified)
	* code/branches/hudelements/src/modules/overlays/hud/HUDNavigation.h (modified)

	tick funktion angepasst


Fri, 07 May 2010 14:14:18 GMT gnadler [6863]
	* code/branches/rocket/data/levels/includes/weaponsettings3.oxi (modified)
	* code/branches/rocket/src/modules/weapons/RocketController.cc (modified)
	* code/branches/rocket/src/modules/weapons/RocketController.h (modified)
	* code/branches/rocket/src/modules/weapons/projectiles/SimpleRocket.cc (modified)
	* code/branches/rocket/src/modules/weapons/projectiles/SimpleRocket.h (modified)
	* code/branches/rocket/src/modules/weapons/weaponmodes/SimpleRocketFire.cc (modified)

	orxonox crashes while, respectively after destroying either the ...


Thu, 06 May 2010 14:36:12 GMT gionc [6861]
	* code/branches/skybox2/src/modules/designtools/CMakeLists.txt (modified)
	* code/branches/skybox2/src/modules/designtools/CreateStars.cc (added)
	* code/branches/skybox2/src/modules/designtools/CreateStars.h (added)

	Added StarCreator


Thu, 06 May 2010 11:11:43 GMT dafrick [6858]
	* code/branches/skybox2/src/libraries/core/Core.cc (modified)
	* code/branches/skybox2/src/libraries/core/Core.h (modified)
	* code/branches/skybox2/src/modules/designtools/SkyboxGenerator.cc (modified)
	* code/branches/skybox2/src/modules/designtools/SkyboxGenerator.h (modified)
	* code/branches/skybox2/src/modules/overlays/hud/GametypeStatus.cc (modified)
	* code/branches/skybox2/src/modules/overlays/hud/GametypeStatus.h (modified)

	Made noCaption feature needed for skybox much nice. :D


Tue, 04 May 2010 09:12:54 GMT solex [6854]
	* code/branches/ai/src/orxonox/controllers/CMakeLists.txt (modified)
	* code/branches/ai/src/orxonox/worldentities/CMakeLists.txt (modified)

	added Drone back into CMakesLists


Mon, 03 May 2010 20:33:02 GMT kolibri7 [6852]
	* code/branches/lod/src/orxonox/graphics/MeshLodInformation.cc (modified)
	* code/branches/lod/src/orxonox/graphics/Model.cc (modified)

	modified it, but the game crashes, something is wrong with while(...)


Mon, 03 May 2010 16:41:43 GMT solex [6850]
	* code/branches/ai/data/levels/templates/spaceship_pirate.oxt (modified)
	* code/branches/ai/src/orxonox/controllers/AIController.cc (modified)
	* code/branches/ai/src/orxonox/controllers/ArtificialController.cc (modified)
	* code/branches/ai/src/orxonox/controllers/ArtificialController.h (modified)
	* code/branches/ai/src/orxonox/controllers/CMakeLists.txt (modified)
	* code/branches/ai/src/orxonox/worldentities/CMakeLists.txt (modified)

	master/slave interaction of bots now correct - getting closer to ...


Mon, 03 May 2010 15:03:05 GMT scurcio [6849]
	* code/branches/hudelements/src/modules/overlays/hud/HUDNavigation.cc (modified)
	* code/branches/hudelements/src/modules/overlays/hud/HUDNavigation.h (modified)
	* code/branches/hudelements/src/modules/overlays/hud/HUDRadar.cc (modified)

	update hudnavigation /addObject, removeObject


Mon, 03 May 2010 14:57:54 GMT jo [6848]
	* code/branches/dynamicmatch/src/orxonox/gametypes/Dynamicmatch.cc (modified)
	* code/branches/dynamicmatch/src/orxonox/gametypes/Dynamicmatch.h (modified)

	enhanced level, Teamspawnpoints - almost playable version


Mon, 03 May 2010 14:51:35 GMT gasserlu [6847]
	* code/branches/ai/src/modules/pickup/items/DronePickup.cc (modified)
	* code/branches/ai/src/orxonox/OrxonoxPrereqs.h (modified)
	* code/branches/ai/src/orxonox/controllers/DroneController.cc (added)
	* code/branches/ai/src/orxonox/controllers/DroneController.h (added)
	* code/branches/ai/src/orxonox/worldentities/Drone.cc (modified)

	drone follows Owner


Mon, 03 May 2010 14:46:00 GMT smerkli [6846]
	* code/branches/chat2/data/gui/layouts/ChatBox.layout (modified)
	* code/branches/chat2/data/gui/scripts/ChatBox.lua (added)
	* code/branches/chat2/src/orxonox/ChatHistory.cc (modified)
	* code/branches/chat2/src/orxonox/ChatInputHandler.cc (modified)
	* code/branches/chat2/src/orxonox/ChatInputHandler.h (modified)

	Chatbox done, with cursor goodness and everything. Thanks for the
	help


Mon, 03 May 2010 14:21:07 GMT kolibri7 [6843]
	* code/branches/lod/src/orxonox/graphics/Model.cc (modified)
	* code/branches/lod/src/orxonox/graphics/Model.h (modified)

	fix of the problem of getting the right scale; cast to WorldEntity ...


Mon, 03 May 2010 12:39:01 GMT scheusso [6839]
	* code/branches/lod/src/libraries/core/BaseObject.h (modified)

	another tab ....


Mon, 03 May 2010 12:29:27 GMT kolibri7 [6838]
	* code/branches/lod/src/orxonox/Level.cc (modified)
	* code/branches/lod/src/orxonox/Level.h (modified)
	* code/branches/lod/src/orxonox/graphics/MeshLodInformation.h (modified)
	* code/branches/lod/src/orxonox/graphics/Model.cc (modified)

	implemented the XMLPort for additional lod information.


Mon, 03 May 2010 12:10:46 GMT smerkli [6837]
	* code/branches/chat2/data/gui/layouts/ChatBox.layout (modified)
	* code/branches/chat2/src/orxonox/ChatInputHandler.cc (modified)

	Changed EditBox to StaticText in ChatBox.layout


Mon, 03 May 2010 11:47:54 GMT rgrieder [6836]
	* code/branches/chat2 (modified)
	* code/branches/chat2/data/defaultConfig/keybindings.ini (modified)
	* code/branches/chat2/data/gui/layouts/ChatBox.layout (copied)
	* code/branches/chat2/src/libraries/network/ChatListener.cc (modified)
	* code/branches/chat2/src/libraries/network/ChatListener.h (modified)
	* code/branches/chat2/src/libraries/network/Host.h (modified)
	* code/branches/chat2/src/libraries/network/packet/Chat.cc (modified)
	* code/branches/chat2/src/libraries/network/packet/Chat.h (modified)
	* code/branches/chat2/src/orxonox/CMakeLists.txt (modified)
	* code/branches/chat2/src/orxonox/ChatHistory.cc (copied)
	* code/branches/chat2/src/orxonox/ChatHistory.h (copied)
	* code/branches/chat2/src/orxonox/ChatInputHandler.cc (copied)
	* code/branches/chat2/src/orxonox/ChatInputHandler.h (copied)
	* code/branches/chat2/src/orxonox/graphics/CEGuiSample.cc (copied)
	* code/branches/chat2/src/orxonox/graphics/CEGuiSample.h (copied)
	* code/branches/chat2/src/orxonox/graphics/ChatBox.cc (copied)
	* code/branches/chat2/src/orxonox/graphics/ChatBox.h (copied)




Mon, 03 May 2010 11:44:18 GMT rgrieder [6835]
	* code/branches/chat2 (copied)

	New chat branch with GUI changes from the trunk.


Mon, 03 May 2010 11:40:16 GMT gnadler [6834]
	* code/branches/rocket/data/levels/includes/weaponsettings3.oxi (modified)
	* code/branches/rocket/data/particle/rocketfire2.particle (added)
	* code/branches/rocket/src/modules/weapons/RocketController.cc (modified)
	* code/branches/rocket/src/modules/weapons/RocketController.h (modified)
	* code/branches/rocket/src/modules/weapons/projectiles/SimpleRocket.cc (modified)
	* code/branches/rocket/src/modules/weapons/projectiles/SimpleRocket.h (modified)
	* code/branches/rocket/src/modules/weapons/weaponmodes/SimpleRocketFire.cc (modified)

	Success:
	Now rocket spawns somewhere around the ship and the ...


Mon, 03 May 2010 11:38:59 GMT gasserlu [6833]
	* code/branches/ai/src/orxonox/controllers/ArtificialController.h (modified)
	* code/branches/ai/src/orxonox/controllers/DroneController.cc (added)
	* code/branches/ai/src/orxonox/controllers/DroneController.cc~ (deleted)
	* code/branches/ai/src/orxonox/controllers/DroneController.h (added)
	* code/branches/ai/src/orxonox/controllers/DroneController.h~ (deleted)

	DroneController edited


Mon, 03 May 2010 11:25:58 GMT gasserlu [6832]
	* code/branches/ai/src/orxonox/controllers/DroneController.cc~ (added)
	* code/branches/ai/src/orxonox/controllers/DroneController.h~ (added)
	* code/branches/ai/src/orxonox/worldentities/Drone.cc (added)
	* code/branches/ai/src/orxonox/worldentities/Drone.h (added)

	dronecontroller upload


Mon, 03 May 2010 09:38:09 GMT scheusso [6829]
	* code/branches/lod/src/libraries/core/BaseObject.cc (modified)

	no tabs ;)


Mon, 03 May 2010 09:34:44 GMT scheusso [6828]
	* code/branches/lod/src/libraries/core/BaseObject.cc (modified)
	* code/branches/lod/src/libraries/core/BaseObject.h (modified)
	* code/branches/lod/src/orxonox/Level.cc (modified)
	* code/branches/lod/src/orxonox/graphics/Model.cc (modified)

	level pointer for the baseobject


Mon, 03 May 2010 09:20:00 GMT scheusso [6827]
	* code/branches/rocket/src/modules/weapons/projectiles/SimpleRocket.cc (modified)
	* code/branches/rocket/src/modules/weapons/weaponmodes/SimpleRocketFire.cc (modified)

	rocket does spawn and is visible now
	however speed and scaling not ...


Mon, 03 May 2010 00:35:03 GMT landauf [6826]
	* code/branches/fps/src/libraries/tools/CMakeLists.txt (modified)

	excluded bsp renderer from compilation until linux compile problems ...


Sun, 02 May 2010 22:27:45 GMT landauf [6825]
	* code/branches/fps/src/libraries/tools/bsp/DemoApp.cpp (modified)
	* code/branches/fps/src/libraries/tools/bsp/ExampleFrameListener.h (modified)
	* code/branches/fps/src/libraries/tools/bsp/OgreFramework.cpp (modified)
	* code/branches/fps/src/libraries/tools/bsp/Q3Map.cpp (modified)

	fixed warnings in BZN bsp renderer


Sun, 02 May 2010 21:51:49 GMT landauf [6824]
	* code/branches/fps/src/libraries/tools/CMakeLists.txt (modified)
	* code/branches/fps/src/libraries/tools/bsp/CMakeLists.txt (added)

	added CMakeLists.txt for bsp renderer. compiles, but with a shitload ...


Sun, 02 May 2010 21:49:01 GMT landauf [6823]
	* code/branches/fps/src/libraries/tools/bsp/ExampleApplication.h (added)
	* code/branches/fps/src/libraries/tools/bsp/ExampleFrameListener.h (added)

	added ogre sample files for BZN bsp renderer (from ogre 1.6.5, but i ...


Sun, 02 May 2010 21:32:14 GMT landauf [6822]
	* code/branches/fps/src/libraries/tools/bsp (moved)

	renamed fps directory as bsp


Sun, 02 May 2010 21:28:23 GMT landauf [6821]
	* code/branches/fps/src/libraries/tools/fps/OgreFramework.hpp (modified)
	* code/branches/fps/src/libraries/tools/fps/Q3Map.h (modified)
	* code/branches/fps/src/libraries/tools/fps/main.cpp (deleted)
	* code/branches/fps/src/libraries/tools/fps/misc.cpp (deleted)

	BZN bsp renderer: removed JarDebug.h includes and deleted main.cpp ...


Sun, 02 May 2010 21:24:04 GMT landauf [6820]
	* code/branches/fps/src/libraries/tools/fps/DemoApp.cpp (modified)
	* code/branches/fps/src/libraries/tools/fps/DemoApp.hpp (modified)
	* code/branches/fps/src/libraries/tools/fps/JarDebug.cpp (deleted)
	* code/branches/fps/src/libraries/tools/fps/JarDebug.h (deleted)
	* code/branches/fps/src/libraries/tools/fps/OgreFramework.cpp (modified)
	* code/branches/fps/src/libraries/tools/fps/OgreFramework.hpp (modified)
	* code/branches/fps/src/libraries/tools/fps/Q3Map.cpp (modified)
	* code/branches/fps/src/libraries/tools/fps/Q3Map.h (modified)
	* code/branches/fps/src/libraries/tools/fps/Q3Map_Bezier.cpp (modified)
	* code/branches/fps/src/libraries/tools/fps/Q3Map_BspVertex.cpp (modified)
	* code/branches/fps/src/libraries/tools/fps/Q3Map_BspVertex.h (modified)
	* code/branches/fps/src/libraries/tools/fps/main.cpp (modified)
	* code/branches/fps/src/libraries/tools/fps/misc.cpp (modified)

	removed JarDebug from BZN bsp renderer


Sun, 02 May 2010 21:11:32 GMT landauf [6819]
	* code/branches/fps/src/libraries/tools/fps (added)
	* code/branches/fps/src/libraries/tools/fps/DemoApp.cpp (added)
	* code/branches/fps/src/libraries/tools/fps/DemoApp.hpp (added)
	* code/branches/fps/src/libraries/tools/fps/JarDebug.cpp (added)
	* code/branches/fps/src/libraries/tools/fps/JarDebug.h (added)
	* code/branches/fps/src/libraries/tools/fps/OgreFramework.cpp (added)
	* code/branches/fps/src/libraries/tools/fps/OgreFramework.hpp (added)
	* code/branches/fps/src/libraries/tools/fps/OgreGpuCommandBufferFlush.cpp (added)
	* code/branches/fps/src/libraries/tools/fps/OgreGpuCommandBufferFlush.h (added)
	* code/branches/fps/src/libraries/tools/fps/Q3Map.cpp (added)
	* code/branches/fps/src/libraries/tools/fps/Q3Map.h (added)
	* code/branches/fps/src/libraries/tools/fps/Q3Map_Bezier.cpp (added)
	* code/branches/fps/src/libraries/tools/fps/Q3Map_Bezier.h (added)
	* code/branches/fps/src/libraries/tools/fps/Q3Map_BspVertex.cpp (added)
	* code/branches/fps/src/libraries/tools/fps/Q3Map_BspVertex.h (added)
	* code/branches/fps/src/libraries/tools/fps/Q3Map_misc.h (added)
	* code/branches/fps/src/libraries/tools/fps/main.cpp (added)
	* code/branches/fps/src/libraries/tools/fps/misc.cpp (added)

	copy paste of all BZN bsp renderer files


Sun, 02 May 2010 21:02:27 GMT gnadler [6818]
	* code/branches/rocket/src/modules/weapons/projectiles/SimpleRocket.cc (modified)

	latest try (see the forum thread for more info...)
	now Orxonox ...


Sun, 02 May 2010 19:55:23 GMT gnadler [6817]
	* code/branches/rocket/src/modules/weapons/RocketController.cc (modified)
	* code/branches/rocket/src/modules/weapons/projectiles/SimpleRocket.cc (modified)

	made a mistake in previous update, but still not working...


Sun, 02 May 2010 19:50:06 GMT gnadler [6816]
	* code/branches/rocket/src/modules/weapons/projectiles/SimpleRocket.cc (modified)

	updated ~SimpleRocket but still doesn't work


Sun, 02 May 2010 11:39:33 GMT gnadler [6815]
	* code/branches/rocket/src/modules/weapons/RocketController.cc (modified)
	* code/branches/rocket/src/modules/weapons/projectiles/SimpleRocket.cc (modified)

	trying to destroy RocketController within SimpleRocket destroyer but ...


Sat, 01 May 2010 16:15:40 GMT gnadler [6814]
	* code/branches/rocket/data/levels/includes/weaponsettings3.oxi (modified)
	* code/branches/rocket/src/modules/weapons/RocketController.cc (modified)
	* code/branches/rocket/src/modules/weapons/RocketController.h (modified)
	* code/branches/rocket/src/modules/weapons/weaponmodes/SimpleRocketFire.cc (modified)

	tried to fix ~RocketController() as well as that the rocket is not ...


Sat, 01 May 2010 10:37:53 GMT gnadler [6813]
	* code/branches/rocket/src/modules/weapons/RocketController.cc (modified)
	* code/branches/rocket/src/modules/weapons/RocketController.h (modified)
	* code/branches/rocket/src/modules/weapons/projectiles/SimpleRocket.cc (modified)
	* code/branches/rocket/src/modules/weapons/weaponmodes/SimpleRocketFire.cc (modified)

	RocketController now creates rocket. compiles.
	but rocket doesn't spawn.


Fri, 30 Apr 2010 14:42:58 GMT jo [6812]
	* code/branches/dynamicmatch/data/levels/gametype_asteroids.oxw (modified)
	* code/branches/dynamicmatch/src/orxonox/controllers/ArtificialController.cc (modified)
	* code/branches/dynamicmatch/src/orxonox/gametypes/Dynamicmatch.cc (modified)
	* code/branches/dynamicmatch/src/orxonox/gametypes/Dynamicmatch.h (modified)

	adding 3rd party: killers, making the gametype playable for larger ...