#
# ChangeLog for code/branches/network
#
# Generated by Trac 1.0.9
# Nov 13, 2024, 8:23:45 AM

Thu, 10 Apr 2008 13:42:41 GMT scheusso [1018]
	* code/branches/network/src/network/Synchronisable.cc (modified)

	dead bug in synchronisable?


Thu, 10 Apr 2008 13:40:53 GMT scheusso [1017]
	* code/branches/network/src/network/Synchronisable.cc (modified)

	dead bug in synchronisable?


Thu, 10 Apr 2008 13:31:07 GMT scheusso [1016]
	* code/branches/network/src/network/GameStateClient.cc (modified)
	* code/branches/network/src/network/GameStateManager.cc (modified)

	blub


Thu, 10 Apr 2008 13:16:52 GMT scheusso [1015]
	* code/branches/network/src/network/GameStateManager.cc (modified)

	blub


Thu, 10 Apr 2008 12:50:12 GMT scheusso [1014]
	* code/branches/network/src/network/GameStateManager.cc (modified)

	blabla


Thu, 10 Apr 2008 11:51:55 GMT scheusso [1013]
	* code/branches/network/src/network/GameStateClient.cc (modified)
	* code/branches/network/src/network/GameStateManager.cc (modified)

	more output


Thu, 10 Apr 2008 11:37:47 GMT dumenim [1011]
	* code/branches/network/src/network/ClientConnection.cc (modified)
	* code/branches/network/src/network/GameStateManager.cc (modified)

	print gamestates on cout(4)


Thu, 10 Apr 2008 10:55:35 GMT dumenim [1008]
	* code/branches/network/src/network/Client.cc (modified)
	* code/branches/network/src/network/ClientInformation.cc (modified)
	* code/branches/network/src/network/ClientInformation.h (modified)
	* code/branches/network/src/network/ConnectionManager.cc (modified)
	* code/branches/network/src/network/ConnectionManager.h (modified)
	* code/branches/network/src/network/GameStateClient.cc (modified)
	* code/branches/network/src/network/GameStateManager.cc (modified)
	* code/branches/network/src/network/PacketBuffer.cc (modified)
	* code/branches/network/src/network/PacketDecoder.cc (modified)
	* code/branches/network/src/network/PacketGenerator.cc (modified)
	* code/branches/network/src/network/Server.cc (modified)
	* code/branches/network/src/network/Synchronisable.cc (modified)
	* code/branches/network/src/network/Synchronisable.h (modified)
	* code/branches/network/src/network/diffTest.cc (modified)

	changed some comments and catched some return values and maybe some ...


Thu, 10 Apr 2008 09:53:16 GMT scheusso [1007]
	* code/branches/network/src/network/GameStateManager.cc (modified)
	* code/branches/network/src/network/GameStateManager.h (modified)
	* code/branches/network/src/network/Server.cc (modified)

	forgot something


Wed, 09 Apr 2008 18:38:52 GMT scheusso [1005]
	* code/branches/network/src/network/GameStateClient.cc (modified)
	* code/branches/network/src/network/GameStateClient.h (modified)
	* code/branches/network/src/network/GameStateManager.cc (modified)
	* code/branches/network/src/network/GameStateManager.h (modified)

	enhanced memory management in gamestatemanager and gamestateclient


Thu, 03 Apr 2008 14:19:19 GMT scheusso [988]
	* code/branches/network/src/network/ConnectionManager.cc (modified)
	* code/branches/network/src/orxonox/Orxonox.cc (modified)

	took out settime from hud


Thu, 03 Apr 2008 13:29:10 GMT scheusso [987]
	* code/branches/network/src/orxonox/Orxonox.cc (modified)

	server render loop


Thu, 03 Apr 2008 13:10:16 GMT scheusso [986]
	* code/branches/network/src/network/GameStateManager.cc (modified)
	* code/branches/network/src/network/PacketDecoder.cc (modified)
	* code/branches/network/src/network/PacketGenerator.cc (modified)
	* code/branches/network/src/network/PacketTypes.h (modified)

	some changes in packetgenerator/decoder and gamestatemanager


Thu, 03 Apr 2008 12:56:48 GMT dumenim [984]
	* code/branches/network/src/network/CMakeLists.txt (modified)
	* code/branches/network/src/network/GameStateClient.cc (modified)
	* code/branches/network/src/network/GameStateClient.h (modified)
	* code/branches/network/src/network/GameStateManager.cc (modified)
	* code/branches/network/src/network/GameStateManager.h (modified)
	* code/branches/network/src/network/PacketDecoder.cc (modified)
	* code/branches/network/src/network/diffTest.cc (added)
	* code/branches/network/src/orxonox/Orxonox.cc (modified)
	* code/branches/network/src/orxonox/Orxonox.h (modified)

	some bugfix in GameStateManager.cc, CMakeLists now generates ...


Thu, 03 Apr 2008 12:12:10 GMT scheusso [977]
	* code/branches/network/TODO (modified)
	* code/branches/network/src/orxonox/objects/Ambient.cc (modified)
	* code/branches/network/src/orxonox/objects/Ambient.h (modified)
	* code/branches/network/src/orxonox/objects/NPC.cc (modified)
	* code/branches/network/src/orxonox/objects/NPC.h (modified)
	* code/branches/network/src/orxonox/objects/Skybox.cc (modified)
	* code/branches/network/src/orxonox/objects/Skybox.h (modified)
	* code/branches/network/src/orxonox/objects/WorldEntity.cc (modified)

	more adjustments for synchronisation


Thu, 03 Apr 2008 10:52:48 GMT scheusso [974]
	* code/branches/network/TODO (added)
	* code/branches/network/src/orxonox/InputHandler.cc (modified)
	* code/branches/network/src/orxonox/objects/Model.cc (modified)
	* code/branches/network/src/orxonox/objects/Skybox.cc (modified)
	* code/branches/network/src/orxonox/objects/Skybox.h (modified)
	* code/branches/network/src/orxonox/objects/WorldEntity.cc (modified)

	Made some adjustments because of synchronisable (mostly in skybox)


Thu, 27 Mar 2008 19:22:37 GMT rgrieder [940]
	* code/branches/network/src/orxonox/GraphicsEngine.cc (modified)
	* code/branches/network/src/orxonox/GraphicsEngine.h (modified)
	* code/branches/network/src/orxonox/InputHandler.cc (modified)

	- Captured Ogre log messages. Can now be configured in ...


Thu, 27 Mar 2008 16:15:08 GMT rgrieder [934]
	* code/branches/network/src/orxonox/CMakeLists.txt (modified)
	* code/branches/network/src/orxonox/InputHandler.cc (modified)
	* code/branches/network/src/orxonox/InputHandler.h (modified)
	* code/branches/network/src/orxonox/Main.cc (modified)
	* code/branches/network/src/orxonox/Orxonox.cc (modified)
	* code/branches/network/src/orxonox/Orxonox.h (modified)
	* code/branches/network/src/orxonox/core/DebugLevel.cc (modified)

	- added debug output to the InputHandler
	- fixed singleton issues
	- ...


Wed, 26 Mar 2008 23:45:47 GMT rgrieder [930]
	* code/branches/network/src/orxonox/InputHandler.cc (modified)
	* code/branches/network/src/orxonox/Orxonox.cc (modified)

	- fixed deletion bugs in regard to the singleton behavior


Wed, 26 Mar 2008 22:39:55 GMT rgrieder [929]
	* code/branches/network/src/audio/AudioManager.cc (modified)
	* code/branches/network/src/orxonox/GraphicsEngine.cc (modified)
	* code/branches/network/src/orxonox/GraphicsEngine.h (modified)
	* code/branches/network/src/orxonox/InputHandler.cc (modified)
	* code/branches/network/src/orxonox/InputHandler.h (modified)
	* code/branches/network/src/orxonox/Orxonox.cc (modified)
	* code/branches/network/src/orxonox/Orxonox.h (modified)
	* code/branches/network/src/orxonox/objects/Camera.cc (modified)
	* code/branches/network/src/orxonox/objects/Fighter.cc (modified)
	* code/branches/network/src/orxonox/objects/SpaceShip.cc (modified)

	- removed getRoot() from GaphicsEngine
	  --> added getRenderWindow() ...


Wed, 26 Mar 2008 19:18:14 GMT rgrieder [928]
	* code/branches/network/src/orxonox/InputHandler.cc (modified)
	* code/branches/network/src/orxonox/InputHandler.h (modified)
	* code/branches/network/src/orxonox/Orxonox.cc (modified)

	- added destroy code for the InputHandler


Wed, 26 Mar 2008 16:02:14 GMT scheusso [927]
	* code/branches/network/src/network/Synchronisable.h (modified)
	* code/branches/network/src/orxonox/objects/Model.cc (modified)
	* code/branches/network/src/orxonox/objects/Model.h (modified)
	* code/branches/network/src/orxonox/objects/SpaceShip.cc (modified)
	* code/branches/network/src/orxonox/objects/SpaceShip.h (modified)
	* code/branches/network/src/orxonox/objects/WorldEntity.cc (modified)
	* code/branches/network/src/orxonox/objects/WorldEntity.h (modified)
	* code/branches/network/src/orxonox/objects/weapon/AmmunitionDump.cc (modified)
	* code/branches/network/src/orxonox/objects/weapon/AmmunitionDump.h (modified)
	* code/branches/network/src/orxonox/objects/weapon/BulletManager.cc (modified)
	* code/branches/network/src/orxonox/objects/weapon/BulletManager.h (modified)

	Made various changes to Classes WorldEntity, Model, SpaceShip, ...


Wed, 26 Mar 2008 12:44:51 GMT rgrieder [926]
	* code/branches/network/Media (deleted)
	* code/branches/network/bin/audio (deleted)
	* code/branches/network/src/orxonox/GraphicsEngine.cc (modified)
	* code/branches/network/src/orxonox/GraphicsEngine.h (modified)
	* code/branches/network/src/orxonox/Orxonox.cc (modified)
	* code/branches/network/src/orxonox/Orxonox.h (modified)

	- removed the media and audio folder
	- applied the changes from Beni ...


Tue, 25 Mar 2008 16:16:46 GMT rgrieder [923]
	* code/branches/network/src/orxonox/Orxonox.cc (modified)

	- böggfix


Tue, 25 Mar 2008 16:04:26 GMT rgrieder [922]
	* code/branches/network/src/orxonox/CMakeLists.txt (modified)
	* code/branches/network/src/orxonox/InputEvent.h (added)
	* code/branches/network/src/orxonox/InputEventListener.cc (added)
	* code/branches/network/src/orxonox/InputEventListener.h (added)
	* code/branches/network/src/orxonox/InputHandler.cc (modified)
	* code/branches/network/src/orxonox/InputHandler.h (modified)
	* code/branches/network/src/orxonox/Orxonox.cc (modified)
	* code/branches/network/src/orxonox/Orxonox.h (modified)
	* code/branches/network/src/orxonox/OrxonoxPrereqs.h (modified)
	* code/branches/network/src/orxonox/OrxonoxStableHeaders.h (modified)
	* code/branches/network/visual_studio/vc8/orxonox.vcproj (modified)

	- created InputEventListener and InputEvent
	- escape key now works ...


Mon, 24 Mar 2008 12:25:52 GMT rgrieder [921]
	* code/branches/network/src/orxonox/InputHandler.cc (modified)
	* code/branches/network/src/orxonox/InputHandler.h (modified)

	- no comment..


Mon, 24 Mar 2008 12:22:40 GMT rgrieder [920]
	* code/branches/network/src/orxonox/InputHandler.cc (modified)
	* code/branches/network/src/orxonox/InputHandler.h (modified)

	- bugfix with includes


Mon, 24 Mar 2008 12:12:31 GMT rgrieder [919]
	* code/branches/network/src/audio/AudioManager.cc (modified)
	* code/branches/network/src/audio/AudioManager.h (modified)
	* code/branches/network/src/orxonox/CMakeLists.txt (modified)
	* code/branches/network/src/orxonox/GraphicsEngine.cc (modified)
	* code/branches/network/src/orxonox/GraphicsEngine.h (modified)
	* code/branches/network/src/orxonox/InputHandler.cc (modified)
	* code/branches/network/src/orxonox/InputHandler.h (modified)
	* code/branches/network/src/orxonox/Orxonox.cc (modified)
	* code/branches/network/src/orxonox/Orxonox.h (modified)
	* code/branches/network/src/orxonox/OrxonoxPrereqs.h (modified)
	* code/branches/network/src/orxonox/core/CMakeLists.txt (modified)
	* code/branches/network/src/orxonox/objects/Fighter.cc (modified)
	* code/branches/network/src/orxonox/objects/NPC.cc (modified)
	* code/branches/network/src/orxonox/objects/SpaceShip.cc (modified)
	* code/branches/network/src/orxonox/tools/OrxListener.cc (deleted)
	* code/branches/network/src/orxonox/tools/OrxListener.h (deleted)
	* code/branches/network/visual_studio/vc8/orxonox.vcproj (modified)

	- AudioManager is now Tickable
	- NPC update moved to its ...


Sat, 22 Mar 2008 20:17:34 GMT rgrieder [918]
	* code/branches/network/src/network/Client.h (modified)
	* code/branches/network/src/network/Server.cc (modified)
	* code/branches/network/src/network/Server.h (modified)
	* code/branches/network/src/orxonox/InputHandler.cc (added)
	* code/branches/network/src/orxonox/InputHandler.h (added)
	* code/branches/network/src/orxonox/Main.cc (modified)
	* code/branches/network/src/orxonox/Orxonox.cc (modified)
	* code/branches/network/src/orxonox/Orxonox.h (modified)
	* code/branches/network/src/orxonox/OrxonoxStableHeaders.h (modified)
	* code/branches/network/src/orxonox/PrecompiledHeaderFiles.cc (modified)
	* code/branches/network/src/orxonox/core/BaseObject.cc (modified)
	* code/branches/network/src/orxonox/core/Tickable.cc (modified)
	* code/branches/network/src/orxonox/core/Tickable.h (modified)
	* code/branches/network/visual_studio/network_properties.vsprops (modified)
	* code/branches/network/visual_studio/vc8/orxonox.vcproj (modified)

	- created basic construct for the InputHandler (mere copy of ...


Fri, 21 Mar 2008 17:14:31 GMT rgrieder [917]
	* code/branches/network/src/network/Client.h (modified)
	* code/branches/network/src/network/Server.cc (modified)
	* code/branches/network/src/network/Server.h (modified)
	* code/branches/network/src/orxonox/Orxonox.cc (modified)
	* code/branches/network/src/orxonox/Orxonox.h (modified)
	* code/branches/network/src/orxonox/OrxonoxPlatform.h (modified)
	* code/branches/network/src/orxonox/OrxonoxStableHeaders.h (modified)
	* code/branches/network/src/orxonox/core/Identifier.h (modified)
	* code/branches/network/src/orxonox/core/Tickable.cc (added)
	* code/branches/network/src/orxonox/core/Tickable.h (added)
	* code/branches/network/src/orxonox/objects/Tickable.cc (deleted)
	* code/branches/network/src/orxonox/objects/Tickable.h (deleted)
	* code/branches/network/src/orxonox/objects/WorldEntity.h (modified)
	* code/branches/network/src/orxonox/objects/weapon/BulletManager.h (modified)
	* code/branches/network/src/orxonox/tools/OrxListener.cc (copied)
	* code/branches/network/src/orxonox/tools/OrxListener.h (copied)
	* code/branches/network/src/orxonox/tools/Timer.cc (modified)
	* code/branches/network/src/orxonox/tools/Timer.h (modified)
	* code/branches/network/src/util/Math.h (modified)
	* code/branches/network/src/util/MultiTypeMath.h (modified)
	* code/branches/network/src/util/MultiTypePrimitive.h (modified)
	* code/branches/network/src/util/MultiTypeString.h (modified)
	* code/branches/network/src/util/Sleep.h (modified)
	* code/branches/network/src/util/XMLIncludes.h (modified)
	* code/branches/network/src/util/tinyxml/TinyXMLPrereqs.h (deleted)
	* code/branches/network/visual_studio/base_properties.vsprops (modified)
	* code/branches/network/visual_studio/orxonox_vc8.sln (modified)
	* code/branches/network/visual_studio/tixml_properties.vsprops (copied)
	* code/branches/network/visual_studio/util_properties.vsprops (modified)
	* code/branches/network/visual_studio/vc8/core.vcproj (modified)
	* code/branches/network/visual_studio/vc8/orxonox.vcproj (modified)
	* code/branches/network/visual_studio/vc8/tixml.vcproj (copied)
	* code/branches/network/visual_studio/vc8/util.vcproj (modified)

	- merged all changes in the input branch into this one
	- moved ...


Thu, 20 Mar 2008 15:44:28 GMT scheusso [915]
	* code/branches/network/src/network/PacketDecoder.cc (modified)

	another dead bug


Thu, 20 Mar 2008 15:37:06 GMT scheusso [914]
	* code/branches/network/src/network/PacketDecoder.cc (modified)

	another dead bug


Thu, 20 Mar 2008 15:32:20 GMT scheusso [913]
	* code/branches/network/src/network/Client.cc (modified)
	* code/branches/network/src/network/PacketDecoder.cc (modified)
	* code/branches/network/src/network/PacketGenerator.cc (modified)
	* code/branches/network/src/network/PacketManager.h (modified)

	another dead bug


Thu, 20 Mar 2008 15:04:52 GMT scheusso [912]
	* code/branches/network/src/network/GameStateClient.cc (modified)
	* code/branches/network/src/network/PacketDecoder.cc (modified)
	* code/branches/network/src/network/Server.cc (modified)

	bugfix in packetdecoder, inserted some std::


Thu, 20 Mar 2008 14:03:23 GMT scheusso [907]
	* code/branches/network/src/network/Client.cc (modified)
	* code/branches/network/src/network/PacketManager.h (modified)
	* code/branches/network/src/network/Server.cc (modified)

	further optimasation/bugfixing


Thu, 20 Mar 2008 13:31:45 GMT scheusso [905]
	* code/branches/network/src/network/Client.cc (modified)
	* code/branches/network/src/network/ConnectionManager.cc (modified)
	* code/branches/network/src/network/GameStateClient.cc (modified)
	* code/branches/network/src/network/GameStateClient.h (modified)
	* code/branches/network/src/network/GameStateManager.cc (modified)
	* code/branches/network/src/orxonox/Orxonox.cc (modified)

	revided and checked gamestate handling


Thu, 20 Mar 2008 12:00:17 GMT scheusso [904]
	* code/branches/network/src/orxonox/Orxonox.cc (modified)

	bugfix


Thu, 20 Mar 2008 10:33:48 GMT scheusso [903]
	* code/branches/network/src/orxonox/Orxonox.cc (modified)

	created client start routine


Thu, 13 Mar 2008 15:16:02 GMT scheusso [894]
	* code/branches/network/src/network/GameStateManager.cc (modified)
	* code/branches/network/src/network/GameStateManager.h (modified)
	* code/branches/network/src/network/Server.cc (modified)

	added more bugfixing and debug output


Thu, 13 Mar 2008 15:01:48 GMT scheusso [891]
	* code/branches/network/src/network/Client.cc (modified)
	* code/branches/network/src/network/ClientConnection.cc (modified)
	* code/branches/network/src/network/GameStateManager.cc (modified)
	* code/branches/network/src/network/GameStateManager.h (modified)
	* code/branches/network/src/network/PacketDecoder.cc (modified)
	* code/branches/network/src/network/dummyclient3.cc (modified)

	some bugfixing/debug output


Thu, 13 Mar 2008 14:47:21 GMT scheusso [889]
	* code/branches/network/src/network/ClientConnection.cc (modified)
	* code/branches/network/src/network/GameStateManager.cc (modified)
	* code/branches/network/src/network/PacketDecoder.cc (modified)
	* code/branches/network/src/orxonox/objects/SpaceShip.cc (modified)

	added some debug output


Thu, 13 Mar 2008 14:25:10 GMT scheusso [888]
	* code/branches/network/bin/levels/sample.oxw (modified)
	* code/branches/network/src/network/Client.h (modified)
	* code/branches/network/src/network/ConnectionManager.cc (modified)
	* code/branches/network/src/network/ConnectionManager.h (modified)
	* code/branches/network/src/network/NetworkPrereqs.h (modified)
	* code/branches/network/src/network/Server.h (modified)
	* code/branches/network/src/orxonox/Orxonox.cc (modified)
	* code/branches/network/src/orxonox/Orxonox.h (modified)
	* code/branches/network/src/orxonox/objects/SpaceShip.cc (modified)

	sdfsdf


Thu, 13 Mar 2008 13:20:53 GMT scheusso [887]
	* code/branches/network/bin/levels/sample.oxw (modified)

	blabla


Thu, 13 Mar 2008 12:26:23 GMT scheusso [885]
	* code/branches/network (copied)

	create network 4th


Sun, 09 Mar 2008 15:44:36 GMT landauf [871]
	* code/trunk/bin/levels/sample.oxw (modified)
	* code/trunk/src/CMakeLists.txt (modified)
	* code/trunk/src/network/GameStateClient.cc (modified)
	* code/trunk/src/network/GameStateManager.cc (modified)
	* code/trunk/src/network/Synchronisable.cc (modified)
	* code/trunk/src/network/Synchronisable.h (modified)
	* code/trunk/src/orxonox/CMakeLists.txt (modified)
	* code/trunk/src/orxonox/Orxonox.cc (modified)
	* code/trunk/src/orxonox/Orxonox.h (modified)
	* code/trunk/src/orxonox/OrxonoxStableHeaders.h (modified)
	* code/trunk/src/orxonox/core/BaseObject.cc (modified)
	* code/trunk/src/orxonox/core/BaseObject.h (modified)
	* code/trunk/src/orxonox/core/CMakeLists.txt (modified)
	* code/trunk/src/orxonox/core/ClassFactory.h (modified)
	* code/trunk/src/orxonox/core/ClassManager.h (copied)
	* code/trunk/src/orxonox/core/ClassTreeMask.cc (copied)
	* code/trunk/src/orxonox/core/ClassTreeMask.h (copied)
	* code/trunk/src/orxonox/core/ConfigValueContainer.cc (modified)
	* code/trunk/src/orxonox/core/ConfigValueContainer.h (modified)
	* code/trunk/src/orxonox/core/CoreIncludes.h (modified)
	* code/trunk/src/orxonox/core/CorePrereqs.h (modified)
	* code/trunk/src/orxonox/core/Debug.h (modified)
	* code/trunk/src/orxonox/core/DebugLevel.cc (modified)
	* code/trunk/src/orxonox/core/DebugLevel.h (modified)
	* code/trunk/src/orxonox/core/Error.cc (modified)
	* code/trunk/src/orxonox/core/Error.h (modified)
	* code/trunk/src/orxonox/core/Executor.cc (copied)
	* code/trunk/src/orxonox/core/Executor.h (copied)
	* code/trunk/src/orxonox/core/Factory.cc (modified)
	* code/trunk/src/orxonox/core/Factory.h (modified)
	* code/trunk/src/orxonox/core/Functor.h (copied)
	* code/trunk/src/orxonox/core/Identifier.cc (modified)
	* code/trunk/src/orxonox/core/Identifier.h (modified)
	* code/trunk/src/orxonox/core/IdentifierDistributor.cc (copied)
	* code/trunk/src/orxonox/core/IdentifierDistributor.h (copied)
	* code/trunk/src/orxonox/core/IdentifierList.cc (deleted)
	* code/trunk/src/orxonox/core/IdentifierList.h (deleted)
	* code/trunk/src/orxonox/core/Iterator.h (modified)
	* code/trunk/src/orxonox/core/Language.cc (modified)
	* code/trunk/src/orxonox/core/Language.h (modified)
	* code/trunk/src/orxonox/core/Level.h (copied)
	* code/trunk/src/orxonox/core/Loader.cc (copied)
	* code/trunk/src/orxonox/core/Loader.h (copied)
	* code/trunk/src/orxonox/core/MetaObjectList.cc (modified)
	* code/trunk/src/orxonox/core/MetaObjectList.h (modified)
	* code/trunk/src/orxonox/core/ObjectList.h (modified)
	* code/trunk/src/orxonox/core/OrxonoxClass.cc (modified)
	* code/trunk/src/orxonox/core/OrxonoxClass.h (modified)
	* code/trunk/src/orxonox/core/OutputHandler.cc (modified)
	* code/trunk/src/orxonox/core/OutputHandler.h (modified)
	* code/trunk/src/orxonox/core/SignalHandler.cc (modified)
	* code/trunk/src/orxonox/core/SignalHandler.h (modified)
	* code/trunk/src/orxonox/core/XMLPort.cc (copied)
	* code/trunk/src/orxonox/core/XMLPort.h (copied)
	* code/trunk/src/orxonox/objects/Ambient.cc (modified)
	* code/trunk/src/orxonox/objects/Ambient.h (modified)
	* code/trunk/src/orxonox/objects/Camera.h (modified)
	* code/trunk/src/orxonox/objects/Explosion.h (modified)
	* code/trunk/src/orxonox/objects/Fighter.h (modified)
	* code/trunk/src/orxonox/objects/Model.cc (modified)
	* code/trunk/src/orxonox/objects/Model.h (modified)
	* code/trunk/src/orxonox/objects/NPC.h (modified)
	* code/trunk/src/orxonox/objects/Projectile.h (modified)
	* code/trunk/src/orxonox/objects/Skybox.cc (modified)
	* code/trunk/src/orxonox/objects/Skybox.h (modified)
	* code/trunk/src/orxonox/objects/SpaceShip.cc (modified)
	* code/trunk/src/orxonox/objects/SpaceShip.h (modified)
	* code/trunk/src/orxonox/objects/SpaceshipSteeringObject.cc (modified)
	* code/trunk/src/orxonox/objects/Test.h (modified)
	* code/trunk/src/orxonox/objects/Tickable.cc (copied)
	* code/trunk/src/orxonox/objects/Tickable.h (modified)
	* code/trunk/src/orxonox/objects/WorldEntity.cc (modified)
	* code/trunk/src/orxonox/objects/WorldEntity.h (modified)
	* code/trunk/src/orxonox/objects/test1.cc (modified)
	* code/trunk/src/orxonox/objects/test2.cc (modified)
	* code/trunk/src/orxonox/objects/test3.cc (modified)
	* code/trunk/src/orxonox/objects/test3.h (modified)
	* code/trunk/src/orxonox/objects/weapon/AmmunitionDump.cc (modified)
	* code/trunk/src/orxonox/objects/weapon/AmmunitionDump.h (modified)
	* code/trunk/src/orxonox/objects/weapon/BarrelGun.cc (modified)
	* code/trunk/src/orxonox/objects/weapon/BarrelGun.h (modified)
	* code/trunk/src/orxonox/objects/weapon/BaseWeapon.cc (modified)
	* code/trunk/src/orxonox/objects/weapon/BaseWeapon.h (modified)
	* code/trunk/src/orxonox/objects/weapon/Bullet.cc (modified)
	* code/trunk/src/orxonox/objects/weapon/Bullet.h (modified)
	* code/trunk/src/orxonox/objects/weapon/BulletManager.cc (modified)
	* code/trunk/src/orxonox/objects/weapon/BulletManager.h (modified)
	* code/trunk/src/orxonox/tools/BillboardSet.h (modified)
	* code/trunk/src/orxonox/tools/Timer.cc (copied)
	* code/trunk/src/orxonox/tools/Timer.h (modified)
	* code/trunk/src/util/CMakeLists.txt (modified)
	* code/trunk/src/util/Convert.h (modified)
	* code/trunk/src/util/Math.cc (copied)
	* code/trunk/src/util/Math.h (modified)
	* code/trunk/src/util/MultiType.h (copied)
	* code/trunk/src/util/MultiTypeMath.cc (copied)
	* code/trunk/src/util/MultiTypeMath.h (copied)
	* code/trunk/src/util/MultiTypePrimitive.cc (copied)
	* code/trunk/src/util/MultiTypePrimitive.h (copied)
	* code/trunk/src/util/MultiTypeString.cc (copied)
	* code/trunk/src/util/MultiTypeString.h (copied)
	* code/trunk/src/util/String.cc (copied)
	* code/trunk/src/util/String.h (copied)
	* code/trunk/src/util/String2Number.h (modified)
	* code/trunk/src/util/SubString.cc (copied)
	* code/trunk/src/util/SubString.h (copied)
	* code/trunk/src/util/UtilPrereqs.h (copied)
	* code/trunk/src/util/XMLIncludes.h (copied)
	* code/trunk/src/util/substring.cc (deleted)
	* code/trunk/src/util/substring.h (deleted)
	* code/trunk/src/util/tinyxml/TinyXMLPrereqs.h (modified)
	* code/trunk/src/util/tinyxml/ticpp.cc (modified)
	* code/trunk/src/util/tinyxml/ticpp.h (modified)
	* code/trunk/src/util/tinyxml/ticpprc.h (modified)
	* code/trunk/src/util/tinyxml/tinyxml.h (modified)

	merged core branch to trunk