# # ChangeLog for branches in orxonox.OLD # # Generated by Trac 1.0.9 # Nov 23, 2024, 10:02:02 PM 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 Wed, 11 Jan 2006 14:32:40 GMT bensch [6481] * branches/spaceshipcontrol (deleted) delete Wed, 11 Jan 2006 14:28:05 GMT bensch [6479] * branches/spaceshipcontrol (copied) new copy of the trunk Wed, 11 Jan 2006 14:27:51 GMT bensch [6478] * branches/spaceshipcontrol (deleted) delete again Wed, 11 Jan 2006 14:08:06 GMT bensch [6476] * branches/spaceshipcontrol (copied) branches: copied the trunk to spaceshipcontrol AGAIN Wed, 11 Jan 2006 14:07:32 GMT bensch [6475] * branches/spaceshipcontrol (deleted) deleted branche/spaceshipcontrol Wed, 11 Jan 2006 13:56:07 GMT bensch [6474] * branches/powerups (copied) branches: created branche powerups as a copy of the trunk Wed, 11 Jan 2006 13:55:36 GMT bensch [6473] * branches/powerups (deleted) delete branche powerups Wed, 11 Jan 2006 13:11:16 GMT bottac [6472] * 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/texture.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/world_entities/terrain.cc (modified) Added Class Tile to HeightMap (allows a primitive LOD Implementation). Wed, 11 Jan 2006 11:20:56 GMT rennerc [6469] * 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_stream.cc (modified) * branches/network/src/world_entities/power_ups/param_power_up.cc (modified) * branches/network/src/world_entities/skybox.cc (modified) * branches/network/src/world_entities/space_ships/space_ship.cc (modified) * branches/network/src/world_entities/world_entity.cc (modified) space_ship: tried to implement control synchronization entities will ... Wed, 11 Jan 2006 10:09:48 GMT patrick [6466] * branches/network/src/story_entities/multi_player_world_data.cc (modified) network: the spaceship spawning bug has been fixed, but no there is ... Tue, 10 Jan 2006 13:53:57 GMT patrick [6464] * branches/network/src/story_entities/multi_player_world_data.cc (modified) * branches/network/src/story_entities/multi_player_world_data.h (modified) network: MultiPlayerWorld debug now switches between to ... Tue, 10 Jan 2006 12:56:38 GMT patrick [6463] * branches/network/src/lib/network/network_game_manager.cc (modified) * branches/network/src/story_entities/multi_player_world.cc (modified) * branches/network/src/story_entities/multi_player_world.h (modified) * branches/network/src/story_entities/multi_player_world_data.cc (modified) * branches/network/src/story_entities/multi_player_world_data.h (modified) * branches/network/src/world_entities/space_ships/space_ship.cc (modified) network: implemented a better debug function Tue, 10 Jan 2006 01:20:37 GMT patrick [6462] * branches/network/src/story_entities/multi_player_world_data.cc (modified) network: work flush Tue, 10 Jan 2006 01:10:39 GMT patrick [6461] * branches/network/src/lib/coord/p_node.h (modified) * branches/network/src/world_entities/world_entity.h (modified) network: changed the network synchronizeable design slighlty Tue, 10 Jan 2006 01:05:57 GMT patrick [6460] * branches/network/src/story_entities/game_world.cc (modified) * branches/network/src/story_entities/multi_player_world_data.cc (modified) network: skybox parenting fix Tue, 10 Jan 2006 01:00:20 GMT patrick [6459] * branches/network/src/lib/network/network_game_manager.cc (modified) * branches/network/src/story_entities/game_world.cc (modified) * branches/network/src/story_entities/game_world.h (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) network: skybox parenting fix Mon, 09 Jan 2006 20:19:17 GMT bensch [6451] * branches/cd_merge (copied) branches: copy trunk to cd_merge Mon, 09 Jan 2006 13:14:00 GMT bensch [6450] * branches/collision_detection/src/lib/collision_detection/cd_engine.cc (modified) * branches/collision_detection/src/lib/math/matrix.cc (modified) * branches/collision_detection/src/subprojects/collision_detection/collision_detection.cc (modified) cd: correctness Mon, 09 Jan 2006 13:02:49 GMT patrick [6449] * branches/collision_detection/configure (modified) * branches/collision_detection/src/lib/collision_detection/obb_tree_node.cc (modified) cd: draw fix Mon, 09 Jan 2006 11:38:12 GMT patrick [6448] * branches/collision_detection/src/lib/collision_detection/obb_tree.cc (modified) * branches/collision_detection/src/lib/collision_detection/obb_tree_node.cc (modified) * branches/collision_detection/src/lib/collision_detection/obb_tree_node.h (modified) collisiondetection: some small changes Sun, 08 Jan 2006 23:39:15 GMT patrick [6447] * branches/collision_detection/src/lib/collision_detection/bv_tree_node.h (modified) * branches/collision_detection/src/lib/collision_detection/obb_tree.cc (modified) * branches/collision_detection/src/lib/collision_detection/obb_tree.h (modified) * branches/collision_detection/src/lib/collision_detection/obb_tree_node.cc (modified) * branches/collision_detection/src/lib/collision_detection/obb_tree_node.h (modified) collision: some more debug work on the collision detection framework Sat, 07 Jan 2006 22:21:07 GMT bensch [6429] * branches/spaceshipcontrol (copied) branches: spaceshipcontrol: added as copy of the trunk again Sat, 07 Jan 2006 22:20:42 GMT bensch [6428] * branches/network (copied) branches: copied the trunk again to network Sat, 07 Jan 2006 22:18:34 GMT bensch [6427] * branches/spaceshipcontrol (deleted) branches: deleted branche spaceshipcontrol reason: merged into the trunk Sat, 07 Jan 2006 22:08:12 GMT bensch [6425] * branches/network (deleted) deleted branche network reason: merged to the trunk Sat, 07 Jan 2006 22:07:22 GMT bensch [6424] * branches/preferences/AUTHORS (modified) * trunk/scripts/orxonoxServer.sh (copied) * trunk/src/Makefile.am (modified) * trunk/src/defs/class_id.h (modified) * trunk/src/lib/Makefile.am (modified) * trunk/src/lib/coord/p_node.cc (modified) * trunk/src/lib/coord/p_node.h (modified) * trunk/src/lib/data (copied) * trunk/src/lib/data/data_tank.cc (copied) * trunk/src/lib/data/data_tank.h (copied) * trunk/src/lib/network/network_game_manager.cc (modified) * trunk/src/lib/network/network_game_manager.h (modified) * trunk/src/lib/network/synchronizeable.cc (modified) * trunk/src/orxonox.cc (modified) * trunk/src/story_entities/campaign.cc (modified) * trunk/src/story_entities/campaign.h (modified) * trunk/src/story_entities/campaign_data.cc (copied) * trunk/src/story_entities/campaign_data.h (copied) * trunk/src/story_entities/debug_world.cc (modified) * trunk/src/story_entities/debug_world.h (modified) * trunk/src/story_entities/dedicated_server_world.cc (copied) * trunk/src/story_entities/dedicated_server_world.h (copied) * trunk/src/story_entities/game_world.cc (copied) * trunk/src/story_entities/game_world.h (copied) * trunk/src/story_entities/game_world_data.cc (copied) * trunk/src/story_entities/game_world_data.h (copied) * trunk/src/story_entities/multi_player_world.cc (copied) * trunk/src/story_entities/multi_player_world.h (copied) * trunk/src/story_entities/multi_player_world_data.cc (copied) * trunk/src/story_entities/multi_player_world_data.h (copied) * trunk/src/story_entities/network_world.cc (deleted) * trunk/src/story_entities/network_world.h (deleted) * trunk/src/story_entities/single_player_world.cc (copied) * trunk/src/story_entities/single_player_world.h (copied) * trunk/src/story_entities/single_player_world_data.cc (copied) * trunk/src/story_entities/single_player_world_data.h (copied) * trunk/src/story_entities/story_entity.cc (modified) * trunk/src/story_entities/story_entity.h (modified) * trunk/src/story_entities/world.cc (deleted) * trunk/src/story_entities/world.h (deleted) * trunk/src/subprojects/network/network_unit_test.cc (modified) * trunk/src/util/loading/game_loader.cc (modified) * trunk/src/util/loading/game_loader.h (modified) * trunk/src/world_entities/camera.cc (modified) * trunk/src/world_entities/power_ups/laser_power_up.cc (modified) * trunk/src/world_entities/power_ups/laser_power_up.h (modified) * trunk/src/world_entities/power_ups/param_power_up.cc (modified) * trunk/src/world_entities/power_ups/param_power_up.h (modified) * trunk/src/world_entities/power_ups/power_up.cc (modified) * trunk/src/world_entities/power_ups/power_up.h (modified) * trunk/src/world_entities/power_ups/turret_power_up.cc (modified) * trunk/src/world_entities/power_ups/turret_power_up.h (modified) * trunk/src/world_entities/power_ups/weapon_power_up.cc (modified) * trunk/src/world_entities/power_ups/weapon_power_up.h (modified) * trunk/src/world_entities/space_ships/space_ship.cc (modified) * trunk/src/world_entities/space_ships/space_ship.h (modified) * trunk/src/world_entities/spawning_point.cc (modified) * trunk/src/world_entities/weapons/ground_turret.cc (modified) * trunk/src/world_entities/world_entity.cc (modified) * trunk/src/world_entities/world_entity.h (modified) orxonox/trunk: merged the branche network back to the trunk merged ... Fri, 06 Jan 2006 22:59:11 GMT bensch [6423] * branches/preferences/configure.ac (modified) * trunk/src/lib/graphics/importer/static_model.cc (modified) * trunk/src/lib/graphics/importer/static_model.h (modified) trunk: staticModel now uses vector instead of tArray (more portable) Fri, 06 Jan 2006 19:07:25 GMT rennerc [6422] * branches/network/src/lib/network/synchronizeable.cc (modified) * branches/network/src/world_entities/world_entity.cc (modified) Fri, 06 Jan 2006 18:11:34 GMT rennerc [6421] * branches/network/src/world_entities/power_ups/param_power_up.cc (modified) * branches/network/src/world_entities/world_entity.cc (modified) ParamPowerUp now syncs state correctly fixed a bug in worldEntity Fri, 06 Jan 2006 17:41:59 GMT rennerc [6420] * branches/network/src/lib/network/network_game_manager.cc (modified) * branches/network/src/world_entities/power_ups/param_power_up.cc (modified) * branches/network/src/world_entities/power_ups/param_power_up.h (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/terrain.cc (modified) tried to place ParamPowerUp Fri, 06 Jan 2006 17:19:30 GMT rennerc [6419] * branches/network/src/lib/network/network_game_manager.cc (modified) * branches/network/src/lib/network/network_game_manager.h (modified) * branches/network/src/subprojects/network/network_unit_test.cc (modified) * branches/network/src/world_entities/power_ups/laser_power_up.cc (modified) * branches/network/src/world_entities/power_ups/laser_power_up.h (modified) * branches/network/src/world_entities/power_ups/param_power_up.cc (modified) * branches/network/src/world_entities/power_ups/power_up.cc (modified) * branches/network/src/world_entities/power_ups/power_up.h (modified) * branches/network/src/world_entities/power_ups/turret_power_up.cc (modified) * branches/network/src/world_entities/power_ups/turret_power_up.h (modified) * branches/network/src/world_entities/power_ups/weapon_power_up.cc (modified) * branches/network/src/world_entities/power_ups/weapon_power_up.h (modified) * branches/network/src/world_entities/world_entity.cc (modified) some more entities should sync now Fri, 06 Jan 2006 15:16:47 GMT bensch [6418] * branches/network/src/world_entities/world_entity.cc (modified) network: scaling: warn instead of just set to 1.0 if the value of ... Fri, 06 Jan 2006 15:00:21 GMT bensch [6417] * branches/network/src/world_entities/space_ships/space_ship.cc (modified) * branches/network/src/world_entities/weapons/ground_turret.cc (modified) * branches/network/src/world_entities/world_entity.cc (modified) * branches/network/src/world_entities/world_entity.h (modified) network: scale to ALLWAY 1 Fri, 06 Jan 2006 14:28:51 GMT bensch [6416] * branches/network/src/story_entities/game_world.cc (modified) network: PNodes visible again Fri, 06 Jan 2006 14:23:36 GMT bensch [6415] * branches/network/src/lib/coord/p_node.cc (modified) * branches/network/src/lib/coord/p_node.h (modified) * branches/network/src/world_entities/world_entity.cc (modified) * branches/network/src/world_entities/world_entity.h (modified) network: some debug functions Fri, 06 Jan 2006 13:47:36 GMT rennerc [6414] * branches/network/src/lib/network/network_game_manager.cc (modified) * branches/network/src/world_entities/power_ups/param_power_up.cc (modified) * branches/network/src/world_entities/terrain.cc (modified) Fri, 06 Jan 2006 12:53:12 GMT bensch [6413] * branches/network/src/world_entities/power_ups/power_up.cc (modified) better includeds Fri, 06 Jan 2006 12:28:36 GMT bensch [6412] * branches/network/src/lib/network/network_game_manager.cc (modified) * branches/network/src/lib/network/network_game_manager.h (modified) * branches/network/src/story_entities/game_world.cc (modified) * branches/network/src/story_entities/multi_player_world_data.cc (modified) * branches/network/src/world_entities/power_ups/param_power_up.cc (modified) ParamPowerUp is now also loaded correctly Fri, 06 Jan 2006 12:00:22 GMT bensch [6411] * branches/preferences/src/lib/lang/class_list.cc (modified) trunk: sync Wed, 04 Jan 2006 18:50:52 GMT rennerc [6410] * branches/preferences/configure.ac (modified) * branches/preferences/src/Makefile.am (modified) * branches/preferences/src/lib/Makefile.am (modified) * branches/preferences/src/lib/argp (deleted) * branches/preferences/src/lib/parser/preferences/cmd_line_prefs_reader.cc (modified) * branches/preferences/src/lib/parser/preferences/cmd_line_prefs_reader.h (modified) removed argp Wed, 04 Jan 2006 15:18:52 GMT patrick [6409] * branches/network/src/story_entities/game_world.cc (modified) * branches/network/src/story_entities/multi_player_world.cc (modified) * branches/network/src/story_entities/multi_player_world.h (modified) * branches/network/src/story_entities/multi_player_world_data.cc (modified) * branches/network/src/story_entities/single_player_world.cc (modified) * branches/network/src/story_entities/story_entity.cc (modified) network: the network loading now works again, couldn't test it over ... Wed, 04 Jan 2006 14:53:49 GMT patrick [6408] * branches/network/src/story_entities/game_world.cc (modified) * branches/network/src/story_entities/multi_player_world.cc (modified) * branches/network/src/story_entities/multi_player_world.h (modified) * branches/network/src/story_entities/multi_player_world_data.h (modified) * branches/network/src/story_entities/single_player_world.cc (modified) * branches/network/src/story_entities/single_player_world_data.h (modified) network: MultiPlayerWorld does load again Wed, 04 Jan 2006 14:40:30 GMT patrick [6407] * branches/network/AUTHORS (modified) * branches/network/src/story_entities/campaign.cc (modified) * branches/network/src/story_entities/campaign_data.cc (modified) * branches/network/src/story_entities/campaign_data.h (modified) * branches/network/src/story_entities/game_world.cc (modified) * branches/network/src/story_entities/game_world.h (modified) * branches/network/src/story_entities/single_player_world.cc (modified) * branches/network/src/story_entities/single_player_world.h (modified) * branches/network/src/story_entities/single_player_world_data.cc (modified) * branches/network/src/story_entities/single_player_world_data.h (modified) network: the worlds get loaded again in the new framework Wed, 04 Jan 2006 13:47:56 GMT hdavid [6406] * 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: some cleanup Wed, 04 Jan 2006 04:04:07 GMT bensch [6405] * branches/preferences/src/lib/graphics/importer/tc.c (modified) * branches/preferences/src/lib/graphics/importer/tc.h (modified) * branches/preferences/src/lib/graphics/importer/vertex_array_model.cc (modified) * branches/preferences/src/lib/graphics/text_engine/font.cc (modified) * branches/preferences/src/lib/graphics/text_engine/font.h (modified) prefs: compile uint on windows (as unsigned int) Wed, 04 Jan 2006 00:49:20 GMT patrick [6404] * branches/network/src/Makefile.am (modified) * branches/network/src/lib/Makefile.am (modified) * branches/network/src/lib/data (added) * branches/network/src/lib/data/data_tank.cc (added) * branches/network/src/lib/data/data_tank.h (added) * branches/network/src/story_entities/campaign_data.cc (modified) * branches/network/src/story_entities/campaign_data.h (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/multi_player_world.cc (modified) * branches/network/src/story_entities/multi_player_world.h (modified) * branches/network/src/story_entities/multi_player_world_data.cc (added) * branches/network/src/story_entities/multi_player_world_data.h (added) * branches/network/src/story_entities/single_player_world.cc (modified) * branches/network/src/story_entities/single_player_world.h (modified) * branches/network/src/story_entities/single_player_world_data.cc (added) * branches/network/src/story_entities/single_player_world_data.h (added) network: working on the last steps, completion is in reach. sadly the ... Tue, 03 Jan 2006 23:38:58 GMT rennerc [6403] * branches/preferences/src/lib/argp/argp.h (modified) * branches/preferences/src/lib/parser/preferences/cmd_line_prefs_reader.cc (modified) argp.h tells you now if it is compiled as C or as C++ maybe this ... Tue, 03 Jan 2006 22:04:50 GMT patrick [6402] * branches/network/src/Makefile.am (modified) * branches/network/src/defs/class_id.h (modified) * branches/network/src/lib/coord/p_node.cc (modified) * branches/network/src/lib/coord/p_node.h (modified) * branches/network/src/story_entities/campaign.cc (modified) * branches/network/src/story_entities/campaign.h (modified) * branches/network/src/story_entities/campaign_data.cc (added) * branches/network/src/story_entities/campaign_data.h (added) * branches/network/src/story_entities/game_world.cc (modified) * branches/network/src/story_entities/game_world.h (modified) * branches/network/src/story_entities/game_world_data.cc (added) * branches/network/src/story_entities/game_world_data.h (added) * branches/network/src/story_entities/multi_player_world.cc (modified) * branches/network/src/story_entities/single_player_world.cc (modified) network: more modularity for the GameWorld: data and process are now ... Tue, 03 Jan 2006 18:47:05 GMT hdavid [6401] * 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 Tue, 03 Jan 2006 17:40:54 GMT rennerc [6400] * branches/preferences/src/lib/argp/argp.h (modified) Tue, 03 Jan 2006 17:38:12 GMT rennerc [6399] * branches/preferences/src/lib/argp/argp.h (modified) Tue, 03 Jan 2006 17:32:15 GMT rennerc [6398] * branches/preferences/src/lib/parser/preferences/cmd_line_prefs_reader.cc (modified) Tue, 03 Jan 2006 15:35:43 GMT rennerc [6397] * branches/preferences/src/lib/parser/preferences/cmd_line_prefs_reader.cc (modified) Tue, 03 Jan 2006 14:56:02 GMT rennerc [6396] * branches/preferences/src/lib/parser/ini_parser/ini_parser.cc (modified) Tue, 03 Jan 2006 14:54:08 GMT rennerc [6395] * branches/preferences/src/lib/parser/ini_parser/ini_parser.h (modified) * branches/preferences/src/lib/parser/preferences/ini_file_prefs_reader.h (modified)