#
# ChangeLog for trunk in orxonox.OLD
#
# Generated by Trac 1.0.9
# Dec 15, 2024, 8:30:39 PM

Wed, 18 Jan 2006 14:55:23 GMT bensch [6578]
	* trunk/src/lib/event/event_handler.cc (modified)
	* trunk/src/world_entities/playable.cc (modified)

	trunk: segfault prevention


Wed, 18 Jan 2006 14:21:47 GMT bensch [6568]
	* trunk/src/world_entities/playable.cc (modified)
	* trunk/src/world_entities/playable.h (modified)
	* trunk/src/world_entities/weapons/weapon_manager.cc (modified)

	trunk: weaponManager is now reporting the change of Weapons to the ...


Wed, 18 Jan 2006 14:06:19 GMT bensch [6565]
	* trunk/src/world_entities/weapons/turret.cc (modified)

	trunk: turret does not move anymore


Wed, 18 Jan 2006 14:00:56 GMT bensch [6561]
	* trunk/src/world_entities/creatures/md2_creature.cc (modified)
	* trunk/src/world_entities/creatures/md2_creature.h (modified)
	* trunk/src/world_entities/weapons/turret.cc (modified)
	* trunk/src/world_entities/weapons/weapon_manager.cc (modified)
	* trunk/src/world_entities/weapons/weapon_manager.h (modified)

	trunk: WeaponManager update


Wed, 18 Jan 2006 13:12:53 GMT bensch [6547]
	* trunk/src/world_entities/playable.cc (modified)
	* trunk/src/world_entities/playable.h (modified)
	* trunk/src/world_entities/power_ups/param_power_up.cc (modified)
	* trunk/src/world_entities/power_ups/param_power_up.h (modified)
	* trunk/src/world_entities/power_ups/power_up.cc (modified)
	* trunk/src/world_entities/power_ups/weapon_power_up.cc (modified)
	* trunk/src/world_entities/space_ships/space_ship.cc (modified)
	* trunk/src/world_entities/space_ships/space_ship.h (modified)
	* trunk/src/world_entities/weapons/turret.cc (modified)

	orxonox/trunk: merged the WeaponManager back to the trunk


Wed, 18 Jan 2006 12:20:02 GMT bensch [6532]
	* trunk/config.h.in (modified)
	* trunk/configure.ac (modified)
	* trunk/src/defs/class_id.h (modified)
	* trunk/src/lib/graphics/importer/Makefile.am (modified)
	* trunk/src/lib/graphics/importer/media_container.cc (copied)
	* trunk/src/lib/graphics/importer/media_container.h (copied)
	* trunk/src/lib/graphics/importer/movie_player.cc (copied)
	* trunk/src/lib/graphics/importer/movie_player.h (copied)
	* trunk/src/lib/graphics/importer/texture.cc (modified)
	* trunk/src/lib/graphics/importer/texture_sequence.cc (modified)
	* trunk/src/lib/graphics/importer/texture_sequence.h (modified)
	* trunk/src/subprojects/importer/Makefile.am (modified)
	* trunk/src/subprojects/importer/movie_player_test.cc (copied)
	* trunk/src/subprojects/importer/multitex.cc (modified)
	* trunk/src/world_entities/Makefile.am (modified)
	* trunk/src/world_entities/movie_entity.cc (copied)
	* trunk/src/world_entities/movie_entity.h (copied)
	* trunk/src/world_entities/space_ships/space_ship.cc (modified)

	orxonox/trunk: merged branches/movie_play to the trunk. no conflicts, ...


Wed, 18 Jan 2006 01:54:04 GMT bensch [6523]
	* trunk/src/lib/graphics/graphics_engine.cc (modified)
	* trunk/src/lib/graphics/importer/texture.cc (modified)
	* trunk/src/world_entities/environments/water.cc (modified)
	* trunk/src/world_entities/skybox.cc (modified)

	trunk: water fake render :)


Wed, 18 Jan 2006 01:20:13 GMT bensch [6522]
	* trunk/src/lib/graphics/graphics_engine.cc (modified)
	* trunk/src/lib/graphics/graphics_engine.h (modified)
	* trunk/src/world_entities/environments/water.cc (modified)

	trunk: switch to WireFrame with
	Shell -> GraphicsEngine wireframe


Tue, 17 Jan 2006 23:38:19 GMT bensch [6519]
	* trunk/src/lib/graphics/importer/grid.h (modified)
	* trunk/src/lib/graphics/importer/vertex_array_model.cc (modified)
	* trunk/src/world_entities/environments/water.cc (modified)
	* trunk/src/world_entities/skybox.cc (modified)
	* trunk/src/world_entities/skybox.h (modified)

	trunk: better smoother water


Tue, 17 Jan 2006 23:09:11 GMT bensch [6518]
	* trunk/src/lib/graphics/importer/grid.h (modified)
	* trunk/src/world_entities/environments/water.cc (modified)
	* trunk/src/world_entities/environments/water.h (modified)
	* trunk/src/world_entities/space_ships/space_ship.cc (modified)

	orxonox/trunk: some waves


Tue, 17 Jan 2006 22:13:05 GMT bensch [6517]
	* trunk/src/lib/lang/base_object.cc (modified)
	* trunk/src/lib/lang/base_object.h (modified)
	* trunk/src/world_entities/space_ships/space_ship.cc (modified)
	* trunk/src/world_entities/weapons/cannon.cc (modified)

	orxonox/trunk: each BaseObject saves its TiXmlElement as a ...


Tue, 17 Jan 2006 21:01:07 GMT bensch [6512]
	* trunk/src/lib/coord/p_node.cc (modified)
	* trunk/src/lib/coord/p_node.h (modified)
	* trunk/src/lib/graphics/light.cc (modified)
	* trunk/src/lib/graphics/light.h (modified)
	* trunk/src/lib/graphics/render2D/element_2d.cc (modified)
	* trunk/src/lib/graphics/render2D/element_2d.h (modified)
	* trunk/src/lib/gui/gl_gui/glmenu/glmenu_imagescreen.h (modified)
	* trunk/src/lib/lang/base_object.h (modified)
	* trunk/src/lib/particles/particle_emitter.cc (modified)
	* trunk/src/lib/particles/particle_emitter.h (modified)
	* trunk/src/lib/particles/particle_engine.h (modified)
	* trunk/src/lib/particles/particle_system.cc (modified)
	* trunk/src/lib/particles/particle_system.h (modified)
	* trunk/src/lib/physics/fields/field.cc (modified)
	* trunk/src/lib/physics/fields/field.h (modified)
	* trunk/src/lib/physics/fields/gravity.cc (modified)
	* trunk/src/lib/physics/fields/gravity.h (modified)
	* trunk/src/lib/physics/physics_connection.cc (modified)
	* trunk/src/lib/physics/physics_engine.h (modified)
	* trunk/src/proto/proto_world_entity.cc (modified)
	* trunk/src/proto/proto_world_entity.h (modified)
	* trunk/src/story_entities/campaign.cc (modified)
	* trunk/src/story_entities/campaign.h (modified)
	* trunk/src/story_entities/campaign_data.h (modified)
	* trunk/src/story_entities/dedicated_server_world.cc (modified)
	* trunk/src/story_entities/dedicated_server_world.h (modified)
	* trunk/src/story_entities/game_world.cc (modified)
	* trunk/src/story_entities/game_world.h (modified)
	* trunk/src/story_entities/multi_player_world.cc (modified)
	* trunk/src/story_entities/multi_player_world.h (modified)
	* trunk/src/story_entities/single_player_world.cc (modified)
	* trunk/src/story_entities/single_player_world.h (modified)
	* trunk/src/story_entities/story_entity.cc (modified)
	* trunk/src/story_entities/story_entity.h (modified)
	* trunk/src/subprojects/collision_detection/collision_test_entity.cc (modified)
	* trunk/src/subprojects/collision_detection/collision_test_entity.h (modified)
	* trunk/src/util/hud.cc (modified)
	* trunk/src/util/hud.h (modified)
	* trunk/src/util/track/track_manager.cc (modified)
	* trunk/src/util/track/track_manager.h (modified)
	* trunk/src/world_entities/creatures/md2_creature.cc (modified)
	* trunk/src/world_entities/creatures/md2_creature.h (modified)
	* trunk/src/world_entities/environment.cc (modified)
	* trunk/src/world_entities/environment.h (modified)
	* trunk/src/world_entities/npcs/ground_turret.cc (modified)
	* trunk/src/world_entities/npcs/ground_turret.h (modified)
	* trunk/src/world_entities/power_ups/laser_power_up.cc (modified)
	* trunk/src/world_entities/power_ups/laser_power_up.h (modified)
	* trunk/src/world_entities/power_ups/param_power_up.cc (modified)
	* trunk/src/world_entities/power_ups/param_power_up.h (modified)
	* trunk/src/world_entities/power_ups/power_up.cc (modified)
	* trunk/src/world_entities/power_ups/power_up.h (modified)
	* trunk/src/world_entities/power_ups/turret_power_up.cc (modified)
	* trunk/src/world_entities/power_ups/turret_power_up.h (modified)
	* trunk/src/world_entities/power_ups/weapon_power_up.cc (modified)
	* trunk/src/world_entities/power_ups/weapon_power_up.h (modified)
	* trunk/src/world_entities/projectiles/bomb.cc (modified)
	* trunk/src/world_entities/projectiles/bomb.h (modified)
	* trunk/src/world_entities/skybox.cc (modified)
	* trunk/src/world_entities/skybox.h (modified)
	* trunk/src/world_entities/space_ships/helicopter.cc (modified)
	* trunk/src/world_entities/space_ships/helicopter.h (modified)
	* trunk/src/world_entities/space_ships/space_ship.cc (modified)
	* trunk/src/world_entities/space_ships/space_ship.h (modified)
	* trunk/src/world_entities/spawning_point.cc (modified)
	* trunk/src/world_entities/spawning_point.h (modified)
	* trunk/src/world_entities/terrain.cc (modified)
	* trunk/src/world_entities/terrain.h (modified)
	* trunk/src/world_entities/test_entity.cc (modified)
	* trunk/src/world_entities/test_entity.h (modified)
	* trunk/src/world_entities/weapons/aim.cc (modified)
	* trunk/src/world_entities/weapons/aim.h (modified)
	* trunk/src/world_entities/weapons/aiming_turret.cc (modified)
	* trunk/src/world_entities/weapons/aiming_turret.h (modified)
	* trunk/src/world_entities/weapons/cannon.cc (modified)
	* trunk/src/world_entities/weapons/cannon.h (modified)
	* trunk/src/world_entities/weapons/crosshair.cc (modified)
	* trunk/src/world_entities/weapons/crosshair.h (modified)
	* trunk/src/world_entities/weapons/targeting_turret.cc (modified)
	* trunk/src/world_entities/weapons/targeting_turret.h (modified)
	* trunk/src/world_entities/weapons/test_gun.cc (modified)
	* trunk/src/world_entities/weapons/test_gun.h (modified)
	* trunk/src/world_entities/weapons/turret.cc (modified)
	* trunk/src/world_entities/weapons/turret.h (modified)
	* trunk/src/world_entities/weapons/weapon.cc (modified)
	* trunk/src/world_entities/weapons/weapon.h (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: loadParams is now virtual.
	ALL THE CLASSES HAVE TO ...


Wed, 11 Jan 2006 20:58:22 GMT patrick [6498]
	* trunk/src/lib/coord/p_node.cc (modified)
	* trunk/src/lib/coord/p_node.h (modified)
	* trunk/src/lib/lang/base_object.cc (modified)
	* trunk/src/lib/network/network_game_manager.cc (modified)
	* trunk/src/lib/network/network_game_manager.h (modified)
	* trunk/src/lib/network/network_stream.cc (modified)
	* trunk/src/story_entities/game_world.cc (modified)
	* trunk/src/story_entities/game_world.h (modified)
	* trunk/src/story_entities/multi_player_world.cc (modified)
	* trunk/src/story_entities/multi_player_world.h (modified)
	* trunk/src/story_entities/multi_player_world_data.cc (modified)
	* trunk/src/story_entities/multi_player_world_data.h (modified)
	* trunk/src/util/hud.cc (modified)
	* trunk/src/util/state.cc (modified)
	* trunk/src/util/state.h (modified)
	* trunk/src/world_entities/power_ups/param_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/space_ships/space_ship.cc (modified)
	* trunk/src/world_entities/world_entity.cc (modified)
	* trunk/src/world_entities/world_entity.h (modified)

	trunk: merged the network branche into the trunk


Wed, 11 Jan 2006 14:32:25 GMT bensch [6480]
	* trunk/src/lib/graphics/importer/tc.h (modified)

	uint to unsigned int


Wed, 11 Jan 2006 14:27:35 GMT bensch [6477]
	* trunk/src/lib/graphics/importer/vertex_array_model.cc (modified)
	* trunk/src/subprojects/importer/tc.cc (modified)

	trunk: uint to unsigned int


Wed, 11 Jan 2006 11:28:17 GMT bensch [6471]
	* trunk/src/lib/graphics/importer/vertex_array_model.cc (modified)
	* trunk/src/world_entities/environments/water.cc (modified)

	orxonox/trunk: testing, but not working


Wed, 11 Jan 2006 11:21:42 GMT bensch [6470]
	* trunk/src/world_entities/environments/water.cc (modified)
	* trunk/src/world_entities/skybox.cc (modified)
	* trunk/src/world_entities/skybox.h (modified)

	trunk some work on cubeMap


Wed, 11 Jan 2006 11:00:06 GMT bensch [6468]
	* trunk/src/util/state.cc (modified)
	* trunk/src/util/state.h (modified)

	trunk: added localPlayer and SkyBox to state


Wed, 11 Jan 2006 10:46:52 GMT bensch [6467]
	* trunk/src/lib/graphics/importer/grid.cc (modified)
	* trunk/src/lib/graphics/importer/material.cc (modified)
	* trunk/src/lib/graphics/importer/material.h (modified)
	* trunk/src/util/loading/resource_manager.cc (modified)
	* trunk/src/util/loading/resource_manager.h (modified)
	* trunk/src/world_entities/environments/water.cc (modified)
	* trunk/src/world_entities/environments/water.h (modified)

	orxonox/trunk: Texture loading with GL_TEXTURE_* in ResourceManager ...


Tue, 10 Jan 2006 22:53:19 GMT bensch [6465]
	* trunk/src/lib/graphics/importer/texture.cc (modified)
	* trunk/src/lib/graphics/importer/texture.h (modified)

	trunk: texture prepared for others than GL_TETURE_2D


Tue, 10 Jan 2006 00:20:12 GMT bensch [6458]
	* trunk/src/lib/graphics/importer/grid.cc (modified)
	* trunk/src/lib/graphics/importer/grid.h (modified)
	* trunk/src/world_entities/environments/water.cc (modified)
	* trunk/src/world_entities/environments/water.h (modified)

	orxonox/trunk: wave now also rebuilds the Normals (do not know if ...


Mon, 09 Jan 2006 23:39:08 GMT bensch [6457]
	* trunk/src/lib/graphics/importer/grid.h (modified)
	* trunk/src/story_entities/game_world.cc (modified)
	* trunk/src/world_entities/environments/water.cc (modified)
	* trunk/src/world_entities/environments/water.h (modified)

	water works


Mon, 09 Jan 2006 23:09:58 GMT bensch [6456]
	* trunk/src/lib/graphics/importer/vertex_array_model.cc (modified)
	* trunk/src/world_entities/environments/water.cc (modified)
	* trunk/src/world_entities/environments/water.h (modified)

	Water draws itself


Mon, 09 Jan 2006 22:53:53 GMT bensch [6455]
	* trunk/src/Makefile.am (modified)
	* trunk/src/defs/class_id.h (modified)
	* trunk/src/lib/graphics/importer/Makefile.am (modified)
	* trunk/src/lib/graphics/importer/tc.c (deleted)
	* trunk/src/lib/graphics/importer/tc.cc (added)
	* trunk/src/world_entities/Makefile.am (modified)
	* trunk/src/world_entities/environments (added)
	* trunk/src/world_entities/environments/water.cc (copied)
	* trunk/src/world_entities/environments/water.h (copied)

	trunk: Simple water surface WE


Mon, 09 Jan 2006 22:20:37 GMT bensch [6454]
	* trunk/src/lib/graphics/importer/grid.cc (modified)
	* trunk/src/lib/graphics/importer/grid.h (modified)
	* trunk/src/lib/graphics/importer/vertex_array_model.h (modified)

	orxonox/trunk: changing the height of the Grid should work


Mon, 09 Jan 2006 22:11:59 GMT bensch [6453]
	* trunk/src/lib/graphics/importer/vertex_array_model.cc (modified)
	* trunk/src/lib/graphics/importer/vertex_array_model.h (modified)

	trunk Vectors instead of floats used in VertexArrayModel


Mon, 09 Jan 2006 21:42:56 GMT bensch [6452]
	* trunk/src/lib/graphics/importer/vertex_array_model.cc (modified)
	* trunk/src/lib/graphics/importer/vertex_array_model.h (modified)

	trunk: vertexArrayModel minor functionality update


Sun, 08 Jan 2006 23:05:57 GMT bensch [6446]
	* trunk/src/lib/graphics/importer/Makefile.am (modified)
	* trunk/src/lib/graphics/importer/grid.cc (copied)
	* trunk/src/lib/graphics/importer/grid.h (copied)
	* trunk/src/util/hud.cc (modified)

	orxonox/trunk: added grid class


Sun, 08 Jan 2006 21:59:21 GMT bensch [6445]
	* trunk/src/util/hud.cc (modified)
	* trunk/src/world_entities/weapons/weapon.cc (modified)
	* trunk/src/world_entities/weapons/weapon.h (modified)

	trunk: bars are nicer now


Sun, 08 Jan 2006 21:45:03 GMT bensch [6444]
	* trunk/src/world_entities/playable.cc (modified)
	* trunk/src/world_entities/playable.h (modified)
	* trunk/src/world_entities/space_ships/space_ship.cc (modified)
	* trunk/src/world_entities/weapons/weapon.cc (modified)
	* trunk/src/world_entities/weapons/weapon_manager.h (modified)

	trunk: sliders get updated, as they should be


Sun, 08 Jan 2006 16:44:04 GMT bensch [6443]
	* trunk/src/util/hud.cc (modified)
	* trunk/src/util/hud.h (modified)
	* trunk/src/world_entities/playable.cc (modified)
	* trunk/src/world_entities/playable.h (modified)
	* trunk/src/world_entities/player.cc (modified)
	* trunk/src/world_entities/player.h (modified)
	* trunk/src/world_entities/space_ships/helicopter.cc (modified)
	* trunk/src/world_entities/space_ships/helicopter.h (modified)
	* trunk/src/world_entities/space_ships/space_ship.cc (modified)
	* trunk/src/world_entities/space_ships/space_ship.h (modified)

	huge pipeline


Sun, 08 Jan 2006 16:19:39 GMT bensch [6442]
	* trunk/src/util/hud.cc (modified)
	* trunk/src/util/hud.h (modified)
	* trunk/src/world_entities/playable.cc (modified)
	* trunk/src/world_entities/playable.h (modified)
	* trunk/src/world_entities/player.cc (modified)
	* trunk/src/world_entities/weapons/weapon_manager.h (modified)

	Gui Shows weapons (simple)


Sun, 08 Jan 2006 15:02:30 GMT bensch [6441]
	* trunk/src/lib/graphics/graphics_engine.cc (modified)
	* trunk/src/util/hud.cc (modified)
	* trunk/src/util/hud.h (modified)
	* trunk/src/util/state.cc (modified)
	* trunk/src/util/state.h (modified)
	* trunk/src/world_entities/player.cc (modified)
	* trunk/src/world_entities/player.h (modified)

	orxonox/trunk: the Hud now scales the Widgets itself


Sun, 08 Jan 2006 14:20:00 GMT bensch [6440]
	* trunk/src/util/hud.cc (modified)
	* trunk/src/world_entities/player.cc (modified)
	* trunk/src/world_entities/player.h (modified)
	* trunk/src/world_entities/space_ships/space_ship.cc (modified)
	* trunk/src/world_entities/world_entity.cc (modified)
	* trunk/src/world_entities/world_entity.h (modified)

	orxonox/trunk: now the Widgets are only rendered within the HUD


Sun, 08 Jan 2006 13:45:23 GMT bensch [6439]
	* trunk/src/world_entities/npcs/ground_turret.cc (modified)
	* trunk/src/world_entities/weapons/aiming_turret.cc (modified)
	* trunk/src/world_entities/weapons/targeting_turret.cc (modified)
	* trunk/src/world_entities/weapons/turret.cc (modified)
	* trunk/src/world_entities/weapons/weapon.cc (modified)
	* trunk/src/world_entities/weapons/weapon.h (modified)
	* trunk/src/world_entities/weapons/weapon_manager.cc (modified)

	trunk: WeaponSystem working again:
	reverted the changed from ...


Sun, 08 Jan 2006 12:51:55 GMT bensch [6438]
	* trunk/src/lib/gui/gl_gui/glgui_widget.h (modified)
	* trunk/src/util/hud.cc (modified)
	* trunk/src/util/hud.h (modified)
	* trunk/src/world_entities/player.cc (modified)
	* trunk/src/world_entities/player.h (modified)
	* trunk/src/world_entities/weapons/turret.cc (modified)
	* trunk/src/world_entities/weapons/turret.h (modified)
	* trunk/src/world_entities/weapons/weapon.cc (modified)
	* trunk/src/world_entities/weapons/weapon.h (modified)

	trunk: widget war


Sun, 08 Jan 2006 12:12:38 GMT bensch [6437]
	* trunk/src/defs/class_id.h (modified)
	* trunk/src/util/Makefile.am (modified)
	* trunk/src/util/hud.cc (copied)
	* trunk/src/util/hud.h (copied)
	* trunk/src/util/user_control.cc (deleted)
	* trunk/src/util/user_control.h (deleted)

	trunk: added HUD definition and removed user_control


Sun, 08 Jan 2006 01:27:29 GMT bensch [6436]
	* trunk/src/world_entities/playable.cc (modified)
	* trunk/src/world_entities/playable.h (modified)
	* trunk/src/world_entities/space_ships/space_ship.cc (modified)

	orxonox/trunk: collides with function now takes away the Energy of ...


Sun, 08 Jan 2006 01:08:24 GMT bensch [6435]
	* trunk/src/world_entities/npcs/ground_turret.cc (modified)
	* trunk/src/world_entities/weapons/aiming_turret.cc (modified)
	* trunk/src/world_entities/weapons/targeting_turret.cc (modified)
	* trunk/src/world_entities/weapons/turret.cc (modified)
	* trunk/src/world_entities/weapons/weapon.cc (modified)
	* trunk/src/world_entities/weapons/weapon.h (modified)
	* trunk/src/world_entities/weapons/weapon_manager.cc (modified)

	orxonox/trunk: weapon tick is now the only tick functions of Weapon. ...


Sun, 08 Jan 2006 01:00:48 GMT bensch [6434]
	* trunk/src/story_entities/game_world.cc (modified)
	* trunk/src/story_entities/game_world_data.cc (modified)
	* trunk/src/story_entities/multi_player_world_data.cc (modified)
	* trunk/src/world_entities/Makefile.am (modified)
	* trunk/src/world_entities/projectiles (added)
	* trunk/src/world_entities/projectiles/bomb.cc (moved)
	* trunk/src/world_entities/projectiles/bomb.h (moved)
	* trunk/src/world_entities/projectiles/guided_missile.cc (moved)
	* trunk/src/world_entities/projectiles/guided_missile.h (moved)
	* trunk/src/world_entities/projectiles/laser.cc (moved)
	* trunk/src/world_entities/projectiles/laser.h (moved)
	* trunk/src/world_entities/projectiles/projectile.cc (moved)
	* trunk/src/world_entities/projectiles/projectile.h (moved)
	* trunk/src/world_entities/projectiles/rocket.cc (moved)
	* trunk/src/world_entities/projectiles/rocket.h (moved)
	* trunk/src/world_entities/projectiles/test_bullet.cc (moved)
	* trunk/src/world_entities/projectiles/test_bullet.h (moved)
	* trunk/src/world_entities/weapons/aiming_turret.cc (modified)
	* trunk/src/world_entities/weapons/cannon.cc (modified)
	* trunk/src/world_entities/weapons/targeting_turret.cc (modified)
	* trunk/src/world_entities/weapons/test_gun.cc (modified)
	* trunk/src/world_entities/weapons/turret.cc (modified)
	* trunk/src/world_entities/weapons/weapon.cc (modified)

	orxonox/trunk: moved the projectiles to Projectiles


Sun, 08 Jan 2006 00:50:16 GMT bensch [6433]
	* trunk/src/story_entities/game_world.cc (modified)
	* trunk/src/world_entities/npcs/ground_turret.cc (modified)
	* trunk/src/world_entities/weapons/guided_missile.cc (modified)
	* trunk/src/world_entities/weapons/rocket.cc (modified)
	* trunk/src/world_entities/weapons/weapon.cc (modified)

	orxonox/trunk: the turret now fires too


Sun, 08 Jan 2006 00:15:52 GMT bensch [6432]
	* trunk/src/Makefile.am (modified)
	* trunk/src/story_entities/Makefile.am (copied)
	* trunk/src/world_entities/Makefile.am (modified)
	* trunk/src/world_entities/npcs/ground_turret.cc (moved)
	* trunk/src/world_entities/npcs/ground_turret.h (moved)

	orxonox/trunk: better build process: fake convenience lib through ...


Sat, 07 Jan 2006 23:52:23 GMT bensch [6431]
	* trunk/src/lib/gui/gl_gui/glgui_widget.cc (modified)
	* trunk/src/lib/gui/gl_gui/glgui_widget.h (modified)
	* trunk/src/world_entities/weapons/bomb.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/projectile.h (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/world_entity.cc (modified)

	orxonox/trunk: projectile inherits Energies from WorldEntity


Sat, 07 Jan 2006 23:14:49 GMT bensch [6430]
	* trunk/src/world_entities/space_ships/space_ship.cc (modified)
	* trunk/src/world_entities/world_entity.cc (modified)
	* trunk/src/world_entities/world_entity.h (modified)

	orxonox/trunk: Energy System on WorldEntity-level


Sat, 07 Jan 2006 22:17:51 GMT bensch [6426]
	* trunk/src/Makefile.am (modified)
	* trunk/src/defs/class_id.h (modified)
	* trunk/src/orxonox.cc (modified)
	* trunk/src/world_entities/camera.cc (modified)
	* trunk/src/world_entities/space_ships/helicopter.cc (modified)
	* trunk/src/world_entities/space_ships/helicopter.h (modified)
	* trunk/src/world_entities/space_ships/space_ship.cc (modified)
	* trunk/src/world_entities/space_ships/space_ship.h (modified)
	* trunk/src/world_entities/weapons/aiming_turret.cc (modified)
	* trunk/src/world_entities/weapons/guided_missile.cc (modified)
	* trunk/src/world_entities/weapons/targeting_turret.cc (copied)
	* trunk/src/world_entities/weapons/targeting_turret.h (copied)

	orxonox/trunk: merged the spaceshipcontrol branche back to the trunk
 ...


Sat, 07 Jan 2006 22:07:22 GMT bensch [6424]
	* branches/preferences/AUTHORS (modified)
	* trunk/scripts/orxonoxServer.sh (copied)
	* trunk/src/Makefile.am (modified)
	* trunk/src/defs/class_id.h (modified)
	* trunk/src/lib/Makefile.am (modified)
	* trunk/src/lib/coord/p_node.cc (modified)
	* trunk/src/lib/coord/p_node.h (modified)
	* trunk/src/lib/data (copied)
	* trunk/src/lib/data/data_tank.cc (copied)
	* trunk/src/lib/data/data_tank.h (copied)
	* trunk/src/lib/network/network_game_manager.cc (modified)
	* trunk/src/lib/network/network_game_manager.h (modified)
	* trunk/src/lib/network/synchronizeable.cc (modified)
	* trunk/src/orxonox.cc (modified)
	* trunk/src/story_entities/campaign.cc (modified)
	* trunk/src/story_entities/campaign.h (modified)
	* trunk/src/story_entities/campaign_data.cc (copied)
	* trunk/src/story_entities/campaign_data.h (copied)
	* trunk/src/story_entities/debug_world.cc (modified)
	* trunk/src/story_entities/debug_world.h (modified)
	* trunk/src/story_entities/dedicated_server_world.cc (copied)
	* trunk/src/story_entities/dedicated_server_world.h (copied)
	* trunk/src/story_entities/game_world.cc (copied)
	* trunk/src/story_entities/game_world.h (copied)
	* trunk/src/story_entities/game_world_data.cc (copied)
	* trunk/src/story_entities/game_world_data.h (copied)
	* trunk/src/story_entities/multi_player_world.cc (copied)
	* trunk/src/story_entities/multi_player_world.h (copied)
	* trunk/src/story_entities/multi_player_world_data.cc (copied)
	* trunk/src/story_entities/multi_player_world_data.h (copied)
	* trunk/src/story_entities/network_world.cc (deleted)
	* trunk/src/story_entities/network_world.h (deleted)
	* trunk/src/story_entities/single_player_world.cc (copied)
	* trunk/src/story_entities/single_player_world.h (copied)
	* trunk/src/story_entities/single_player_world_data.cc (copied)
	* trunk/src/story_entities/single_player_world_data.h (copied)
	* trunk/src/story_entities/story_entity.cc (modified)
	* trunk/src/story_entities/story_entity.h (modified)
	* trunk/src/story_entities/world.cc (deleted)
	* trunk/src/story_entities/world.h (deleted)
	* trunk/src/subprojects/network/network_unit_test.cc (modified)
	* trunk/src/util/loading/game_loader.cc (modified)
	* trunk/src/util/loading/game_loader.h (modified)
	* trunk/src/world_entities/camera.cc (modified)
	* trunk/src/world_entities/power_ups/laser_power_up.cc (modified)
	* trunk/src/world_entities/power_ups/laser_power_up.h (modified)
	* trunk/src/world_entities/power_ups/param_power_up.cc (modified)
	* trunk/src/world_entities/power_ups/param_power_up.h (modified)
	* trunk/src/world_entities/power_ups/power_up.cc (modified)
	* trunk/src/world_entities/power_ups/power_up.h (modified)
	* trunk/src/world_entities/power_ups/turret_power_up.cc (modified)
	* trunk/src/world_entities/power_ups/turret_power_up.h (modified)
	* trunk/src/world_entities/power_ups/weapon_power_up.cc (modified)
	* trunk/src/world_entities/power_ups/weapon_power_up.h (modified)
	* trunk/src/world_entities/space_ships/space_ship.cc (modified)
	* trunk/src/world_entities/space_ships/space_ship.h (modified)
	* trunk/src/world_entities/spawning_point.cc (modified)
	* trunk/src/world_entities/weapons/ground_turret.cc (modified)
	* trunk/src/world_entities/world_entity.cc (modified)
	* trunk/src/world_entities/world_entity.h (modified)

	orxonox/trunk: merged the branche network back to the trunk
	merged ...


Fri, 06 Jan 2006 22:59:11 GMT bensch [6423]
	* branches/preferences/configure.ac (modified)
	* trunk/src/lib/graphics/importer/static_model.cc (modified)
	* trunk/src/lib/graphics/importer/static_model.h (modified)

	trunk: staticModel now uses vector instead of tArray (more portable)


Fri, 30 Dec 2005 04:32:59 GMT bensch [6349]
	* trunk/src/lib/graphics/text_engine/font.cc (modified)
	* trunk/src/lib/graphics/text_engine/font.h (modified)
	* trunk/src/lib/graphics/text_engine/text.cc (modified)

	orxonox/trunk: minor fix in the TextEngine


Fri, 30 Dec 2005 04:16:25 GMT bensch [6348]
	* trunk/src/subprojects/others (added)
	* trunk/src/subprojects/others/TTFtoIMG.cc (added)

	trunk: added small app, that converts ttf-to images
	compile with: ...


Fri, 30 Dec 2005 01:26:12 GMT bensch [6345]
	* trunk/src/story_entities/network_world.cc (modified)
	* trunk/src/story_entities/network_world.h (modified)

	orxonox/trunk: tried to merge the old world to the new one... this ...


Fri, 30 Dec 2005 00:57:12 GMT bensch [6341]
	* trunk/src/defs/class_id.h (modified)
	* trunk/src/lib/coord/p_node.cc (modified)
	* trunk/src/lib/coord/p_node.h (modified)
	* trunk/src/lib/lang/base_object.cc (modified)
	* trunk/src/lib/lang/base_object.h (modified)
	* trunk/src/lib/network/converter.cc (modified)
	* trunk/src/lib/network/converter.h (modified)
	* trunk/src/lib/network/data_stream.h (modified)
	* trunk/src/lib/network/handshake.cc (modified)
	* trunk/src/lib/network/handshake.h (modified)
	* trunk/src/lib/network/network_game_manager.cc (modified)
	* trunk/src/lib/network/network_game_manager.h (modified)
	* trunk/src/lib/network/network_manager.cc (modified)
	* trunk/src/lib/network/network_manager.h (modified)
	* trunk/src/lib/network/network_protocol.cc (modified)
	* trunk/src/lib/network/network_protocol.h (modified)
	* trunk/src/lib/network/network_socket.cc (modified)
	* trunk/src/lib/network/network_stream.cc (modified)
	* trunk/src/lib/network/network_stream.h (modified)
	* trunk/src/lib/network/synchronizeable.cc (modified)
	* trunk/src/lib/network/synchronizeable.h (modified)
	* trunk/src/story_entities/network_world.cc (modified)
	* trunk/src/subprojects/network/Makefile.am (modified)
	* trunk/src/subprojects/network/network_unit_test.cc (modified)
	* trunk/src/subprojects/network/read_sync.cc (modified)
	* trunk/src/subprojects/network/read_sync.h (modified)
	* trunk/src/subprojects/network/simple_sync.cc (modified)
	* trunk/src/subprojects/network/simple_sync.h (modified)
	* trunk/src/subprojects/network/write_sync.cc (modified)
	* trunk/src/subprojects/network/write_sync.h (modified)
	* trunk/src/util/loading/factory.cc (modified)
	* trunk/src/util/loading/factory.h (modified)
	* trunk/src/world_entities/npcs/npc.cc (modified)
	* trunk/src/world_entities/npcs/npc.h (modified)
	* trunk/src/world_entities/skybox.cc (modified)
	* trunk/src/world_entities/skybox.h (modified)
	* trunk/src/world_entities/space_ships/space_ship.cc (modified)
	* trunk/src/world_entities/terrain.cc (modified)
	* trunk/src/world_entities/terrain.h (modified)
	* trunk/src/world_entities/weapons/ground_turret.cc (modified)
	* trunk/src/world_entities/weapons/ground_turret.h (modified)
	* trunk/src/world_entities/world_entity.cc (modified)
	* trunk/src/world_entities/world_entity.h (modified)

	orxonox/trunk: merged the network branche back to the trunk, so we do ...


Tue, 27 Dec 2005 12:27:56 GMT bensch [6316]
	* trunk/src/lib/collision_detection/cd_engine.cc (modified)
	* trunk/src/lib/collision_detection/cd_engine.h (modified)
	* trunk/src/story_entities/world.cc (modified)

	orxonox/trunk: now painting the BV's again.... no error due to my ...


Tue, 27 Dec 2005 12:17:51 GMT bensch [6315]
	* trunk/src/lib/graphics/importer/static_model.cc (modified)

	orxonox/trunk: again had to remove some 3's

	@patrick: ok??


Tue, 27 Dec 2005 12:09:01 GMT bensch [6314]
	* trunk/src/lib/graphics/importer/vertex_array_model.cc (modified)

	orxonox/trunk: less debug output


Tue, 27 Dec 2005 11:53:06 GMT bensch [6313]
	* trunk/src/lib/graphics/importer/vertex_array_model.cc (modified)

	orxonox/trunk: any-3D-model to VertexArrayModel works perfectly


Tue, 27 Dec 2005 11:52:16 GMT bensch [6312]
	* trunk/src/lib/graphics/importer/static_model.cc (modified)

	orxonox/trunk: patch, so that the VertexArrayModel conversion works
 ...


Tue, 27 Dec 2005 11:33:14 GMT bensch [6311]
	* trunk/src/subprojects/importer/tc.cc (added)

	trunk: temporary added file


Tue, 27 Dec 2005 11:24:27 GMT bensch [6310]
	* trunk/src/lib/graphics/importer/vertex_array_model.cc (modified)
	* trunk/src/lib/graphics/importer/vertex_array_model.h (modified)
	* trunk/src/subprojects/importer/Makefile.am (modified)
	* trunk/src/subprojects/importer/importer.cc (modified)

	orxonox/trunk: merged the VertexArrayModel from heightmap and added ...


Tue, 27 Dec 2005 01:28:15 GMT bensch [6309]
	* trunk/src/lib/graphics/importer/Makefile.am (modified)
	* trunk/src/lib/graphics/importer/vertex_array_model.cc (modified)

	orxonox/trunk: some new tc-stuff


Tue, 27 Dec 2005 00:51:26 GMT bensch [6308]
	* trunk/src/lib/graphics/importer/Makefile.am (modified)
	* trunk/src/lib/graphics/importer/model.h (modified)
	* trunk/src/lib/graphics/importer/tc.COPYRIGHT (added)
	* trunk/src/lib/graphics/importer/tc.c (added)
	* trunk/src/lib/graphics/importer/tc.h (added)
	* trunk/src/lib/graphics/importer/vertex_array_model.cc (modified)
	* trunk/src/lib/graphics/importer/vertex_array_model.h (modified)
	* trunk/src/lib/particles/particle_system.cc (modified)

	orxonox/trunk: added tc a library to convert Vertice-Melanges into ...


Mon, 26 Dec 2005 23:20:32 GMT bensch [6307]
	* trunk/src/lib/coord/p_node.cc (modified)
	* trunk/src/lib/graphics/render2D/element_2d.cc (modified)
	* trunk/src/story_entities/world.cc (modified)
	* trunk/src/world_entities/skybox.cc (modified)
	* trunk/src/world_entities/skybox.h (modified)

	orxonox/trunk: PNode fix: PNODE_MOVEMENT didn't work, because the ...


Mon, 26 Dec 2005 13:27:13 GMT bensch [6306]
	* trunk/src/world_entities/space_ships/space_ship.cc (modified)
	* trunk/src/world_entities/weapons/turret.cc (modified)
	* trunk/src/world_entities/weapons/turret.h (modified)
	* trunk/src/world_entities/weapons/weapon.cc (modified)
	* trunk/src/world_entities/weapons/weapon.h (modified)

	orxonox/trunk: cool bars for the rocket-louncher


Mon, 26 Dec 2005 12:46:16 GMT bensch [6305]
	* trunk/src/lib/gui/gl_gui/glgui_bar.cc (modified)
	* trunk/src/world_entities/weapons/aim.cc (modified)

	trunk: removed unused Text


Mon, 26 Dec 2005 12:02:12 GMT bensch [6302]
	* trunk/src/subprojects/collision_detection/Makefile.am (modified)
	* trunk/src/subprojects/particles/Makefile.am (modified)

	orxonox/trunk: file-fiexes


Mon, 26 Dec 2005 03:45:09 GMT bensch [6300]
	* trunk/src/lib/gui/gl_gui/glgui_widget.cc (modified)
	* trunk/src/world_entities/space_ships/space_ship.cc (modified)

	orxonox/trunk: show some widgets... man this is cool...


Mon, 26 Dec 2005 03:41:09 GMT bensch [6299]
	* trunk/src/lib/coord/p_node.cc (modified)
	* trunk/src/lib/graphics/render2D/element_2d.cc (modified)
	* trunk/src/lib/graphics/render2D/element_2d.h (modified)
	* trunk/src/lib/graphics/render2D/render_2d.cc (modified)

	orxonox/trunk: syncing PNode to Element2D again


Mon, 26 Dec 2005 02:01:14 GMT bensch [6295]
	* trunk/src/lib/graphics/importer/material.cc (modified)
	* trunk/src/lib/graphics/render2D/element_2d.cc (modified)
	* trunk/src/lib/gui/gl_gui/glgui_bar.cc (modified)
	* trunk/src/lib/gui/gl_gui/glgui_pushbutton.cc (modified)
	* trunk/src/lib/gui/gl_gui/glgui_widget.cc (modified)
	* trunk/src/lib/gui/gl_gui/glgui_widget.h (modified)
	* trunk/src/world_entities/space_ships/space_ship.cc (modified)

	orxonox/trunk: new GUI-functionality


Sun, 25 Dec 2005 16:32:56 GMT bensch [6288]
	* trunk/src/world_entities/space_ships/space_ship.cc (modified)

	orxonox/trunk: no more segfaults


Sun, 25 Dec 2005 16:32:21 GMT bensch [6287]
	* trunk/src/defs/class_id.h (modified)
	* trunk/src/lib/gui/gl_gui/Makefile.am (modified)
	* trunk/src/lib/gui/gl_gui/glgui_bar.cc (modified)
	* trunk/src/lib/gui/gl_gui/glgui_bar.h (modified)
	* trunk/src/lib/gui/gl_gui/glgui_box.cc (modified)
	* trunk/src/lib/gui/gl_gui/glgui_box.h (modified)
	* trunk/src/lib/gui/gl_gui/glgui_button.cc (modified)
	* trunk/src/lib/gui/gl_gui/glgui_checkbutton.cc (modified)
	* trunk/src/lib/gui/gl_gui/glgui_checkbutton.h (modified)
	* trunk/src/lib/gui/gl_gui/glgui_pushbutton.cc (modified)
	* trunk/src/lib/gui/gl_gui/glgui_widget.cc (modified)
	* trunk/src/lib/gui/gl_gui/glgui_widget.h (modified)
	* trunk/src/lib/gui/gl_gui/glgui_window.cc (modified)
	* trunk/src/lib/gui/gl_gui/glgui_window.h (modified)
	* trunk/src/world_entities/space_ships/space_ship.cc (modified)

	orxonox/trunk: some gui-work


Sun, 25 Dec 2005 15:21:48 GMT bensch [6282]
	* trunk/src/lib/lang/base_object.cc (modified)
	* trunk/src/world_entities/extendable.h (modified)
	* trunk/src/world_entities/power_ups/power_up.cc (modified)
	* trunk/src/world_entities/power_ups/power_up.h (modified)

	orxonox/trunk: merged the PowerUps back here


Sun, 25 Dec 2005 15:07:53 GMT bensch [6281]
	* trunk/src/lib/lang/base_object.cc (modified)
	* trunk/src/world_entities/creatures/md2_creature.cc (modified)
	* trunk/src/world_entities/space_ships/helicopter.cc (modified)
	* trunk/src/world_entities/space_ships/space_ship.cc (modified)
	* trunk/src/world_entities/test_entity.cc (modified)
	* trunk/src/world_entities/test_entity.h (modified)
	* trunk/src/world_entities/world_entity.cc (modified)
	* trunk/src/world_entities/world_entity.h (modified)

	trunk: make usage of the Virtual-derivates


Sun, 25 Dec 2005 13:46:33 GMT bensch [6280]
	* trunk/src/defs/class_id.h (modified)
	* trunk/src/lib/lang/base_object.cc (modified)
	* trunk/src/lib/lang/base_object.h (modified)
	* trunk/src/lib/lang/class_list.cc (modified)
	* trunk/src/lib/lang/class_list.h (modified)

	orxonox/trunk: ClassList now supports getLeafID() to retriefe the ID ...


Sat, 24 Dec 2005 23:52:23 GMT bensch [6279]
	* trunk/src/defs/class_id.h (modified)

	orxonox/trunk: descriptions


Sat, 24 Dec 2005 18:14:06 GMT bensch [6278]
	* trunk/src/defs/class_id.h (modified)
	* trunk/src/lib/lang/base_object.cc (modified)
	* trunk/src/lib/lang/class_list.cc (modified)
	* trunk/src/lib/lang/class_list.h (modified)
	* trunk/src/world_entities/test_entity.cc (modified)
	* trunk/src/world_entities/test_entity.h (modified)

	trunk: christmas commit.... fixed baseObject


Sat, 24 Dec 2005 13:28:00 GMT bensch [6276]
	* trunk/src/defs/class_id.h (modified)
	* trunk/src/lib/lang/base_object.cc (modified)

	orxonox/trunk: cleaner base_object-stuff


Sat, 24 Dec 2005 00:01:43 GMT bensch [6274]
	* trunk/acinclude.m4 (added)
	* trunk/autogen.sh (modified)
	* trunk/configure.ac (modified)
	* trunk/m4 (deleted)

	orxonox/trunk: better destination of the m4-files (in acinclude.m4)


Fri, 23 Dec 2005 13:22:07 GMT bensch [6272]
	* trunk/NEWS (modified)

	orxonox/trunk: NEWS update


Fri, 23 Dec 2005 12:54:58 GMT bensch [6271]
	* trunk/config.h.in (modified)
	* trunk/configure.ac (modified)
	* trunk/m4/ax_check_header_lib.m4 (moved)
	* trunk/m4/ax_check_required_header_lib.m4 (added)

	orxonox/trunk: MUCH better configure-checks


Wed, 21 Dec 2005 15:48:53 GMT bensch [6253]
	* trunk/src/lib/coord/p_node.cc (modified)
	* trunk/src/world_entities/creatures/md2_creature.cc (modified)

	orxonox/trunk: fixed the *final* pnode bug


Wed, 21 Dec 2005 14:41:11 GMT bensch [6243]
	* trunk/src/defs/class_id.h (modified)
	* trunk/src/world_entities/power_ups/param_power_up.cc (modified)
	* trunk/src/world_entities/power_ups/power_up.cc (modified)
	* trunk/src/world_entities/power_ups/weapon_power_up.cc (modified)
	* trunk/src/world_entities/space_ships/space_ship.cc (modified)
	* trunk/src/world_entities/space_ships/space_ship.h (modified)

	orxonox/trunk: merged the power-ups to the tunk again


Wed, 21 Dec 2005 14:36:25 GMT bensch [6241]
	* trunk/src/story_entities/world.cc (modified)
	* trunk/src/world_entities/playable.cc (modified)
	* trunk/src/world_entities/playable.h (modified)
	* trunk/src/world_entities/player.cc (modified)
	* trunk/src/world_entities/space_ships/space_ship.cc (modified)
	* trunk/src/world_entities/weapons/guided_missile.cc (modified)

	trunk: merged the spaceshipcontrol back to the trunk


Wed, 21 Dec 2005 12:49:06 GMT bensch [6222]
	* trunk (modified)
	* trunk/src (modified)
	* trunk/src/Makefile.am (modified)
	* trunk/src/defs/class_id.h (modified)
	* trunk/src/lib (modified)
	* trunk/src/lib/collision_detection (modified)
	* trunk/src/lib/collision_detection/cd_engine.cc (modified)
	* trunk/src/lib/collision_detection/obb.cc (modified)
	* trunk/src/lib/event (modified)
	* trunk/src/lib/graphics (modified)
	* trunk/src/lib/graphics/graphics_engine.cc (modified)
	* trunk/src/lib/graphics/importer (modified)
	* trunk/src/lib/graphics/importer/md2Model.cc (modified)
	* trunk/src/lib/graphics/importer/md2Model.h (modified)
	* trunk/src/lib/graphics/importer/model.h (modified)
	* trunk/src/lib/graphics/render2D/render_2d.cc (modified)
	* trunk/src/lib/graphics/spatial_separation (modified)
	* trunk/src/lib/graphics/text_engine/text_engine.cc (modified)
	* trunk/src/lib/gui (modified)
	* trunk/src/lib/gui/gl_gui (modified)
	* trunk/src/lib/gui/gtk_gui (modified)
	* trunk/src/lib/network (modified)
	* trunk/src/lib/parser (modified)
	* trunk/src/lib/parser/ini_parser (modified)
	* trunk/src/lib/parser/tinyxml (modified)
	* trunk/src/lib/particles (modified)
	* trunk/src/lib/particles/particle_system.cc (modified)
	* trunk/src/lib/physics (modified)
	* trunk/src/lib/shell (modified)
	* trunk/src/lib/shell/shell.cc (modified)
	* trunk/src/lib/shell/shell_buffer.cc (modified)
	* trunk/src/lib/shell/shell_command.cc (modified)
	* trunk/src/lib/shell/shell_input.cc (modified)
	* trunk/src/lib/sound (modified)
	* trunk/src/lib/sound/sound_engine.cc (modified)
	* trunk/src/lib/util/executor/executor.cc (modified)
	* trunk/src/story_entities/debug_world.cc (modified)
	* trunk/src/story_entities/network_world.cc (modified)
	* trunk/src/story_entities/world.cc (modified)
	* trunk/src/subprojects (modified)
	* trunk/src/subprojects/collision_detection (modified)
	* trunk/src/subprojects/importer (modified)
	* trunk/src/subprojects/importer/Makefile.am (modified)
	* trunk/src/subprojects/importer/importer.cc (modified)
	* trunk/src/subprojects/network (modified)
	* trunk/src/subprojects/particles (modified)
	* trunk/src/subprojects/testmain (modified)
	* trunk/src/util (modified)
	* trunk/src/util/animation/animation.h (modified)
	* trunk/src/util/loading/resource_manager.cc (modified)
	* trunk/src/util/loading/resource_manager.h (modified)
	* trunk/src/util/state.cc (modified)
	* trunk/src/util/state.h (modified)
	* trunk/src/world_entities/Makefile.am (modified)
	* trunk/src/world_entities/camera.cc (modified)
	* trunk/src/world_entities/creatures (copied)
	* trunk/src/world_entities/creatures/md2_creature.cc (copied)
	* trunk/src/world_entities/creatures/md2_creature.h (copied)
	* trunk/src/world_entities/npcs/npc.cc (modified)
	* trunk/src/world_entities/npcs/npc_test.cc (modified)
	* trunk/src/world_entities/npcs/npc_test1.cc (modified)
	* trunk/src/world_entities/playable.h (modified)
	* trunk/src/world_entities/player.cc (modified)
	* trunk/src/world_entities/power_ups/laser_power_up.cc (modified)
	* trunk/src/world_entities/power_ups/param_power_up.cc (modified)
	* trunk/src/world_entities/power_ups/turret_power_up.cc (modified)
	* trunk/src/world_entities/power_ups/weapon_power_up.cc (modified)
	* trunk/src/world_entities/satellite.cc (modified)
	* trunk/src/world_entities/space_ships/helicopter.cc (modified)
	* trunk/src/world_entities/space_ships/helicopter.h (modified)
	* trunk/src/world_entities/space_ships/space_ship.cc (modified)
	* trunk/src/world_entities/space_ships/space_ship.h (modified)
	* trunk/src/world_entities/test_entity.cc (modified)
	* trunk/src/world_entities/test_entity.h (modified)
	* trunk/src/world_entities/weapons/aim.cc (modified)
	* trunk/src/world_entities/weapons/bomb.cc (modified)
	* trunk/src/world_entities/weapons/guided_missile.cc (modified)
	* trunk/src/world_entities/weapons/laser.cc (modified)
	* trunk/src/world_entities/weapons/rocket.cc (modified)
	* trunk/src/world_entities/weapons/test_bullet.cc (modified)
	* trunk/src/world_entities/weapons/test_gun.cc (modified)
	* trunk/src/world_entities/weapons/turret.cc (modified)
	* trunk/src/world_entities/world_entity.cc (modified)
	* trunk/src/world_entities/world_entity.h (modified)

	orxonox/trunk: merged the christmas branche to the trunk
	merged with ...


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


Mon, 19 Dec 2005 17:44:32 GMT bensch [6164]
	* trunk/autogen.sh (modified)
	* trunk/configure.ac (modified)
	* trunk/m4 (added)
	* trunk/m4/ax_check_lib.m4 (added)

	orxonox/trunk: ac-files for easier checks in the configure.ac


Mon, 19 Dec 2005 15:52:01 GMT bensch [6162]
	* trunk/src/defs/class_id.h (modified)
	* trunk/src/lib/graphics/graphics_engine.cc (modified)
	* trunk/src/lib/graphics/importer/model.cc (modified)
	* trunk/src/lib/graphics/importer/objModel.cc (modified)
	* trunk/src/lib/graphics/importer/static_model.cc (modified)
	* trunk/src/world_entities/playable.h (modified)
	* trunk/src/world_entities/space_ships/helicopter.cc (modified)
	* trunk/src/world_entities/space_ships/helicopter.h (modified)
	* trunk/src/world_entities/space_ships/space_ship.cc (modified)
	* trunk/src/world_entities/space_ships/space_ship.h (modified)
	* trunk/src/world_entities/weapons/crosshair.cc (modified)
	* trunk/src/world_entities/weapons/guided_missile.cc (modified)
	* trunk/src/world_entities/weapons/guided_missile.h (modified)
	* trunk/src/world_entities/weapons/laser.cc (modified)
	* trunk/src/world_entities/weapons/test_gun.cc (modified)

	orxonox/trunk: merged the spaceshipcontroll branche into the trunk ...


Sat, 17 Dec 2005 21:00:15 GMT bensch [6158]
	* trunk/NEWS (modified)

	trunk: i really was a typo


Sat, 17 Dec 2005 20:59:23 GMT bensch [6157]
	* trunk/NEWS (modified)

	trunk: typo


Sat, 17 Dec 2005 20:57:27 GMT bensch [6156]
	* trunk/NEWS (modified)

	trunk: typo


Sat, 17 Dec 2005 20:52:48 GMT bensch [6155]
	* trunk/NEWS (modified)
	* trunk/src/story_entities/world.cc (modified)

	typo


Sat, 17 Dec 2005 20:06:19 GMT patrick [6154]
	* trunk/NEWS (modified)

	trunk: NEWS updated


Sat, 17 Dec 2005 18:05:52 GMT bensch [6153]
	* trunk/src/story_entities/campaign.cc (modified)
	* trunk/src/story_entities/story_entity.cc (modified)
	* trunk/src/story_entities/story_entity.h (modified)

	docu


Sat, 17 Dec 2005 17:52:57 GMT bensch [6152]
	* trunk/src/story_entities/campaign.cc (modified)
	* trunk/src/story_entities/story_entity.cc (modified)
	* trunk/src/story_entities/story_entity.h (modified)
	* trunk/src/story_entities/world.cc (modified)
	* trunk/src/story_entities/world.h (modified)
	* trunk/src/util/loading/game_loader.cc (modified)
	* trunk/src/util/loading/game_loader.h (modified)

	orxonox/trunk: some work in the loading process of worlds


Sat, 17 Dec 2005 17:08:28 GMT bensch [6151]
	* trunk/src/lib/collision_detection/cd_engine.cc (modified)
	* trunk/src/story_entities/world.cc (modified)
	* trunk/src/story_entities/world.h (modified)
	* trunk/src/util/loading/game_loader.cc (modified)

	trunk: more world cleanup


Sat, 17 Dec 2005 16:56:25 GMT bensch [6150]
	* trunk/src/story_entities/debug_world.cc (copied)
	* trunk/src/story_entities/debug_world.h (copied)
	* trunk/src/story_entities/world.cc (modified)
	* trunk/src/story_entities/world.h (modified)
	* trunk/src/util/loading/game_loader.cc (modified)
	* trunk/src/world_entities/power_ups/power_up.cc (modified)

	orxonox/trunk: cleanup of the world begin


Sat, 17 Dec 2005 14:17:48 GMT bensch [6148]
	* trunk/src/world_entities/power_ups/power_up.cc (modified)

	orxonox/trunk: segfault-prevention


Fri, 16 Dec 2005 22:46:55 GMT patrick [6145]
	* trunk/src/lib/graphics/importer/texture.cc (modified)
	* trunk/src/lib/network/synchronizeable.cc (modified)

	trunk: fixed the network bug, uninitialized variable :D


Fri, 16 Dec 2005 18:44:02 GMT bensch [6144]
	* trunk/src/lib/network/network_stream.cc (modified)

	orxonox/trunk: minor fix in synchronizeable erase instead of remove


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


Fri, 16 Dec 2005 17:45:32 GMT patrick [6139]
	* trunk/src/Makefile.am (modified)
	* trunk/src/defs/class_id.h (modified)
	* trunk/src/lib/graphics/importer/texture.cc (modified)
	* trunk/src/lib/graphics/importer/texture.h (modified)
	* trunk/src/lib/network/Makefile.am (modified)
	* trunk/src/lib/network/converter.cc (copied)
	* trunk/src/lib/network/converter.h (copied)
	* trunk/src/lib/network/handshake.cc (copied)
	* trunk/src/lib/network/handshake.h (copied)
	* trunk/src/lib/network/network_game_manager.cc (copied)
	* trunk/src/lib/network/network_game_manager.h (copied)
	* trunk/src/lib/network/network_manager.cc (modified)
	* trunk/src/lib/network/network_manager.h (modified)
	* trunk/src/lib/network/network_protocol.cc (modified)
	* trunk/src/lib/network/network_protocol.h (modified)
	* trunk/src/lib/network/network_socket.cc (modified)
	* trunk/src/lib/network/network_socket.h (modified)
	* trunk/src/lib/network/network_stream.cc (modified)
	* trunk/src/lib/network/network_stream.h (modified)
	* trunk/src/lib/network/server_socket.cc (modified)
	* trunk/src/lib/network/server_socket.h (modified)
	* trunk/src/lib/network/synchronizeable.cc (modified)
	* trunk/src/lib/network/synchronizeable.h (modified)
	* trunk/src/lib/sound/sound_source.cc (modified)
	* trunk/src/orxonox.cc (modified)
	* trunk/src/story_entities/campaign.cc (modified)
	* trunk/src/story_entities/network_world.cc (added)
	* trunk/src/story_entities/network_world.h (added)
	* trunk/src/subprojects/network/Makefile.am (modified)
	* trunk/src/subprojects/network/network_unit_test.cc (modified)
	* trunk/src/subprojects/network/read_sync.cc (modified)
	* trunk/src/subprojects/network/read_sync.h (modified)
	* trunk/src/subprojects/network/simple_sync.cc (modified)
	* trunk/src/subprojects/network/simple_sync.h (modified)
	* trunk/src/subprojects/network/write_sync.cc (modified)
	* trunk/src/subprojects/network/write_sync.h (modified)
	* trunk/src/util/loading/game_loader.cc (modified)
	* trunk/src/util/loading/game_loader.h (modified)
	* trunk/src/world_entities/Makefile.am (modified)
	* trunk/src/world_entities/camera.h (modified)
	* trunk/src/world_entities/spawning_point.cc (copied)
	* trunk/src/world_entities/spawning_point.h (copied)

	trunk: merged branche network with trunk using command: svn merge ...


Wed, 14 Dec 2005 15:44:13 GMT bensch [6113]
	* trunk/src/Makefile.am (modified)
	* trunk/src/defs/class_id.h (modified)
	* trunk/src/world_entities/extendable.h (copied)
	* trunk/src/world_entities/power_ups/laser_power_up.cc (modified)
	* trunk/src/world_entities/power_ups/param_power_up.cc (added)
	* trunk/src/world_entities/power_ups/param_power_up.h (added)
	* trunk/src/world_entities/power_ups/power_up.cc (modified)
	* trunk/src/world_entities/power_ups/power_up.h (modified)
	* trunk/src/world_entities/power_ups/turret_power_up.cc (modified)
	* trunk/src/world_entities/power_ups/weapon_power_up.cc (added)
	* trunk/src/world_entities/power_ups/weapon_power_up.h (added)

	trunk: copied new power-ups