# # ChangeLog for branches in orxonox.OLD # # Generated by Trac 1.0.9 # Sep 21, 2024, 1:43:19 PM Fri, 30 Dec 2005 01:27:26 GMT bensch [6346] * branches/network (deleted) branches: deleted network again Fri, 30 Dec 2005 00:59:25 GMT bensch [6344] * branches/network (copied) orxonox/branches: copied the trunk to brnaches/network, for further work Fri, 30 Dec 2005 00:58:33 GMT bensch [6343] * branches/network (deleted) orxonox/branches: deleted network branche to generate new trunk copy Fri, 30 Dec 2005 00:57:59 GMT bensch [6342] * branches/network_merged (deleted) branches: deleted network_merged again Fri, 30 Dec 2005 00:52:26 GMT bensch [6340] * branches/network_merged/src/defs/class_id.h (modified) * branches/network_merged/src/lib/coord/p_node.cc (modified) * branches/network_merged/src/lib/coord/p_node.h (modified) * branches/network_merged/src/lib/lang/base_object.cc (modified) * branches/network_merged/src/lib/lang/base_object.h (modified) * branches/network_merged/src/lib/network/converter.cc (modified) * branches/network_merged/src/lib/network/converter.h (modified) * branches/network_merged/src/lib/network/data_stream.h (modified) * branches/network_merged/src/lib/network/handshake.cc (modified) * branches/network_merged/src/lib/network/handshake.h (modified) * branches/network_merged/src/lib/network/network_game_manager.cc (modified) * branches/network_merged/src/lib/network/network_game_manager.h (modified) * branches/network_merged/src/lib/network/network_manager.cc (modified) * branches/network_merged/src/lib/network/network_manager.h (modified) * branches/network_merged/src/lib/network/network_protocol.cc (modified) * branches/network_merged/src/lib/network/network_protocol.h (modified) * branches/network_merged/src/lib/network/network_socket.cc (modified) * branches/network_merged/src/lib/network/network_stream.cc (modified) * branches/network_merged/src/lib/network/network_stream.h (modified) * branches/network_merged/src/lib/network/synchronizeable.cc (modified) * branches/network_merged/src/lib/network/synchronizeable.h (modified) * branches/network_merged/src/story_entities/network_world.cc (modified) * branches/network_merged/src/subprojects/network/Makefile.am (modified) * branches/network_merged/src/subprojects/network/network_unit_test.cc (modified) * branches/network_merged/src/subprojects/network/read_sync.cc (modified) * branches/network_merged/src/subprojects/network/read_sync.h (modified) * branches/network_merged/src/subprojects/network/simple_sync.cc (modified) * branches/network_merged/src/subprojects/network/simple_sync.h (modified) * branches/network_merged/src/subprojects/network/write_sync.cc (modified) * branches/network_merged/src/subprojects/network/write_sync.h (modified) * branches/network_merged/src/util/loading/factory.cc (modified) * branches/network_merged/src/util/loading/factory.h (modified) * branches/network_merged/src/world_entities/npcs/npc.cc (modified) * branches/network_merged/src/world_entities/npcs/npc.h (modified) * branches/network_merged/src/world_entities/skybox.cc (modified) * branches/network_merged/src/world_entities/skybox.h (modified) * branches/network_merged/src/world_entities/space_ships/space_ship.cc (modified) * branches/network_merged/src/world_entities/terrain.cc (modified) * branches/network_merged/src/world_entities/terrain.h (modified) * branches/network_merged/src/world_entities/weapons/ground_turret.cc (modified) * branches/network_merged/src/world_entities/weapons/ground_turret.h (modified) * branches/network_merged/src/world_entities/world_entity.cc (modified) * branches/network_merged/src/world_entities/world_entity.h (modified) orxonox/branches/newtork: merged the network branche for merging to ... Fri, 30 Dec 2005 00:51:41 GMT hdavid [6339] * 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/src/lib/graphics/importer/texture_sequence.cc (modified) * branches/avi_play/src/lib/graphics/importer/texture_sequence.h (modified) * branches/avi_play/src/subprojects/importer/importer.cc (modified) * branches/avi_play/src/subprojects/importer/movie_player_test.cc (modified) * branches/avi_play/src/subprojects/importer/multitex.cc (modified) branches\avi_play: some copy, pasta & delete Fri, 30 Dec 2005 00:33:42 GMT bensch [6338] * branches/network_merged (copied) orxonox/branchs: added new branche network_merged to merge the trunk ... Fri, 30 Dec 2005 00:32:46 GMT rennerc [6337] * branches/network/src/lib/coord/p_node.cc (modified) * branches/network/src/lib/lang/base_object.cc (modified) * branches/network/src/lib/lang/base_object.h (modified) * branches/network/src/world_entities/world_entity.cc (modified) * branches/network/src/world_entities/world_entity.h (modified) groundturret now scales correctly on client Thu, 29 Dec 2005 18:43:51 GMT rennerc [6336] * branches/network/src/lib/coord/p_node.cc (modified) ground turret at right place Thu, 29 Dec 2005 18:35:36 GMT bensch [6335] * branches/network/src/world_entities/npcs/npc.cc (modified) * branches/network/src/world_entities/npcs/npc.h (modified) network: physicsengine is bork Thu, 29 Dec 2005 18:09:07 GMT rennerc [6334] * branches/network/src/lib/coord/p_node.cc (modified) comitted with strange bug :D Thu, 29 Dec 2005 17:12:24 GMT hdavid [6333] * branches/avi_play/src/lib/graphics/importer/media_container.cc (modified) * branches/avi_play/src/subprojects/importer/multitex.cc (modified) branches\avi_play: fixed a bug, still memory leak somewhere in ... Thu, 29 Dec 2005 16:42:13 GMT rennerc [6332] * branches/network/src/lib/coord/p_node.h (modified) pnode.h includes stdincl.h Thu, 29 Dec 2005 16:37:00 GMT rennerc [6331] * branches/network/src/lib/coord/p_node.cc (modified) * branches/network/src/lib/coord/p_node.h (modified) * branches/network/src/lib/network/converter.cc (modified) * branches/network/src/lib/network/handshake.cc (modified) * branches/network/src/lib/network/handshake.h (modified) * 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) * branches/network/src/lib/network/synchronizeable.cc (modified) * branches/network/src/lib/network/synchronizeable.h (modified) * branches/network/src/subprojects/network/read_sync.cc (modified) * branches/network/src/subprojects/network/read_sync.h (modified) * branches/network/src/subprojects/network/simple_sync.cc (modified) * branches/network/src/subprojects/network/simple_sync.h (modified) * branches/network/src/subprojects/network/write_sync.cc (modified) * branches/network/src/subprojects/network/write_sync.h (modified) * branches/network/src/world_entities/skybox.cc (modified) * branches/network/src/world_entities/skybox.h (modified) * branches/network/src/world_entities/terrain.cc (modified) * branches/network/src/world_entities/terrain.h (modified) * branches/network/src/world_entities/weapons/ground_turret.cc (modified) * branches/network/src/world_entities/weapons/ground_turret.h (modified) * branches/network/src/world_entities/world_entity.cc (modified) * branches/network/src/world_entities/world_entity.h (modified) synchronizeable: writeBytes now returns int converter: converts now ... Thu, 29 Dec 2005 00:49:53 GMT hdavid [6330] * 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/src/subprojects/importer/multitex.cc (modified) branches\avi_play: no big changes, somewhere in MediaPlayer is a big ... Wed, 28 Dec 2005 12:51:28 GMT bottac [6329] * branches/height_map/src/lib/graphics/importer/height_map.cc (modified) * branches/height_map/src/lib/graphics/importer/height_map.h (modified) * branches/height_map/src/world_entities/terrain.cc (modified) Fixed some bugs. Wed, 28 Dec 2005 01:41:52 GMT rennerc [6328] * branches/network/src/lib/network/converter.cc (modified) * branches/network/src/world_entities/skybox.cc (modified) * branches/network/src/world_entities/skybox.h (modified) * branches/network/src/world_entities/world_entity.cc (modified) fixed some bugs Wed, 28 Dec 2005 01:14:31 GMT rennerc [6327] * branches/network/src/lib/sound/sound_engine.cc (modified) Wed, 28 Dec 2005 01:13:57 GMT rennerc [6326] * branches/network/src/lib/network/converter.cc (modified) * branches/network/src/lib/network/network_game_manager.cc (modified) * branches/network/src/lib/network/network_stream.cc (modified) * branches/network/src/lib/sound/sound_engine.cc (modified) * branches/network/src/world_entities/skybox.cc (modified) * branches/network/src/world_entities/world_entity.cc (modified) Tue, 27 Dec 2005 23:20:38 GMT hdavid [6325] * branches/avi_play/src/lib/graphics/importer/media_container.cc (modified) * branches/avi_play/src/lib/graphics/importer/movie_player.cc (modified) * branches/avi_play/src/subprojects/importer/movie_player_test.cc (modified) branches\avi_play: the frames are created faster with ... Tue, 27 Dec 2005 21:25:48 GMT hdavid [6324] * 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/src/subprojects/importer/movie_player_test.cc (modified) * branches/avi_play/src/subprojects/importer/multitex.cc (modified) branches\avi_play: MoviePlayer works, at the moment not very fast Tue, 27 Dec 2005 16:38:24 GMT hdavid [6323] * branches/avi_play/src/lib/graphics/importer/media_container.cc (modified) * branches/avi_play/src/lib/graphics/importer/movie_player.cc (modified) * branches/avi_play/src/subprojects/importer/movie_player_test.cc (modified) branches\avi_play: some fixes Tue, 27 Dec 2005 16:12:20 GMT stefalie [6322] * branches/avi_play/src/lib/graphics/importer/movie_player.cc (modified) branches/avi_play: controls should now work for sure Tue, 27 Dec 2005 16:05:17 GMT stefalie [6321] * branches/avi_play/src/lib/graphics/importer/movie_player.cc (modified) * branches/avi_play/src/subprojects/importer/movie_player_test.cc (modified) branches/avi_play: controls should know work for the movie_player Tue, 27 Dec 2005 15:36:36 GMT hdavid [6320] * 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: new function Tue, 27 Dec 2005 14:58:14 GMT stefalie [6319] * branches/avi_play/src/lib/graphics/importer/movie_player.cc (modified) branches\avi_play: few other details... Tue, 27 Dec 2005 14:14:31 GMT stefalie [6318] * branches/avi_play/src/subprojects/importer/movie_player_test.cc (modified) added some controls for movie_player Tue, 27 Dec 2005 13:24:13 GMT hdavid [6317] * 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/src/lib/graphics/importer/texture_sequence.cc (modified) * branches/avi_play/src/lib/graphics/importer/texture_sequence.h (modified) * branches/avi_play/src/subprojects/importer/movie_player_test.cc (modified) branches\avi_play: MediaContainer returns a texture not a surface, ... Mon, 26 Dec 2005 12:24:03 GMT rennerc [6304] * branches/network/src/lib/network/network_game_manager.cc (modified) * branches/network/src/lib/network/network_stream.cc (modified) Mon, 26 Dec 2005 12:02:55 GMT rennerc [6303] * branches/network/src/lib/network/network_game_manager.cc (modified) * branches/network/src/lib/network/network_stream.cc (modified) Mon, 26 Dec 2005 11:47:14 GMT rennerc [6301] * 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_protocol.cc (modified) * branches/network/src/lib/network/network_stream.cc (modified) Mon, 26 Dec 2005 03:07:41 GMT rennerc [6298] * branches/network/src/lib/network/network_protocol.cc (modified) Mon, 26 Dec 2005 02:40:10 GMT rennerc [6297] * branches/network/src/lib/network/network_stream.cc (modified) Mon, 26 Dec 2005 02:28:47 GMT rennerc [6296] * branches/network/src/lib/network/network_stream.cc (modified) Mon, 26 Dec 2005 01:29:09 GMT rennerc [6294] * branches/network/src/world_entities/world_entity.cc (modified) Mon, 26 Dec 2005 00:36:19 GMT rennerc [6293] * branches/network/src/world_entities/world_entity.cc (modified) * branches/network/src/world_entities/world_entity.h (modified) Mon, 26 Dec 2005 00:25:06 GMT bensch [6292] * branches/network/src/world_entities/power_ups/power_up.cc (modified) * branches/network/src/world_entities/space_ships/space_ship.cc (modified) orxonox/branches/network: no more segfaults (at this end) Mon, 26 Dec 2005 00:16:13 GMT rennerc [6291] * branches/network/src/world_entities/terrain.cc (modified) * branches/network/src/world_entities/world_entity.cc (modified) * branches/network/src/world_entities/world_entity.h (modified) commit code which crashes my system so bensch can test it Sun, 25 Dec 2005 23:59:35 GMT hdavid [6290] * 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/src/lib/graphics/importer/texture.cc (modified) * branches/avi_play/src/subprojects/importer/movie_player_test.cc (modified) * branches/avi_play/src/subprojects/importer/multitex.cc (modified) branches\avi_play: work on the movie_player Sun, 25 Dec 2005 19:01:00 GMT hdavid [6289] * 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/src/subprojects/importer/movie_player_test.cc (modified) * branches/avi_play/src/subprojects/importer/multitex.cc (modified) branches/avi_play: begin of the media_player implementation Sun, 25 Dec 2005 16:26:11 GMT hdavid [6286] * branches/avi_play/src/lib/graphics/importer/media_container.cc (modified) * branches/avi_play/src/subprojects/importer/Makefile.am (modified) * branches/avi_play/src/subprojects/importer/importer.cc (modified) * branches/avi_play/src/subprojects/importer/movie_player_test.cc (added) * branches/avi_play/src/subprojects/importer/multitex.cc (modified) branches\avi_play: added new file to the importer subproject Sun, 25 Dec 2005 15:24:50 GMT rennerc [6285] * branches/network/src/lib/network/converter.cc (modified) * branches/network/src/lib/network/converter.h (modified) * branches/network/src/lib/network/synchronizeable.h (modified) converter: added function which allocates momory Sun, 25 Dec 2005 15:23:07 GMT bensch [6284] * branches/powerups (copied) branches: deleted power-ups again Sun, 25 Dec 2005 15:22:48 GMT bensch [6283] * branches/powerups (deleted) branches: deleted power-ups again Sat, 24 Dec 2005 14:27:23 GMT rennerc [6277] * branches/network/src/lib/network/synchronizeable.h (modified) * branches/network/src/world_entities/skybox.cc (modified) * branches/network/src/world_entities/terrain.cc (modified) * branches/network/src/world_entities/terrain.h (modified) * branches/network/src/world_entities/world_entity.cc (modified) * branches/network/src/world_entities/world_entity.h (modified) terrain loads now Sat, 24 Dec 2005 13:15:49 GMT rennerc [6275] * branches/network/src/lib/lang/base_object.cc (modified) * branches/network/src/lib/lang/base_object.h (modified) * branches/network/src/lib/network/converter.cc (modified) * branches/network/src/lib/network/data_stream.h (modified) * branches/network/src/lib/network/network_game_manager.cc (modified) * branches/network/src/lib/network/synchronizeable.h (modified) * branches/network/src/world_entities/skybox.cc (modified) * branches/network/src/world_entities/terrain.cc (modified) * branches/network/src/world_entities/terrain.h (modified) synchronizeable: added macros to help write/read data Fri, 23 Dec 2005 16:30:22 GMT rennerc [6273] * branches/network/src/lib/network/converter.cc (modified) * branches/network/src/lib/network/converter.h (modified) * 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_protocol.cc (modified) * branches/network/src/lib/network/network_protocol.h (modified) * branches/network/src/lib/network/network_stream.cc (modified) * branches/network/src/lib/network/synchronizeable.cc (modified) * branches/network/src/lib/network/synchronizeable.h (modified) * branches/network/src/world_entities/skybox.cc (modified) * branches/network/src/world_entities/skybox.h (modified) converter: added functions for strings network_protocol: length and ... Fri, 23 Dec 2005 10:55:53 GMT bottac [6270] * branches/height_map/src/lib/graphics/importer/height_map.cc (modified) fixed height_map. Fri, 23 Dec 2005 01:42:54 GMT bensch [6269] * branches/powerups/src/world_entities/extendable.h (modified) * branches/powerups/src/world_entities/power_ups/power_up.cc (modified) * branches/powerups/src/world_entities/power_ups/power_up.h (modified) orxonox/branches: Power-UPS: added capability to Collide with a ... Thu, 22 Dec 2005 18:35:59 GMT bensch [6268] * branches/height_map/src/lib/graphics/importer/height_map.cc (modified) * branches/height_map/src/story_entities/world.cc (modified) * branches/height_map/src/story_entities/world.h (modified) * branches/height_map/src/world_entities/terrain.cc (modified) heightMap: fixed the VertexArrayModel, and reverted everything, that ... Thu, 22 Dec 2005 18:31:35 GMT bensch [6267] * branches/height_map/src/lib/graphics/importer/height_map.cc (modified) * branches/height_map/src/lib/graphics/importer/vertex_array_model.cc (modified) * branches/height_map/src/lib/graphics/importer/vertex_array_model.h (modified) * branches/height_map/src/story_entities/world.cc (modified) heightMap: sphere with some info, draw with colors Thu, 22 Dec 2005 18:24:57 GMT bensch [6266] * branches/height_map/src/lib/graphics/importer/vertex_array_model.cc (modified) * branches/height_map/src/story_entities/world.cc (modified) heightMap: sphere with some info, draw with colors Thu, 22 Dec 2005 18:10:54 GMT bensch [6265] * branches/height_map/src/lib/graphics/importer/vertex_array_model.cc (modified) * branches/height_map/src/lib/graphics/importer/vertex_array_model.h (modified) heightMap: drawing works: *fu*** GLubyte... Thu, 22 Dec 2005 17:45:31 GMT bensch [6264] * branches/height_map/src/lib/graphics/importer/vertex_array_model.cc (modified) heightmap: triangle strips Thu, 22 Dec 2005 17:43:49 GMT bensch [6263] * branches/height_map/src/lib/graphics/importer/vertex_array_model.cc (modified) * branches/height_map/src/lib/graphics/importer/vertex_array_model.h (modified) * branches/height_map/src/story_entities/world.cc (modified) * branches/height_map/src/story_entities/world.h (modified) * branches/height_map/src/world_entities/terrain.cc (modified) heightmap: changes to revert afterwards Thu, 22 Dec 2005 17:38:54 GMT bensch [6262] * branches/height_map/src/lib/graphics/importer/vertex_array_model.cc (modified) * branches/height_map/src/lib/graphics/importer/vertex_array_model.h (modified) heightmap: better stripes (vector instead of tArray) Thu, 22 Dec 2005 16:39:18 GMT bensch [6261] * branches/height_map/src/lib/graphics/importer/vertex_array_model.cc (modified) heightmap: better stipes Thu, 22 Dec 2005 16:08:39 GMT hdavid [6260] * 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/subprojects/importer/multitex.cc (modified) branches\avi_play: MediaContainer::getFrame(int frame_number) works Thu, 22 Dec 2005 13:36:03 GMT bensch [6259] * branches/height_map/src/lib/graphics/importer/vertex_array_model.cc (modified) * branches/height_map/src/lib/graphics/importer/vertex_array_model.h (modified) heightMap: vertex-array draws as it should Wed, 21 Dec 2005 23:09:32 GMT rennerc [6258] * branches/network/src/story_entities/network_world.cc (modified) network_world.cc: the client does not create the skybox anymore Wed, 21 Dec 2005 22:58:57 GMT rennerc [6257] * branches/network/src/defs/class_id.h (modified) * branches/network/src/lib/lang/base_object.cc (modified) * branches/network/src/lib/lang/base_object.h (modified) * branches/network/src/lib/network/network_game_manager.cc (modified) class_id.h: changed CL_ENTITY_MANAGER to CL_NETWORK_GAME_MANAGER ... Wed, 21 Dec 2005 18:26:49 GMT rennerc [6256] * branches/network/src/lib/network/network_game_manager.cc (modified) * branches/network/src/lib/network/network_socket.cc (modified) * branches/network/src/lib/network/network_stream.cc (modified) network_socket: can now send more than 255 bytes ... Wed, 21 Dec 2005 16:31:17 GMT snellen [6255] * branches/spaceshipcontrol/src/Makefile.am (modified) * branches/spaceshipcontrol/src/defs/class_id.h (modified) * branches/spaceshipcontrol/src/lib/coord/p_node.cc (modified) * branches/spaceshipcontrol/src/world_entities/creatures/md2_creature.cc (modified) * branches/spaceshipcontrol/src/world_entities/space_ships/space_ship.cc (modified) * branches/spaceshipcontrol/src/world_entities/weapons/aiming_turret.cc (modified) * branches/spaceshipcontrol/src/world_entities/weapons/guided_missile.cc (modified) * branches/spaceshipcontrol/src/world_entities/weapons/targeting_turret.cc (added) * branches/spaceshipcontrol/src/world_entities/weapons/targeting_turret.h (added) guiding_misslie.cc updated, targeting_turret added Wed, 21 Dec 2005 16:25:04 GMT stefalie [6254] * 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/subprojects/importer/multitex.cc (modified) branches\avi_play: some changes.... Wed, 21 Dec 2005 15:43:24 GMT patrick [6252] * branches/network/src/lib/network/synchronizeable.cc (modified) network: less output Wed, 21 Dec 2005 15:40:13 GMT patrick [6251] * branches/network/src/lib/network/synchronizeable.cc (modified) * branches/network/src/story_entities/network_world.cc (modified) network: debug less and client fix Wed, 21 Dec 2005 15:29:15 GMT patrick [6250] * 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/synchronizeable.cc (modified) * branches/network/src/lib/network/synchronizeable.h (modified) * branches/network/src/story_entities/network_world.cc (modified) * branches/network/src/util/loading/factory.cc (modified) network: network game manager now sounds good Wed, 21 Dec 2005 15:24:50 GMT bottac [6249] * branches/height_map/src/lib/graphics/importer/height_map.cc (modified) * branches/height_map/src/lib/graphics/importer/height_map.h (modified) * branches/height_map/src/lib/graphics/importer/vertex_array_model.cc (modified) * branches/height_map/src/world_entities/terrain.cc (modified) * branches/height_map/src/world_entities/terrain.h (modified) Uses VertexArrayModel now Wed, 21 Dec 2005 15:09:58 GMT bknecht [6248] * branches/spaceshipcontrol/src/world_entities/camera.cc (modified) Control: Dynamic camera is now finished Wed, 21 Dec 2005 14:44:40 GMT bensch [6247] * branches/powerups (copied) branches: added power-ups branche as a copy of the trunk again Wed, 21 Dec 2005 14:44:04 GMT bwuest [6246] * branches/network/src/subprojects/network/network_unit_test.cc (modified) converter stuff changed Wed, 21 Dec 2005 14:43:58 GMT bensch [6245] * branches/powerups_old (deleted) branches: deleted even older power-ups Wed, 21 Dec 2005 14:43:39 GMT bensch [6244] * branches/powerups (deleted) branches: delete old powerups Wed, 21 Dec 2005 14:40:14 GMT bknecht [6242] * branches/spaceshipcontrol/src/world_entities/space_ships/helicopter.cc (modified) Control: Helicopter updated Wed, 21 Dec 2005 14:30:04 GMT patrick [6240] * branches/network/src/util/loading/factory.cc (modified) network: singleton fix Wed, 21 Dec 2005 14:29:38 GMT patrick [6239] * branches/network/src/lib/network/network_manager.cc (modified) * branches/network/src/story_entities/network_world.cc (modified) * branches/network/src/util/loading/factory.cc (modified) network: singleton fix Wed, 21 Dec 2005 14:28:37 GMT patrick [6238] * 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/story_entities/network_world.cc (modified) network: singleton fix Wed, 21 Dec 2005 14:25:17 GMT bensch [6237] * branches/christmas_branche (deleted) branches: delete christmas branche again Wed, 21 Dec 2005 14:23:12 GMT snellen [6236] * branches/spaceshipcontrol/src/story_entities/world.cc (modified) space_ship.cc updated Wed, 21 Dec 2005 14:20:57 GMT manuel [6235] * branches/powerups/src/world_entities/power_ups/power_up.cc (modified) some small fixes before trunk merge Wed, 21 Dec 2005 14:14:00 GMT snellen [6234] * branches/spaceshipcontrol/src/story_entities/world.cc (modified) * branches/spaceshipcontrol/src/world_entities/playable.cc (modified) * branches/spaceshipcontrol/src/world_entities/playable.h (modified) * branches/spaceshipcontrol/src/world_entities/player.cc (modified) * branches/spaceshipcontrol/src/world_entities/space_ships/space_ship.cc (modified) * branches/spaceshipcontrol/src/world_entities/weapons/guided_missile.cc (modified) playable.cc and space_ship.cc updated Wed, 21 Dec 2005 14:09:37 GMT manuel [6233] * branches/powerups/src/defs/class_id.h (modified) * branches/powerups/src/world_entities/power_ups/param_power_up.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/space_ships/space_ship.cc (modified) * branches/powerups/src/world_entities/space_ships/space_ship.h (modified) powerup: merged old powerups into new trunk framework Wed, 21 Dec 2005 14:06:29 GMT bknecht [6232] * branches/spaceshipcontrol/src/world_entities/space_ships/helicopter.cc (modified) Control: more realistic helicopter-control Wed, 21 Dec 2005 14:00:35 GMT rennerc [6231] * branches/network/src/lib/network/network_game_manager.cc (modified) * branches/network/src/lib/network/network_game_manager.h (modified) network_game_manager now works with new converter Wed, 21 Dec 2005 13:59:06 GMT patrick [6230] * 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 bla Wed, 21 Dec 2005 13:55:55 GMT bwuest [6229] * branches/network/src/lib/network/converter.cc (modified) * branches/network/src/lib/network/converter.h (modified) converter.h and converter.cc! Wed, 21 Dec 2005 13:50:20 GMT bwuest [6228] * branches/network/src/lib/network/converter.cc (modified) * branches/network/src/lib/network/converter.h (modified) Take my converter.h again! Wed, 21 Dec 2005 13:22:59 GMT bottac [6227] * branches/height_map/src/lib/graphics/importer/height_map.cc (modified) * branches/height_map/src/lib/graphics/importer/height_map.h (modified) * branches/height_map/src/world_entities/terrain.cc (modified) * branches/height_map/src/world_entities/terrain.h (modified) getHeight implemented support for 'colour maps' Wed, 21 Dec 2005 13:21:44 GMT bensch [6226] * branches/network/src/util/loading/factory.h (modified) orxonox/branches/network: list included Wed, 21 Dec 2005 13:08:24 GMT bwuest [6225] * branches/network/src/lib/network/converter.h (modified) * branches/network/src/subprojects/network/Makefile.am (modified) * branches/network/src/subprojects/network/network_unit_test.cc (modified) Take my converter.h! Wed, 21 Dec 2005 12:57:50 GMT bensch [6224] * branches/spaceshipcontrol (copied) branches: copied trunk to spaceshipcontrol again Wed, 21 Dec 2005 12:57:14 GMT bensch [6223] * branches/powerups (copied) branches: copied trunk to powerups Wed, 21 Dec 2005 12:44:24 GMT bensch [6221] * branches/spaceshipcontrol (deleted) branches: deleted branche spaceshipcontroll Wed, 21 Dec 2005 12:43:19 GMT rennerc [6220] * branches/network/src/lib/network/network_stream.cc (modified) network_stream: server now sends the entity list to clients Wed, 21 Dec 2005 12:39:20 GMT rennerc [6219] * branches/network/src/lib/network/converter.cc (modified) * branches/network/src/lib/network/converter.h (modified) * branches/network/src/lib/network/network_game_manager.cc (modified) * branches/network/src/lib/network/network_game_manager.h (modified) network_game_manager: implemented some functions Wed, 21 Dec 2005 11:05:55 GMT bensch [6218] * branches/christmas_branche/src/world_entities/creatures/md2_creature.cc (modified) * branches/christmas_branche/src/world_entities/creatures/md2_creature.h (modified) * branches/christmas_branche/src/world_entities/player.cc (modified) * branches/christmas_branche/src/world_entities/space_ships/helicopter.cc (modified) * branches/christmas_branche/src/world_entities/space_ships/helicopter.h (modified) * branches/christmas_branche/src/world_entities/space_ships/space_ship.cc (modified) * branches/christmas_branche/src/world_entities/space_ships/space_ship.h (modified) christmas: enter-leave events Wed, 21 Dec 2005 10:52:49 GMT patrick [6217] * branches/christmas_branche/src/world_entities/test_entity.cc (modified) christmas: the animation is now also loadable Wed, 21 Dec 2005 10:52:20 GMT bensch [6216] * branches/christmas_branche/src/world_entities/player.cc (modified) christmas: chaging of entities works Wed, 21 Dec 2005 10:42:12 GMT bensch [6215] * branches/christmas_branche/src/world_entities/playable.h (modified) * branches/christmas_branche/src/world_entities/player.cc (modified) christmas: changing the ship Wed, 21 Dec 2005 08:11:47 GMT rennerc [6214] * 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) * branches/network/src/lib/network/network_stream.h (modified) network_game_manager: implemented some functions