# # ChangeLog for branches in orxonox.OLD # # Generated by Trac 1.0.9 # Nov 27, 2024, 1:09:55 PM Wed, 18 Jan 2006 16:26:14 GMT bensch [6601] * branches/avi_play (deleted) deleted avi_play Wed, 18 Jan 2006 16:19:27 GMT hdavid [6599] * branches/avi_play/src/story_entities/movie_loader.cc (modified) avi_play: movie plays (not fullscreen) Wed, 18 Jan 2006 16:11:26 GMT hdavid [6598] * branches/avi_play/src/story_entities/movie_loader.cc (modified) * branches/avi_play/src/story_entities/movie_loader.h (modified) avi-play: movie stops afer it is done Wed, 18 Jan 2006 16:04:44 GMT patrick [6597] * branches/network/src/world_entities/space_ships/space_ship.cc (modified) network: booleans now included Wed, 18 Jan 2006 15:58:05 GMT rennerc [6596] * branches/network/src/world_entities/space_ships/space_ship.cc (modified) fire and co should be synced Wed, 18 Jan 2006 15:54:58 GMT patrick [6595] * branches/network/src/world_entities/space_ships/space_ship.cc (modified) network: mouse caputred again Wed, 18 Jan 2006 15:53:50 GMT patrick [6594] * branches/network/src/lib/coord/p_node.cc (modified) reverted last change Wed, 18 Jan 2006 15:48:41 GMT rennerc [6593] * branches/network/src/lib/coord/p_node.cc (modified) using rel direction again Wed, 18 Jan 2006 15:43:37 GMT rennerc [6592] * branches/network/src/lib/network/converter.cc (modified) * branches/network/src/lib/network/converter.h (modified) Wed, 18 Jan 2006 15:42:51 GMT bensch [6591] * branches/powerups (copied) branches: new copy of the Trunk Wed, 18 Jan 2006 15:42:24 GMT bensch [6590] * branches/powerups (deleted) remove branches/powerups Wed, 18 Jan 2006 15:41:00 GMT manuel [6588] * branches/powerups/src/world_entities/playable.cc (modified) * branches/powerups/src/world_entities/power_ups/power_up.cc (modified) * branches/powerups/src/world_entities/power_ups/power_up.h (modified) * branches/powerups/src/world_entities/power_ups/weapon_power_up.cc (modified) * branches/powerups/src/world_entities/weapons/turret.cc (modified) prepare to merge... Wed, 18 Jan 2006 15:36:20 GMT stefalie [6586] * branches/avi_play/src/lib/graphics/importer/movie_player.cc (modified) branches/avi_play: ... Wed, 18 Jan 2006 15:34:50 GMT stefalie [6585] * 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/story_entities/movie_loader.cc (modified) branches/avi_play: ... Wed, 18 Jan 2006 15:32:47 GMT snellen [6584] * branches/spaceshipcontrol/src/world_entities/space_ships/helicopter.h (modified) * branches/spaceshipcontrol/src/world_entities/space_ships/space_ship.cc (modified) * branches/spaceshipcontrol/src/world_entities/space_ships/space_ship.h (modified) space_ship.cc updated Wed, 18 Jan 2006 15:24:34 GMT rennerc [6583] * branches/network/src/lib/coord/p_node.cc (modified) syncing abs direction now Wed, 18 Jan 2006 15:12:40 GMT rennerc [6582] * branches/network/src/lib/network/network_socket.cc (modified) added warning when sending big packets Wed, 18 Jan 2006 15:01:19 GMT rennerc [6581] * branches/network/src/lib/network/converter.cc (modified) fixed converter 0 handling Wed, 18 Jan 2006 14:59:06 GMT bknecht [6580] * branches/spaceshipcontrol/src/defs/class_id.h (modified) * branches/spaceshipcontrol/src/world_entities/space_ships/hover.cc (modified) Control: HoverCraft added in classId-list Wed, 18 Jan 2006 14:55:37 GMT bottac [6579] * branches/height_map_merge/src/lib/graphics/importer/height_map.cc (modified) * branches/height_map_merge/src/lib/graphics/importer/height_map.h (modified) * branches/height_map_merge/src/world_entities/terrain.cc (modified) HeightMap may now be loaded from a .oxw . Wed, 18 Jan 2006 14:51:31 GMT rennerc [6577] * branches/network/src/lib/coord/p_node.cc (modified) Wed, 18 Jan 2006 14:46:40 GMT hdavid [6576] * branches/avi_play/src/story_entities/movie_loader.cc (modified) * branches/avi_play/src/story_entities/movie_loader.h (modified) branches/avi_play Wed, 18 Jan 2006 14:40:34 GMT rennerc [6575] * branches/network/src/lib/coord/p_node.cc (modified) Wed, 18 Jan 2006 14:39:48 GMT stefalie [6574] * branches/avi_play/src/story_entities/movie_loader.cc (modified) * branches/avi_play/src/story_entities/movie_loader.h (modified) branches/avi_play: ... Wed, 18 Jan 2006 14:37:31 GMT rennerc [6573] * branches/network/src/lib/coord/p_node.cc (modified) * branches/network/src/lib/network/converter.cc (modified) Wed, 18 Jan 2006 14:32:45 GMT bknecht [6572] * branches/spaceshipcontrol/src/world_entities/Makefile.am (modified) * branches/spaceshipcontrol/src/world_entities/space_ships/hover.cc (added) * branches/spaceshipcontrol/src/world_entities/space_ships/hover.h (added) Control: New Class Hover Wed, 18 Jan 2006 14:31:05 GMT rennerc [6571] * branches/network/src/lib/network/converter.cc (modified) Wed, 18 Jan 2006 14:28:46 GMT stefalie [6570] * branches/avi_play/src/story_entities/movie_loader.cc (modified) * branches/avi_play/src/story_entities/movie_loader.h (modified) branches/avi_play: ... Wed, 18 Jan 2006 14:22:44 GMT rennerc [6569] * branches/network/src/lib/coord/p_node.cc (modified) Wed, 18 Jan 2006 14:18:49 GMT stefalie [6567] * branches/avi_play/src/story_entities/movie_loader.cc (modified) * branches/avi_play/src/story_entities/movie_loader.h (modified) branches/avi_play: ... Wed, 18 Jan 2006 14:08:43 GMT rennerc [6566] * branches/network/src/lib/coord/p_node.cc (modified) Wed, 18 Jan 2006 14:05:09 GMT bwuest [6564] * branches/network/src/lib/network/converter.cc (modified) * branches/network/src/lib/network/converter.h (modified) * branches/network/src/subprojects/network/Makefile.am (modified) * branches/network/src/subprojects/network/isolated_unit_test.cc (added) * branches/network/src/subprojects/network/isolated_unit_test.h (added) * branches/network/src/subprojects/network/read_sync.cc (modified) * branches/network/src/subprojects/network/simple_sync.cc (modified) * branches/network/src/subprojects/network/write_sync.cc (modified) Converter.cc changed: float converter should work now except for ... Wed, 18 Jan 2006 14:02:54 GMT patrick [6563] * branches/network/src/world_entities/space_ships/space_ship.cc (modified) network: weapon draw hack Wed, 18 Jan 2006 14:02:11 GMT stefalie [6562] * branches/avi_play/src/story_entities/movie_loader.cc (modified) branches/avi_play: ... Wed, 18 Jan 2006 14:00:32 GMT patrick [6560] * branches/network/src/world_entities/space_ships/space_ship.cc (modified) playable now checks for player Wed, 18 Jan 2006 13:51:53 GMT bknecht [6559] * branches/spaceshipcontrol/src/world_entities/space_ships/space_ship.cc (modified) Control: SpaceShip is not anymore as strong effected by gravity as before Wed, 18 Jan 2006 13:49:13 GMT rennerc [6558] * branches/network/src/lib/coord/p_node.cc (modified) Wed, 18 Jan 2006 13:47:31 GMT stefalie [6557] * branches/avi_play/src/story_entities/movie_loader.cc (modified) * branches/avi_play/src/story_entities/movie_loader.h (modified) branches/avi_play: ... Wed, 18 Jan 2006 13:44:00 GMT rennerc [6556] * branches/network/src/lib/coord/p_node.cc (modified) debug right thing now Wed, 18 Jan 2006 13:40:36 GMT hdavid [6555] * branches/avi_play/src/defs/class_id.h (modified) * branches/avi_play/src/story_entities/Makefile.am (modified) * branches/avi_play/src/story_entities/movie_loader.cc (added) * branches/avi_play/src/story_entities/movie_loader.h (added) branches/avi_play: created new story entity MovieLoader Wed, 18 Jan 2006 13:33:10 GMT rennerc [6554] * branches/network/src/lib/coord/p_node.cc (modified) debug quaternion sync Wed, 18 Jan 2006 13:27:25 GMT rennerc [6553] * branches/network/src/world_entities/space_ships/space_ship.cc (modified) Wed, 18 Jan 2006 13:20:38 GMT rennerc [6552] * branches/network/src/world_entities/space_ships/space_ship.cc (modified) * branches/network/src/world_entities/space_ships/space_ship.h (modified) Wed, 18 Jan 2006 13:19:54 GMT bknecht [6551] * branches/spaceshipcontrol/src/world_entities/space_ships/space_ship.cc (modified) Control: SpaceShipcontrol updated Wed, 18 Jan 2006 13:15:10 GMT bensch [6550] * branches/powerups (copied) branches: copy of the trunk Wed, 18 Jan 2006 13:14:45 GMT bensch [6549] * branches/powerups (deleted) deleted old powerups Wed, 18 Jan 2006 13:14:14 GMT rennerc [6548] * branches/network/src/lib/network/network_game_manager.cc (modified) place spaceship at 0 0 0 Wed, 18 Jan 2006 13:11:53 GMT rennerc [6546] * branches/network/src/world_entities/world_entity.cc (modified) fixed bug Wed, 18 Jan 2006 13:11:34 GMT hdavid [6545] * branches/avi_play/src/world_entities/movie_entity.cc (modified) * branches/avi_play/src/world_entities/movie_entity.h (modified) branches/avi_play: removed material Wed, 18 Jan 2006 13:10:57 GMT snellen [6544] * branches/spaceshipcontrol/src/world_entities/projectiles/guided_missile.cc (modified) * branches/spaceshipcontrol/src/world_entities/space_ships/space_ship.cc (modified) * branches/spaceshipcontrol/src/world_entities/space_ships/space_ship.h (modified) space_ship.cc updated Wed, 18 Jan 2006 13:06:21 GMT rennerc [6543] * branches/network/src/lib/lang/base_object.cc (modified) * branches/network/src/world_entities/world_entity.cc (modified) maybe fixed bug with relative model file names Wed, 18 Jan 2006 12:59:41 GMT rennerc [6542] * branches/network/src/lib/coord/p_node.cc (modified) habe now two offsets Wed, 18 Jan 2006 12:54:55 GMT rennerc [6541] * branches/network/src/lib/coord/p_node.cc (modified) changed offset Wed, 18 Jan 2006 12:53:56 GMT bensch [6540] * branches/height_map_merge (moved) movement Wed, 18 Jan 2006 12:51:43 GMT rennerc [6539] * branches/network/src/lib/coord/p_node.cc (modified) dont output flags Wed, 18 Jan 2006 12:40:10 GMT rennerc [6538] * branches/network/src/world_entities/space_ships/space_ship.cc (modified) spaceship Wed, 18 Jan 2006 12:36:27 GMT bknecht [6537] * branches/spaceshipcontrol/src/world_entities/space_ships/space_ship.cc (modified) Control: Minimumspeed for SpaceShip Wed, 18 Jan 2006 12:34:53 GMT rennerc [6536] * branches/network/src/lib/coord/p_node.cc (modified) * branches/network/src/lib/coord/p_node.h (modified) pnode Wed, 18 Jan 2006 12:25:51 GMT manuel [6535] * branches/powerups/src/world_entities/playable.cc (modified) * branches/powerups/src/world_entities/power_ups/weapon_power_up.cc (modified) param- and weaponpowerup debugged and working Wed, 18 Jan 2006 12:22:49 GMT rennerc [6534] * branches/network/src/world_entities/world_entity.cc (modified) sync: check if model loaded Wed, 18 Jan 2006 12:21:33 GMT hdavid [6533] * branches/avi_play (copied) branches: added a copy of the trunk again Wed, 18 Jan 2006 12:19:58 GMT hdavid [6531] * branches/avi_play (deleted) Wed, 18 Jan 2006 12:19:25 GMT rennerc [6530] * branches/network/src/lib/lang/base_object.cc (modified) debug objectname Wed, 18 Jan 2006 12:18:40 GMT bottac [6529] * 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/static_model.cc (modified) * branches/height_map/src/lib/graphics/importer/vertex_array_model.cc (modified) * branches/height_map/src/world_entities/terrain.cc (modified) Some bugs fixed Wed, 18 Jan 2006 12:13:03 GMT rennerc [6528] * branches/network/src/world_entities/world_entity.cc (modified) dont sync md2 Wed, 18 Jan 2006 12:10:25 GMT patrick [6527] * branches/network/src/world_entities/space_ships/space_ship.cc (modified) network: spaceship has no focus anymore Wed, 18 Jan 2006 12:01:27 GMT rennerc [6526] * branches/network/src/lib/coord/p_node.cc (modified) * branches/network/src/lib/coord/p_node.h (modified) * branches/network/src/lib/network/network_game_manager.cc (modified) * branches/network/src/lib/network/network_stream.cc (modified) * branches/network/src/story_entities/multi_player_world_data.cc (modified) * branches/network/src/world_entities/space_ships/space_ship.cc (modified) pnode can sync now Wed, 18 Jan 2006 02:37:52 GMT patrick [6525] * branches/network/src/world_entities/planet.cc (modified) network: the gamemenu now looks quite nice. but there is more to ... Wed, 18 Jan 2006 02:27:12 GMT patrick [6524] * branches/network/src/defs/class_id.h (modified) * branches/network/src/story_entities/simple_game_menu.cc (modified) * branches/network/src/world_entities/Makefile.am (modified) * branches/network/src/world_entities/planet.cc (added) * branches/network/src/world_entities/planet.h (added) * branches/network/src/world_entities/skybox.cc (modified) network: added the planet to the menu Wed, 18 Jan 2006 00:57:58 GMT patrick [6521] * branches/network/src/story_entities/simple_game_menu.cc (modified) * branches/network/src/story_entities/simple_game_menu.h (modified) network: the background of the menu is now rotating (or the other way ... Tue, 17 Jan 2006 23:58:14 GMT patrick [6520] * branches/network/src/story_entities/simple_game_menu.cc (modified) * branches/network/src/story_entities/simple_game_menu.h (modified) * branches/network/src/world_entities/image_entity.cc (modified) * branches/network/src/world_entities/image_entity.h (modified) network: the simple menu now works. now i need more graphics, more ... Tue, 17 Jan 2006 21:50:19 GMT patrick [6516] * branches/network/src/world_entities/image_entity.cc (modified) network: imageentity working Tue, 17 Jan 2006 21:45:07 GMT patrick [6515] * branches/network/src/world_entities/image_entity.cc (modified) network: added the ImageEntity WorldEntity class which will soon ... Tue, 17 Jan 2006 21:44:34 GMT patrick [6514] * branches/network/src/defs/class_id.h (modified) * branches/network/src/world_entities/Makefile.am (modified) * branches/network/src/world_entities/image_entity.cc (added) * branches/network/src/world_entities/image_entity.h (added) * branches/network/src/world_entities/skybox.cc (modified) network: added the ImageEntity WorldEntity class which will soon ... Tue, 17 Jan 2006 21:35:53 GMT hdavid [6513] * branches/avi_play/src/lib/graphics/importer/movie_player.cc (modified) * branches/avi_play/src/world_entities/movie_entity.cc (modified) branches\avi_play: disable lighting for the movie_entity Tue, 17 Jan 2006 01:03:02 GMT patrick [6511] * branches/network/src/lib/graphics/graphics_engine.cc (modified) * branches/network/src/lib/graphics/importer/texture.cc (modified) * branches/network/src/world_entities/skybox.cc (modified) * branches/network/src/world_entities/skybox.h (modified) network: skybox is now fixed, there is no seam on the border anymore, ... Mon, 16 Jan 2006 15:29:04 GMT hdavid [6510] * 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: fixed loading Mon, 16 Jan 2006 12:09:26 GMT bknecht [6509] * branches/spaceshipcontrol/src/world_entities/space_ships/space_ship.cc (modified) * branches/spaceshipcontrol/src/world_entities/space_ships/space_ship.h (modified) Control: Major changes in Spaceshipcontrol. Go check it out! It's not ... Sun, 15 Jan 2006 23:23:49 GMT hdavid [6508] * branches/avi_play/src/world_entities/movie_entity.cc (modified) * branches/avi_play/src/world_entities/movie_entity.h (modified) Sun, 15 Jan 2006 14:33:54 GMT hdavid [6507] * branches/avi_play/src/defs/class_id.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: basic implementation of the world entity movie_entity Thu, 12 Jan 2006 15:10:05 GMT bknecht [6506] * branches/spaceshipcontrol/src/world_entities/space_ships/helicopter.cc (modified) * branches/spaceshipcontrol/src/world_entities/space_ships/space_ship.cc (modified) Control: Some keys for SpaceShip and Helicopter can now be altered in ... Thu, 12 Jan 2006 08:04:23 GMT bknecht [6505] * branches/spaceshipcontrol/src/world_entities/space_ships/helicopter.cc (modified) * branches/spaceshipcontrol/src/world_entities/space_ships/space_ship.cc (modified) Control: Helicopter and SpaceShip Control Thu, 12 Jan 2006 00:13:20 GMT patrick [6504] * branches/network/src/lib/sound/sound_source.h (modified) * branches/network/src/story_entities/campaign_data.cc (modified) * branches/network/src/story_entities/game_world.cc (modified) * branches/network/src/story_entities/game_world_data.cc (modified) * branches/network/src/story_entities/game_world_data.h (modified) * branches/network/src/story_entities/simple_game_menu.cc (modified) * branches/network/src/story_entities/simple_game_menu.h (modified) * branches/network/src/story_entities/story_entity.h (modified) network: some more menu work. There is no menu visible yet (only for ... Wed, 11 Jan 2006 22:54:32 GMT rennerc [6503] * 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) * branches/network/src/world_entities/space_ships/space_ship.cc (modified) networkGameManager now copies data to one buffer for each client Wed, 11 Jan 2006 21:49:27 GMT patrick [6502] * branches/network/src/defs/class_id.h (modified) * branches/network/src/story_entities/simple_game_menu.cc (modified) * branches/network/src/story_entities/simple_game_menu.h (modified) network: the simple menu is a game world, that is a little more ... Wed, 11 Jan 2006 21:19:35 GMT patrick [6501] * branches/network/src/story_entities/Makefile.am (modified) * branches/network/src/story_entities/simple_game_menu.cc (added) * branches/network/src/story_entities/simple_game_menu.h (added) network: prepearing the game menu Wed, 11 Jan 2006 21:00:57 GMT patrick [6500] * branches/network (copied) * branches/network/src/lib/coord/p_node.cc (copied) * branches/network/src/lib/coord/p_node.h (copied) * branches/network/src/lib/lang/base_object.cc (copied) * branches/network/src/lib/network/network_game_manager.cc (copied) * branches/network/src/lib/network/network_game_manager.h (copied) * branches/network/src/lib/network/network_stream.cc (copied) * branches/network/src/story_entities/game_world.cc (copied) * branches/network/src/story_entities/game_world.h (copied) * branches/network/src/story_entities/multi_player_world.cc (copied) * branches/network/src/story_entities/multi_player_world.h (copied) * branches/network/src/story_entities/multi_player_world_data.cc (copied) * branches/network/src/story_entities/multi_player_world_data.h (copied) * branches/network/src/util/hud.cc (copied) * branches/network/src/util/state.cc (copied) * branches/network/src/util/state.h (copied) * branches/network/src/world_entities/power_ups/param_power_up.cc (copied) * branches/network/src/world_entities/power_ups/power_up.cc (copied) * branches/network/src/world_entities/power_ups/turret_power_up.cc (copied) * branches/network/src/world_entities/skybox.cc (copied) * branches/network/src/world_entities/space_ships/space_ship.cc (copied) * branches/network/src/world_entities/world_entity.cc (copied) * branches/network/src/world_entities/world_entity.h (copied) network: added branche network again: fresh copy of the trunk Wed, 11 Jan 2006 21:00:18 GMT patrick [6499] * branches/network (deleted) removed the network branche Wed, 11 Jan 2006 16:45:38 GMT bknecht [6497] * 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/space_ship.cc (modified) Control: Helicoptercontrol updated Wed, 11 Jan 2006 16:06:43 GMT patrick [6493] * 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/story_entities/multi_player_world_data.cc (modified) * branches/network/src/util/state.cc (modified) * branches/network/src/util/state.h (modified) * branches/network/src/world_entities/power_ups/power_up.cc (modified) * branches/network/src/world_entities/power_ups/turret_power_up.cc (modified) * branches/network/src/world_entities/world_entity.cc (modified) network: playable creation fix Wed, 11 Jan 2006 16:01:35 GMT bensch [6491] * branches/avi_play (moved) moved branches/avi-play-merge to branches/avi_play Wed, 11 Jan 2006 16:01:05 GMT bensch [6490] * branches/avi_play (deleted) deleted avi_play Wed, 11 Jan 2006 15:48:53 GMT stefalie [6489] * branches/avi_play_merge/src/world_entities/movie_entity.cc (modified) * branches/avi_play_merge/src/world_entities/movie_entity.h (modified) avi_play_merge: fastfactory works Wed, 11 Jan 2006 15:33:14 GMT stefalie [6488] * branches/avi_play_merge/src/defs/class_id.h (modified) * branches/avi_play_merge/src/world_entities/Makefile.am (modified) * branches/avi_play_merge/src/world_entities/movie_entity.cc (added) * branches/avi_play_merge/src/world_entities/movie_entity.h (added) avi_play_merge: movie_entity added Wed, 11 Jan 2006 15:18:14 GMT manuel [6487] * branches/powerups/src/world_entities/playable.cc (modified) * branches/powerups/src/world_entities/playable.h (modified) * branches/powerups/src/world_entities/power_ups/param_power_up.cc (modified) * branches/powerups/src/world_entities/power_ups/param_power_up.h (modified) * branches/powerups/src/world_entities/power_ups/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) moved pickup from spaceship to playable. playable can now pickup ... Wed, 11 Jan 2006 15:01:06 GMT bensch [6486] * branches/avi_play_merge/config.h.in (modified) * branches/avi_play_merge/configure.ac (modified) * branches/avi_play_merge/src/defs/class_id.h (modified) * branches/avi_play_merge/src/lib/graphics/importer/Makefile.am (modified) * branches/avi_play_merge/src/lib/graphics/importer/media_container.cc (copied) * branches/avi_play_merge/src/lib/graphics/importer/media_container.h (copied) * branches/avi_play_merge/src/lib/graphics/importer/movie_player.cc (copied) * branches/avi_play_merge/src/lib/graphics/importer/movie_player.h (copied) * branches/avi_play_merge/src/lib/graphics/importer/texture.cc (modified) * branches/avi_play_merge/src/lib/graphics/importer/texture_sequence.cc (modified) * branches/avi_play_merge/src/lib/graphics/importer/texture_sequence.h (modified) * branches/avi_play_merge/src/subprojects/importer/Makefile.am (modified) * branches/avi_play_merge/src/subprojects/importer/movie_player_test.cc (copied) * branches/avi_play_merge/src/subprojects/importer/multitex.cc (modified) orxonox/branches/avi_play_merge: merged the trunk, commit for testing Wed, 11 Jan 2006 14:42:52 GMT bknecht [6485] * branches/spaceshipcontrol/src/lib/graphics/importer/tc.cc (modified) * branches/spaceshipcontrol/src/lib/graphics/text_engine/font.cc (modified) * branches/spaceshipcontrol/src/lib/graphics/text_engine/font.h (modified) uint corrections Wed, 11 Jan 2006 14:36:21 GMT bensch [6484] * branches/avi_play_merge (copied) copy of the trunk for merging the avi_player into the trunk Wed, 11 Jan 2006 14:35:24 GMT rennerc [6483] * branches/network/src/lib/coord/p_node.cc (modified) * branches/network/src/lib/lang/base_object.cc (modified) * branches/network/src/lib/network/network_game_manager.cc (modified) * branches/network/src/lib/network/network_stream.cc (modified) * branches/network/src/world_entities/skybox.cc (modified) * branches/network/src/world_entities/space_ships/space_ship.cc (modified) base_object.cc: fixed bug with sync Wed, 11 Jan 2006 14:32:53 GMT bensch [6482] * branches/spaceshipcontrol (copied) control: copy trunk again