#
# ChangeLog for trunk in orxonox.OLD
#
# Generated by Trac 1.0.9
# Dec 12, 2024, 10:27:07 AM

Mon, 17 Jul 2006 07:29:22 GMT bensch [9298]
	* trunk/src/lib/script_engine/script.cc (modified)
	* trunk/src/lib/script_engine/script.h (modified)
	* trunk/src/world_entities/npcs/gate.cc (modified)
	* trunk/src/world_entities/npcs/gate.h (modified)
	* trunk/src/world_entities/projectiles/guided_missile.cc (modified)
	* trunk/src/world_entities/script_trigger.cc (modified)
	* trunk/src/world_entities/script_trigger.h (modified)
	* trunk/src/world_entities/space_ships/spacecraft_2d.cc (modified)
	* trunk/src/world_entities/weapons/aiming_system.cc (modified)
	* trunk/src/world_entities/world_entity.h (modified)

	orxonox/trunk: merged the branche scripting back here.

	merged with ...


Tue, 11 Jul 2006 17:50:12 GMT patrick [9246]
	* trunk/src/lib/network/netdefs.h (modified)
	* trunk/src/lib/network/network_stream.cc (modified)
	* trunk/src/lib/network/network_stream.h (modified)
	* trunk/src/lib/network/udp_server_socket.h (modified)

	some network comments


Thu, 06 Jul 2006 10:25:44 GMT bensch [9240]
	* trunk/src/lib/event/event_handler.cc (modified)
	* trunk/src/lib/gui/gl/glgui_handler.cc (modified)
	* trunk/src/lib/gui/gl/glgui_handler.h (modified)
	* trunk/src/orxonox.cc (modified)
	* trunk/src/util/signal_handler.cc (modified)
	* trunk/src/util/signal_handler.h (modified)

	orxonox/trunk: better signal handler.
	patched by chrigi


Wed, 05 Jul 2006 15:05:52 GMT bensch [9237]
	* trunk/configure.ac (modified)

	0.3.5 created


Wed, 05 Jul 2006 14:39:02 GMT bensch [9235]
	* trunk/src/defs/class_id.h (modified)
	* trunk/src/lib/collision_detection/obb_tree.cc (modified)
	* trunk/src/lib/collision_detection/obb_tree.h (modified)
	* trunk/src/lib/collision_detection/obb_tree_node.cc (modified)
	* trunk/src/lib/collision_detection/obb_tree_node.h (modified)
	* trunk/src/lib/collision_reaction/Makefile.am (modified)
	* trunk/src/lib/collision_reaction/collision_handle.cc (modified)
	* trunk/src/lib/collision_reaction/cr_engine.h (modified)
	* trunk/src/lib/collision_reaction/cr_object_damage.cc (modified)
	* trunk/src/lib/collision_reaction/cr_physics_full_walk.cc (copied)
	* trunk/src/lib/collision_reaction/cr_physics_full_walk.h (copied)
	* trunk/src/lib/collision_reaction/cr_physics_ground_walk.cc (modified)
	* trunk/src/lib/coord/p_node.cc (modified)
	* trunk/src/lib/graphics/effects/cloud_effect.cc (modified)
	* trunk/src/lib/graphics/effects/fog_effect.cc (modified)
	* trunk/src/lib/graphics/effects/fog_effect.h (modified)
	* trunk/src/lib/graphics/effects/lightning_effect.cc (modified)
	* trunk/src/lib/graphics/effects/rain_effect.cc (modified)
	* trunk/src/lib/graphics/effects/rain_effect.h (modified)
	* trunk/src/lib/graphics/effects/snow_effect.cc (modified)
	* trunk/src/lib/graphics/effects/snow_effect.h (modified)
	* trunk/src/lib/graphics/importer/bsp_manager.cc (modified)
	* trunk/src/lib/graphics/importer/md2/md2Model.cc (modified)
	* trunk/src/lib/graphics/importer/md2/md2Model.h (modified)
	* trunk/src/lib/gui/gl/glgui_handler.cc (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_stream.cc (modified)
	* trunk/src/lib/network/player_stats.cc (modified)
	* trunk/src/lib/particles/particle_system.cc (modified)
	* trunk/src/lib/script_engine/script.cc (modified)
	* trunk/src/lib/script_engine/script.h (modified)
	* trunk/src/lib/sound/sound_engine.cc (modified)
	* trunk/src/orxonox.cc (modified)
	* trunk/src/story_entities/game_world.cc (modified)
	* trunk/src/story_entities/game_world.h (modified)
	* trunk/src/story_entities/game_world_data.cc (modified)
	* trunk/src/story_entities/menu/game_menu.cc (modified)
	* trunk/src/story_entities/multi_player_world.cc (modified)
	* trunk/src/story_entities/multi_player_world_data.cc (modified)
	* trunk/src/util/hud.cc (modified)
	* trunk/src/util/multiplayer_team_deathmatch.cc (modified)
	* trunk/src/util/multiplayer_team_deathmatch.h (modified)
	* trunk/src/util/network_game_rules.cc (modified)
	* trunk/src/util/network_game_rules.h (modified)
	* trunk/src/world_entities/WorldEntities.am (modified)
	* trunk/src/world_entities/camera.cc (modified)
	* trunk/src/world_entities/creatures/fps_player.cc (modified)
	* trunk/src/world_entities/creatures/fps_player.h (modified)
	* trunk/src/world_entities/effects/explosion.cc (modified)
	* trunk/src/world_entities/environments/mapped_water.cc (modified)
	* trunk/src/world_entities/environments/model_entity.cc (modified)
	* trunk/src/world_entities/npcs/attractor_mine.cc (copied)
	* trunk/src/world_entities/npcs/attractor_mine.h (copied)
	* trunk/src/world_entities/npcs/gate.cc (copied)
	* trunk/src/world_entities/npcs/gate.h (copied)
	* trunk/src/world_entities/npcs/generic_npc.cc (modified)
	* trunk/src/world_entities/npcs/generic_npc.h (modified)
	* trunk/src/world_entities/npcs/ground_turret.cc (modified)
	* trunk/src/world_entities/npcs/ground_turret.h (modified)
	* trunk/src/world_entities/npcs/npc.cc (modified)
	* trunk/src/world_entities/npcs/npc_test.cc (modified)
	* trunk/src/world_entities/npcs/npc_test.h (modified)
	* trunk/src/world_entities/npcs/npc_test1.cc (modified)
	* trunk/src/world_entities/npcs/space_turret.cc (copied)
	* trunk/src/world_entities/npcs/space_turret.h (copied)
	* trunk/src/world_entities/playable.cc (modified)
	* trunk/src/world_entities/playable.h (modified)
	* trunk/src/world_entities/projectiles/boomerang_projectile.cc (copied)
	* trunk/src/world_entities/projectiles/boomerang_projectile.h (copied)
	* trunk/src/world_entities/projectiles/guided_missile.cc (modified)
	* trunk/src/world_entities/projectiles/guided_missile.h (modified)
	* trunk/src/world_entities/projectiles/hyperblast.cc (modified)
	* trunk/src/world_entities/projectiles/hyperblast.h (modified)
	* trunk/src/world_entities/projectiles/laser.cc (modified)
	* trunk/src/world_entities/projectiles/laser.h (modified)
	* trunk/src/world_entities/projectiles/projectile.cc (modified)
	* trunk/src/world_entities/projectiles/projectile.h (modified)
	* trunk/src/world_entities/projectiles/rail_projectile.cc (copied)
	* trunk/src/world_entities/projectiles/rail_projectile.h (copied)
	* trunk/src/world_entities/projectiles/rocket.cc (modified)
	* trunk/src/world_entities/projectiles/rocket.h (modified)
	* trunk/src/world_entities/projectiles/test_bullet.cc (modified)
	* trunk/src/world_entities/projectiles/test_bullet.h (modified)
	* trunk/src/world_entities/script_trigger.cc (modified)
	* trunk/src/world_entities/skydome.cc (modified)
	* trunk/src/world_entities/space_ships/cruizer.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/hover.cc (modified)
	* trunk/src/world_entities/space_ships/hover.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/space_ships/spacecraft_2d.cc (modified)
	* trunk/src/world_entities/space_ships/spacecraft_2d.h (modified)
	* trunk/src/world_entities/spawning_point.cc (modified)
	* trunk/src/world_entities/test_entity.cc (modified)
	* trunk/src/world_entities/test_entity.h (modified)
	* trunk/src/world_entities/weapons/aiming_system.cc (copied)
	* trunk/src/world_entities/weapons/aiming_system.h (copied)
	* trunk/src/world_entities/weapons/boomerang_gun.cc (copied)
	* trunk/src/world_entities/weapons/boomerang_gun.h (copied)
	* trunk/src/world_entities/weapons/fps_sniper_rifle.cc (modified)
	* trunk/src/world_entities/weapons/laser_cannon.cc (copied)
	* trunk/src/world_entities/weapons/laser_cannon.h (copied)
	* trunk/src/world_entities/world_entity.cc (modified)
	* trunk/src/world_entities/world_entity.h (modified)

	merged the presentation back


Tue, 04 Jul 2006 09:29:10 GMT bensch [9112]
	* trunk/src/lib/graphics/effects/cloud_effect.cc (modified)
	* trunk/src/lib/graphics/effects/cloud_effect.h (modified)
	* trunk/src/lib/graphics/effects/fog_effect.cc (modified)
	* trunk/src/lib/graphics/effects/lightning_effect.cc (modified)
	* trunk/src/lib/graphics/effects/rain_effect.cc (modified)
	* trunk/src/lib/graphics/effects/snow_effect.cc (modified)
	* trunk/src/lib/shell/shell_command.cc (modified)

	merged the mountain-lake back here


Tue, 04 Jul 2006 09:18:41 GMT bensch [9110]
	* trunk/config.h.in (modified)
	* trunk/configure.ac (modified)
	* trunk/src/lib/collision_detection/cd_engine.cc (modified)
	* trunk/src/lib/collision_reaction/cr_physics_ground_walk.cc (modified)
	* trunk/src/lib/graphics/importer/bsp_manager.cc (modified)
	* trunk/src/lib/graphics/importer/bsp_manager.h (modified)
	* trunk/src/lib/graphics/importer/md3/md3_model.cc (modified)
	* trunk/src/lib/graphics/importer/primitive_model.cc (modified)
	* trunk/src/lib/graphics/spatial_separation/quadtree.cc (modified)
	* trunk/src/lib/graphics/spatial_separation/quadtree_node.cc (modified)
	* trunk/src/lib/gui/gl/glgui_box.cc (modified)
	* trunk/src/lib/gui/gtk/gui_gtk.cc (modified)
	* trunk/src/lib/math/curve.cc (modified)
	* trunk/src/lib/math/line.h (modified)
	* trunk/src/lib/math/matrix.cc (modified)
	* trunk/src/lib/math/matrix.h (modified)
	* trunk/src/lib/math/plane.h (modified)
	* trunk/src/lib/math/quaternion.cc (modified)
	* trunk/src/lib/math/quaternion.h (modified)
	* trunk/src/lib/math/vector.cc (modified)
	* trunk/src/lib/math/vector.h (modified)
	* trunk/src/lib/network/network_game_manager.cc (modified)
	* trunk/src/lib/network/player_stats.cc (modified)
	* trunk/src/lib/network/player_stats.h (modified)
	* trunk/src/lib/network/shared_network_data.cc (modified)
	* trunk/src/lib/network/synchronizeable.cc (modified)
	* trunk/src/lib/shell/shell_buffer.cc (modified)
	* trunk/src/lib/util/loading/game_loader.cc (modified)
	* trunk/src/story_entities/game_world.cc (modified)
	* trunk/src/story_entities/menu/game_menu.cc (modified)
	* trunk/src/story_entities/multi_player_world.cc (modified)
	* trunk/src/subprojects/framework.cc (modified)
	* trunk/src/util/multiplayer_team_deathmatch.cc (modified)
	* trunk/src/util/multiplayer_team_deathmatch.h (modified)
	* trunk/src/util/network_game_rules.cc (modified)
	* trunk/src/util/network_game_rules.h (modified)
	* trunk/src/util/signal_handler.h (modified)
	* trunk/src/world_entities/creatures/fps_player.cc (modified)
	* trunk/src/world_entities/creatures/fps_player.h (modified)
	* trunk/src/world_entities/environments/mapped_water.cc (modified)
	* trunk/src/world_entities/npcs/door.cc (modified)
	* trunk/src/world_entities/npcs/door.h (modified)
	* trunk/src/world_entities/npcs/generic_npc.cc (modified)
	* trunk/src/world_entities/playable.cc (modified)
	* trunk/src/world_entities/script_trigger.cc (modified)
	* trunk/src/world_entities/space_ships/space_ship.cc (modified)
	* trunk/src/world_entities/space_ships/spacecraft_2d.cc (modified)
	* trunk/src/world_entities/space_ships/spacecraft_2d.h (modified)
	* trunk/src/world_entities/world_entity.cc (modified)
	* trunk/src/world_entities/world_entity.h (modified)

	orxonox/trunk: merged the Presentation back


Mon, 03 Jul 2006 22:47:49 GMT bensch [9079]
	* trunk/NEWS (modified)

	new NEWS


Mon, 03 Jul 2006 16:59:18 GMT patrick [9062]
	* trunk/src/lib/collision_reaction/cr_defs.h (modified)
	* trunk/src/world_entities/player.cc (modified)

	merged branche single_player_map back to trunk


Mon, 03 Jul 2006 16:39:10 GMT patrick [9061]
	* trunk/src/defs/class_id.h (modified)
	* trunk/src/lib/collision_reaction/cr_defs.h (modified)
	* trunk/src/lib/collision_reaction/cr_object_damage.cc (modified)
	* trunk/src/lib/collision_reaction/cr_physics_ground_walk.cc (modified)
	* trunk/src/lib/graphics/importer/bsp_manager.cc (modified)
	* trunk/src/lib/graphics/importer/bsp_manager.h (modified)
	* trunk/src/lib/graphics/text_engine/font_data.cc (modified)
	* trunk/src/lib/script_engine/script.cc (modified)
	* trunk/src/lib/script_engine/script.h (modified)
	* trunk/src/story_entities/game_world.cc (modified)
	* trunk/src/world_entities/WorldEntities.am (modified)
	* trunk/src/world_entities/npcs/generic_npc.cc (modified)
	* trunk/src/world_entities/npcs/generic_npc.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/projectiles/laser.cc (modified)
	* trunk/src/world_entities/script_trigger.cc (modified)
	* trunk/src/world_entities/space_ships/cruizer.cc (copied)
	* trunk/src/world_entities/space_ships/cruizer.h (copied)
	* trunk/src/world_entities/space_ships/space_ship.cc (modified)
	* trunk/src/world_entities/space_ships/spacecraft_2d.cc (copied)
	* trunk/src/world_entities/space_ships/spacecraft_2d.h (copied)
	* trunk/src/world_entities/world_entity.cc (modified)

	merged the single_player branche to trunk


Mon, 03 Jul 2006 16:30:42 GMT patrick [9059]
	* trunk/src/lib/network/message_manager.cc (modified)
	* trunk/src/lib/network/network_game_manager.cc (modified)
	* trunk/src/lib/network/network_manager.cc (modified)
	* trunk/src/lib/network/network_manager.h (modified)
	* trunk/src/lib/network/network_stream.cc (modified)
	* trunk/src/story_entities/menu/game_menu.cc (modified)
	* trunk/src/story_entities/menu/game_menu.h (modified)
	* trunk/src/story_entities/multi_player_world.cc (modified)
	* trunk/src/util/multiplayer_team_deathmatch.cc (modified)
	* trunk/src/util/multiplayer_team_deathmatch.h (modified)
	* trunk/src/world_entities/bsp_entity.cc (modified)
	* trunk/src/world_entities/bsp_entity.h (modified)
	* trunk/src/world_entities/player.h (modified)
	* trunk/src/world_entities/world_entity.cc (modified)

	merged the network branche with the trunk


Mon, 03 Jul 2006 09:30:17 GMT patrick [9027]
	* trunk/src/lib/collision_reaction/cr_object_damage.cc (modified)
	* trunk/src/lib/collision_reaction/cr_physics_ground_walk.cc (modified)
	* trunk/src/story_entities/game_world.cc (modified)
	* trunk/src/world_entities/npcs/generic_npc.cc (modified)

	npc does not yet move again. strange


Mon, 03 Jul 2006 09:21:33 GMT patrick [9026]
	* trunk/src/world_entities/npcs/generic_npc.cc (modified)

	trunk: npcs are walking again


Mon, 03 Jul 2006 09:02:01 GMT patrick [9025]
	* trunk/src/lib/collision_reaction/cr_object_damage.cc (modified)
	* trunk/src/lib/graphics/importer/bsp_file.cc (modified)

	some small debug output error


Sun, 02 Jul 2006 20:26:47 GMT bensch [9022]
	* trunk/src/lib/gui/gl/glgui_handler.cc (modified)

	orxonox/trunk: less output


Sun, 02 Jul 2006 20:25:41 GMT bensch [9021]
	* trunk/src/lib/gui/gl/glgui_handler.cc (modified)
	* trunk/src/world_entities/environments/mapped_water.cc (modified)
	* trunk/src/world_entities/environments/mapped_water.h (modified)

	orxonox/trunk: GUI: mapped water can no be edited with the mouse


Sun, 02 Jul 2006 14:41:32 GMT bensch [9019]
	* trunk/src/lib/gui/gl/glgui_widget.cc (modified)
	* trunk/src/lib/sound/ogg_player.cc (modified)
	* trunk/src/lib/sound/ogg_player.h (modified)
	* trunk/src/story_entities/game_world_data.cc (modified)
	* trunk/src/world_entities/elements/glgui_radar.cc (modified)
	* trunk/src/world_entities/environments/mapped_water.cc (modified)
	* trunk/src/world_entities/player.cc (modified)
	* trunk/src/world_entities/player.h (modified)

	orxonox/trunk: OggPlayer retrieves Information about the current ...


Sun, 02 Jul 2006 13:04:20 GMT bensch [9015]
	* trunk/src/lib/gui/gl/glgui.h (modified)
	* trunk/src/lib/gui/gl/glgui_textfield.cc (modified)
	* trunk/src/lib/gui/gl/glgui_textfield.h (modified)
	* trunk/src/story_entities/menu/game_menu.cc (modified)

	orxonox/trunk: text-field


Sun, 02 Jul 2006 12:50:47 GMT bensch [9014]
	* trunk/src/story_entities/menu/game_menu.cc (modified)
	* trunk/src/util/hud.cc (modified)
	* trunk/src/world_entities/elements/glgui_energywidget.cc (modified)
	* trunk/src/world_entities/elements/glgui_radar.cc (modified)

	orxonox/trunk: autoselect first entries in the Menu


Sun, 02 Jul 2006 12:22:19 GMT bensch [9008]
	* trunk/src/lib/collision_detection/bounding_volume.h (modified)
	* trunk/src/lib/collision_detection/obb_tree_node.cc (modified)
	* trunk/src/lib/collision_reaction/cr_object_damage.cc (modified)
	* trunk/src/lib/network/message_manager.h (modified)
	* trunk/src/lib/network/network_game_manager.cc (modified)
	* trunk/src/story_entities/multi_player_world.cc (modified)
	* trunk/src/story_entities/multi_player_world_data.cc (modified)
	* trunk/src/util/game_rules.cc (modified)
	* trunk/src/util/game_rules.h (modified)
	* trunk/src/util/multiplayer_team_deathmatch.cc (modified)
	* trunk/src/util/multiplayer_team_deathmatch.h (modified)
	* trunk/src/util/object_manager.cc (modified)
	* trunk/src/world_entities/playable.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/spawning_point.cc (modified)
	* trunk/src/world_entities/spawning_point.h (modified)
	* trunk/src/world_entities/world_entity.cc (modified)
	* trunk/src/world_entities/world_entity.h (modified)

	orxonox/trunk: merged the network bak to the trunk
	merged with ...


Sun, 02 Jul 2006 12:11:59 GMT bensch [9006]
	* trunk/src/Makefile.am (modified)
	* trunk/src/defs/class_id.h (modified)
	* trunk/src/lib/graphics/Makefile.am (modified)
	* trunk/src/lib/graphics/effects/cloud_effect.cc (modified)
	* trunk/src/lib/graphics/effects/cloud_effect.h (modified)
	* trunk/src/lib/graphics/effects/fog_effect.cc (modified)
	* trunk/src/lib/graphics/effects/lense_flare.cc (modified)
	* trunk/src/lib/graphics/effects/lightening_effect.cc (deleted)
	* trunk/src/lib/graphics/effects/lightening_effect.h (deleted)
	* trunk/src/lib/graphics/effects/lightning_effect.cc (copied)
	* trunk/src/lib/graphics/effects/lightning_effect.h (copied)
	* trunk/src/lib/graphics/effects/rain_effect.cc (modified)
	* trunk/src/lib/graphics/effects/rain_effect.h (modified)
	* trunk/src/lib/graphics/effects/snow_effect.cc (modified)
	* trunk/src/lib/graphics/effects/volfog_effect.cc (modified)
	* trunk/src/lib/gui/gl/glgui_handler.cc (modified)
	* trunk/src/lib/util/executor/executor_lua.h (modified)
	* trunk/src/world_entities/environments/mapped_water.cc (modified)
	* trunk/src/world_entities/environments/mapped_water.h (modified)
	* trunk/src/world_entities/script_trigger.cc (modified)
	* trunk/src/world_entities/script_trigger.h (modified)
	* trunk/src/world_entities/skydome.cc (modified)
	* trunk/src/world_entities/skydome.h (modified)

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


Sun, 02 Jul 2006 11:36:13 GMT bensch [9003]
	* trunk/src/defs/class_id.h (modified)
	* trunk/src/lib/collision_reaction/cr_physics_ground_walk.cc (modified)
	* trunk/src/lib/graphics/importer/bsp_file.cc (modified)
	* trunk/src/lib/graphics/importer/bsp_file.h (modified)
	* trunk/src/lib/graphics/importer/bsp_manager.cc (modified)
	* trunk/src/lib/graphics/importer/bsp_manager.h (modified)
	* trunk/src/lib/graphics/importer/interactive_model.h (modified)
	* trunk/src/lib/graphics/importer/md2/md2Model.cc (modified)
	* trunk/src/lib/graphics/importer/md2/md2Model.h (modified)
	* trunk/src/lib/script_engine/script.cc (modified)
	* trunk/src/lib/script_engine/script.h (modified)
	* trunk/src/lib/script_engine/script_class.h (modified)
	* trunk/src/lib/script_engine/script_manager.cc (modified)
	* trunk/src/lib/util/executor/executor_lua.cc (modified)
	* trunk/src/util/hud.cc (modified)
	* trunk/src/world_entities/WorldEntities.am (modified)
	* trunk/src/world_entities/bsp_entity.cc (modified)
	* trunk/src/world_entities/creatures/fps_player.cc (modified)
	* trunk/src/world_entities/creatures/fps_player.h (modified)
	* trunk/src/world_entities/door.cc (deleted)
	* trunk/src/world_entities/door.h (deleted)
	* trunk/src/world_entities/elements/glgui_radar.cc (modified)
	* trunk/src/world_entities/npcs/door.cc (copied)
	* trunk/src/world_entities/npcs/door.h (copied)
	* trunk/src/world_entities/npcs/generic_npc.cc (modified)
	* trunk/src/world_entities/npcs/generic_npc.h (modified)
	* trunk/src/world_entities/npcs/npc.cc (modified)
	* trunk/src/world_entities/npcs/repair_station.cc (copied)
	* trunk/src/world_entities/npcs/repair_station.h (copied)
	* trunk/src/world_entities/script_trigger.cc (modified)
	* trunk/src/world_entities/script_trigger.h (modified)
	* trunk/src/world_entities/test_entity.cc (modified)
	* trunk/src/world_entities/weapons/fps_sniper_rifle.cc (modified)
	* trunk/src/world_entities/weapons/fps_sniper_rifle.h (modified)
	* trunk/src/world_entities/world_entity.cc (modified)
	* trunk/src/world_entities/world_entity.h (modified)

	orxonox/trunk: merged the single_player_map branche back
	merged with ...


Sun, 02 Jul 2006 10:47:18 GMT bensch [9002]
	* trunk/src/world_entities/elements/glgui_radar.cc (modified)
	* trunk/src/world_entities/player.h (modified)
	* trunk/src/world_entities/weapons/test_gun.cc (modified)

	orxonox/trunk: redirect everything to see into the dof of the
	_centerNode


Sun, 02 Jul 2006 04:57:09 GMT bensch [9001]
	* trunk/src/util/hud.cc (modified)
	* trunk/src/world_entities/elements/glgui_radar.cc (modified)

	orxonox/trunk: The Radar is now displayed with the radar-pic ...


Sun, 02 Jul 2006 04:43:15 GMT bensch [9000]
	* trunk/src/util/hud.cc (modified)
	* trunk/src/world_entities/elements/glgui_radar.cc (modified)

	nicer, better radar


Sun, 02 Jul 2006 04:32:18 GMT bensch [8999]
	* trunk/src/world_entities/elements/glgui_radar.cc (modified)

	radar: much better sizeing


Sun, 02 Jul 2006 04:30:55 GMT bensch [8998]
	* trunk/src/world_entities/elements/glgui_radar.cc (modified)

	orxonox/trunk: gui-Radar renders in a corrected Size();


Sun, 02 Jul 2006 04:27:43 GMT bensch [8997]
	* trunk/src/world_entities/elements/glgui_radar.cc (modified)

	orxonox/trunk: RADAR shows the correct Elements now


Sun, 02 Jul 2006 04:25:54 GMT bensch [8996]
	* trunk/src/util/hud.cc (modified)
	* trunk/src/world_entities/elements/glgui_radar.cc (modified)
	* trunk/src/world_entities/elements/glgui_radar.h (modified)

	orxonox/trunk: RADAR RENDERS


Sun, 02 Jul 2006 03:43:28 GMT bensch [8995]
	* trunk/src/util/hud.cc (modified)
	* trunk/src/util/hud.h (modified)

	hud: radar shown inside of the HUD


Sun, 02 Jul 2006 03:38:44 GMT bensch [8994]
	* trunk/src/util/hud.cc (modified)
	* trunk/src/util/hud.h (modified)
	* trunk/src/world_entities/Makefile.am (modified)
	* trunk/src/world_entities/WorldEntities.am (modified)
	* trunk/src/world_entities/elements/glgui_radar.cc (modified)

	compiling radar


Sun, 02 Jul 2006 03:30:14 GMT bensch [8993]
	* trunk/src/world_entities/elements/glgui_radar.cc (modified)
	* trunk/src/world_entities/elements/glgui_radar.h (modified)

	radar should provide the right data now


Sun, 02 Jul 2006 03:00:49 GMT bensch [8992]
	* trunk/src/lib/event/event_handler.cc (modified)
	* trunk/src/world_entities/elements/glgui_radar.cc (modified)
	* trunk/src/world_entities/elements/glgui_radar.h (modified)

	more radar work


Sat, 01 Jul 2006 18:16:09 GMT bensch [8991]
	* trunk/src/lib/gui/gl/glgui_bar.cc (modified)
	* trunk/src/lib/gui/gl/glgui_bar.h (modified)
	* trunk/src/lib/gui/gl/glgui_text.cc (modified)
	* trunk/src/lib/gui/gl/glgui_text.h (modified)
	* trunk/src/world_entities/Makefile.am (modified)
	* trunk/src/world_entities/elements/glgui_energywidget.cc (modified)
	* trunk/src/world_entities/elements/glgui_radar.cc (copied)
	* trunk/src/world_entities/elements/glgui_radar.h (copied)

	orxonox/trunk: added a Radar class, to display radar as Widget


Sat, 01 Jul 2006 16:09:30 GMT bensch [8990]
	* trunk/src/lib/gui/gl/glgui_widget.cc (modified)
	* trunk/src/lib/gui/gl/glgui_widget.h (modified)
	* trunk/src/util/hud.cc (modified)
	* trunk/src/util/hud.h (modified)
	* trunk/src/world_entities/elements/glgui_energywidget.cc (modified)

	orxonox/trunk: new Functionality to widget, so one can set a ...


Sat, 01 Jul 2006 15:32:45 GMT bensch [8989]
	* trunk/src/lib/graphics/render2D/element_2d.cc (modified)
	* trunk/src/lib/graphics/text_engine/font.cc (modified)
	* trunk/src/lib/gui/gl/glgui_widget.cc (modified)
	* trunk/src/util/hud.cc (modified)

	orxonox/trunk: notifier notifies


Sat, 01 Jul 2006 15:13:19 GMT bensch [8988]
	* trunk/src/util/hud.cc (modified)
	* trunk/src/world_entities/elements/glgui_energywidget.cc (modified)
	* trunk/src/world_entities/elements/glgui_energywidget.h (modified)

	orxonox/trunk: much nicer rendering. The Bar is now behind the Value


Sat, 01 Jul 2006 15:08:20 GMT bensch [8987]
	* trunk/src/util/hud.cc (modified)

	orxonox/trunk: multi-lined the weapon-alignment, man, it looks real ...


Sat, 01 Jul 2006 14:57:07 GMT bensch [8986]
	* trunk/src/lib/gui/gl/glgui_bar.h (modified)
	* trunk/src/lib/util/color.cc (modified)
	* trunk/src/lib/util/color.h (modified)
	* trunk/src/util/hud.cc (modified)
	* trunk/src/world_entities/elements/glgui_energywidget.cc (modified)

	trunk: slerping colors in HSV-space works


Sat, 01 Jul 2006 14:25:45 GMT bensch [8985]
	* trunk/src/world_entities/elements/glgui_energywidget.cc (modified)

	orxonox/trunk: works perfectly with nice fading effect :)


Sat, 01 Jul 2006 14:23:49 GMT bensch [8984]
	* trunk/src/lib/gui/gl/glgui_bar.cc (modified)
	* trunk/src/lib/gui/gl/glgui_bar.h (modified)
	* trunk/src/world_entities/elements/glgui_energywidget.cc (modified)
	* trunk/src/world_entities/weapons/test_gun.cc (modified)

	orxonox/trunk: gui with fading :)


Sat, 01 Jul 2006 14:12:44 GMT bensch [8983]
	* trunk/src/lib/gui/gl/glgui_bar.cc (modified)
	* trunk/src/lib/gui/gl/glgui_bar.h (modified)
	* trunk/src/lib/gui/gl/glgui_widget.h (modified)
	* trunk/src/world_entities/elements/glgui_energywidget.cc (modified)
	* trunk/src/world_entities/weapons/test_gun.cc (modified)

	blend-stuff


Sat, 01 Jul 2006 13:28:54 GMT bensch [8982]
	* trunk/src/lib/gui/gl/glgui_widget.cc (modified)

	font-loading hack, until fonts are real resources, and can be loaded ...


Sat, 01 Jul 2006 13:23:12 GMT bensch [8981]
	* trunk/src/lib/graphics/text_engine/limited_width_text.cc (modified)
	* trunk/src/world_entities/elements/glgui_energywidget.cc (modified)
	* trunk/src/world_entities/elements/glgui_energywidget.h (modified)

	trunk: less debug output


Sat, 01 Jul 2006 13:18:43 GMT bensch [8980]
	* trunk/src/lib/graphics/text_engine/limited_width_text.h (modified)
	* trunk/src/lib/gui/gl/glgui_text.cc (modified)
	* trunk/src/lib/gui/gl/glgui_text.h (modified)
	* trunk/src/world_entities/elements/glgui_energywidget.cc (modified)
	* trunk/src/world_entities/elements/glgui_energywidget.h (modified)

	trunk: more gui in the Hud


Sat, 01 Jul 2006 11:17:57 GMT bensch [8977]
	* trunk/src/world_entities/elements/glgui_energywidget.cc (modified)
	* trunk/src/world_entities/elements/glgui_energywidget.h (modified)
	* trunk/src/world_entities/weapons/weapon.cc (modified)
	* trunk/src/world_entities/world_entity.cc (modified)

	trunk: gui displayes nicely


Sat, 01 Jul 2006 11:05:38 GMT bensch [8976]
	* trunk/src/util/hud.cc (modified)
	* trunk/src/world_entities/elements/glgui_energywidget.cc (modified)
	* trunk/src/world_entities/weapons/weapon.cc (modified)
	* trunk/src/world_entities/weapons/weapon.h (modified)

	orxonox/trunk: the hud displays Energy and WeaponEnergy


Sat, 01 Jul 2006 10:12:48 GMT bensch [8975]
	* trunk/src/story_entities/game_world_data.cc (modified)
	* trunk/src/util/hud.cc (modified)
	* trunk/src/world_entities/elements/glgui_energywidget.cc (modified)
	* trunk/src/world_entities/elements/glgui_energywidget.h (modified)

	trunk: widget displayed


Sat, 01 Jul 2006 09:47:08 GMT bensch [8974]
	* trunk/src/lib/gui/gl/glgui_bar.cc (modified)
	* trunk/src/world_entities/elements/glgui_energywidget.cc (modified)
	* trunk/src/world_entities/elements/glgui_energywidget.h (modified)
	* trunk/src/world_entities/world_entity.cc (modified)
	* trunk/src/world_entities/world_entity.h (modified)

	trunk: better implemented


Sat, 01 Jul 2006 09:37:42 GMT bensch [8973]
	* trunk/src/defs/class_id.h (modified)
	* trunk/src/lib/gui/gl/Makefile.am (modified)
	* trunk/src/lib/gui/gl/glgui_text.cc (modified)
	* trunk/src/lib/gui/gl/glgui_text.h (modified)
	* trunk/src/world_entities/elements/glgui_energywidget.cc (modified)
	* trunk/src/world_entities/elements/glgui_energywidget.h (modified)

	trunk: gui: full functionality of Text


Sat, 01 Jul 2006 09:26:00 GMT bensch [8972]
	* trunk/src/lib/gui/gl/glgui_bar.cc (modified)
	* trunk/src/lib/gui/gl/glgui_bar.h (modified)
	* trunk/src/lib/gui/gl/glgui_text.h (modified)
	* trunk/src/util/hud.h (modified)
	* trunk/src/world_entities/Makefile.am (modified)
	* trunk/src/world_entities/elements/glgui_energywidget.cc (copied)
	* trunk/src/world_entities/elements/glgui_energywidget.h (copied)
	* trunk/src/world_entities/world_entity.cc (modified)

	added glgui_energywidget, the new Widget to display Energy and a
	Value


Sat, 01 Jul 2006 08:51:46 GMT bensch [8971]
	* trunk/src/lib/sound/sound_buffer.cc (modified)

	trunk: warning message, if ogg loading fails


Sat, 01 Jul 2006 08:48:06 GMT bensch [8970]
	* trunk/src/lib/sound/sound_buffer.cc (modified)

	orxonox/trunk: doxy


Sat, 01 Jul 2006 08:45:47 GMT bensch [8969]
	* trunk/src/lib/sound/sound_buffer.cc (modified)
	* trunk/src/lib/sound/sound_buffer.h (modified)
	* trunk/src/lib/sound/sound_source.cc (modified)

	orxonox/trunk: ogg-files loadable (hopefully)


Wed, 28 Jun 2006 22:19:48 GMT patrick [8894]
	* trunk/src/defs/class_id.h (modified)
	* trunk/src/lib/collision_detection/cd_engine.cc (modified)
	* trunk/src/lib/collision_reaction/collision_event.h (modified)
	* trunk/src/lib/collision_reaction/cr_defs.h (modified)
	* trunk/src/lib/collision_reaction/cr_physics_ground_walk.cc (modified)
	* trunk/src/lib/collision_reaction/cr_physics_ground_walk.h (modified)
	* trunk/src/lib/event/event_handler.cc (modified)
	* trunk/src/lib/graphics/importer/bsp_file.cc (modified)
	* trunk/src/lib/graphics/importer/bsp_manager.cc (modified)
	* trunk/src/lib/graphics/importer/interactive_model.h (modified)
	* trunk/src/lib/graphics/importer/md2/md2Model.cc (modified)
	* trunk/src/lib/graphics/importer/md2/md2Model.h (modified)
	* trunk/src/lib/math/quaternion.h (modified)
	* trunk/src/lib/math/vector.h (modified)
	* trunk/src/lib/script_engine/script_manager.h (modified)
	* trunk/src/lib/shell/shell_command.cc (modified)
	* trunk/src/lib/util/executor/executor.cc (modified)
	* trunk/src/lib/util/executor/executor.h (modified)
	* trunk/src/lib/util/executor/executor_functional.cc (modified)
	* trunk/src/lib/util/executor/executor_lua.cc (modified)
	* trunk/src/lib/util/executor/executor_lua.h (modified)
	* trunk/src/lib/util/executor/functor_list.h (modified)
	* trunk/src/story_entities/game_world.cc (modified)
	* trunk/src/story_entities/multi_player_world.cc (modified)
	* trunk/src/world_entities/WorldEntities.am (modified)
	* trunk/src/world_entities/creatures/fps_player.cc (modified)
	* trunk/src/world_entities/door.cc (copied)
	* trunk/src/world_entities/door.h (copied)
	* trunk/src/world_entities/npcs/generic_npc.cc (modified)
	* trunk/src/world_entities/npcs/generic_npc.h (modified)
	* trunk/src/world_entities/npcs/npc.cc (modified)
	* trunk/src/world_entities/script_trigger.cc (modified)
	* trunk/src/world_entities/script_trigger.h (modified)
	* trunk/src/world_entities/weapons/fps_sniper_rifle.cc (copied)
	* trunk/src/world_entities/weapons/fps_sniper_rifle.h (copied)
	* trunk/src/world_entities/world_entity.cc (modified)
	* trunk/src/world_entities/world_entity.h (modified)

	merged the branche single_player_map with the trunk


Wed, 28 Jun 2006 10:22:46 GMT bensch [8846]
	* trunk/src/world_entities/creatures/fps_player.cc (modified)

	no more segfault


Wed, 28 Jun 2006 10:17:53 GMT bensch [8844]
	* trunk/acinclude.m4 (modified)
	* trunk/src/world_entities/creatures/fps_player.cc (modified)
	* trunk/src/world_entities/weapons/weapon_manager.cc (modified)
	* trunk/src/world_entities/weapons/weapon_manager.h (modified)

	deleting weapons should be fixed


Mon, 26 Jun 2006 14:56:45 GMT patrick [8805]
	* trunk/src/world_entities/npcs/generic_npc.cc (modified)

	trunk: generic npc model wolking function


Mon, 26 Jun 2006 14:46:25 GMT patrick [8802]
	* trunk/src/lib/math/quaternion.h (modified)
	* trunk/src/lib/network/netdefs.h (modified)
	* trunk/src/lib/network/udp_server_socket.cc (modified)
	* trunk/src/lib/network/udp_server_socket.h (modified)
	* trunk/src/lib/network/udp_socket.cc (modified)
	* trunk/src/lib/network/udp_socket.h (modified)
	* trunk/src/util/game_rules.cc (modified)
	* trunk/src/util/game_rules.h (modified)
	* trunk/src/util/multiplayer_team_deathmatch.cc (modified)
	* trunk/src/util/multiplayer_team_deathmatch.h (modified)
	* trunk/src/world_entities/npcs/generic_npc.cc (modified)
	* trunk/src/world_entities/npcs/generic_npc.h (modified)
	* trunk/src/world_entities/spawning_point.cc (modified)
	* trunk/src/world_entities/spawning_point.h (modified)

	merged the network branche back to trunk


Mon, 26 Jun 2006 13:43:40 GMT patrick [8796]
	* trunk/src/lib/collision_reaction/cr_physics_ground_walk.cc (modified)
	* trunk/src/lib/graphics/importer/bsp_manager.cc (modified)
	* trunk/src/world_entities/npcs/generic_npc.h (modified)

	merged the bsp model branche back to trunk and some npc code changes
	:D


Mon, 26 Jun 2006 13:36:16 GMT patrick [8793]
	* trunk/src/defs/class_id.h (modified)
	* trunk/src/lib/graphics/effects/cloud_effect.cc (modified)
	* trunk/src/lib/graphics/effects/cloud_effect.h (modified)
	* trunk/src/lib/graphics/effects/fog_effect.cc (modified)
	* trunk/src/lib/graphics/effects/fog_effect.h (modified)
	* trunk/src/lib/graphics/effects/lightening_effect.cc (modified)
	* trunk/src/lib/graphics/effects/lightening_effect.h (modified)
	* trunk/src/lib/graphics/effects/rain_effect.cc (modified)
	* trunk/src/lib/graphics/effects/rain_effect.h (modified)
	* trunk/src/lib/graphics/effects/snow_effect.cc (modified)
	* trunk/src/lib/graphics/effects/sun_effect.cc (modified)
	* trunk/src/lib/graphics/effects/sun_effect.h (modified)
	* trunk/src/lib/sound/sound_source.cc (modified)
	* trunk/src/lib/sound/sound_source.h (modified)
	* trunk/src/world_entities/WorldEntities.am (modified)
	* trunk/src/world_entities/effects/lightning_bolt.cc (modified)
	* trunk/src/world_entities/npcs/generic_npc.h (modified)
	* trunk/src/world_entities/skydome.cc (copied)
	* trunk/src/world_entities/skydome.h (copied)

	trunk: merged the weather engine branche to the trunk


Mon, 26 Jun 2006 13:18:08 GMT patrick [8792]
	* trunk/src/world_entities/environments/mapped_water.cc (modified)
	* trunk/src/world_entities/environments/mapped_water.h (modified)

	merged water branche back to trunk


Mon, 26 Jun 2006 12:00:31 GMT patrick [8783]
	* trunk/src/defs/class_id.h (modified)
	* trunk/src/lib/lang/class_list.cc (modified)
	* trunk/src/lib/script_engine/script.cc (modified)
	* trunk/src/world_entities/npcs/generic_npc.cc (modified)
	* trunk/src/world_entities/npcs/generic_npc.h (modified)
	* trunk/src/world_entities/script_trigger.cc (modified)
	* trunk/src/world_entities/script_trigger.h (modified)
	* trunk/src/world_entities/space_ships/helicopter.cc (modified)
	* trunk/src/world_entities/space_ships/helicopter.h (modified)

	merged the script engine branche back to trunk


Sun, 25 Jun 2006 23:41:49 GMT patrick [8779]
	* trunk/src/lib/collision_reaction/cr_object_damage.cc (modified)

	trunk: less debug


Sun, 25 Jun 2006 23:05:42 GMT patrick [8778]
	* 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: test model die function reimplemented


Sun, 25 Jun 2006 22:59:13 GMT patrick [8777]
	* trunk/src/lib/collision_reaction/cr_object_damage.cc (modified)
	* trunk/src/world_entities/npcs/ground_turret.cc (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/hyperblaster.cc (modified)
	* trunk/src/world_entities/weapons/hyperblaster.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.h (modified)
	* trunk/src/world_entities/world_entity.cc (modified)
	* trunk/src/world_entities/world_entity.h (modified)

	trunk: damage and distruction reimplemented


Sun, 25 Jun 2006 21:47:54 GMT patrick [8776]
	* trunk/src/lib/collision_detection/obb_tree_node.cc (modified)
	* trunk/src/world_entities/creatures/fps_player.cc (modified)

	trunk: added weapons to the fps character


Sat, 24 Jun 2006 02:21:52 GMT bensch [8769]
	* trunk/src/lib/graphics/text_engine/text.cc (modified)
	* trunk/src/lib/gui/gl/glgui_button.cc (modified)
	* trunk/src/lib/gui/gl/glgui_widget.cc (modified)
	* trunk/src/lib/gui/gl/glgui_widget.h (modified)

	orxonox/trunk: Font in Button-Widget used


Sat, 24 Jun 2006 01:59:11 GMT bensch [8768]
	* trunk/src/lib/graphics/text_engine/font.cc (modified)
	* trunk/src/lib/graphics/text_engine/font_data.h (modified)
	* trunk/src/lib/graphics/text_engine/limited_width_text.cc (modified)
	* trunk/src/lib/graphics/text_engine/multi_line_text.cc (modified)
	* trunk/src/lib/graphics/text_engine/text.cc (modified)

	trunk: font: cleaner draw() of Texts


Sat, 24 Jun 2006 01:55:18 GMT bensch [8767]
	* trunk/src/lib/graphics/text_engine/font.cc (modified)

	font: less debug


Sat, 24 Jun 2006 01:54:58 GMT bensch [8766]
	* trunk/src/lib/graphics/text_engine/font.cc (modified)
	* trunk/src/lib/graphics/text_engine/font.h (modified)
	* trunk/src/lib/graphics/text_engine/font_data.h (modified)

	font: no more friends


Sat, 24 Jun 2006 01:49:33 GMT bensch [8765]
	* trunk/src/lib/graphics/text_engine/font.cc (modified)
	* trunk/src/lib/graphics/text_engine/font.h (modified)
	* trunk/src/lib/graphics/text_engine/font_data.cc (modified)
	* trunk/src/lib/graphics/text_engine/font_data.h (modified)

	trunk: much better loading of the Font


Sat, 24 Jun 2006 01:12:14 GMT bensch [8764]
	* trunk/src/lib/graphics/text_engine/font.cc (modified)
	* trunk/src/lib/graphics/text_engine/font.h (modified)
	* trunk/src/lib/graphics/text_engine/font_data.cc (modified)
	* trunk/src/lib/graphics/text_engine/font_data.h (modified)
	* trunk/src/lib/graphics/text_engine/text.cc (modified)
	* trunk/src/lib/graphics/text_engine/text.h (modified)

	load-implementation of font in font-data


Sat, 24 Jun 2006 00:37:58 GMT bensch [8763]
	* trunk/src/lib/graphics/text_engine/font.cc (modified)
	* trunk/src/lib/graphics/text_engine/font.h (modified)

	minor nicer design


Sat, 24 Jun 2006 00:16:12 GMT bensch [8761]
	* trunk/src/defs/class_id.h (modified)
	* trunk/src/lib/graphics/importer/material.cc (modified)
	* trunk/src/lib/graphics/importer/material.h (modified)
	* trunk/src/lib/graphics/importer/texture.cc (modified)
	* trunk/src/lib/graphics/importer/texture.h (modified)
	* trunk/src/lib/graphics/importer/texture_data.h (modified)
	* trunk/src/lib/graphics/text_engine/font.cc (modified)
	* trunk/src/lib/graphics/text_engine/font.h (modified)
	* trunk/src/lib/graphics/text_engine/font_data.cc (modified)
	* trunk/src/lib/graphics/text_engine/font_data.h (modified)
	* trunk/src/lib/graphics/text_engine/limited_width_text.cc (modified)
	* trunk/src/lib/graphics/text_engine/multi_line_text.cc (modified)
	* trunk/src/lib/graphics/text_engine/text.cc (modified)
	* trunk/src/lib/graphics/text_engine/text.h (modified)
	* trunk/src/lib/graphics/text_engine/text_engine.cc (modified)
	* trunk/src/lib/util/count_pointer.h (modified)

	merged the new Font-Implementation back here
	merged with svn merge ...


Fri, 23 Jun 2006 16:12:07 GMT bensch [8751]
	* trunk/src/lib/graphics/Makefile.am (modified)
	* trunk/src/lib/graphics/importer/texture_data.h (modified)
	* trunk/src/lib/graphics/text_engine/font.cc (modified)
	* trunk/src/lib/graphics/text_engine/font.h (modified)
	* trunk/src/lib/graphics/text_engine/font_data.cc (copied)
	* trunk/src/lib/graphics/text_engine/font_data.h (copied)

	orxonox/trunk: Preparing for FONT-DATA


Fri, 23 Jun 2006 15:28:13 GMT bensch [8750]
	* trunk/src/lib/gui/qt/qt_gui_datadir_fallback.cc (modified)
	* trunk/src/orxonox.cc (modified)

	orxonox/trunk: now one can also close orxonox when the datadir is not ...


Fri, 23 Jun 2006 15:08:04 GMT bensch [8749]
	* trunk/src/lib/gui/qt/Makefile.am (modified)
	* trunk/src/lib/gui/qt/qt_gui_datadir_fallback.cc (copied)
	* trunk/src/lib/gui/qt/qt_gui_datadir_fallback.h (copied)
	* trunk/src/orxonox.cc (modified)

	orxonox/trunk: fallback test for ORXONOX-data-directory


Fri, 23 Jun 2006 13:17:15 GMT bensch [8743]
	* trunk/src/lib/event/event_handler.cc (modified)
	* trunk/src/lib/event/event_handler.h (modified)
	* trunk/src/lib/gui/gl/glgui_handler.cc (modified)

	gui: event-handler now supports retrieving key-states


Fri, 23 Jun 2006 12:55:59 GMT bensch [8742]
	* trunk/src/lib/graphics/light.cc (modified)
	* trunk/src/lib/gui/gl/glgui_handler.cc (modified)
	* trunk/src/story_entities/menu/game_menu.cc (modified)

	gui: better switch with keys


Fri, 23 Jun 2006 09:22:37 GMT bensch [8740]
	* trunk/src/lib/graphics/graphics_engine.cc (modified)
	* trunk/src/lib/gui/gl/glgui_button.cc (modified)
	* trunk/src/story_entities/game_world.cc (modified)
	* trunk/src/story_entities/game_world.h (modified)
	* trunk/src/story_entities/menu/glgui_imagebutton.cc (modified)
	* trunk/src/story_entities/menu/glgui_imagebutton.h (modified)

	orxonox/trunk: now the elements are draw correctly


Thu, 22 Jun 2006 14:28:18 GMT bensch [8731]
	* trunk/src/lib/math/quaternion.cc (modified)
	* trunk/src/lib/math/quaternion.h (modified)
	* trunk/src/world_entities/creatures/fps_player.cc (modified)
	* trunk/src/world_entities/creatures/fps_player.h (modified)

	new player


Thu, 22 Jun 2006 13:14:58 GMT bensch [8724]
	* trunk/src/defs/class_id.h (modified)
	* trunk/src/lib/collision_detection/Makefile.am (modified)
	* trunk/src/lib/collision_detection/aabb.cc (copied)
	* trunk/src/lib/collision_detection/aabb.h (copied)
	* trunk/src/lib/collision_detection/aabb_tree_node.cc (copied)
	* trunk/src/lib/collision_detection/aabb_tree_node.h (copied)
	* trunk/src/lib/collision_reaction/collision_handle.cc (modified)
	* trunk/src/lib/collision_reaction/cr_object_damage.cc (modified)
	* trunk/src/lib/collision_reaction/cr_physics_ground_walk.cc (modified)
	* trunk/src/lib/collision_reaction/cr_physics_ground_walk.h (modified)
	* trunk/src/lib/event/key_mapper.cc (modified)
	* trunk/src/lib/event/key_mapper.h (modified)
	* trunk/src/lib/graphics/importer/Makefile.am (modified)
	* trunk/src/lib/graphics/importer/bsp_manager.cc (modified)
	* trunk/src/lib/graphics/importer/bsp_manager.h (modified)
	* trunk/src/lib/graphics/importer/interactive_model.h (modified)
	* trunk/src/lib/graphics/importer/md2/md2Model.h (modified)
	* trunk/src/lib/graphics/importer/md3/md3_animation.cc (modified)
	* trunk/src/lib/graphics/importer/md3/md3_animation.h (modified)
	* trunk/src/lib/graphics/importer/md3/md3_animation_cfg.cc (copied)
	* trunk/src/lib/graphics/importer/md3/md3_animation_cfg.h (copied)
	* trunk/src/lib/graphics/importer/md3/md3_bone_frame.h (modified)
	* trunk/src/lib/graphics/importer/md3/md3_data.cc (modified)
	* trunk/src/lib/graphics/importer/md3/md3_data.h (modified)
	* trunk/src/lib/graphics/importer/md3/md3_mesh.h (modified)
	* trunk/src/lib/graphics/importer/md3/md3_model.cc (modified)
	* trunk/src/lib/graphics/importer/md3/md3_model.h (modified)
	* trunk/src/lib/math/quaternion.cc (modified)
	* trunk/src/lib/math/quaternion.h (modified)
	* trunk/src/lib/util/Makefile.am (modified)
	* trunk/src/lib/util/loading/resource_manager.cc (modified)
	* trunk/src/lib/util/loading/resource_manager.h (modified)
	* trunk/src/lib/util/tokenizer.cc (copied)
	* trunk/src/lib/util/tokenizer.h (copied)
	* trunk/src/story_entities/game_world.cc (modified)
	* trunk/src/world_entities/WorldEntities.am (modified)
	* trunk/src/world_entities/creatures/fps_player.cc (copied)
	* trunk/src/world_entities/creatures/fps_player.h (copied)
	* trunk/src/world_entities/creatures/md2_creature.cc (modified)
	* trunk/src/world_entities/creatures/md2_creature.h (modified)
	* trunk/src/world_entities/npcs/generic_npc.cc (copied)
	* trunk/src/world_entities/npcs/generic_npc.h (copied)
	* trunk/src/world_entities/npcs/ground_turret.cc (modified)
	* trunk/src/world_entities/npcs/npc.cc (modified)
	* trunk/src/world_entities/npcs/npc.h (modified)
	* trunk/src/world_entities/npcs/npc_test.cc (modified)
	* trunk/src/world_entities/npcs/npc_test1.cc (modified)
	* trunk/src/world_entities/playable.cc (modified)
	* trunk/src/world_entities/playable.h (modified)
	* trunk/src/world_entities/space_ships/collision_probe.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)

	merged the bsp-model-stuff back here


Thu, 22 Jun 2006 12:13:18 GMT bensch [8719]
	* trunk/src/story_entities/menu/game_menu.cc (modified)
	* trunk/src/world_entities/environments/mapped_water.cc (modified)
	* trunk/src/world_entities/environments/mapped_water.h (modified)
	* trunk/src/world_entities/space_ships/hover.cc (modified)

	merged the water branche back. conflicts resolved in favour of the
	trunk


Thu, 22 Jun 2006 12:04:28 GMT bensch [8717]
	* trunk/src/defs/class_id.h (modified)
	* trunk/src/defs/error.h (modified)
	* trunk/src/lib/data/data_tank.h (modified)
	* trunk/src/lib/event/event_handler.cc (modified)
	* trunk/src/lib/gui/gl/Makefile.am (modified)
	* trunk/src/lib/gui/gl/glgui_box.cc (modified)
	* trunk/src/lib/gui/gl/glgui_button.cc (modified)
	* trunk/src/lib/gui/gl/glgui_button.h (modified)
	* trunk/src/lib/gui/gl/glgui_checkbutton.cc (modified)
	* trunk/src/lib/gui/gl/glgui_checkbutton.h (modified)
	* trunk/src/lib/gui/gl/glgui_handler.cc (modified)
	* trunk/src/lib/gui/gl/glgui_handler.h (modified)
	* trunk/src/lib/gui/gl/glgui_inputline.cc (modified)
	* trunk/src/lib/gui/gl/glgui_pushbutton.cc (modified)
	* trunk/src/lib/gui/gl/glgui_pushbutton.h (modified)
	* trunk/src/lib/gui/gl/glgui_slider.cc (modified)
	* trunk/src/lib/gui/gl/glgui_slider.h (modified)
	* trunk/src/lib/gui/gl/glgui_table.cc (modified)
	* trunk/src/lib/gui/gl/glgui_table.h (modified)
	* trunk/src/lib/gui/gl/glgui_widget.cc (modified)
	* trunk/src/lib/gui/gl/glgui_widget.h (modified)
	* trunk/src/lib/util/loading/game_loader.cc (modified)
	* trunk/src/story_entities/Makefile.am (modified)
	* trunk/src/story_entities/campaign.cc (modified)
	* trunk/src/story_entities/game_world.cc (modified)
	* trunk/src/story_entities/game_world_data.cc (modified)
	* trunk/src/story_entities/menu (copied)
	* trunk/src/story_entities/menu/game_menu.cc (copied)
	* trunk/src/story_entities/menu/game_menu.h (copied)
	* trunk/src/story_entities/menu/glgui_imagebutton.cc (copied)
	* trunk/src/story_entities/menu/glgui_imagebutton.h (copied)
	* trunk/src/story_entities/multi_player_world.cc (modified)
	* trunk/src/story_entities/multi_player_world_data.cc (modified)
	* trunk/src/story_entities/simple_game_menu.cc (modified)
	* trunk/src/story_entities/single_player_world_data.cc (modified)
	* trunk/src/story_entities/story_entity.h (modified)
	* trunk/src/util/multiplayer_team_deathmatch.cc (modified)

	merged the gui back


Thu, 22 Jun 2006 11:09:20 GMT bensch [8711]
	* trunk/src/defs/class_id.h (modified)
	* trunk/src/lib/coord/p_node.h (modified)
	* trunk/src/lib/gui/gl/glgui_handler.cc (modified)
	* trunk/src/lib/script_engine/Makefile.am (modified)
	* trunk/src/lib/script_engine/lunartest.lua (deleted)
	* trunk/src/lib/script_engine/lunartest2.lua (modified)
	* trunk/src/lib/script_engine/script.cc (modified)
	* trunk/src/lib/script_engine/script.h (modified)
	* trunk/src/lib/script_engine/script_class.cc (modified)
	* trunk/src/lib/script_engine/script_manager.cc (modified)
	* trunk/src/lib/script_engine/script_manager.h (modified)
	* trunk/src/lib/script_engine/script_method.cc (modified)
	* trunk/src/lib/script_engine/script_method.h (modified)
	* trunk/src/lib/util/executor/executor_lua.h (modified)
	* trunk/src/story_entities/game_world.cc (modified)
	* trunk/src/world_entities/script_trigger.cc (modified)
	* trunk/src/world_entities/script_trigger.h (modified)
	* trunk/src/world_entities/space_ships/helicopter.h (modified)

	merged the script_engine back here


Thu, 22 Jun 2006 10:48:01 GMT bensch [8708]
	* trunk/src/lib/network/message_manager.cc (modified)
	* trunk/src/lib/network/message_manager.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/player_stats.cc (modified)
	* trunk/src/lib/network/synchronizeable.cc (modified)
	* trunk/src/lib/network/synchronizeable.h (modified)
	* trunk/src/util/multiplayer_team_deathmatch.cc (modified)
	* trunk/src/util/multiplayer_team_deathmatch.h (modified)
	* trunk/src/world_entities/space_ships/space_ship.cc (modified)
	* trunk/src/world_entities/spectator.cc (modified)

	merged network back
	merged with command:
	svn merge -r8625:HEAD ...


Thu, 22 Jun 2006 10:46:29 GMT bensch [8707]
	* trunk/acinclude.m4 (modified)

	merged the lua-download-script back


Tue, 20 Jun 2006 11:39:01 GMT bensch [8623]
	* trunk/src/lib/event/event_handler.cc (modified)
	* trunk/src/lib/event/event_handler.h (modified)
	* trunk/src/lib/network/Makefile.am (modified)
	* trunk/src/lib/network/connection_monitor.cc (modified)
	* trunk/src/lib/network/connection_monitor.h (modified)
	* trunk/src/lib/network/data_stream.cc (modified)
	* trunk/src/lib/network/message_manager.cc (modified)
	* trunk/src/lib/network/message_manager.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_stream.cc (modified)
	* trunk/src/lib/network/network_stream.h (modified)
	* trunk/src/lib/network/player_stats.cc (modified)
	* trunk/src/lib/network/player_stats.h (modified)
	* trunk/src/lib/network/synchronizeable.cc (modified)
	* trunk/src/lib/network/udp_broadcast.cc (copied)
	* trunk/src/lib/network/udp_broadcast.h (copied)
	* trunk/src/lib/network/udp_server_socket.cc (modified)
	* trunk/src/lib/network/zip.cc (modified)
	* trunk/src/lib/network/zip.h (modified)
	* trunk/src/lib/shell/some_shell_commands.cc (modified)
	* trunk/src/orxonox.cc (modified)
	* trunk/src/subprojects/network/network_unit_test.cc (modified)
	* trunk/src/util/game_rules.h (modified)
	* trunk/src/util/multiplayer_team_deathmatch.cc (modified)
	* trunk/src/util/multiplayer_team_deathmatch.h (modified)
	* trunk/src/util/network_game_rules.cc (modified)
	* trunk/src/util/network_game_rules.h (modified)
	* trunk/src/util/signal_handler.h (modified)
	* trunk/src/world_entities/space_ships/turbine_hover.cc (modified)

	orxonox/trunk: merged the network branche back here
	merged with ...


Tue, 20 Jun 2006 11:24:11 GMT bensch [8619]
	* trunk/src/defs/class_id.h (modified)
	* trunk/src/lib/event/event_handler.cc (modified)
	* trunk/src/lib/graphics/Makefile.am (modified)
	* trunk/src/lib/graphics/effects/lense_flare.cc (modified)
	* trunk/src/lib/graphics/effects/lense_flare.h (modified)
	* trunk/src/lib/graphics/importer/material.cc (modified)
	* trunk/src/lib/graphics/importer/material.h (modified)
	* trunk/src/lib/graphics/importer/texture_sequence.cc (modified)
	* trunk/src/lib/graphics/text_engine/limited_width_text.cc (copied)
	* trunk/src/lib/graphics/text_engine/limited_width_text.h (copied)
	* trunk/src/lib/graphics/text_engine/multi_line_text.cc (modified)
	* trunk/src/lib/graphics/text_engine/text.cc (modified)
	* trunk/src/lib/graphics/text_engine/text.h (modified)
	* trunk/src/lib/gui/gl/Makefile.am (modified)
	* trunk/src/lib/gui/gl/glgui.h (modified)
	* trunk/src/lib/gui/gl/glgui_box.cc (modified)
	* trunk/src/lib/gui/gl/glgui_button.cc (modified)
	* trunk/src/lib/gui/gl/glgui_button.h (modified)
	* trunk/src/lib/gui/gl/glgui_checkbutton.cc (modified)
	* trunk/src/lib/gui/gl/glgui_container.cc (modified)
	* trunk/src/lib/gui/gl/glgui_cursor.cc (modified)
	* trunk/src/lib/gui/gl/glgui_defs.h (modified)
	* trunk/src/lib/gui/gl/glgui_image.cc (modified)
	* trunk/src/lib/gui/gl/glgui_inputline.cc (modified)
	* trunk/src/lib/gui/gl/glgui_inputline.h (modified)
	* trunk/src/lib/gui/gl/glgui_slider.cc (modified)
	* trunk/src/lib/gui/gl/glgui_style.cc (deleted)
	* trunk/src/lib/gui/gl/glgui_style.h (deleted)
	* trunk/src/lib/gui/gl/glgui_table.cc (copied)
	* trunk/src/lib/gui/gl/glgui_table.h (copied)
	* trunk/src/lib/gui/gl/glgui_widget.cc (modified)
	* trunk/src/lib/gui/gl/glgui_widget.h (modified)
	* trunk/src/lib/gui/gl/specials/glgui_notifier.cc (modified)
	* trunk/src/lib/gui/gl/specials/glgui_notifier.h (modified)
	* trunk/src/lib/math/rect2D.cc (modified)
	* trunk/src/lib/math/rect2D.h (modified)
	* trunk/src/lib/sound/sound_buffer.cc (modified)
	* trunk/src/lib/util/color.cc (modified)
	* trunk/src/lib/util/executor/functor_list.h (modified)
	* trunk/src/lib/util/filesys/file.cc (modified)
	* trunk/src/lib/util/filesys/file.h (modified)
	* trunk/src/story_entities/simple_game_menu.cc (modified)
	* trunk/src/util/hud.cc (modified)
	* trunk/src/world_entities/environments/mapped_water.cc (modified)
	* trunk/src/world_entities/skybox.h (modified)

	trunk: merged the gui-branche back.
	merged with command:
	svn merge ...


Fri, 16 Jun 2006 11:50:21 GMT bensch [8527]
	* trunk/src/lib/util/executor/executor_lua.cc (modified)
	* trunk/src/lib/util/executor/executor_lua.h (modified)

	compiles again


Fri, 16 Jun 2006 09:16:38 GMT bensch [8523]
	* trunk/acinclude.m4 (modified)
	* trunk/configure.ac (modified)
	* trunk/src/lib/graphics/effects/volfog_effect.cc (modified)
	* trunk/src/lib/util/filesys/directory.cc (modified)
	* trunk/src/story_entities/simple_game_menu.cc (modified)
	* trunk/src/util/signal_handler.h (modified)

	trunk: compiles on Windows: DANGER: THE LINUX PORT MAY BE COMPROMISED


Fri, 16 Jun 2006 08:23:05 GMT bensch [8518]
	* trunk/scripts/tardis-scratch-checkout.pl (modified)
	* trunk/src/defs/class_id.h (modified)
	* trunk/src/lib/graphics/graphics_engine.cc (modified)
	* trunk/src/lib/graphics/graphics_engine.h (modified)
	* trunk/src/lib/graphics/text_engine/text.cc (modified)
	* trunk/src/lib/graphics/text_engine/text.h (modified)
	* trunk/src/lib/gui/gl/Makefile.am (modified)
	* trunk/src/lib/gui/gl/glgui_inputline.cc (modified)
	* trunk/src/lib/gui/gl/glgui_inputline.h (modified)
	* trunk/src/lib/gui/gl/glgui_style.cc (modified)
	* trunk/src/lib/gui/gl/glgui_style.h (modified)
	* trunk/src/lib/gui/gl/glgui_widget.h (modified)
	* trunk/src/lib/gui/gl/specials (copied)
	* trunk/src/lib/gui/gl/specials/glgui_notifier.cc (copied)
	* trunk/src/lib/gui/gl/specials/glgui_notifier.h (copied)
	* trunk/src/story_entities/simple_game_menu.cc (modified)
	* trunk/src/util/hud.cc (modified)
	* trunk/src/util/hud.h (modified)

	merged the gui back to the trunk


Thu, 15 Jun 2006 19:50:56 GMT bensch [8495]
	* trunk/src/lib/collision_reaction/collision_handle.cc (modified)
	* trunk/src/lib/graphics/effects/atmospheric_engine.cc (modified)
	* trunk/src/lib/graphics/effects/cloud_effect.cc (modified)
	* trunk/src/lib/graphics/effects/cloud_effect.h (modified)
	* trunk/src/lib/graphics/effects/fog_effect.cc (modified)
	* trunk/src/lib/graphics/effects/fog_effect.h (modified)
	* trunk/src/lib/graphics/effects/graphics_effect.cc (modified)
	* trunk/src/lib/graphics/effects/graphics_effect.h (modified)
	* trunk/src/lib/graphics/effects/lense_flare.cc (modified)
	* trunk/src/lib/graphics/effects/lense_flare.h (modified)
	* trunk/src/lib/graphics/effects/lightening_effect.cc (modified)
	* trunk/src/lib/graphics/effects/lightening_effect.h (modified)
	* trunk/src/lib/graphics/effects/rain_effect.cc (modified)
	* trunk/src/lib/graphics/effects/rain_effect.h (modified)
	* trunk/src/lib/graphics/effects/sglmodel.h (deleted)
	* trunk/src/lib/graphics/effects/sky.sgl (deleted)
	* trunk/src/lib/graphics/effects/snow_effect.cc (modified)
	* trunk/src/lib/graphics/effects/snow_effect.h (modified)
	* trunk/src/lib/graphics/effects/volfog_effect.cc (modified)
	* trunk/src/lib/graphics/effects/volfog_effect.h (modified)
	* trunk/src/lib/graphics/effects/weather_effect.cc (modified)
	* trunk/src/lib/graphics/effects/weather_effect.h (modified)
	* trunk/src/lib/gui/qt/gui_control.cc (modified)
	* trunk/src/lib/sound/sound_source.cc (modified)
	* trunk/src/lib/sound/sound_source.h (modified)
	* trunk/src/subprojects/benchmark.cc (modified)
	* trunk/src/util/kill_target.cc (modified)
	* trunk/src/world_entities/effects/billboard.cc (modified)
	* trunk/src/world_entities/space_ships/helicopter.cc (modified)

	merged the branche atmos back. no conflicts


Thu, 15 Jun 2006 19:34:48 GMT patrick [8490]
	* trunk/src/defs/class_id.h (modified)
	* trunk/src/defs/include_paths.am (modified)
	* trunk/src/lib/collision_detection/cd_engine.cc (modified)
	* trunk/src/lib/collision_reaction/Makefile.am (modified)
	* trunk/src/lib/collision_reaction/collision.h (modified)
	* trunk/src/lib/collision_reaction/collision_event.h (modified)
	* trunk/src/lib/collision_reaction/collision_handle.cc (modified)
	* trunk/src/lib/collision_reaction/collision_handle.h (modified)
	* trunk/src/lib/collision_reaction/collision_reaction.h (modified)
	* trunk/src/lib/collision_reaction/cr_engine.cc (modified)
	* trunk/src/lib/collision_reaction/cr_object_damage.cc (modified)
	* trunk/src/lib/collision_reaction/cr_physics_ground_walk.cc (copied)
	* trunk/src/lib/collision_reaction/cr_physics_ground_walk.h (copied)
	* trunk/src/lib/coord/p_node.h (modified)
	* trunk/src/lib/event/event_handler.cc (modified)
	* trunk/src/lib/graphics/graphics_engine.cc (modified)
	* trunk/src/lib/graphics/graphics_engine.h (modified)
	* trunk/src/lib/graphics/importer/Makefile.am (modified)
	* trunk/src/lib/graphics/importer/bsp_file.cc (modified)
	* trunk/src/lib/graphics/importer/bsp_file.h (modified)
	* trunk/src/lib/graphics/importer/bsp_manager.cc (modified)
	* trunk/src/lib/graphics/importer/bsp_manager.h (modified)
	* trunk/src/lib/graphics/importer/interactive_model.cc (copied)
	* trunk/src/lib/graphics/importer/interactive_model.h (copied)
	* trunk/src/lib/graphics/importer/md2 (copied)
	* trunk/src/lib/graphics/importer/md2/md2Model.cc (copied)
	* trunk/src/lib/graphics/importer/md2/md2Model.h (copied)
	* trunk/src/lib/graphics/importer/md2Model.cc (deleted)
	* trunk/src/lib/graphics/importer/md2Model.h (deleted)
	* trunk/src/lib/graphics/importer/md3 (copied)
	* trunk/src/lib/graphics/importer/md3/md3_animation.cc (copied)
	* trunk/src/lib/graphics/importer/md3/md3_animation.h (copied)
	* trunk/src/lib/graphics/importer/md3/md3_bone_frame.cc (copied)
	* trunk/src/lib/graphics/importer/md3/md3_bone_frame.h (copied)
	* trunk/src/lib/graphics/importer/md3/md3_data.cc (copied)
	* trunk/src/lib/graphics/importer/md3/md3_data.h (copied)
	* trunk/src/lib/graphics/importer/md3/md3_mesh.cc (copied)
	* trunk/src/lib/graphics/importer/md3/md3_mesh.h (copied)
	* trunk/src/lib/graphics/importer/md3/md3_model.cc (copied)
	* trunk/src/lib/graphics/importer/md3/md3_model.h (copied)
	* trunk/src/lib/graphics/importer/md3/md3_tag.cc (copied)
	* trunk/src/lib/graphics/importer/md3/md3_tag.h (copied)
	* trunk/src/lib/graphics/importer/md_model_structure.cc (copied)
	* trunk/src/lib/graphics/importer/md_model_structure.h (copied)
	* trunk/src/lib/math/vector.h (modified)
	* trunk/src/lib/util/loading/resource_manager.cc (modified)
	* 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/subprojects/collision_detection/collision_detection.cc (modified)
	* trunk/src/subprojects/importer/importer.cc (modified)
	* trunk/src/world_entities/WorldEntities.am (modified)
	* trunk/src/world_entities/bsp_entity.cc (modified)
	* trunk/src/world_entities/bsp_entity.h (modified)
	* trunk/src/world_entities/creatures/md2_creature.cc (modified)
	* trunk/src/world_entities/playable.cc (modified)
	* trunk/src/world_entities/space_ships/collision_probe.cc (copied)
	* trunk/src/world_entities/space_ships/collision_probe.h (copied)
	* trunk/src/world_entities/space_ships/turbine_hover.h (modified)
	* trunk/src/world_entities/test_entity.cc (modified)
	* trunk/src/world_entities/world_entity.cc (modified)
	* trunk/src/world_entities/world_entity.h (modified)

	merged the bsp branche back to trunk


Thu, 15 Jun 2006 10:56:03 GMT bensch [8450]
	* trunk/src/lib/gui/gl/glgui_box.cc (modified)
	* trunk/src/lib/gui/gl/glgui_handler.cc (modified)
	* trunk/src/lib/gui/gl/glgui_style.cc (modified)

	orxonox/trunk: fixed compile errors


Thu, 15 Jun 2006 10:48:26 GMT bensch [8448]
	* trunk/Makefile.am (modified)
	* trunk/configure.ac (modified)
	* trunk/src/lib/event/event_handler.cc (modified)
	* trunk/src/lib/graphics/importer/material.h (modified)
	* trunk/src/lib/graphics/text_engine/multi_line_text.cc (modified)
	* trunk/src/lib/graphics/text_engine/text.cc (modified)
	* trunk/src/lib/graphics/text_engine/text.h (modified)
	* trunk/src/lib/gui/gl/glgui_bar.cc (modified)
	* trunk/src/lib/gui/gl/glgui_button.cc (modified)
	* trunk/src/lib/gui/gl/glgui_button.h (modified)
	* trunk/src/lib/gui/gl/glgui_checkbutton.cc (modified)
	* trunk/src/lib/gui/gl/glgui_checkbutton.h (modified)
	* trunk/src/lib/gui/gl/glgui_defs.h (modified)
	* trunk/src/lib/gui/gl/glgui_handler.cc (modified)
	* trunk/src/lib/gui/gl/glgui_image.cc (modified)
	* trunk/src/lib/gui/gl/glgui_image.h (modified)
	* trunk/src/lib/gui/gl/glgui_inputline.cc (modified)
	* trunk/src/lib/gui/gl/glgui_inputline.h (modified)
	* trunk/src/lib/gui/gl/glgui_pushbutton.cc (modified)
	* trunk/src/lib/gui/gl/glgui_slider.cc (modified)
	* trunk/src/lib/gui/gl/glgui_slider.h (modified)
	* trunk/src/lib/gui/gl/glgui_style.cc (modified)
	* trunk/src/lib/gui/gl/glgui_style.h (modified)
	* trunk/src/lib/gui/gl/glgui_textfield.cc (modified)
	* trunk/src/lib/gui/gl/glgui_widget.cc (modified)
	* trunk/src/lib/gui/gl/glgui_widget.h (modified)
	* trunk/src/lib/math/rect2D.cc (modified)
	* trunk/src/lib/math/rect2D.h (modified)
	* trunk/src/lib/util/color.cc (modified)
	* trunk/src/lib/util/color.h (modified)
	* trunk/src/util/hud.cc (modified)
	* trunk/src/util/hud.h (modified)

	merged gui back to the trunk
	merged with command
	merge -r8377:HEAD ...


Wed, 14 Jun 2006 16:03:16 GMT bensch [8413]
	* trunk/src/lib/script_engine/script_method.cc (added)
	* trunk/src/lib/script_engine/script_method.h (added)

	added strangely missing files


Wed, 14 Jun 2006 15:50:18 GMT bensch [8408]
	* trunk/src/lib/script_engine/Makefile.am (modified)
	* trunk/src/lib/script_engine/account.cc (modified)
	* trunk/src/lib/script_engine/lunar.h (modified)
	* trunk/src/lib/script_engine/lunartest2.lua (modified)
	* trunk/src/lib/script_engine/object.cc (modified)
	* trunk/src/lib/script_engine/script.cc (modified)
	* trunk/src/lib/script_engine/script.h (modified)
	* trunk/src/lib/script_engine/script_class.cc (modified)
	* trunk/src/lib/script_engine/script_class.h (modified)
	* trunk/src/lib/script_engine/script_manager.cc (modified)
	* trunk/src/lib/util/executor/executor.h (modified)
	* trunk/src/lib/util/executor/executor_functional.cc (modified)
	* trunk/src/lib/util/executor/executor_lua.cc (modified)
	* trunk/src/lib/util/executor/executor_lua.h (modified)
	* trunk/src/lib/util/loading/load_param.cc (modified)
	* trunk/src/lib/util/substring.h (modified)
	* trunk/src/story_entities/game_world.cc (modified)
	* trunk/src/util/state.h (modified)
	* trunk/src/world_entities/script_trigger.cc (modified)
	* trunk/src/world_entities/script_trigger.h (modified)
	* trunk/src/world_entities/space_ships/helicopter.cc (modified)
	* trunk/src/world_entities/space_ships/helicopter.h (modified)

	trunk: merged the script_engine branche back here
	merged with ...


Wed, 14 Jun 2006 10:13:16 GMT bensch [8376]
	* trunk/src/lib/graphics/importer/material.cc (modified)
	* trunk/src/lib/graphics/importer/material.h (modified)
	* trunk/src/lib/graphics/importer/texture.cc (modified)
	* trunk/src/lib/graphics/importer/texture.h (modified)
	* trunk/src/lib/util/color.cc (modified)
	* trunk/src/lib/util/color.h (modified)
	* trunk/src/story_entities/simple_game_menu.cc (modified)

	orxonox/trunk: no more seg-fault when copying a Texture