# # ChangeLog for / in orxonox.OLD # # Generated by Trac 1.0.9 # Nov 17, 2024, 5:20:37 AM Wed, 25 Jan 2006 15:55:12 GMT rennerc [6718] * branches/network/src/world_entities/space_ships/space_ship.cc (modified) Wed, 25 Jan 2006 15:48:26 GMT bknecht [6717] * branches/spaceshipcontrol/src/world_entities/space_ships/helicopter.cc (modified) * branches/spaceshipcontrol/src/world_entities/space_ships/helicopter.h (modified) * branches/spaceshipcontrol/src/world_entities/space_ships/hover.cc (modified) Control: Helicopter cameranode Wed, 25 Jan 2006 15:33:29 GMT patrick [6716] * branches/network/src/world_entities/space_ships/space_ship.cc (modified) network caputre enabled Wed, 25 Jan 2006 15:28:37 GMT patrick [6715] * branches/network/src/lib/network/network_game_manager.cc (modified) * branches/network/src/lib/network/network_game_manager.h (modified) * branches/network/src/lib/network/network_stream.cc (modified) network: removing entity Wed, 25 Jan 2006 15:24:24 GMT bensch [6714] * trunk/src/world_entities/weapons/weapon_manager.cc (modified) no assertion error anymore. Wed, 25 Jan 2006 15:20:06 GMT bensch [6713] * branches/powerups (copied) branches: new copy of the trunk Wed, 25 Jan 2006 15:19:39 GMT bensch [6712] * branches/powerups (deleted) deleted old powerups Wed, 25 Jan 2006 15:18:25 GMT hdavid [6711] * branches/avi_play/src/lib/graphics/importer/media_container.cc (modified) * branches/avi_play/src/lib/graphics/importer/media_container.h (modified) * branches/avi_play/src/lib/graphics/importer/movie_player.cc (modified) * branches/avi_play/src/lib/graphics/importer/movie_player.h (modified) branches/avi_play: safe Wed, 25 Jan 2006 15:18:12 GMT bensch [6710] * trunk/src/story_entities/game_world.cc (modified) * trunk/src/world_entities/playable.cc (modified) * trunk/src/world_entities/power_ups/power_up.cc (modified) * trunk/src/world_entities/power_ups/weapon_power_up.cc (modified) * trunk/src/world_entities/power_ups/weapon_power_up.h (modified) * trunk/src/world_entities/space_ships/space_ship.cc (modified) merged the powerups back to the trunk Wed, 25 Jan 2006 15:09:29 GMT manuel [6709] * branches/powerups/src/world_entities/playable.cc (modified) my code works ;) --> bensch's turn Wed, 25 Jan 2006 15:06:24 GMT rennerc [6708] * branches/network/src/world_entities/weapons/weapon_manager.cc (modified) disabling weapon manger M src/world_entities/weapons/weapon_manager.cc Wed, 25 Jan 2006 15:02:01 GMT manuel [6707] * branches/powerups/src/story_entities/game_world.cc (modified) * branches/powerups/src/world_entities/power_ups/power_up.cc (modified) * branches/powerups/src/world_entities/power_ups/weapon_power_up.cc (modified) * branches/powerups/src/world_entities/power_ups/weapon_power_up.h (modified) * branches/powerups/src/world_entities/space_ships/space_ship.cc (modified) fixed bug Wed, 25 Jan 2006 14:59:22 GMT rennerc [6706] * branches/network/src/lib/network/network_game_manager.cc (modified) * branches/network/src/world_entities/space_ships/space_ship.cc (modified) * branches/network/src/world_entities/space_ships/space_ship.h (modified) * branches/network/src/world_entities/weapons/weapon_manager.cc (modified) Wed, 25 Jan 2006 14:19:39 GMT bwuest [6705] * branches/network/src/lib/network/converter.cc (modified) converter.cc and converter.h changed Wed, 25 Jan 2006 14:18:45 GMT hdavid [6704] * branches/avi_play/src/lib/graphics/importer/media_container.cc (modified) * branches/avi_play/src/lib/graphics/importer/media_container.h (modified) * branches/avi_play/src/world_entities/movie_entity.cc (modified) * branches/avi_play/src/world_entities/movie_entity.h (modified) branches/avi_play: MediaContainer is dummy-safe Wed, 25 Jan 2006 14:17:08 GMT bwuest [6703] * branches/network/src/lib/network/converter.cc (modified) * branches/network/src/lib/network/converter.h (modified) converter.cc and converter.h changed: bug fix Wed, 25 Jan 2006 14:12:12 GMT bensch [6702] * branches/powerups (copied) orxonox/branches: new copy of the trunk Wed, 25 Jan 2006 14:11:16 GMT bensch [6701] * branches/powerups (deleted) removed again Wed, 25 Jan 2006 14:10:17 GMT bensch [6700] * trunk/src/world_entities/playable.cc (modified) * trunk/src/world_entities/player.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) * trunk/src/world_entities/space_ships/space_ship.cc (modified) * trunk/src/world_entities/weapons/weapon.cc (modified) * trunk/src/world_entities/world_entity.cc (modified) * trunk/src/world_entities/world_entity.h (modified) trunk: Energy->Health Wed, 25 Jan 2006 14:09:58 GMT bknecht [6699] * branches/spaceshipcontrol/src/world_entities/space_ships/helicopter.cc (modified) * branches/spaceshipcontrol/src/world_entities/space_ships/helicopter.h (modified) * branches/spaceshipcontrol/src/world_entities/space_ships/hover.cc (modified) * branches/spaceshipcontrol/src/world_entities/space_ships/hover.h (modified) Control: Helicopterrotors set Wed, 25 Jan 2006 14:04:26 GMT patrick [6698] * branches/network (copied) network added Wed, 25 Jan 2006 13:54:51 GMT patrick [6697] * branches/network (deleted) network branche deleted Wed, 25 Jan 2006 13:53:34 GMT patrick [6696] * trunk/src/story_entities/simple_game_menu.cc (modified) * trunk/src/story_entities/simple_game_menu.h (modified) * trunk/src/world_entities/image_entity.cc (modified) * trunk/src/world_entities/planet.cc (modified) * trunk/src/world_entities/space_ships/space_ship.cc (modified) trunk: works again Wed, 25 Jan 2006 13:39:53 GMT patrick [6695] * 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/importer/vertex_array_model.cc (modified) * trunk/src/lib/network/Makefile.am (modified) * trunk/src/lib/network/handshake.cc (modified) * trunk/src/lib/network/netdefs.h (modified) * trunk/src/lib/network/network_game_manager.cc (modified) * trunk/src/lib/network/network_game_manager.h (modified) * trunk/src/lib/network/network_manager.cc (modified) * trunk/src/lib/network/network_manager.h (modified) * trunk/src/lib/network/network_socket.cc (modified) * trunk/src/lib/network/network_socket.h (modified) * trunk/src/lib/network/network_stream.cc (modified) * trunk/src/lib/network/network_stream.h (modified) * trunk/src/lib/network/shared_network_data.cc (copied) * trunk/src/lib/network/shared_network_data.h (copied) * trunk/src/lib/network/synchronizeable.cc (modified) * trunk/src/lib/network/synchronizeable.h (modified) * trunk/src/orxonox.cc (modified) * trunk/src/util/state.cc (modified) * trunk/src/util/state.h (modified) * trunk/src/world_entities/environments/water.cc (modified) * trunk/src/world_entities/environments/water.h (modified) * trunk/src/world_entities/movie_entity.cc (modified) * trunk/src/world_entities/planet.cc (modified) * trunk/src/world_entities/playable.cc (modified) * trunk/src/world_entities/power_ups/param_power_up.cc (modified) * trunk/src/world_entities/power_ups/turret_power_up.cc (modified) * trunk/src/world_entities/power_ups/weapon_power_up.cc (modified) * trunk/src/world_entities/projectiles/laser.cc (modified) * trunk/src/world_entities/skybox.cc (modified) * trunk/src/world_entities/space_ships/space_ship.cc (modified) * trunk/src/world_entities/terrain.cc (modified) * trunk/src/world_entities/weapons/targeting_turret.cc (modified) * trunk/src/world_entities/weapons/weapon.cc (modified) * trunk/src/world_entities/world_entity.cc (modified) * trunk/src/world_entities/world_entity.h (modified) merged the network branche to the trunk Wed, 25 Jan 2006 13:24:37 GMT patrick [6694] * branches/spaceshipcontrol (copied) copy of the trunk Wed, 25 Jan 2006 13:19:46 GMT patrick [6693] * branches/network/src/defs/class_id.h (modified) * branches/network/src/lib/graphics/importer/material.cc (modified) * branches/network/src/lib/graphics/importer/md2Model.cc (modified) * branches/network/src/lib/graphics/shader.cc (modified) * branches/network/src/lib/graphics/text_engine/text.cc (modified) * branches/network/src/lib/lang/base_object.cc (modified) * branches/network/src/lib/particles/Makefile.am (modified) * branches/network/src/lib/particles/dot_particles.cc (copied) * branches/network/src/lib/particles/dot_particles.h (copied) * branches/network/src/lib/particles/model_particles.cc (modified) * branches/network/src/lib/particles/spark_particles.cc (modified) * branches/network/src/lib/particles/sprite_particles.cc (modified) * branches/network/src/lib/util/count_pointer.h (copied) * branches/network/src/lib/util/executor/executor.cc (modified) * branches/network/src/lib/util/multi_type.cc (modified) * branches/network/src/lib/util/multi_type.h (modified) * branches/network/src/lib/util/substring.h (modified) * branches/network/src/subprojects/importer/Makefile.am (modified) * branches/network/src/subprojects/importer/tc.cc (deleted) * branches/network/src/util/hud.cc (modified) * branches/network/src/util/loading/resource_manager.cc (modified) * branches/network/src/util/loading/resource_manager.h (modified) * branches/network/src/world_entities/Makefile.am (modified) * branches/network/src/world_entities/environments/water.cc (modified) * branches/network/src/world_entities/items (copied) * branches/network/src/world_entities/items/item_container.cc (copied) * branches/network/src/world_entities/items/item_container.h (copied) * branches/network/src/world_entities/movie_entity.cc (modified) * branches/network/src/world_entities/projectiles/guided_missile.cc (modified) * branches/network/src/world_entities/projectiles/laser.cc (modified) * branches/network/src/world_entities/space_ships/helicopter.cc (modified) * branches/network/src/world_entities/space_ships/helicopter.h (modified) * branches/network/src/world_entities/space_ships/hover.cc (copied) * branches/network/src/world_entities/space_ships/hover.h (copied) * branches/network/src/world_entities/space_ships/space_ship.cc (modified) * branches/network/src/world_entities/space_ships/space_ship.h (modified) * branches/network/src/world_entities/weapons/aim.cc (modified) * branches/network/src/world_entities/weapons/aim.h (modified) * branches/network/src/world_entities/weapons/aiming_turret.cc (modified) * branches/network/src/world_entities/weapons/ammo_container.cc (copied) * branches/network/src/world_entities/weapons/ammo_container.h (copied) * branches/network/src/world_entities/weapons/cannon.cc (modified) * branches/network/src/world_entities/weapons/targeting_turret.cc (modified) * branches/network/src/world_entities/weapons/targeting_turret.h (modified) * branches/network/src/world_entities/weapons/test_gun.cc (modified) * branches/network/src/world_entities/weapons/turret.cc (modified) * branches/network/src/world_entities/weapons/weapon.cc (modified) * branches/network/src/world_entities/weapons/weapon.h (modified) * branches/network/src/world_entities/weapons/weapon_manager.cc (modified) * branches/network/src/world_entities/weapons/weapon_manager.h (modified) * branches/spaceshipcontrol (deleted) branches: removed spaceshipcontrol branche Wed, 25 Jan 2006 13:16:31 GMT patrick [6692] * trunk/src/world_entities/projectiles/laser.cc (modified) * trunk/src/world_entities/space_ships/space_ship.cc (modified) emerged spaceshipcontrol back to trunk via command >svn merge ... Wed, 25 Jan 2006 13:07:01 GMT snellen [6691] * branches/spaceshipcontrol/src/lib/event/event_handler.cc (modified) * branches/spaceshipcontrol/src/world_entities/projectiles/laser.cc (modified) * branches/spaceshipcontrol/src/world_entities/space_ships/space_ship.cc (modified) adjusted some parameters Wed, 25 Jan 2006 13:02:10 GMT patrick [6690] * branches/network/src/lib/event/event_handler.cc (modified) * branches/network/src/world_entities/world_entity.cc (modified) network debug stuff caputre Wed, 25 Jan 2006 12:59:05 GMT hdavid [6689] * branches/avi_play/src/defs/class_id.h (modified) branches/avi_play: removing MediaContainer from class_list works Wed, 25 Jan 2006 12:59:02 GMT rennerc [6688] * branches/network/src/world_entities/space_ships/space_ship.cc (modified) * branches/network/src/world_entities/world_entity.cc (modified) spaceship: hack: load default model Wed, 25 Jan 2006 10:27:35 GMT patrick [6687] * branches/network/src/world_entities/world_entity.cc (modified) * branches/network/src/world_entities/world_entity.h (modified) network: war of the model names Wed, 25 Jan 2006 10:05:01 GMT patrick [6686] * branches/network/src/world_entities/environments/water.cc (modified) * branches/network/src/world_entities/environments/water.h (modified) network: water gets synced correctly now Wed, 25 Jan 2006 00:35:29 GMT patrick [6685] * branches/network/src/lib/coord/p_node.cc (modified) * branches/network/src/lib/coord/p_node.h (modified) * branches/network/src/lib/network/netdefs.h (modified) * branches/network/src/lib/network/network_game_manager.cc (modified) * branches/network/src/lib/network/synchronizeable.cc (modified) * branches/network/src/orxonox.cc (modified) * branches/network/src/world_entities/environments/water.cc (modified) * branches/network/src/world_entities/environments/water.h (modified) network: some more degbug ability for pnode, started work on water ... 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:21:02 GMT patrick [6683] * branches/network/src/lib/network/synchronizeable.cc (modified) * branches/network/src/orxonox.cc (modified) newtork: singleplayer does work again Tue, 24 Jan 2006 22:15:46 GMT patrick [6682] * branches/network/src/lib/coord/p_node.cc (modified) * branches/network/src/util/state.cc (modified) * branches/network/src/util/state.h (modified) network: less parenting algoritmics Tue, 24 Jan 2006 22:15:16 GMT hdavid [6681] * branches/avi_play/src/world_entities/recorder.cc (modified) * branches/avi_play/src/world_entities/recorder.h (modified) branches/avi_play: RGB->YUV faster 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 21:22:33 GMT patrick [6678] * branches/network/src/defs/class_id.h (modified) * branches/network/src/lib/coord/p_node.cc (modified) * branches/network/src/lib/network/Makefile.am (modified) * branches/network/src/lib/network/netdefs.h (modified) * branches/network/src/lib/network/network_game_manager.cc (modified) * branches/network/src/lib/network/network_manager.cc (modified) * branches/network/src/lib/network/network_manager.h (modified) * branches/network/src/lib/network/network_stream.cc (modified) * branches/network/src/lib/network/network_stream.h (modified) * branches/network/src/lib/network/shared_network_data.cc (added) * branches/network/src/lib/network/shared_network_data.h (added) * branches/network/src/lib/network/synchronizeable.cc (modified) * branches/network/src/world_entities/movie_entity.cc (modified) network: sys better now, got less errors and removed the pnode link ... 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 15:39:51 GMT patrick [6675] * branches/network/src/lib/network/synchronizeable.cc (modified) * branches/network/src/world_entities/movie_entity.cc (modified) * branches/network/src/world_entities/power_ups/param_power_up.cc (modified) * branches/network/src/world_entities/power_ups/turret_power_up.cc (modified) * branches/network/src/world_entities/power_ups/weapon_power_up.cc (modified) * branches/network/src/world_entities/skybox.cc (modified) * branches/network/src/world_entities/terrain.cc (modified) * branches/network/src/world_entities/weapons/targeting_turret.cc (modified) network: the net code works again Tue, 24 Jan 2006 15:11:16 GMT patrick [6674] * branches/network/src/lib/coord/p_node.cc (modified) * branches/network/src/lib/network/network_game_manager.cc (modified) * branches/network/src/world_entities/weapons/weapon.cc (modified) network: NullParent now is also synced over network, some more debug ... Tue, 24 Jan 2006 14:10:55 GMT patrick [6673] * branches/network/src/lib/network/network_game_manager.cc (modified) * branches/network/src/lib/network/network_manager.h (modified) * branches/network/src/lib/network/network_stream.cc (modified) newtork: now only entities created on the server get a valiable uniqueID Tue, 24 Jan 2006 14:02:19 GMT patrick [6672] * branches/network/src/lib/network/network_game_manager.cc (modified) * branches/network/src/lib/network/network_game_manager.h (modified) * branches/network/src/lib/network/network_manager.cc (modified) * branches/network/src/lib/network/network_manager.h (modified) * branches/network/src/lib/network/network_stream.cc (modified) * branches/network/src/lib/network/network_stream.h (modified) * branches/network/src/lib/network/synchronizeable.cc (modified) * branches/network/src/world_entities/space_ships/space_ship.cc (modified) network: now every entity gets a network uniqueID 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:32:00 GMT patrick [6670] * branches/network/src/lib/network/network_game_manager.cc (modified) network: small change: makes more sense this way 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 13:23:44 GMT patrick [6668] * branches/network/src/lib/network/network_game_manager.cc (modified) * branches/network/src/lib/network/network_game_manager.h (modified) network: restructured the writeBytes a little bit and added the new ... Tue, 24 Jan 2006 12:56:03 GMT patrick [6667] * branches/network/src/lib/network/network_game_manager.cc (modified) * branches/network/src/lib/network/network_game_manager.h (modified) * branches/network/src/lib/network/network_socket.cc (modified) * branches/network/src/lib/network/network_socket.h (modified) network: working on helper funciton Tue, 24 Jan 2006 12:45:30 GMT patrick [6666] * branches/network/src/lib/network/network_game_manager.cc (modified) * branches/network/src/lib/network/network_game_manager.h (modified) network: branche compiles again Tue, 24 Jan 2006 12:36:11 GMT patrick [6665] * branches/network/src/lib/network/network_game_manager.cc (modified) * branches/network/src/lib/network/network_game_manager.h (modified) * branches/network/src/lib/network/network_manager.cc (modified) network: changed network signal namings and added a new one 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 Tue, 24 Jan 2006 00:21:02 GMT hdavid [6663] * branches/avi_play/src/defs/class_id.h (modified) * branches/avi_play/src/world_entities/Makefile.am (modified) * branches/avi_play/src/world_entities/recorder.cc (added) * branches/avi_play/src/world_entities/recorder.h (added) implementation of a recording function, the conversion from ... Mon, 23 Jan 2006 15:12:02 GMT patrick [6662] * branches/network/src/lib/network/handshake.cc (modified) * branches/network/src/lib/network/network_game_manager.cc (modified) * branches/network/src/lib/network/network_manager.cc (modified) network: now sync is on the road again, clients segfaults on assertion Mon, 23 Jan 2006 14:50:35 GMT patrick [6661] * branches/network/src/lib/network/handshake.cc (modified) * branches/network/src/lib/network/network_game_manager.cc (modified) * branches/network/src/lib/network/network_stream.cc (modified) network: dont get the sync process to run again. Mon, 23 Jan 2006 14:38:45 GMT patrick [6660] * branches/network/src/lib/coord/p_node.cc (modified) * branches/network/src/lib/network/network_game_manager.cc (modified) * branches/network/src/lib/network/network_manager.cc (modified) * branches/network/src/lib/network/network_stream.cc (modified) * branches/network/src/lib/network/network_stream.h (modified) * branches/network/src/world_entities/weapons/weapon.cc (modified) network: some more nodes connected to the NetworkStream no sync yet Mon, 23 Jan 2006 14:15:07 GMT patrick [6659] * branches/network/src/lib/coord/p_node.cc (modified) * branches/network/src/lib/network/network_manager.cc (modified) * branches/network/src/lib/network/network_stream.cc (modified) * branches/network/src/lib/network/network_stream.h (modified) * branches/network/src/lib/network/synchronizeable.cc (modified) * branches/network/src/lib/network/synchronizeable.h (modified) network: the Synchronizeables now all get connected Mon, 23 Jan 2006 13:43:50 GMT patrick [6658] * branches/network/src/lib/network/network_manager.cc (modified) * branches/network/src/lib/network/network_manager.h (modified) * branches/network/src/lib/network/network_stream.cc (modified) * branches/network/src/lib/network/network_stream.h (modified) * branches/network/src/lib/network/synchronizeable.cc (modified) * branches/network/src/lib/network/synchronizeable.h (modified) * branches/network/src/orxonox.cc (modified) * branches/network/src/world_entities/playable.cc (modified) network: debug function for NetworkStream and connection Mon, 23 Jan 2006 13:25:13 GMT bensch [6657] * branches/cd_merge/src/defs/debug.h (modified) * branches/cd_merge/src/lib/collision_detection/bounding_sphere.cc (modified) * branches/cd_merge/src/lib/collision_detection/bounding_volume.cc (modified) * branches/cd_merge/src/lib/collision_detection/bounding_volume.h (modified) * branches/cd_merge/src/lib/collision_detection/bv_tree.cc (modified) * branches/cd_merge/src/lib/collision_detection/bv_tree.h (modified) * branches/cd_merge/src/lib/collision_detection/bv_tree_node.cc (modified) * branches/cd_merge/src/lib/collision_detection/bv_tree_node.h (modified) * branches/cd_merge/src/lib/collision_detection/cd_engine.cc (modified) * branches/cd_merge/src/lib/collision_detection/collision.cc (modified) * branches/cd_merge/src/lib/collision_detection/obb.cc (modified) * branches/cd_merge/src/lib/collision_detection/obb.h (modified) * branches/cd_merge/src/lib/collision_detection/obb_tree.cc (modified) * branches/cd_merge/src/lib/collision_detection/obb_tree.h (modified) * branches/cd_merge/src/lib/collision_detection/obb_tree_node.cc (modified) * branches/cd_merge/src/lib/collision_detection/obb_tree_node.h (modified) * branches/cd_merge/src/lib/math/matrix.cc (modified) * branches/cd_merge/src/lib/util/executor/executor_specials.h (modified) * branches/cd_merge/src/orxonox.cc (modified) * branches/cd_merge/src/subprojects/collision_detection/collision_detection.cc (modified) orxonox/cd_merge: merged the old collision-detection here. Mon, 23 Jan 2006 13:05:50 GMT bensch [6656] * branches/cd_merge (copied) copy of the Trunk as a new copy of the trunk 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 Mon, 23 Jan 2006 11:08:34 GMT patrick [6654] * branches/network/src/lib/graphics/importer/vertex_array_model.cc (modified) * branches/network/src/lib/network/network_manager.cc (modified) * branches/network/src/lib/network/network_manager.h (modified) * branches/network/src/lib/network/synchronizeable.h (modified) * branches/network/src/world_entities/planet.cc (modified) * branches/network/src/world_entities/projectiles/laser.cc (modified) network: synchronizeable and network manager start of new concept ... 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:29:22 GMT bensch [6639] * branches/spaceshipcontrol (copied) branches: added spaceshipcontrol again as a copy of the Trunk Sat, 21 Jan 2006 00:28:45 GMT bensch [6638] * branches/spaceshipcontrol (deleted) delete branche spaceshipcontrol 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:19:45 GMT bensch [6636] * branches/network (copied) branches: copied the Trunk to network again. Sat, 21 Jan 2006 00:18:58 GMT bensch [6635] * branches/network (deleted) deleted network: merged 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 Sat, 21 Jan 2006 00:04:30 GMT bensch [6632] * branches/cd_merge (deleted) deleted branche cd_merge, do this later (again) 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 ...