#
# ChangeLog for trunk/src in orxonox.OLD
#
# Generated by Trac 1.0.9
# Dec 22, 2024, 6:29:22 PM

Tue, 24 Jan 2006 23:37:21 GMT bensch [6684]
	* trunk/src/lib/event/event_handler.cc (modified)
	* trunk/src/world_entities/environments/water.cc (modified)

	some water fixes


Tue, 24 Jan 2006 22:01:11 GMT bensch [6680]
	* trunk/src/world_entities/environments/water.cc (modified)

	tried to fix water


Tue, 24 Jan 2006 21:56:46 GMT bensch [6679]
	* trunk/src/lib/event/event_handler.cc (modified)
	* trunk/src/world_entities/space_ships/space_ship.cc (modified)
	* trunk/src/world_entities/weapons/weapon_manager.cc (modified)
	* trunk/src/world_entities/weapons/weapon_manager.h (modified)

	orxonox/trunk: WeaponManager seems to work, better than before.


Tue, 24 Jan 2006 19:37:08 GMT bensch [6677]
	* trunk/src/world_entities/weapons/weapon_manager.cc (modified)

	trunk: minor


Tue, 24 Jan 2006 19:24:48 GMT bensch [6676]
	* trunk/src/subprojects/importer/Makefile.am (modified)
	* trunk/src/subprojects/importer/tc.cc (deleted)
	* trunk/src/world_entities/movie_entity.cc (modified)
	* trunk/src/world_entities/playable.cc (modified)
	* trunk/src/world_entities/weapons/weapon_manager.cc (modified)

	trunk: weaponManager works again


Tue, 24 Jan 2006 13:52:25 GMT bensch [6671]
	* trunk/src/util/hud.cc (modified)
	* trunk/src/world_entities/weapons/aiming_turret.cc (modified)
	* trunk/src/world_entities/weapons/ammo_container.h (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)
	* trunk/src/world_entities/weapons/weapon.h (modified)

	WeaponManger now handles Ammo.
	If a Weapon has NO ammo then the Ammo ...


Tue, 24 Jan 2006 13:26:15 GMT bensch [6669]
	* trunk/src/lib/util/count_pointer.h (added)
	* trunk/src/world_entities/playable.cc (modified)
	* trunk/src/world_entities/weapons/ammo_container.cc (modified)
	* trunk/src/world_entities/weapons/ammo_container.h (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)

	some WeaponManager remake


Tue, 24 Jan 2006 10:23:53 GMT bensch [6664]
	* trunk/src/lib/event/event_handler.cc (modified)
	* trunk/src/util/loading/resource_manager.cc (modified)
	* trunk/src/world_entities/weapons/ammo_container.cc (modified)

	trunk: small fix in resource/ammos


Mon, 23 Jan 2006 13:02:22 GMT bensch [6655]
	* trunk/src/defs/class_id.h (modified)
	* trunk/src/util/loading/resource_manager.cc (modified)
	* trunk/src/world_entities/Makefile.am (modified)
	* trunk/src/world_entities/items (added)
	* trunk/src/world_entities/items/item_container.cc (copied)
	* trunk/src/world_entities/items/item_container.h (copied)
	* trunk/src/world_entities/projectiles/laser.cc (modified)
	* trunk/src/world_entities/weapons/ammo_container.cc (copied)
	* trunk/src/world_entities/weapons/ammo_container.h (copied)

	orxonox/trunk: ammoContainer added


Sun, 22 Jan 2006 15:38:59 GMT bensch [6653]
	* trunk/src/lib/particles/dot_particles.cc (modified)
	* trunk/src/lib/particles/model_particles.cc (modified)
	* trunk/src/lib/particles/spark_particles.cc (modified)
	* trunk/src/lib/particles/sprite_particles.cc (modified)

	optimize


Sun, 22 Jan 2006 15:33:43 GMT bensch [6652]
	* trunk/src/lib/particles/Makefile.am (modified)
	* trunk/src/lib/particles/dot_particles.cc (copied)
	* trunk/src/lib/particles/dot_particles.h (copied)

	trunk: dot-particles


Sun, 22 Jan 2006 13:22:48 GMT bensch [6651]
	* trunk/src/lib/graphics/importer/material.cc (modified)
	* trunk/src/lib/particles/sprite_particles.cc (modified)
	* trunk/src/util/loading/resource_manager.cc (modified)
	* trunk/src/util/loading/resource_manager.h (modified)

	orxonox/trunk: copy Resources from the ResourceManger (this is not as ...


Sat, 21 Jan 2006 18:16:30 GMT bensch [6650]
	* trunk/src/util/loading/resource_manager.cc (modified)
	* trunk/src/util/loading/resource_manager.h (modified)

	trunk: cache bools


Sat, 21 Jan 2006 18:13:13 GMT bensch [6649]
	* trunk/src/util/loading/resource_manager.h (modified)

	trunk: resourceManager::resourceCount();


Sat, 21 Jan 2006 18:09:02 GMT bensch [6648]
	* trunk/src/lib/util/substring.h (modified)
	* trunk/src/util/loading/resource_manager.cc (modified)
	* trunk/src/util/loading/resource_manager.h (modified)

	orxonox/trunk: built two new functions for the NETWORK precache
 ...


Sat, 21 Jan 2006 17:01:43 GMT bensch [6647]
	* trunk/src/util/loading/resource_manager.cc (modified)

	trunk: doxygen


Sat, 21 Jan 2006 16:48:00 GMT bensch [6646]
	* trunk/src/util/loading/resource_manager.cc (modified)
	* trunk/src/util/loading/resource_manager.h (modified)

	trunk: ResourceManeger names


Sat, 21 Jan 2006 15:56:43 GMT bensch [6645]
	* trunk/src/lib/graphics/importer/material.cc (modified)
	* trunk/src/lib/graphics/importer/md2Model.cc (modified)
	* trunk/src/lib/graphics/shader.cc (modified)
	* trunk/src/lib/graphics/text_engine/text.cc (modified)
	* trunk/src/lib/util/executor/executor.cc (modified)
	* trunk/src/lib/util/multi_type.cc (modified)
	* trunk/src/lib/util/multi_type.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)

	orxonox/trunk: totally remastered the ResourceManager.
	Now it takes ...


Sat, 21 Jan 2006 14:57:10 GMT bensch [6644]
	* trunk/src/lib/util/multi_type.h (modified)

	trunk: MultiType equalities


Sat, 21 Jan 2006 14:04:40 GMT bensch [6643]
	* trunk/src/lib/util/multi_type.cc (modified)
	* trunk/src/lib/util/multi_type.h (modified)

	trunk: MultiType comparisons


Sat, 21 Jan 2006 13:32:04 GMT bensch [6642]
	* trunk/src/util/loading/resource_manager.cc (modified)
	* trunk/src/util/loading/resource_manager.h (modified)

	trunk: ResourceManager now has Vectors instead of Lists


Sat, 21 Jan 2006 02:18:55 GMT bensch [6641]
	* trunk/src/util/loading/resource_manager.cc (modified)

	trunk: ResourceManager: caching should work


Sat, 21 Jan 2006 02:13:27 GMT bensch [6640]
	* trunk/src/lib/lang/base_object.cc (modified)
	* trunk/src/util/loading/resource_manager.cc (modified)
	* trunk/src/util/loading/resource_manager.h (modified)

	trunk: ResourceManager: make the ResourceManager more modular


Sat, 21 Jan 2006 00:27:29 GMT bensch [6637]
	* trunk/src/defs/class_id.h (modified)
	* trunk/src/world_entities/Makefile.am (modified)
	* trunk/src/world_entities/projectiles/guided_missile.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 (copied)
	* trunk/src/world_entities/space_ships/hover.h (copied)
	* 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/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/targeting_turret.cc (modified)
	* trunk/src/world_entities/weapons/targeting_turret.h (modified)

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


Sat, 21 Jan 2006 00:18:19 GMT bensch [6634]
	* 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/graphics/graphics_engine.cc (modified)
	* trunk/src/lib/graphics/importer/texture.cc (modified)
	* trunk/src/lib/lang/base_object.cc (modified)
	* trunk/src/lib/network/converter.cc (modified)
	* trunk/src/lib/network/converter.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_socket.cc (modified)
	* trunk/src/lib/network/network_stream.cc (modified)
	* trunk/src/lib/network/network_stream.h (modified)
	* trunk/src/lib/sound/sound_source.h (modified)
	* trunk/src/story_entities/Makefile.am (modified)
	* trunk/src/story_entities/campaign_data.cc (modified)
	* trunk/src/story_entities/game_world.cc (modified)
	* trunk/src/story_entities/game_world_data.cc (modified)
	* trunk/src/story_entities/game_world_data.h (modified)
	* trunk/src/story_entities/multi_player_world_data.cc (modified)
	* trunk/src/story_entities/simple_game_menu.cc (copied)
	* trunk/src/story_entities/simple_game_menu.h (copied)
	* trunk/src/story_entities/story_entity.h (modified)
	* trunk/src/subprojects/network/Makefile.am (modified)
	* trunk/src/subprojects/network/isolated_unit_test.cc (copied)
	* trunk/src/subprojects/network/isolated_unit_test.h (copied)
	* trunk/src/subprojects/network/read_sync.cc (modified)
	* trunk/src/subprojects/network/simple_sync.cc (modified)
	* trunk/src/subprojects/network/write_sync.cc (modified)
	* trunk/src/world_entities/Makefile.am (modified)
	* trunk/src/world_entities/image_entity.cc (copied)
	* trunk/src/world_entities/image_entity.h (copied)
	* trunk/src/world_entities/planet.cc (copied)
	* trunk/src/world_entities/planet.h (copied)
	* 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/space_ships/space_ship.h (modified)
	* trunk/src/world_entities/world_entity.cc (modified)

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

	merged ...


Sat, 21 Jan 2006 00:05:05 GMT bensch [6633]
	* trunk/src/lib/particles/particle_system.cc (modified)
	* trunk/src/util/loading/resource_manager.h (modified)

	trunk: some minors


Fri, 20 Jan 2006 23:47:49 GMT bensch [6631]
	* trunk/src/subprojects/importer/Makefile.am (modified)

	trunk: more linkage


Fri, 20 Jan 2006 20:33:36 GMT bensch [6630]
	* trunk/src/Makefile.am (modified)
	* trunk/src/lib/particles/particle_system.cc (modified)

	orxonox/trunk: precache works, and the particle-systems get Linked.. ...


Fri, 20 Jan 2006 19:11:04 GMT bensch [6629]
	* trunk/src/lib/particles/Makefile.am (modified)
	* trunk/src/lib/particles/model_particles.cc (copied)
	* trunk/src/lib/particles/model_particles.h (copied)
	* trunk/src/lib/particles/particle_system.cc (modified)
	* trunk/src/lib/particles/particle_system.h (modified)
	* trunk/src/lib/particles/spark_particles.cc (modified)

	trunk: particles: precache and ModelParticles


Fri, 20 Jan 2006 01:55:12 GMT bensch [6628]
	* trunk/src/lib/particles/sprite_particles.cc (modified)
	* trunk/src/world_entities/projectiles/rocket.cc (modified)

	trunk: segfault-prevention, and minor cleanup


Fri, 20 Jan 2006 01:43:55 GMT bensch [6627]
	* trunk/configure.ac (modified)
	* trunk/src/lib/math/quaternion.h (modified)
	* trunk/src/lib/particles/particle_emitter.cc (modified)
	* trunk/src/world_entities/projectiles/guided_missile.cc (modified)
	* trunk/src/world_entities/projectiles/rocket.cc (modified)

	trunk: valgrind sweep


Fri, 20 Jan 2006 00:57:57 GMT bensch [6626]
	* trunk/src/lib/particles/particle_system.cc (modified)
	* trunk/src/lib/particles/spark_particles.cc (modified)
	* trunk/src/lib/particles/sprite_particles.cc (modified)
	* trunk/src/lib/particles/sprite_particles.h (modified)
	* trunk/src/story_entities/game_world_data.cc (modified)

	trunk: segfault prevention


Fri, 20 Jan 2006 00:29:52 GMT bensch [6625]
	* trunk/src/lib/particles/particle_emitter.cc (modified)
	* trunk/src/lib/particles/particle_system.cc (modified)

	orxonox/trunk: ParticleSystem and Emitter get Deleted correctly


Thu, 19 Jan 2006 23:54:48 GMT bensch [6624]
	* trunk/src/defs/class_id.h (modified)
	* trunk/src/lib/coord/p_node.cc (modified)
	* trunk/src/lib/event/event_handler.cc (modified)
	* trunk/src/lib/graphics/importer/texture_sequence.cc (modified)
	* trunk/src/world_entities/projectiles/test_bullet.h (modified)

	orxonox/trunk: Some missing stuff


Thu, 19 Jan 2006 23:54:20 GMT bensch [6623]
	* trunk/src/lib/particles/Makefile.am (modified)
	* trunk/src/lib/particles/particle_emitter.cc (modified)
	* trunk/src/lib/particles/particle_system.cc (modified)
	* trunk/src/lib/particles/particle_system.h (modified)
	* trunk/src/lib/particles/spark_particles.cc (copied)
	* trunk/src/lib/particles/spark_particles.h (copied)
	* trunk/src/lib/particles/sprite_particles.cc (modified)
	* trunk/src/lib/particles/sprite_particles.h (modified)

	orxonox/trunk: particle Systems and Emitters are loaded and cleaned ...


Thu, 19 Jan 2006 23:08:41 GMT bensch [6622]
	* trunk/src/lib/graphics/importer/material.cc (modified)
	* trunk/src/lib/graphics/importer/material.h (modified)
	* trunk/src/world_entities/projectiles/bomb.h (modified)
	* trunk/src/world_entities/projectiles/guided_missile.cc (modified)
	* trunk/src/world_entities/projectiles/guided_missile.h (modified)
	* trunk/src/world_entities/projectiles/laser.cc (modified)
	* trunk/src/world_entities/projectiles/laser.h (modified)
	* 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)

	orxonox/trunk: Material can now be copied
	ParticleSprite used for ...


Thu, 19 Jan 2006 22:46:28 GMT bensch [6621]
	* trunk/src/defs/class_id.h (modified)
	* trunk/src/lib/particles/Makefile.am (modified)
	* trunk/src/lib/particles/particle_system.cc (modified)
	* trunk/src/lib/particles/particle_system.h (modified)
	* trunk/src/lib/particles/sprite_particles.cc (copied)
	* trunk/src/lib/particles/sprite_particles.h (copied)
	* trunk/src/world_entities/projectiles/guided_missile.cc (modified)
	* trunk/src/world_entities/projectiles/laser.cc (modified)
	* trunk/src/world_entities/projectiles/rocket.cc (modified)
	* trunk/src/world_entities/projectiles/test_bullet.cc (modified)

	orxonox/trunk: particle derivate... still working on this


Thu, 19 Jan 2006 17:31:39 GMT bensch [6620]
	* trunk/src/lib/particles/particle_emitter.cc (modified)
	* trunk/src/lib/particles/particle_emitter.h (modified)
	* trunk/src/lib/particles/particle_system.cc (modified)

	trunk: particle-optimisation


Thu, 19 Jan 2006 17:23:56 GMT bensch [6619]
	* trunk/src/lib/event/event_handler.cc (modified)
	* trunk/src/lib/particles/Makefile.am (modified)
	* trunk/src/lib/particles/engine (added)
	* trunk/src/lib/particles/engine/particle_engine.cc (moved)
	* trunk/src/lib/particles/engine/particle_engine.h (moved)
	* trunk/src/lib/particles/particle_emitter.cc (modified)
	* trunk/src/lib/particles/particle_emitter.h (modified)
	* trunk/src/lib/particles/particle_system.cc (modified)
	* trunk/src/story_entities/game_world.cc (modified)
	* trunk/src/story_entities/game_world_data.cc (modified)
	* trunk/src/world_entities/projectiles/bomb.cc (modified)
	* trunk/src/world_entities/projectiles/guided_missile.cc (modified)
	* trunk/src/world_entities/projectiles/laser.cc (modified)
	* trunk/src/world_entities/projectiles/rocket.cc (modified)
	* trunk/src/world_entities/projectiles/test_bullet.cc (modified)

	orxonox/trunk: rendering without the ParticleEngine, so now we are ...


Thu, 19 Jan 2006 11:46:56 GMT bensch [6618]
	* trunk/src/lib/graphics/importer (modified)

	trunk: properties


Thu, 19 Jan 2006 11:45:55 GMT bensch [6617]
	* trunk/src/lib/Makefile.am (modified)
	* trunk/src/lib/collision_detection/obb_tree_node.cc (modified)
	* trunk/src/lib/graphics/spatial_separation/quadtree_node.h (modified)
	* trunk/src/lib/math/line.cc (copied)
	* trunk/src/lib/math/line.h (copied)
	* trunk/src/lib/math/plane.cc (copied)
	* trunk/src/lib/math/plane.h (copied)
	* trunk/src/lib/math/rotation_OBSOLETE.cc (copied)
	* trunk/src/lib/math/rotation_OBSOLETE.h (copied)
	* trunk/src/lib/math/vector.cc (modified)
	* trunk/src/lib/math/vector.h (modified)
	* trunk/src/world_entities/space_ships/space_ship.cc (modified)

	trunk: split Rotation/Line/Quaternion/Plane(Rectangle) into seperate ...


Thu, 19 Jan 2006 11:27:45 GMT bensch [6616]
	* 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/math/curve.h (modified)
	* trunk/src/lib/math/quaternion.cc (copied)
	* trunk/src/lib/math/quaternion.h (copied)
	* trunk/src/lib/math/vector.cc (modified)
	* trunk/src/lib/math/vector.h (modified)
	* trunk/src/lib/math/vector2D.h (modified)
	* trunk/src/lib/physics/physics_interface.h (modified)
	* trunk/src/util/animation/animation3d.h (modified)

	orxonox/trunk: taken the quaternion outside of Vector.cc to ...


Thu, 19 Jan 2006 11:16:54 GMT bensch [6615]
	* trunk/src/lib/Makefile.am (modified)
	* trunk/src/lib/math/vector2D.cc (copied)
	* trunk/src/lib/math/vector2D.h (copied)

	orxonox/trunk: added vector2D, a 2D-version of the 3D-vector


Thu, 19 Jan 2006 00:51:00 GMT bensch [6613]
	* trunk/src/util/loading/load_param.cc (modified)
	* trunk/src/util/loading/load_param.h (modified)

	orxonox/trunk: better LoadParam


Thu, 19 Jan 2006 00:50:39 GMT bensch [6612]
	* trunk/src/lib/particles/particle_engine.cc (modified)
	* trunk/src/lib/particles/particle_system.cc (modified)
	* trunk/src/lib/particles/particle_system.h (modified)

	orxonox/trunk: particle_system is now loaded differently
 ...


Wed, 18 Jan 2006 23:29:58 GMT bensch [6610]
	* trunk/src/world_entities/environments/water.cc (modified)

	trunk: minor valgrinds


Wed, 18 Jan 2006 22:50:25 GMT bensch [6609]
	* trunk/configure.ac (modified)
	* trunk/src/lib/graphics/text_engine/font.cc (modified)
	* trunk/src/lib/graphics/text_engine/font.h (modified)

	orxonox/trunk: compile again on Windows


Wed, 18 Jan 2006 22:21:04 GMT bensch [6608]
	* trunk/src/lib/graphics/importer/tc.cc (modified)

	trunk: copy the tc version from spaceshipcontrol


Wed, 18 Jan 2006 22:03:20 GMT bensch [6607]
	* trunk/src/lib/graphics/importer/media_container.h (modified)
	* trunk/src/lib/graphics/importer/movie_player.h (modified)

	orxonox/trunk: some windows fixes


Wed, 18 Jan 2006 16:25:48 GMT bensch [6600]
	* trunk/src/defs/class_id.h (modified)
	* trunk/src/lib/graphics/importer/movie_player.cc (modified)
	* trunk/src/lib/graphics/importer/movie_player.h (modified)
	* trunk/src/story_entities/Makefile.am (modified)
	* trunk/src/story_entities/movie_loader.cc (copied)
	* trunk/src/story_entities/movie_loader.h (copied)
	* trunk/src/world_entities/movie_entity.cc (modified)
	* trunk/src/world_entities/movie_entity.h (modified)

	TRUNK: merged the avi_play branche again


Wed, 18 Jan 2006 15:41:57 GMT bensch [6589]
	* trunk/src/world_entities/playable.cc (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/weapon_power_up.cc (modified)
	* trunk/src/world_entities/weapons/turret.cc (modified)

	TRUNK: merged powerups back


Wed, 18 Jan 2006 15:40:35 GMT bensch [6587]
	* trunk/src/lib/lang/base_object.h (modified)

	retrieve the XML-Element


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