#
# ChangeLog for branches/christmas_branche/src/world_entities/world_entity.h in orxonox.OLD
#
# Generated by Trac 1.0.9
# Jun 3, 2024, 5:27:33 PM

Tue, 20 Dec 2005 14:24:14 GMT patrick [6191]
	* branches/christmas_branche/src/lib/graphics/importer/md2Model.cc (modified)
	* branches/christmas_branche/src/lib/graphics/importer/md2Model.h (modified)
	* branches/christmas_branche/src/subprojects/importer/importer.cc (modified)
	* branches/christmas_branche/src/world_entities/world_entity.cc (modified)
	* branches/christmas_branche/src/world_entities/world_entity.h (modified)

	christmas: the texture gets loaded now and is loadable


Tue, 20 Dec 2005 01:57:34 GMT patrick [6179]
	* branches/christmas_branche/src/world_entities/world_entity.cc (modified)
	* branches/christmas_branche/src/world_entities/world_entity.h (modified)

	christmas: the draw funciton now is original again


Tue, 20 Dec 2005 01:53:50 GMT patrick [6177]
	* branches/christmas_branche/src/world_entities/world_entity.h (modified)

	christmas: the world entity is now as it was


Mon, 19 Dec 2005 23:59:06 GMT patrick [6170]
	* branches/christmas_branche/src/Makefile.am (modified)
	* branches/christmas_branche/src/lib/graphics/importer/md2Model.h (modified)
	* branches/christmas_branche/src/world_entities/Makefile.am (modified)
	* branches/christmas_branche/src/world_entities/creatures/md2_creature.cc (modified)
	* branches/christmas_branche/src/world_entities/world_entity.h (modified)

	christmas: link error


Mon, 19 Dec 2005 23:22:17 GMT patrick [6169]
	* branches/christmas_branche/src/lib/event/event_handler.cc (modified)
	* branches/christmas_branche/src/lib/graphics/importer/md2Model.cc (modified)
	* branches/christmas_branche/src/lib/graphics/importer/md2Model.h (modified)
	* branches/christmas_branche/src/util/loading/resource_manager.cc (modified)
	* branches/christmas_branche/src/world_entities/space_ships/space_ship.cc (modified)
	* branches/christmas_branche/src/world_entities/world_entity.cc (modified)
	* branches/christmas_branche/src/world_entities/world_entity.h (modified)

	christmas: model loading progress


Mon, 19 Dec 2005 18:29:26 GMT patrick [6165]
	* branches/christmas_branche (copied)
	* branches/christmas_branche/src/lib/graphics/importer/texture.cc (modified)
	* trunk/src/lib/graphics/importer/texture.cc (modified)

	branches: added a branche christmas for some christmas tests


Fri, 16 Dec 2005 18:13:57 GMT bensch [6142]
	* trunk/src/defs/debug.h (modified)
	* trunk/src/lib/collision_detection/cd_engine.cc (modified)
	* trunk/src/lib/collision_detection/cd_engine.h (modified)
	* trunk/src/lib/coord/p_node.cc (modified)
	* trunk/src/lib/coord/p_node.h (modified)
	* trunk/src/lib/graphics/graphics_engine.cc (modified)
	* trunk/src/lib/graphics/graphics_engine.h (modified)
	* trunk/src/lib/graphics/render2D/element_2d.cc (modified)
	* trunk/src/lib/graphics/render2D/element_2d.h (modified)
	* trunk/src/lib/sound/sound_engine.cc (modified)
	* trunk/src/lib/sound/sound_source.cc (modified)
	* trunk/src/orxonox.cc (modified)
	* trunk/src/story_entities/network_world.cc (modified)
	* trunk/src/story_entities/network_world.h (modified)
	* trunk/src/story_entities/world.cc (modified)
	* trunk/src/story_entities/world.h (modified)
	* trunk/src/util/Makefile.am (modified)
	* trunk/src/util/garbage_collector.cc (deleted)
	* trunk/src/util/garbage_collector.h (deleted)
	* trunk/src/util/object_manager.cc (modified)
	* trunk/src/util/object_manager.h (modified)
	* trunk/src/util/state.cc (modified)
	* trunk/src/util/state.h (modified)
	* trunk/src/world_entities/environment.cc (modified)
	* trunk/src/world_entities/npcs/npc.cc (modified)
	* trunk/src/world_entities/playable.cc (modified)
	* trunk/src/world_entities/power_ups/laser_power_up.cc (modified)
	* trunk/src/world_entities/power_ups/power_up.cc (modified)
	* trunk/src/world_entities/power_ups/turret_power_up.cc (modified)
	* trunk/src/world_entities/skybox.cc (modified)
	* trunk/src/world_entities/skysphere.cc (modified)
	* trunk/src/world_entities/terrain.cc (modified)
	* trunk/src/world_entities/test_entity.cc (modified)
	* trunk/src/world_entities/weapons/aim.cc (modified)
	* trunk/src/world_entities/weapons/bomb.cc (modified)
	* trunk/src/world_entities/weapons/ground_turret.cc (modified)
	* trunk/src/world_entities/weapons/guided_missile.cc (modified)
	* trunk/src/world_entities/weapons/laser.cc (modified)
	* trunk/src/world_entities/weapons/projectile.cc (modified)
	* trunk/src/world_entities/weapons/rocket.cc (modified)
	* trunk/src/world_entities/weapons/test_bullet.cc (modified)
	* trunk/src/world_entities/weapons/weapon.cc (modified)
	* trunk/src/world_entities/weapons/weapon_manager.cc (modified)
	* trunk/src/world_entities/weapons/weapon_manager.h (modified)
	* trunk/src/world_entities/world_entity.cc (modified)
	* trunk/src/world_entities/world_entity.h (modified)

	orxonox/trunk: merge the ObjectManager to the trunk
	merged with ...